Commit 24ab8efb authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Jakub Kicinski
Browse files

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: default avatarDaniel Borkmann <daniel@iogearbox.net>
Co-developed-by: default avatarDavid Wei <dw@davidwei.uk>
Signed-off-by: default avatarDavid Wei <dw@davidwei.uk>
Reviewed-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Reviewed-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20251031212103.310683-7-daniel@iogearbox.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8a25a2e3

include/net/xdp_sock_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ 
#define XDP_UMEM_MIN_CHUNK_SHIFT 11

#define XDP_UMEM_MIN_CHUNK_SIZE (1 << XDP_UMEM_MIN_CHUNK_SHIFT)



#define NETDEV_XDP_ACT_XSK	(NETDEV_XDP_ACT_BASIC |		\

				 NETDEV_XDP_ACT_REDIRECT |	\

				 NETDEV_XDP_ACT_XSK_ZEROCOPY)



struct xsk_cb_desc {

	void *src;

	u8 off;

net/xdp/xsk_buff_pool.c

+1 −5
Original line number Diff line number Diff line
@@ -155,10 +155,6 @@ static void xp_disable_drv_zc(struct xsk_buff_pool *pool) 
	}

}



#define NETDEV_XDP_ACT_ZC	(NETDEV_XDP_ACT_BASIC |		\

				 NETDEV_XDP_ACT_REDIRECT |	\

				 NETDEV_XDP_ACT_XSK_ZEROCOPY)



int xp_assign_dev(struct xsk_buff_pool *pool,

		  struct net_device *netdev, u16 queue_id, u16 flags)

{
@@ -200,7 +196,7 @@ int xp_assign_dev(struct xsk_buff_pool *pool, 
		/* For copy-mode, we are done. */

		return 0;



	if ((netdev->xdp_features & NETDEV_XDP_ACT_ZC) != NETDEV_XDP_ACT_ZC) {

	if ((netdev->xdp_features & NETDEV_XDP_ACT_XSK) != NETDEV_XDP_ACT_XSK) {

		err = -EOPNOTSUPP;

		goto err_unreg_pool;

	}