Expose a new per-queue nest attribute, xsk, which will be present for
queues that are being used for AF_XDP. If the queue is not being used for
AF_XDP, the nest will not be present.
In the future, this attribute can be extended to include more data about
XSK as it is needed.
Signed-off-by: Joe Damato <jdamato@fastly.com>
Suggested-by: Jakub Kicinski <kuba@kernel.org>
---
v4:
- Updated netdev_nl_queue_fill_one to use the empty nest helper added
in patch 1.
v2:
- Patch adjusted to include an attribute, xsk, which is an empty nest
and exposed for queues which have a pool.
Documentation/netlink/specs/netdev.yaml | 13 ++++++++++++-
include/uapi/linux/netdev.h | 6 ++++++
net/core/netdev-genl.c | 12 ++++++++++++
tools/include/uapi/linux/netdev.h | 6 ++++++
4 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/Documentation/netlink/specs/netdev.yaml b/Documentation/netlink/specs/netdev.yaml
index 288923e965ae..85402a2e289c 100644
--- a/Documentation/netlink/specs/netdev.yaml
+++ b/Documentation/netlink/specs/netdev.yaml
@@ -276,6 +276,9 @@ attribute-sets:
doc: The timeout, in nanoseconds, of how long to suspend irq
processing, if event polling finds events
type: uint
+ -
+ name: xsk-info
+ attributes: []
-
name: queue
attributes:
@@ -294,6 +297,9 @@ attribute-sets:
-
name: type
doc: Queue type as rx, tx. Each queue type defines a separate ID space.
+ XDP TX queues allocated in the kernel are not linked to NAPIs and
+ thus not listed. AF_XDP queues will have more information set in
+ the xsk attribute.
type: u32
enum: queue-type
-
@@ -309,7 +315,11 @@ attribute-sets:
doc: io_uring memory provider information.
type: nest
nested-attributes: io-uring-provider-info
-
+ -
+ name: xsk
+ doc: XSK information for this queue, if any.
+ type: nest
+ nested-attributes: xsk-info
-
name: qstats
doc: |
@@ -652,6 +662,7 @@ operations:
- ifindex
- dmabuf
- io-uring
+ - xsk
dump:
request:
attributes:
diff --git a/include/uapi/linux/netdev.h b/include/uapi/linux/netdev.h
index 6c6ee183802d..4e82f3871473 100644
--- a/include/uapi/linux/netdev.h
+++ b/include/uapi/linux/netdev.h
@@ -136,6 +136,11 @@ enum {
NETDEV_A_NAPI_MAX = (__NETDEV_A_NAPI_MAX - 1)
};
+enum {
+ __NETDEV_A_XSK_INFO_MAX,
+ NETDEV_A_XSK_INFO_MAX = (__NETDEV_A_XSK_INFO_MAX - 1)
+};
+
enum {
NETDEV_A_QUEUE_ID = 1,
NETDEV_A_QUEUE_IFINDEX,
@@ -143,6 +148,7 @@ enum {
NETDEV_A_QUEUE_NAPI_ID,
NETDEV_A_QUEUE_DMABUF,
NETDEV_A_QUEUE_IO_URING,
+ NETDEV_A_QUEUE_XSK,
__NETDEV_A_QUEUE_MAX,
NETDEV_A_QUEUE_MAX = (__NETDEV_A_QUEUE_MAX - 1)
diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c
index 0dcd4faefd8d..75ca111aa591 100644
--- a/net/core/netdev-genl.c
+++ b/net/core/netdev-genl.c
@@ -380,6 +380,7 @@ netdev_nl_queue_fill_one(struct sk_buff *rsp, struct net_device *netdev,
struct netdev_rx_queue *rxq;
struct netdev_queue *txq;
void *hdr;
+ int ret;
hdr = genlmsg_iput(rsp, info);
if (!hdr)
@@ -400,11 +401,22 @@ netdev_nl_queue_fill_one(struct sk_buff *rsp, struct net_device *netdev,
if (params->mp_ops &&
params->mp_ops->nl_fill(params->mp_priv, rsp, rxq))
goto nla_put_failure;
+
+ if (rxq->pool)
+ if (nla_put_empty_nest(rsp, NETDEV_A_QUEUE_XSK))
+ goto nla_put_failure;
+
break;
case NETDEV_QUEUE_TYPE_TX:
txq = netdev_get_tx_queue(netdev, q_idx);
if (nla_put_napi_id(rsp, txq->napi))
goto nla_put_failure;
+
+ if (txq->pool)
+ if (nla_put_empty_nest(rsp, NETDEV_A_QUEUE_XSK))
+ goto nla_put_failure;
+
+ break;
}
genlmsg_end(rsp, hdr);
diff --git a/tools/include/uapi/linux/netdev.h b/tools/include/uapi/linux/netdev.h
index 6c6ee183802d..4e82f3871473 100644
--- a/tools/include/uapi/linux/netdev.h
+++ b/tools/include/uapi/linux/netdev.h
@@ -136,6 +136,11 @@ enum {
NETDEV_A_NAPI_MAX = (__NETDEV_A_NAPI_MAX - 1)
};
+enum {
+ __NETDEV_A_XSK_INFO_MAX,
+ NETDEV_A_XSK_INFO_MAX = (__NETDEV_A_XSK_INFO_MAX - 1)
+};
+
enum {
NETDEV_A_QUEUE_ID = 1,
NETDEV_A_QUEUE_IFINDEX,
@@ -143,6 +148,7 @@ enum {
NETDEV_A_QUEUE_NAPI_ID,
NETDEV_A_QUEUE_DMABUF,
NETDEV_A_QUEUE_IO_URING,
+ NETDEV_A_QUEUE_XSK,
__NETDEV_A_QUEUE_MAX,
NETDEV_A_QUEUE_MAX = (__NETDEV_A_QUEUE_MAX - 1)
--
2.43.0Hi Joe,
kernel test robot noticed the following build warnings:
[auto build test WARNING on f3eba8edd885db439f4bfaa2cf9d766bad1ae6c5]
url: https://github.com/intel-lab-lkp/linux/commits/Joe-Damato/netlink-Add-nla_put_empty_nest-helper/20250207-111126
base: f3eba8edd885db439f4bfaa2cf9d766bad1ae6c5
patch link: https://lore.kernel.org/r/20250207030916.32751-3-jdamato%40fastly.com
patch subject: [PATCH net-next v4 2/3] netdev-genl: Add an XSK attribute to queues
config: i386-buildonly-randconfig-001-20250208 (https://download.01.org/0day-ci/archive/20250208/202502081141.R4zMr9v1-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-12) 11.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250208/202502081141.R4zMr9v1-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202502081141.R4zMr9v1-lkp@intel.com/
All warnings (new ones prefixed by >>):
net/core/netdev-genl.c: In function 'netdev_nl_queue_fill_one':
>> net/core/netdev-genl.c:383:13: warning: unused variable 'ret' [-Wunused-variable]
383 | int ret;
| ^~~
vim +/ret +383 net/core/netdev-genl.c
374
375 static int
376 netdev_nl_queue_fill_one(struct sk_buff *rsp, struct net_device *netdev,
377 u32 q_idx, u32 q_type, const struct genl_info *info)
378 {
379 struct pp_memory_provider_params *params;
380 struct netdev_rx_queue *rxq;
381 struct netdev_queue *txq;
382 void *hdr;
> 383 int ret;
384
385 hdr = genlmsg_iput(rsp, info);
386 if (!hdr)
387 return -EMSGSIZE;
388
389 if (nla_put_u32(rsp, NETDEV_A_QUEUE_ID, q_idx) ||
390 nla_put_u32(rsp, NETDEV_A_QUEUE_TYPE, q_type) ||
391 nla_put_u32(rsp, NETDEV_A_QUEUE_IFINDEX, netdev->ifindex))
392 goto nla_put_failure;
393
394 switch (q_type) {
395 case NETDEV_QUEUE_TYPE_RX:
396 rxq = __netif_get_rx_queue(netdev, q_idx);
397 if (nla_put_napi_id(rsp, rxq->napi))
398 goto nla_put_failure;
399
400 params = &rxq->mp_params;
401 if (params->mp_ops &&
402 params->mp_ops->nl_fill(params->mp_priv, rsp, rxq))
403 goto nla_put_failure;
404
405 if (rxq->pool)
406 if (nla_put_empty_nest(rsp, NETDEV_A_QUEUE_XSK))
407 goto nla_put_failure;
408
409 break;
410 case NETDEV_QUEUE_TYPE_TX:
411 txq = netdev_get_tx_queue(netdev, q_idx);
412 if (nla_put_napi_id(rsp, txq->napi))
413 goto nla_put_failure;
414
415 if (txq->pool)
416 if (nla_put_empty_nest(rsp, NETDEV_A_QUEUE_XSK))
417 goto nla_put_failure;
418
419 break;
420 }
421
422 genlmsg_end(rsp, hdr);
423
424 return 0;
425
426 nla_put_failure:
427 genlmsg_cancel(rsp, hdr);
428 return -EMSGSIZE;
429 }
430
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
On Fri, Feb 07, 2025 at 03:08:54AM +0000, Joe Damato wrote: > Expose a new per-queue nest attribute, xsk, which will be present for > queues that are being used for AF_XDP. If the queue is not being used for > AF_XDP, the nest will not be present. > > In the future, this attribute can be extended to include more data about > XSK as it is needed. > > Signed-off-by: Joe Damato <jdamato@fastly.com> > Suggested-by: Jakub Kicinski <kuba@kernel.org> ... > diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c > index 0dcd4faefd8d..75ca111aa591 100644 > --- a/net/core/netdev-genl.c > +++ b/net/core/netdev-genl.c > @@ -380,6 +380,7 @@ netdev_nl_queue_fill_one(struct sk_buff *rsp, struct net_device *netdev, > struct netdev_rx_queue *rxq; > struct netdev_queue *txq; > void *hdr; > + int ret; > Hi Joe, Perhaps this got left behind after some revisions elsewhere. But as it stands ret is unused in this function and should be removed. > hdr = genlmsg_iput(rsp, info); > if (!hdr) ... -- pw-bot: changes-requested
On Fri, Feb 07, 2025 at 01:30:55PM +0000, Simon Horman wrote: > On Fri, Feb 07, 2025 at 03:08:54AM +0000, Joe Damato wrote: > > Expose a new per-queue nest attribute, xsk, which will be present for > > queues that are being used for AF_XDP. If the queue is not being used for > > AF_XDP, the nest will not be present. > > > > In the future, this attribute can be extended to include more data about > > XSK as it is needed. > > > > Signed-off-by: Joe Damato <jdamato@fastly.com> > > Suggested-by: Jakub Kicinski <kuba@kernel.org> > > ... > > > diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c > > index 0dcd4faefd8d..75ca111aa591 100644 > > --- a/net/core/netdev-genl.c > > +++ b/net/core/netdev-genl.c > > @@ -380,6 +380,7 @@ netdev_nl_queue_fill_one(struct sk_buff *rsp, struct net_device *netdev, > > struct netdev_rx_queue *rxq; > > struct netdev_queue *txq; > > void *hdr; > > + int ret; > > > > Hi Joe, > > Perhaps this got left behind after some revisions elsewhere. > But as it stands ret is unused in this function and should be removed. > > > hdr = genlmsg_iput(rsp, info); > > if (!hdr) > > ... Yes, you are right. I originally added it for the empty nest and then didn't use it. Sorry that I missed that and caused unnecessary churn due to my own negligence. Thanks for the review / catching it.
© 2016 - 2026 Red Hat, Inc.