xsk: add new netlink attribute dedicated for ZC max frags

Introduce new netlink attribute NETDEV_A_DEV_XDP_ZC_MAX_SEGS that will
carry maximum fragments that underlying ZC driver is able to handle on
TX side. It is going to be included in netlink response only when driver
supports ZC. Any value higher than 1 implies multi-buffer ZC support on
underlying device.

Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Link: https://lore.kernel.org/r/20230719132421.584801-11-maciej.fijalkowski@intel.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/Documentation/netlink/specs/netdev.yaml b/Documentation/netlink/specs/netdev.yaml
index b99e7ff..e410153 100644 (file)
--- a/Documentation/netlink/specs/netdev.yaml
+++ b/Documentation/netlink/specs/netdev.yaml
@@ -62,6 +62,12 @@ attribute-sets:
         type: u64
         enum: xdp-act
         enum-as-flags: true
+      -
+        name: xdp_zc_max_segs
+        doc: max fragment count supported by ZC driver
+        type: u32
+        checks:
+          min: 1
 
 operations:
   list:

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b828c7a..b12477e 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2250,6 +2250,7 @@ struct net_device {
 #define GRO_MAX_SIZE           (8 * 65535u)
        unsigned int            gro_max_size;
        unsigned int            gro_ipv4_max_size;
+       unsigned int            xdp_zc_max_segs;
        rx_handler_func_t __rcu *rx_handler;
        void __rcu              *rx_handler_data;
 

diff --git a/include/uapi/linux/netdev.h b/include/uapi/linux/netdev.h
index 639524b..bf71698 100644 (file)
--- a/include/uapi/linux/netdev.h
+++ b/include/uapi/linux/netdev.h
@@ -41,6 +41,7 @@ enum {
        NETDEV_A_DEV_IFINDEX = 1,
        NETDEV_A_DEV_PAD,
        NETDEV_A_DEV_XDP_FEATURES,
+       NETDEV_A_DEV_XDP_ZC_MAX_SEGS,
 
        __NETDEV_A_DEV_MAX,
        NETDEV_A_DEV_MAX = (__NETDEV_A_DEV_MAX - 1)

diff --git a/net/core/dev.c b/net/core/dev.c
index d6e1b78..dd4f114 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10613,6 +10613,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
        dev_net_set(dev, &init_net);
 
        dev->gso_max_size = GSO_LEGACY_MAX_SIZE;
+       dev->xdp_zc_max_segs = 1;
        dev->gso_max_segs = GSO_MAX_SEGS;
        dev->gro_max_size = GRO_LEGACY_MAX_SIZE;
        dev->gso_ipv4_max_size = GSO_LEGACY_MAX_SIZE;

diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c
index a4270fa..65ef486 100644 (file)
--- a/net/core/netdev-genl.c
+++ b/net/core/netdev-genl.c
@@ -25,6 +25,14 @@ netdev_nl_dev_fill(struct net_device *netdev, struct sk_buff *rsp,
                return -EINVAL;
        }
 
+       if (netdev->xdp_features & NETDEV_XDP_ACT_XSK_ZEROCOPY) {
+               if (nla_put_u32(rsp, NETDEV_A_DEV_XDP_ZC_MAX_SEGS,
+                               netdev->xdp_zc_max_segs)) {
+                       genlmsg_cancel(rsp, hdr);
+                       return -EINVAL;
+               }
+       }
+
        genlmsg_end(rsp, hdr);
 
        return 0;

diff --git a/tools/include/uapi/linux/netdev.h b/tools/include/uapi/linux/netdev.h
index 639524b..bf71698 100644 (file)
--- a/tools/include/uapi/linux/netdev.h
+++ b/tools/include/uapi/linux/netdev.h
@@ -41,6 +41,7 @@ enum {
        NETDEV_A_DEV_IFINDEX = 1,
        NETDEV_A_DEV_PAD,
        NETDEV_A_DEV_XDP_FEATURES,
+       NETDEV_A_DEV_XDP_ZC_MAX_SEGS,
 
        __NETDEV_A_DEV_MAX,
        NETDEV_A_DEV_MAX = (__NETDEV_A_DEV_MAX - 1)

diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index 10642ad..674e578 100644 (file)
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -1105,9 +1105,10 @@ struct bpf_xdp_query_opts {
        __u32 skb_prog_id;      /* output */
        __u8 attach_mode;       /* output */
        __u64 feature_flags;    /* output */
+       __u32 xdp_zc_max_segs;  /* output */
        size_t :0;
 };
-#define bpf_xdp_query_opts__last_field feature_flags
+#define bpf_xdp_query_opts__last_field xdp_zc_max_segs
 
 LIBBPF_API int bpf_xdp_attach(int ifindex, int prog_fd, __u32 flags,
                              const struct bpf_xdp_attach_opts *opts);

diff --git a/tools/lib/bpf/netlink.c b/tools/lib/bpf/netlink.c
index 84dd5fa..090bcf6 100644 (file)
--- a/tools/lib/bpf/netlink.c
+++ b/tools/lib/bpf/netlink.c
@@ -45,6 +45,7 @@ struct xdp_id_md {
 
 struct xdp_features_md {
        int ifindex;
+       __u32 xdp_zc_max_segs;
        __u64 flags;
 };
 
@@ -421,6 +422,9 @@ static int parse_xdp_features(struct nlmsghdr *nh, libbpf_dump_nlmsg_t fn,
                return NL_CONT;
 
        md->flags = libbpf_nla_getattr_u64(tb[NETDEV_A_DEV_XDP_FEATURES]);
+       if (tb[NETDEV_A_DEV_XDP_ZC_MAX_SEGS])
+               md->xdp_zc_max_segs =
+                       libbpf_nla_getattr_u32(tb[NETDEV_A_DEV_XDP_ZC_MAX_SEGS]);
        return NL_DONE;
 }
 
@@ -493,6 +497,7 @@ int bpf_xdp_query(int ifindex, int xdp_flags, struct bpf_xdp_query_opts *opts)
                return libbpf_err(err);
 
        opts->feature_flags = md.flags;
+       opts->xdp_zc_max_segs = md.xdp_zc_max_segs;
 
 skip_feature_flags:
        return 0;