tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

xsk: Move NETDEV_XDP_ACT_ZC into generic header

Move NETDEV_XDP_ACT_ZC into xdp_sock_drv.h header such that external code
can reuse it, and rename it into more generic NETDEV_XDP_ACT_XSK.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Co-developed-by: David Wei <dw@davidwei.uk>
Signed-off-by: David Wei <dw@davidwei.uk>
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20251031212103.310683-7-daniel@iogearbox.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Daniel Borkmann and committed by
Jakub Kicinski 24ab8efb 8a25a2e3

+5 -5
+4
include/net/xdp_sock_drv.h
··· 12 12 #define XDP_UMEM_MIN_CHUNK_SHIFT 11 13 13 #define XDP_UMEM_MIN_CHUNK_SIZE (1 << XDP_UMEM_MIN_CHUNK_SHIFT) 14 14 15 + #define NETDEV_XDP_ACT_XSK (NETDEV_XDP_ACT_BASIC | \ 16 + NETDEV_XDP_ACT_REDIRECT | \ 17 + NETDEV_XDP_ACT_XSK_ZEROCOPY) 18 + 15 19 struct xsk_cb_desc { 16 20 void *src; 17 21 u8 off;
+1 -5
net/xdp/xsk_buff_pool.c
··· 155 155 } 156 156 } 157 157 158 - #define NETDEV_XDP_ACT_ZC (NETDEV_XDP_ACT_BASIC | \ 159 - NETDEV_XDP_ACT_REDIRECT | \ 160 - NETDEV_XDP_ACT_XSK_ZEROCOPY) 161 - 162 158 int xp_assign_dev(struct xsk_buff_pool *pool, 163 159 struct net_device *netdev, u16 queue_id, u16 flags) 164 160 { ··· 196 200 /* For copy-mode, we are done. */ 197 201 return 0; 198 202 199 - if ((netdev->xdp_features & NETDEV_XDP_ACT_ZC) != NETDEV_XDP_ACT_ZC) { 203 + if ((netdev->xdp_features & NETDEV_XDP_ACT_XSK) != NETDEV_XDP_ACT_XSK) { 200 204 err = -EOPNOTSUPP; 201 205 goto err_unreg_pool; 202 206 }