net: page_pool: add callback for mp info printing

Add a mandatory callback that prints information about the memory
provider to netlink.

Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: David Wei <dw@davidwei.uk>
Link: https://patch.msgid.link/20250204215622.695511-7-dw@davidwei.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/page_pool/memory_provider.h b/include/net/page_pool/memory_provider.h
index e49d0a52629d7b344c7f41e45870130c52cc82c4..6d10a0959d00ce50ea8a292b0f3936c32c44a604 100644 (file)
--- a/include/net/page_pool/memory_provider.h
+++ b/include/net/page_pool/memory_provider.h
@@ -5,11 +5,16 @@
 #include <net/netmem.h>
 #include <net/page_pool/types.h>
 
+struct netdev_rx_queue;
+struct sk_buff;
+
 struct memory_provider_ops {
        netmem_ref (*alloc_netmems)(struct page_pool *pool, gfp_t gfp);
        bool (*release_netmem)(struct page_pool *pool, netmem_ref netmem);
        int (*init)(struct page_pool *pool);
        void (*destroy)(struct page_pool *pool);
+       int (*nl_fill)(void *mp_priv, struct sk_buff *rsp,
+                      struct netdev_rx_queue *rxq);
 };
 
 #endif

diff --git a/net/core/devmem.c b/net/core/devmem.c
index c81625ca57c6141a7df433ada89d99707c1a222f..63b790326c7d4ba5b7ccbd416648d9d035468dfb 100644 (file)
--- a/net/core/devmem.c
+++ b/net/core/devmem.c
@@ -406,9 +406,19 @@ bool mp_dmabuf_devmem_release_page(struct page_pool *pool, netmem_ref netmem)
        return false;
 }
 
+static int mp_dmabuf_devmem_nl_fill(void *mp_priv, struct sk_buff *rsp,
+                                   struct netdev_rx_queue *rxq)
+{
+       const struct net_devmem_dmabuf_binding *binding = mp_priv;
+       int type = rxq ? NETDEV_A_QUEUE_DMABUF : NETDEV_A_PAGE_POOL_DMABUF;
+
+       return nla_put_u32(rsp, type, binding->id);
+}
+
 static const struct memory_provider_ops dmabuf_devmem_ops = {
        .init                   = mp_dmabuf_devmem_init,
        .destroy                = mp_dmabuf_devmem_destroy,
        .alloc_netmems          = mp_dmabuf_devmem_alloc_netmems,
        .release_netmem         = mp_dmabuf_devmem_release_page,
+       .nl_fill                = mp_dmabuf_devmem_nl_fill,
 };

diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c
index 715f85c6b62eabcc61a10065f98cc914f5f0d975..5b459b4fef46dd67a4669f66da73bdf04c0a321b 100644 (file)
--- a/net/core/netdev-genl.c
+++ b/net/core/netdev-genl.c
@@ -10,6 +10,7 @@
 #include <net/sock.h>
 #include <net/xdp.h>
 #include <net/xdp_sock.h>
+#include <net/page_pool/memory_provider.h>
 
 #include "dev.h"
 #include "devmem.h"
@@ -368,7 +369,7 @@ static int
 netdev_nl_queue_fill_one(struct sk_buff *rsp, struct net_device *netdev,
                         u32 q_idx, u32 q_type, const struct genl_info *info)
 {
-       struct net_devmem_dmabuf_binding *binding;
+       struct pp_memory_provider_params *params;
        struct netdev_rx_queue *rxq;
        struct netdev_queue *txq;
        void *hdr;
@@ -385,15 +386,15 @@ netdev_nl_queue_fill_one(struct sk_buff *rsp, struct net_device *netdev,
        switch (q_type) {
        case NETDEV_QUEUE_TYPE_RX:
                rxq = __netif_get_rx_queue(netdev, q_idx);
+
                if (rxq->napi && nla_put_u32(rsp, NETDEV_A_QUEUE_NAPI_ID,
                                             rxq->napi->napi_id))
                        goto nla_put_failure;
 
-               binding = rxq->mp_params.mp_priv;
-               if (binding &&
-                   nla_put_u32(rsp, NETDEV_A_QUEUE_DMABUF, binding->id))
+               params = &rxq->mp_params;
+               if (params->mp_ops &&
+                   params->mp_ops->nl_fill(params->mp_priv, rsp, rxq))
                        goto nla_put_failure;
-
                break;
        case NETDEV_QUEUE_TYPE_TX:
                txq = netdev_get_tx_queue(netdev, q_idx);

diff --git a/net/core/page_pool_user.c b/net/core/page_pool_user.c
index d5e214c30c310f9164a27b140a61d7dc067b35d5..9d8a3d8597fa84bb35b948d2984f9d6a2a2a55a4 100644 (file)
--- a/net/core/page_pool_user.c
+++ b/net/core/page_pool_user.c
@@ -8,9 +8,9 @@
 #include <net/netdev_rx_queue.h>
 #include <net/page_pool/helpers.h>
 #include <net/page_pool/types.h>
+#include <net/page_pool/memory_provider.h>
 #include <net/sock.h>
 
-#include "devmem.h"
 #include "page_pool_priv.h"
 #include "netdev-genl-gen.h"
 
@@ -216,7 +216,6 @@ static int
 page_pool_nl_fill(struct sk_buff *rsp, const struct page_pool *pool,
                  const struct genl_info *info)
 {
-       struct net_devmem_dmabuf_binding *binding = pool->mp_priv;
        size_t inflight, refsz;
        unsigned int napi_id;
        void *hdr;
@@ -249,7 +248,7 @@ page_pool_nl_fill(struct sk_buff *rsp, const struct page_pool *pool,
                         pool->user.detach_time))
                goto err_cancel;
 
-       if (binding && nla_put_u32(rsp, NETDEV_A_PAGE_POOL_DMABUF, binding->id))
+       if (pool->mp_ops && pool->mp_ops->nl_fill(pool->mp_priv, rsp, NULL))
                goto err_cancel;
 
        genlmsg_end(rsp, hdr);