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>

diff --git a/include/net/xdp_sock_drv.h b/include/net/xdp_sock_drv.h
index 4f2d3268a6769dc6ac69a8bc3c8c4ef31b602dd8..242e34f771cca6ad8af471f853a43bd9f0d822e8 100644 (file)
--- a/include/net/xdp_sock_drv.h
+++ b/include/net/xdp_sock_drv.h
@@ -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;

diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c
index 00a4eddaa0cd65c657ae6ebf12b06eb2e1eb910f..51526034c42acb9a45b69133da430c0f72227831 100644 (file)
--- a/net/xdp/xsk_buff_pool.c
+++ b/net/xdp/xsk_buff_pool.c
@@ -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;
        }