Commit 6e126872 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Daniel Borkmann
Browse files

xsk: Carry a copy of xdp_zc_max_segs within xsk_buff_pool 



This so we avoid dereferencing struct net_device within hot path.

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-5-maciej.fijalkowski@intel.com
parent bea14124

include/net/xsk_buff_pool.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct xsk_buff_pool { 
	u32 chunk_size;

	u32 chunk_shift;

	u32 frame_len;

	u32 xdp_zc_max_segs;

	u8 tx_metadata_len; /* inherited from umem */

	u8 cached_need_wakeup;

	bool uses_need_wakeup;

net/xdp/xsk_buff_pool.c

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ int xp_assign_dev(struct xsk_buff_pool *pool, 
		goto err_unreg_xsk;

	}

	pool->umem->zc = true;

	pool->xdp_zc_max_segs = netdev->xdp_zc_max_segs;

	return 0;



err_unreg_xsk:

net/xdp/xsk_queue.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ u32 xskq_cons_read_desc_batch(struct xsk_queue *q, struct xsk_buff_pool *pool, 
			nr_frags = 0;

		} else {

			nr_frags++;

			if (nr_frags == pool->netdev->xdp_zc_max_segs) {

			if (nr_frags == pool->xdp_zc_max_segs) {

				nr_frags = 0;

				break;

			}