Commit 845368bc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Fixes 2019-04-01

This series contains two fixes for XDP in the i40e driver.

Björn provides both fixes, first moving a function out of the header and
into the main.c file.  Second fixes a regression introduced in an
earlier patch that removed umem from the VSI.  This caused an issue
because the setup code would try to enable AF_XDP zero copy
unconditionally, as long as there was a umem placed in the netdev
receive structure.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b2e54b09 44ddd4f1

drivers/net/ethernet/intel/i40e/i40e.h

+2 −14
Original line number Diff line number Diff line
@@ -790,6 +790,8 @@ struct i40e_vsi { 


	/* VSI specific handlers */

	irqreturn_t (*irq_handler)(int irq, void *data);



	unsigned long *af_xdp_zc_qps; /* tracks AF_XDP ZC enabled qps */

} ____cacheline_internodealigned_in_smp;



struct i40e_netdev_priv {
@@ -1096,20 +1098,6 @@ static inline bool i40e_enabled_xdp_vsi(struct i40e_vsi *vsi) 
	return !!vsi->xdp_prog;

}



static inline struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring)

{

	bool xdp_on = i40e_enabled_xdp_vsi(ring->vsi);

	int qid = ring->queue_index;



	if (ring_is_xdp(ring))

		qid -= ring->vsi->alloc_queue_pairs;



	if (!xdp_on)

		return NULL;



	return xdp_get_umem_from_qid(ring->vsi->netdev, qid);

}



int i40e_create_queue_channel(struct i40e_vsi *vsi, struct i40e_channel *ch);

int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate);

int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,

drivers/net/ethernet/intel/i40e/i40e_main.c

+28 −0
Original line number Diff line number Diff line
@@ -3063,6 +3063,26 @@ static void i40e_config_xps_tx_ring(struct i40e_ring *ring) 
			    ring->queue_index);

}



/**

 * i40e_xsk_umem - Retrieve the AF_XDP ZC if XDP and ZC is enabled

 * @ring: The Tx or Rx ring

 *

 * Returns the UMEM or NULL.

 **/

static struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring)

{

	bool xdp_on = i40e_enabled_xdp_vsi(ring->vsi);

	int qid = ring->queue_index;



	if (ring_is_xdp(ring))

		qid -= ring->vsi->alloc_queue_pairs;



	if (!xdp_on || !test_bit(qid, ring->vsi->af_xdp_zc_qps))

		return NULL;



	return xdp_get_umem_from_qid(ring->vsi->netdev, qid);

}



/**

 * i40e_configure_tx_ring - Configure a transmit ring context and rest

 * @ring: The Tx ring to configure
@@ -10064,6 +10084,12 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type) 
	hash_init(vsi->mac_filter_hash);

	vsi->irqs_ready = false;



	if (type == I40E_VSI_MAIN) {

		vsi->af_xdp_zc_qps = bitmap_zalloc(pf->num_lan_qps, GFP_KERNEL);

		if (!vsi->af_xdp_zc_qps)

			goto err_rings;

	}



	ret = i40e_set_num_rings_in_vsi(vsi);

	if (ret)

		goto err_rings;
@@ -10082,6 +10108,7 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type) 
	goto unlock_pf;



err_rings:

	bitmap_free(vsi->af_xdp_zc_qps);

	pf->next_vsi = i - 1;

	kfree(vsi);

unlock_pf:
@@ -10162,6 +10189,7 @@ static int i40e_vsi_clear(struct i40e_vsi *vsi) 
	i40e_put_lump(pf->qp_pile, vsi->base_queue, vsi->idx);

	i40e_put_lump(pf->irq_pile, vsi->base_vector, vsi->idx);



	bitmap_free(vsi->af_xdp_zc_qps);

	i40e_vsi_free_arrays(vsi, true);

	i40e_clear_rss_config_user(vsi);

drivers/net/ethernet/intel/i40e/i40e_xsk.c

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem, 
	if (err)

		return err;



	set_bit(qid, vsi->af_xdp_zc_qps);



	if_running = netif_running(vsi->netdev) && i40e_enabled_xdp_vsi(vsi);



	if (if_running) {
@@ -148,6 +150,7 @@ static int i40e_xsk_umem_disable(struct i40e_vsi *vsi, u16 qid) 
			return err;

	}



	clear_bit(qid, vsi->af_xdp_zc_qps);

	i40e_xsk_umem_dma_unmap(vsi, umem);



	if (if_running) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE