Commit 1d10b2be authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Daniel Borkmann
Browse files

xsk: Wrap duplicated code to function 



Both allocation paths have exactly the same code responsible for getting
and initializing xskb. Pull it out to common function.

Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMagnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/bpf/20241007122458.282590-6-maciej.fijalkowski@intel.com
parent 6e126872

net/xdp/xsk_buff_pool.c

+18 −16
Original line number Diff line number Diff line
@@ -503,6 +503,22 @@ static bool xp_check_aligned(struct xsk_buff_pool *pool, u64 *addr) 
	return *addr < pool->addrs_cnt;

}



static struct xdp_buff_xsk *xp_get_xskb(struct xsk_buff_pool *pool, u64 addr)

{

	struct xdp_buff_xsk *xskb;



	if (pool->unaligned) {

		xskb = pool->free_heads[--pool->free_heads_cnt];

		xp_init_xskb_addr(xskb, pool, addr);

		if (pool->dma_pages)

			xp_init_xskb_dma(xskb, pool, pool->dma_pages, addr);

	} else {

		xskb = &pool->heads[xp_aligned_extract_idx(pool, addr)];

	}



	return xskb;

}



static struct xdp_buff_xsk *__xp_alloc(struct xsk_buff_pool *pool)

{

	struct xdp_buff_xsk *xskb;
@@ -528,14 +544,7 @@ static struct xdp_buff_xsk *__xp_alloc(struct xsk_buff_pool *pool) 
		break;

	}



	if (pool->unaligned) {

		xskb = pool->free_heads[--pool->free_heads_cnt];

		xp_init_xskb_addr(xskb, pool, addr);

		if (pool->dma_pages)

			xp_init_xskb_dma(xskb, pool, pool->dma_pages, addr);

	} else {

		xskb = &pool->heads[xp_aligned_extract_idx(pool, addr)];

	}

	xskb = xp_get_xskb(pool, addr);



	xskq_cons_release(pool->fq);

	return xskb;
@@ -593,14 +602,7 @@ static u32 xp_alloc_new_from_fq(struct xsk_buff_pool *pool, struct xdp_buff **xd 
			continue;

		}



		if (pool->unaligned) {

			xskb = pool->free_heads[--pool->free_heads_cnt];

			xp_init_xskb_addr(xskb, pool, addr);

			if (pool->dma_pages)

				xp_init_xskb_dma(xskb, pool, pool->dma_pages, addr);

		} else {

			xskb = &pool->heads[xp_aligned_extract_idx(pool, addr)];

		}

		xskb = xp_get_xskb(pool, addr);



		*xdp = &xskb->xdp;

		xdp++;