Commit d1bc532e authored by Magnus Karlsson's avatar Magnus Karlsson Committed by Daniel Borkmann
Browse files

i40e: xsk: Move tmp desc array from driver to pool 



Move desc_array from the driver to the pool. The reason behind this is
that we can then reuse this array as a temporary storage for descriptors
in all zero-copy drivers that use the batched interface. This will make
it easier to add batching to more drivers.

i40e is the only driver that has a batched Tx zero-copy
implementation, so no need to touch any other driver.

Signed-off-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarAlexander Lobakin <alexandr.lobakin@intel.com>
Link: https://lore.kernel.org/bpf/20220125160446.78976-6-maciej.fijalkowski@intel.com
parent 3dd411ef

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

+0 −11
Original line number Diff line number Diff line
@@ -830,8 +830,6 @@ void i40e_free_tx_resources(struct i40e_ring *tx_ring) 
	i40e_clean_tx_ring(tx_ring);

	kfree(tx_ring->tx_bi);

	tx_ring->tx_bi = NULL;

	kfree(tx_ring->xsk_descs);

	tx_ring->xsk_descs = NULL;



	if (tx_ring->desc) {

		dma_free_coherent(tx_ring->dev, tx_ring->size,
@@ -1433,13 +1431,6 @@ int i40e_setup_tx_descriptors(struct i40e_ring *tx_ring) 
	if (!tx_ring->tx_bi)

		goto err;



	if (ring_is_xdp(tx_ring)) {

		tx_ring->xsk_descs = kcalloc(I40E_MAX_NUM_DESCRIPTORS, sizeof(*tx_ring->xsk_descs),

					     GFP_KERNEL);

		if (!tx_ring->xsk_descs)

			goto err;

	}



	u64_stats_init(&tx_ring->syncp);



	/* round up to nearest 4K */
@@ -1463,8 +1454,6 @@ int i40e_setup_tx_descriptors(struct i40e_ring *tx_ring) 
	return 0;



err:

	kfree(tx_ring->xsk_descs);

	tx_ring->xsk_descs = NULL;

	kfree(tx_ring->tx_bi);

	tx_ring->tx_bi = NULL;

	return -ENOMEM;

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

+0 −1
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ struct i40e_ring { 
	u16 rx_offset;

	struct xdp_rxq_info xdp_rxq;

	struct xsk_buff_pool *xsk_pool;

	struct xdp_desc *xsk_descs;      /* For storing descriptors in the AF_XDP ZC path */

} ____cacheline_internodealigned_in_smp;



static inline bool ring_uses_build_skb(struct i40e_ring *ring)

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

+2 −2
Original line number Diff line number Diff line
@@ -467,11 +467,11 @@ static void i40e_set_rs_bit(struct i40e_ring *xdp_ring) 
 **/

static bool i40e_xmit_zc(struct i40e_ring *xdp_ring, unsigned int budget)

{

	struct xdp_desc *descs = xdp_ring->xsk_descs;

	struct xdp_desc *descs = xdp_ring->xsk_pool->tx_descs;

	u32 nb_pkts, nb_processed = 0;

	unsigned int total_bytes = 0;



	nb_pkts = xsk_tx_peek_release_desc_batch(xdp_ring->xsk_pool, descs, budget);

	nb_pkts = xsk_tx_peek_release_desc_batch(xdp_ring->xsk_pool, budget);

	if (!nb_pkts)

		return true;

include/net/xdp_sock_drv.h

+2 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


void xsk_tx_completed(struct xsk_buff_pool *pool, u32 nb_entries);

bool xsk_tx_peek_desc(struct xsk_buff_pool *pool, struct xdp_desc *desc);

u32 xsk_tx_peek_release_desc_batch(struct xsk_buff_pool *pool, struct xdp_desc *desc, u32 max);

u32 xsk_tx_peek_release_desc_batch(struct xsk_buff_pool *pool, u32 max);

void xsk_tx_release(struct xsk_buff_pool *pool);

struct xsk_buff_pool *xsk_get_pool_from_qid(struct net_device *dev,

					    u16 queue_id);
@@ -142,8 +142,7 @@ static inline bool xsk_tx_peek_desc(struct xsk_buff_pool *pool, 
	return false;

}



static inline u32 xsk_tx_peek_release_desc_batch(struct xsk_buff_pool *pool, struct xdp_desc *desc,

						 u32 max)

static inline u32 xsk_tx_peek_release_desc_batch(struct xsk_buff_pool *pool, u32 max)

{

	return 0;

}

include/net/xsk_buff_pool.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ struct xsk_buff_pool { 
	 */

	dma_addr_t *dma_pages;

	struct xdp_buff_xsk *heads;

	struct xdp_desc *tx_descs;

	u64 chunk_mask;

	u64 addrs_cnt;

	u32 free_list_cnt;