Commit 44ddd4f1 authored by Björn Töpel's avatar Björn Töpel Committed by Jeff Kirsher
Browse files

i40e: add tracking of AF_XDP ZC state for each queue pair 



In commit f3fef2b6 ("i40e: Remove umem from VSI") a regression was
introduced; When the VSI was reset, the setup code would try to enable
AF_XDP ZC unconditionally (as long as there was a umem placed in the
netdev._rx struct). Here, we add a bitmap to the VSI that tracks if a
certain queue pair has been "zero-copy enabled" via the ndo_bpf. The
bitmap is used in i40e_xsk_umem, and enables zero-copy if and only if
XDP is enabled, the corresponding qid in the bitmap is set and the
umem is non-NULL.

Fixes: f3fef2b6 ("i40e: Remove umem from VSI")
Signed-off-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b83f28e1

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

+2 −0
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 {

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

+9 −1
Original line number Diff line number Diff line
@@ -3077,7 +3077,7 @@ static struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring) 
	if (ring_is_xdp(ring))

		qid -= ring->vsi->alloc_queue_pairs;



	if (!xdp_on)

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

		return NULL;



	return xdp_get_umem_from_qid(ring->vsi->netdev, qid);
@@ -10084,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;
@@ -10102,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:
@@ -10182,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