D1640.diff
No OneTemporary
Actions

Size

20 KB

Referenced Files

None

Subscribers

None

D1640.diff
View Options

	Index: sys/dev/ixl/if_ixl.c
	===================================================================
	--- sys/dev/ixl/if_ixl.c
	+++ sys/dev/ixl/if_ixl.c
	@@ -112,10 +112,10 @@
	static void ixl_set_queue_tx_itr(struct ixl_queue *);
	static int ixl_set_advertised_speeds(struct ixl_pf *, int);

	-static void ixl_enable_rings(struct ixl_vsi *);
	-static void ixl_disable_rings(struct ixl_vsi *);
	-static void ixl_enable_intr(struct ixl_vsi *);
	-static void ixl_disable_intr(struct ixl_vsi *);
	+static int ixl_enable_rings(struct ixl_vsi *);
	+static int ixl_disable_rings(struct ixl_vsi *);
	+static void ixl_enable_intr(struct ixl_vsi *);
	+static void ixl_disable_intr(struct ixl_vsi *);

	static void ixl_enable_adminq(struct i40e_hw *);
	static void ixl_disable_adminq(struct i40e_hw *);
	@@ -139,6 +139,8 @@
	static struct ixl_mac_filter *
	ixl_find_filter(struct ixl_vsi , u8 , s16);
	static void ixl_add_mc_filter(struct ixl_vsi , u8 );
	+static void ixl_free_mac_filters(struct ixl_vsi *vsi);
	+

	/* Sysctl debug interface */
	static int ixl_debug_info(SYSCTL_HANDLER_ARGS);
	@@ -168,6 +170,7 @@
	struct i40e_eth_stats *);
	static void ixl_update_stats_counters(struct ixl_pf *);
	static void ixl_update_eth_stats(struct ixl_vsi *);
	+static void ixl_update_vsi_stats(struct ixl_vsi *);
	static void ixl_pf_reset_stats(struct ixl_pf *);
	static void ixl_vsi_reset_stats(struct ixl_vsi *);
	static void ixl_stat_update48(struct i40e_hw *, u32, u32, bool,
	@@ -281,6 +284,9 @@
	#endif


	+static uint8_t ixl_bcast_addr[ETHER_ADDR_LEN] =
	+ {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
	+
	static char *ixl_fc_string[6] = {
	"None",
	"Rx",
	@@ -921,7 +927,7 @@
	ixl_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
	{
	struct ixl_vsi *vsi = ifp->if_softc;
	- struct ixl_pf pf = (struct ixl_pf )vsi->back;
	+ struct ixl_pf *pf = vsi->back;
	struct ifreq ifr = (struct ifreq ) data;
	#if defined(INET) \|\| defined(INET6)
	struct ifaddr ifa = (struct ifaddr )data;
	@@ -1119,7 +1125,10 @@
	ixl_config_rss(vsi);

	/* Setup the VSI */
	- ixl_setup_vsi(vsi);
	+ if (ixl_setup_vsi(vsi)) {
	+ device_printf(dev,"ixl_setup_vsi() failed!\n");
	+ return;
	+ }

	/*
	** Prepare the rings, hmc contexts, etc...
	@@ -1149,6 +1158,7 @@

	i40e_aq_set_default_vsi(hw, vsi->seid, NULL);

	+
	/* Set MTU in hardware*/
	int aq_error = i40e_aq_set_mac_config(hw, vsi->max_frame_size,
	TRUE, 0, NULL);
	@@ -1369,7 +1379,7 @@
	ixl_media_status(struct ifnet * ifp, struct ifmediareq * ifmr)
	{
	struct ixl_vsi *vsi = ifp->if_softc;
	- struct ixl_pf pf = (struct ixl_pf )vsi->back;
	+ struct ixl_pf *pf = vsi->back;
	struct i40e_hw *hw = &pf->hw;

	INIT_DEBUGOUT("ixl_media_status: begin");
	@@ -1764,7 +1774,7 @@
	enum i40e_fc_mode fc;


	- if (vsi->link_up){
	+ if (vsi->link_up){
	if (vsi->link_active == FALSE) {
	i40e_aq_get_link_info(hw, TRUE, NULL, NULL);
	if (bootverbose) {
	@@ -2616,7 +2626,7 @@
	ixl_init_tx_ring(que);

	/* Next setup the HMC RX Context */
	- if (vsi->max_frame_size <= 2048)
	+ if (vsi->max_frame_size <= MCLBYTES)
	rxr->mbuf_sz = MCLBYTES;
	else
	rxr->mbuf_sz = MJUMPAGESIZE;
	@@ -2679,7 +2689,6 @@
	{
	struct ixl_pf pf = (struct ixl_pf )vsi->back;
	struct ixl_queue *que = vsi->queues;
	- struct ixl_mac_filter *f;

	/* Free station queues */
	for (int i = 0; i < vsi->num_queues; i++, que++) {
	@@ -2708,6 +2717,14 @@
	free(vsi->queues, M_DEVBUF);

	/* Free VSI filter list */
	+ ixl_free_mac_filters(vsi);
	+}
	+
	+static void
	+ixl_free_mac_filters(struct ixl_vsi *vsi)
	+{
	+ struct ixl_mac_filter *f;
	+
	while (!SLIST_EMPTY(&vsi->ftl)) {
	f = SLIST_FIRST(&vsi->ftl);
	SLIST_REMOVE_HEAD(&vsi->ftl, next);
	@@ -2739,6 +2756,7 @@
	vsi->hw = &pf->hw;
	vsi->id = 0;
	vsi->num_vlans = 0;
	+ vsi->back = pf;

	/* Get memory for the station queues */
	if (!(vsi->queues =
	@@ -2991,6 +3009,27 @@
	return;
	}

	+#define QUEUE_NAME_LEN 32
	+
	+static void
	+ixl_add_vsi_sysctls(struct ixl_pf pf, struct ixl_vsi vsi,
	+ struct sysctl_ctx_list *ctx)
	+{
	+ struct sysctl_oid *tree;
	+ struct sysctl_oid_list *child;
	+ struct sysctl_oid_list *vsi_list;
	+ char vsi_namebuf[QUEUE_NAME_LEN];
	+
	+ tree = device_get_sysctl_tree(pf->dev);
	+ child = SYSCTL_CHILDREN(tree);
	+ snprintf(vsi_namebuf, QUEUE_NAME_LEN, "vsi%d",
	+ vsi->info.stat_counter_idx);
	+ vsi->vsi_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, vsi_namebuf,
	+ CTLFLAG_RD, NULL, "VSI Number");
	+ vsi_list = SYSCTL_CHILDREN(vsi->vsi_node);
	+
	+ ixl_add_sysctls_eth_stats(ctx, vsi_list, &vsi->eth_stats);
	+}

	static void
	ixl_add_hw_stats(struct ixl_pf *pf)
	@@ -2998,18 +3037,19 @@
	device_t dev = pf->dev;
	struct ixl_vsi *vsi = &pf->vsi;
	struct ixl_queue *queues = vsi->queues;
	- struct i40e_eth_stats *vsi_stats = &vsi->eth_stats;
	struct i40e_hw_port_stats *pf_stats = &pf->stats;

	struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(dev);
	struct sysctl_oid *tree = device_get_sysctl_tree(dev);
	struct sysctl_oid_list *child = SYSCTL_CHILDREN(tree);
	+ struct sysctl_oid_list *vsi_list;

	- struct sysctl_oid vsi_node, queue_node;
	- struct sysctl_oid_list vsi_list, queue_list;
	+ struct sysctl_oid *queue_node;
	+ struct sysctl_oid_list *queue_list;

	struct tx_ring *txr;
	struct rx_ring *rxr;
	+ char queue_namebuf[QUEUE_NAME_LEN];

	/* Driver statistics */
	SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "watchdog_events",
	@@ -3019,17 +3059,9 @@
	CTLFLAG_RD, &pf->admin_irq,
	"Admin Queue IRQ Handled");

	- /* VSI statistics */
	-#define QUEUE_NAME_LEN 32
	- char queue_namebuf[QUEUE_NAME_LEN];
	-
	- // ERJ: Only one vsi now, re-do when >1 VSI enabled
	- // snprintf(vsi_namebuf, QUEUE_NAME_LEN, "vsi%d", vsi->info.stat_counter_idx);
	- vsi_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "vsi",
	- CTLFLAG_RD, NULL, "VSI-specific stats");
	- vsi_list = SYSCTL_CHILDREN(vsi_node);

	- ixl_add_sysctls_eth_stats(ctx, vsi_list, vsi_stats);
	+ ixl_add_vsi_sysctls(pf, &pf->vsi, ctx);
	+ vsi_list = SYSCTL_CHILDREN(pf->vsi.vsi_node);

	/* Queue statistics */
	for (int q = 0; q < vsi->num_queues; q++) {
	@@ -3357,9 +3389,9 @@
	static void
	ixl_init_filters(struct ixl_vsi *vsi)
	{
	+
	/* Add broadcast address */
	- u8 bc[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
	- ixl_add_filter(vsi, bc, IXL_VLAN_ANY);
	+ ixl_add_filter(vsi, ixl_bcast_addr, IXL_VLAN_ANY);
	}

	/*
	@@ -3395,10 +3427,14 @@
	ixl_add_filter(struct ixl_vsi vsi, u8 macaddr, s16 vlan)
	{
	struct ixl_mac_filter f, tmp;
	- device_t dev = vsi->dev;
	+ struct ixl_pf *pf;
	+ device_t dev;

	DEBUGOUT("ixl_add_filter: begin");

	+ pf = vsi->back;
	+ dev = pf->dev;
	+
	/* Does one already exist */
	f = ixl_find_filter(vsi, macaddr, vlan);
	if (f != NULL)
	@@ -3485,10 +3521,16 @@
	{
	struct i40e_aqc_add_macvlan_element_data a, b;
	struct ixl_mac_filter *f;
	- struct i40e_hw *hw = vsi->hw;
	- device_t dev = vsi->dev;
	+ struct ixl_pf *pf;
	+ struct i40e_hw *hw;
	+ device_t dev;
	int err, j = 0;

	+ pf = vsi->back;
	+ dev = pf->dev;
	+ hw = &pf->hw;
	+ IXL_PF_LOCK_ASSERT(pf);
	+
	a = malloc(sizeof(struct i40e_aqc_add_macvlan_element_data) * cnt,
	M_DEVBUF, M_NOWAIT \| M_ZERO);
	if (a == NULL) {
	@@ -3535,13 +3577,18 @@
	ixl_del_hw_filters(struct ixl_vsi *vsi, int cnt)
	{
	struct i40e_aqc_remove_macvlan_element_data d, e;
	- struct i40e_hw *hw = vsi->hw;
	- device_t dev = vsi->dev;
	+ struct ixl_pf *pf;
	+ struct i40e_hw *hw;
	+ device_t dev;
	struct ixl_mac_filter f, f_temp;
	int err, j = 0;

	DEBUGOUT("ixl_del_hw_filters: begin\n");

	+ pf = vsi->back;
	+ hw = &pf->hw;
	+ dev = pf->dev;
	+
	d = malloc(sizeof(struct i40e_aqc_remove_macvlan_element_data) * cnt,
	M_DEVBUF, M_NOWAIT \| M_ZERO);
	if (d == NULL) {
	@@ -3585,82 +3632,106 @@
	return;
	}

	-
	-static void
	+static int
	ixl_enable_rings(struct ixl_vsi *vsi)
	{
	- struct i40e_hw *hw = vsi->hw;
	+ struct ixl_pf *pf = vsi->back;
	+ struct i40e_hw *hw = &pf->hw;
	+ int index, error;
	u32 reg;

	+ error = 0;
	for (int i = 0; i < vsi->num_queues; i++) {
	- i40e_pre_tx_queue_cfg(hw, i, TRUE);
	+ index = vsi->first_queue + i;
	+ i40e_pre_tx_queue_cfg(hw, index, TRUE);

	- reg = rd32(hw, I40E_QTX_ENA(i));
	+ reg = rd32(hw, I40E_QTX_ENA(index));
	reg \|= I40E_QTX_ENA_QENA_REQ_MASK \|
	I40E_QTX_ENA_QENA_STAT_MASK;
	- wr32(hw, I40E_QTX_ENA(i), reg);
	+ wr32(hw, I40E_QTX_ENA(index), reg);
	/* Verify the enable took */
	for (int j = 0; j < 10; j++) {
	- reg = rd32(hw, I40E_QTX_ENA(i));
	+ reg = rd32(hw, I40E_QTX_ENA(index));
	if (reg & I40E_QTX_ENA_QENA_STAT_MASK)
	break;
	i40e_msec_delay(10);
	}
	- if ((reg & I40E_QTX_ENA_QENA_STAT_MASK) == 0)
	- printf("TX queue %d disabled!\n", i);
	+ if ((reg & I40E_QTX_ENA_QENA_STAT_MASK) == 0) {
	+ device_printf(pf->dev, "TX queue %d disabled!\n",
	+ index);
	+ error = ETIMEDOUT;
	+ }

	- reg = rd32(hw, I40E_QRX_ENA(i));
	+ reg = rd32(hw, I40E_QRX_ENA(index));
	reg \|= I40E_QRX_ENA_QENA_REQ_MASK \|
	I40E_QRX_ENA_QENA_STAT_MASK;
	- wr32(hw, I40E_QRX_ENA(i), reg);
	+ wr32(hw, I40E_QRX_ENA(index), reg);
	/* Verify the enable took */
	for (int j = 0; j < 10; j++) {
	- reg = rd32(hw, I40E_QRX_ENA(i));
	+ reg = rd32(hw, I40E_QRX_ENA(index));
	if (reg & I40E_QRX_ENA_QENA_STAT_MASK)
	break;
	i40e_msec_delay(10);
	}
	- if ((reg & I40E_QRX_ENA_QENA_STAT_MASK) == 0)
	- printf("RX queue %d disabled!\n", i);
	+ if ((reg & I40E_QRX_ENA_QENA_STAT_MASK) == 0) {
	+ device_printf(pf->dev, "RX queue %d disabled!\n",
	+ index);
	+ error = ETIMEDOUT;
	+ }
	}
	+
	+ return (error);
	}

	-static void
	+static int
	ixl_disable_rings(struct ixl_vsi *vsi)
	{
	- struct i40e_hw *hw = vsi->hw;
	+ struct ixl_pf *pf = vsi->back;
	+ struct i40e_hw *hw = &pf->hw;
	+ int index, error;
	u32 reg;

	+ error = 0;
	for (int i = 0; i < vsi->num_queues; i++) {
	- i40e_pre_tx_queue_cfg(hw, i, FALSE);
	+ index = vsi->first_queue + i;
	+
	+ i40e_pre_tx_queue_cfg(hw, index, FALSE);
	i40e_usec_delay(500);

	- reg = rd32(hw, I40E_QTX_ENA(i));
	+ reg = rd32(hw, I40E_QTX_ENA(index));
	reg &= ~I40E_QTX_ENA_QENA_REQ_MASK;
	- wr32(hw, I40E_QTX_ENA(i), reg);
	+ wr32(hw, I40E_QTX_ENA(index), reg);
	/* Verify the disable took */
	for (int j = 0; j < 10; j++) {
	- reg = rd32(hw, I40E_QTX_ENA(i));
	+ reg = rd32(hw, I40E_QTX_ENA(index));
	if (!(reg & I40E_QTX_ENA_QENA_STAT_MASK))
	break;
	i40e_msec_delay(10);
	}
	- if (reg & I40E_QTX_ENA_QENA_STAT_MASK)
	- printf("TX queue %d still enabled!\n", i);
	+ if (reg & I40E_QTX_ENA_QENA_STAT_MASK) {
	+ device_printf(pf->dev, "TX queue %d still enabled!\n",
	+ index);
	+ error = ETIMEDOUT;
	+ }

	- reg = rd32(hw, I40E_QRX_ENA(i));
	+ reg = rd32(hw, I40E_QRX_ENA(index));
	reg &= ~I40E_QRX_ENA_QENA_REQ_MASK;
	- wr32(hw, I40E_QRX_ENA(i), reg);
	+ wr32(hw, I40E_QRX_ENA(index), reg);
	/* Verify the disable took */
	for (int j = 0; j < 10; j++) {
	- reg = rd32(hw, I40E_QRX_ENA(i));
	+ reg = rd32(hw, I40E_QRX_ENA(index));
	if (!(reg & I40E_QRX_ENA_QENA_STAT_MASK))
	break;
	i40e_msec_delay(10);
	}
	- if (reg & I40E_QRX_ENA_QENA_STAT_MASK)
	- printf("RX queue %d still enabled!\n", i);
	+ if (reg & I40E_QRX_ENA_QENA_STAT_MASK) {
	+ device_printf(pf->dev, "RX queue %d still enabled!\n",
	+ index);
	+ error = ETIMEDOUT;
	+ }
	}
	+
	+ return (error);
	}

	/**
	@@ -3996,7 +4067,7 @@
	/* End hw stats */

	/* Update vsi stats */
	- ixl_update_eth_stats(vsi);
	+ ixl_update_vsi_stats(vsi);

	/* OS statistics */
	// ERJ - these are per-port, update all vsis?
	@@ -4136,8 +4207,6 @@
	struct i40e_hw *hw = &pf->hw;
	struct i40e_eth_stats *es;
	struct i40e_eth_stats *oes;
	- int i;
	- uint64_t tx_discards;
	struct i40e_hw_port_stats *nsd;
	u16 stat_idx = vsi->info.stat_counter_idx;

	@@ -4187,6 +4256,24 @@
	vsi->stat_offsets_loaded,
	&oes->tx_broadcast, &es->tx_broadcast);
	vsi->stat_offsets_loaded = true;
	+}
	+
	+static void
	+ixl_update_vsi_stats(struct ixl_vsi *vsi)
	+{
	+ struct ixl_pf *pf;
	+ struct ifnet *ifp;
	+ struct i40e_eth_stats *es;
	+ struct i40e_hw_port_stats *nsd;
	+ uint64_t tx_discards;
	+ int i;
	+
	+ pf = vsi->back;
	+ ifp = vsi->ifp;
	+ es = &vsi->eth_stats;
	+ nsd = &pf->stats;
	+
	+ ixl_update_eth_stats(vsi);

	tx_discards = es->tx_discards + nsd->tx_dropped_link_down;
	for (i = 0; i < vsi->num_queues; i++)
	@@ -4937,7 +5024,7 @@
	sbuf_cat(buf, "\n");

	// set to queue 1?
	- struct ixl_queue *que = pf->vsi.queues;
	+ struct ixl_queue *que = pf->queues;
	struct tx_ring *txr = &(que[1].txr);
	struct i40e_tx_desc *txd = &txr->base[desc_idx];

	Index: sys/dev/ixl/if_ixlv.c
	===================================================================
	--- sys/dev/ixl/if_ixlv.c
	+++ sys/dev/ixl/if_ixlv.c
	@@ -473,7 +473,7 @@

	/* Make sure VLANS are not using driver */
	if (vsi->ifp->if_vlantrunk != NULL) {
	- device_printf(dev, "Vlan in use, detach first\n");
	+ if_printf(vsi->ifp, "Vlan in use, detach first\n");
	INIT_DBG_DEV(dev, "end");
	return (EBUSY);
	}
	@@ -886,7 +886,7 @@

	ixl_init_tx_ring(que);

	- if (vsi->max_frame_size <= 2048)
	+ if (vsi->max_frame_size <= MCLBYTES)
	rxr->mbuf_sz = MCLBYTES;
	else
	rxr->mbuf_sz = MJUMPAGESIZE;
	@@ -1403,7 +1403,7 @@
	#endif
	bus_bind_intr(dev, que->res, cpu_id);
	que->msix = vector;
	- vsi->que_mask \|= (u64)(1 << que->msix);
	+ vsi->que_mask \|= (u64)(1 << que->msix);
	TASK_INIT(&que->tx_task, 0, ixl_deferred_mq_start, que);
	TASK_INIT(&que->task, 0, ixlv_handle_que, que);
	que->tq = taskqueue_create_fast("ixlv_que", M_NOWAIT,
	@@ -1707,12 +1707,12 @@
	static void
	ixlv_register_vlan(void arg, struct ifnet ifp, u16 vtag)
	{
	- struct ixl_vsi *vsi = ifp->if_softc;
	- struct ixlv_sc *sc = vsi->back;
	+ struct ixl_vsi *vsi = arg;
	+ struct ixlv_sc *sc = vsi->back;
	struct ixlv_vlan_filter *v;


	- if (ifp->if_softc != arg) /* Not our event */
	+ if (ifp->if_softc != arg) /* Not our event */
	return;

	if ((vtag == 0) \|\| (vtag > 4095)) /* Invalid */
	@@ -1744,12 +1744,12 @@
	static void
	ixlv_unregister_vlan(void arg, struct ifnet ifp, u16 vtag)
	{
	- struct ixl_vsi *vsi = ifp->if_softc;
	- struct ixlv_sc *sc = vsi->back;
	+ struct ixl_vsi *vsi = arg;
	+ struct ixlv_sc *sc = vsi->back;
	struct ixlv_vlan_filter *v;
	int i = 0;

	- if (ifp->if_softc != arg)
	+ if (ifp->if_softc != arg)
	return;

	if ((vtag == 0) \|\| (vtag > 4095)) /* Invalid */
	@@ -2422,7 +2422,7 @@
	} else {
	/* Check if we've come back from hung */
	if ((vsi->active_queues & ((u64)1 << que->me)) == 0)
	- vsi->active_queues \|= ((u64)1 << que->me);
	+ vsi->active_queues \|= ((u64)1 << que->me);
	}
	if (que->busy >= IXL_MAX_TX_BUSY) {
	device_printf(dev,"Warning queue %d "
	@@ -2453,12 +2453,11 @@
	{
	struct ixl_vsi *vsi = &sc->vsi;
	struct ifnet *ifp = vsi->ifp;
	- device_t dev = sc->dev;

	- if (vsi->link_up){
	+ if (vsi->link_up) {
	if (vsi->link_active == FALSE) {
	if (bootverbose)
	- device_printf(dev,"Link is Up, %d Gbps\n",
	+ if_printf(ifp,"Link is Up, %d Gbps\n",
	(vsi->link_speed == I40E_LINK_SPEED_40GB) ? 40:10);
	vsi->link_active = TRUE;
	if_link_state_change(ifp, LINK_STATE_UP);
	@@ -2466,7 +2465,7 @@
	} else { /* Link down */
	if (vsi->link_active == TRUE) {
	if (bootverbose)
	- device_printf(dev,"Link is Down\n");
	+ if_printf(ifp,"Link is Down\n");
	if_link_state_change(ifp, LINK_STATE_DOWN);
	vsi->link_active = FALSE;
	}
	@@ -2684,7 +2683,6 @@
	ixlv_add_mac_filter(struct ixlv_sc sc, u8 macaddr, u16 flags)
	{
	struct ixlv_mac_filter *f;
	- device_t dev = sc->dev;

	/* Does one already exist? */
	f = ixlv_find_mac_filter(sc, macaddr);
	@@ -2697,7 +2695,7 @@
	/* If not, get a new empty filter */
	f = ixlv_get_mac_filter(sc);
	if (f == NULL) {
	- device_printf(dev, "%s: no filters available!!\n",
	+ if_printf(sc->vsi.ifp, "%s: no filters available!!\n",
	__func__);
	return (ENOMEM);
	}
	@@ -2828,7 +2826,7 @@
	struct ixl_sysctl_info *entry = ctls;
	while (entry->stat != 0)
	{
	- SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, entry->name,
	+ SYSCTL_ADD_QUAD(ctx, child, OID_AUTO, entry->name,
	CTLFLAG_RD, entry->stat,
	entry->description);
	entry++;
	@@ -2844,34 +2842,34 @@
	txr = &(queues[q].txr);
	rxr = &(queues[q].rxr);

	- SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "mbuf_defrag_failed",
	+ SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "mbuf_defrag_failed",
	CTLFLAG_RD, &(queues[q].mbuf_defrag_failed),
	"m_defrag() failed");
	- SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "dropped",
	+ SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "dropped",
	CTLFLAG_RD, &(queues[q].dropped_pkts),
	"Driver dropped packets");
	- SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "irqs",
	+ SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "irqs",
	CTLFLAG_RD, &(queues[q].irqs),
	"irqs on this queue");
	- SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tso_tx",
	+ SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "tso_tx",
	CTLFLAG_RD, &(queues[q].tso),
	"TSO");
	- SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tx_dma_setup",
	+ SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "tx_dma_setup",
	CTLFLAG_RD, &(queues[q].tx_dma_setup),
	"Driver tx dma failure in xmit");
	- SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "no_desc_avail",
	+ SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "no_desc_avail",
	CTLFLAG_RD, &(txr->no_desc),
	"Queue No Descriptor Available");
	- SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tx_packets",
	+ SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "tx_packets",
	CTLFLAG_RD, &(txr->total_packets),
	"Queue Packets Transmitted");
	- SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tx_bytes",
	+ SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "tx_bytes",
	CTLFLAG_RD, &(txr->tx_bytes),
	"Queue Bytes Transmitted");
	- SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "rx_packets",
	+ SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "rx_packets",
	CTLFLAG_RD, &(rxr->rx_packets),
	"Queue Packets Received");
	- SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "rx_bytes",
	+ SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "rx_bytes",
	CTLFLAG_RD, &(rxr->rx_bytes),
	"Queue Bytes Received");

	Index: sys/dev/ixl/ixl.h
	===================================================================
	--- sys/dev/ixl/ixl.h
	+++ sys/dev/ixl/ixl.h
	@@ -459,13 +459,17 @@
	struct ifmedia media;
	u64 que_mask;
	int id;
	+ u16 vsi_num;
	u16 msix_base; /* station base MSIX vector */
	+ u16 first_queue;
	u16 num_queues;
	u16 rx_itr_setting;
	u16 tx_itr_setting;
	struct ixl_queue queues; / head of queues */
	bool link_active;
	u16 seid;
	+ u16 uplink_seid;
	+ u16 downlink_seid;
	u16 max_frame_size;
	u32 link_speed;
	bool link_up;
	@@ -473,6 +477,7 @@

	/* MAC/VLAN Filter list */
	struct ixl_ftl_head ftl;
	+ u16 num_macs;

	struct i40e_aqc_vsi_properties_data info;

	@@ -501,9 +506,11 @@
	u64 hw_filters_del;
	u64 hw_filters_add;

	+
	/* Misc. */
	u64 active_queues;
	u64 flags;
	+ struct sysctl_oid *vsi_node;
	};

	/*
	Index: sys/dev/ixl/ixl_pf.h
	===================================================================
	--- sys/dev/ixl/ixl_pf.h
	+++ sys/dev/ixl/ixl_pf.h
	@@ -67,11 +67,12 @@
	int advertised_speed;

	/*
	- ** VSI - Stations:
	+ ** Network interfaces
	** These are the traffic class holders, and
	** will have a stack interface and queues
	** associated with them.
	- ** NOTE: for now using just one, so embed it.
	+ ** NOTE: The PF has only a single interface,
	+ ** so it is embedded in the PF struct.
	*/
	struct ixl_vsi vsi;

	Index: sys/dev/ixl/ixl_txrx.c
	===================================================================
	--- sys/dev/ixl/ixl_txrx.c
	+++ sys/dev/ixl/ixl_txrx.c
	@@ -813,10 +813,8 @@
	struct ixl_tx_buf *buf;
	struct i40e_tx_desc tx_desc, eop_desc;

	-
	mtx_assert(&txr->mtx, MA_OWNED);

	-
	/* These are not the descriptors you seek, move along :) */
	if (txr->avail == que->num_desc) {
	que->busy = 0;
	Index: sys/dev/ixl/ixlvc.c
	===================================================================
	--- sys/dev/ixl/ixlvc.c
	+++ sys/dev/ixl/ixlvc.c
	@@ -362,7 +362,7 @@

	struct i40e_virtchnl_vsi_queue_config_info *vqci;
	struct i40e_virtchnl_queue_pair_info *vqpi;
	-
	+
	pairs = vsi->num_queues;
	len = sizeof(struct i40e_virtchnl_vsi_queue_config_info) +
	(sizeof(struct i40e_virtchnl_queue_pair_info) * pairs);
	@@ -790,7 +790,7 @@
	vsi = &sc->vsi;

	tx_discards = es->tx_discards;
	- for (i = 0; i < sc->vsi.num_queues; i++)
	+ for (i = 0; i < vsi->num_queues; i++)
	tx_discards += sc->vsi.queues[i].txr.br->br_drops;

	/* Update ifnet stats */
	@@ -811,7 +811,7 @@
	IXL_SET_NOPROTO(vsi, es->rx_unknown_protocol);
	IXL_SET_COLLISIONS(vsi, 0);

	- sc->vsi.eth_stats = *es;
	+ vsi->eth_stats = *es;
	}

	/*

File Metadata

Mime Type: text/plain
Expires: Sat, Mar 14, 8:13 AM (10 h, 52 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 29623885
Default Alt Text: D1640.diff (20 KB)

D1640.diffNo OneTemporaryActions

D1640.diffView Options

File Metadata

Event Timeline

D1640.diff
No OneTemporary
Actions

D1640.diff
View Options