net: page_pool: report when page pool was destroyed

Report when page pool was destroyed. Together with the inflight
/ memory use reporting this can serve as a replacement for the
warning about leaked page pools we currently print to dmesg.

Example output for a fake leaked page pool using some hacks
in netdevsim (one "live" pool, and one "leaked" on the same dev):

$ ./cli.py --no-schema --spec netlink/specs/netdev.yaml \
           --dump page-pool-get
[{'id': 2, 'ifindex': 3},
 {'id': 1, 'ifindex': 3, 'destroyed': 133, 'inflight': 1}]

Tested-by: Dragos Tatulea <dtatulea@nvidia.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Acked-by: Jesper Dangaard Brouer <hawk@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/Documentation/netlink/specs/netdev.yaml b/Documentation/netlink/specs/netdev.yaml
index b76623ff2932b9b0e4db0ff08559385f5088e8ad..b5f715cf9e06644d20e5fe6e163a60b8927d661e 100644 (file)
--- a/Documentation/netlink/specs/netdev.yaml
+++ b/Documentation/netlink/specs/netdev.yaml
@@ -127,6 +127,18 @@ attribute-sets:
         type: uint
         doc: |
           Amount of memory held by inflight pages.
+      -
+        name: detach-time
+        type: uint
+        doc: |
+          Seconds in CLOCK_BOOTTIME of when Page Pool was detached by
+          the driver. Once detached Page Pool can no longer be used to
+          allocate memory.
+          Page Pools wait for all the memory allocated from them to be freed
+          before truly disappearing. "Detached" Page Pools cannot be
+          "re-attached", they are just waiting to disappear.
+          Attribute is absent if Page Pool has not been detached, and
+          can still be used to allocate new memory.
 
 operations:
   list:
@@ -178,6 +190,7 @@ operations:
             - napi-id
             - inflight
             - inflight-mem
+            - detach-time
       dump:
         reply: *pp-reply
       config-cond: page-pool

diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types.h
index 7e47d7bb2c1edbedff928ee88e06b38500ef7ddf..ac286ea8ce2deef08906b1daa418b584772836b2 100644 (file)
--- a/include/net/page_pool/types.h
+++ b/include/net/page_pool/types.h
@@ -193,6 +193,7 @@ struct page_pool {
        /* User-facing fields, protected by page_pools_lock */
        struct {
                struct hlist_node list;
+               u64 detach_time;
                u32 napi_id;
                u32 id;
        } user;

diff --git a/include/uapi/linux/netdev.h b/include/uapi/linux/netdev.h
index 26ae5bdd3187b010e1014cc476ed7a0ab6048610..75641027412019db103e2dde8c85af60fc6d5cd1 100644 (file)
--- a/include/uapi/linux/netdev.h
+++ b/include/uapi/linux/netdev.h
@@ -70,6 +70,7 @@ enum {
        NETDEV_A_PAGE_POOL_NAPI_ID,
        NETDEV_A_PAGE_POOL_INFLIGHT,
        NETDEV_A_PAGE_POOL_INFLIGHT_MEM,
+       NETDEV_A_PAGE_POOL_DETACH_TIME,
 
        __NETDEV_A_PAGE_POOL_MAX,
        NETDEV_A_PAGE_POOL_MAX = (__NETDEV_A_PAGE_POOL_MAX - 1)

diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index 5663907592948b1a3cf48d0afe19e94ba78553ce..a821fb5fe0545c3995b32aea2759ebd181f2cde3 100644 (file)
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -953,6 +953,7 @@ void page_pool_destroy(struct page_pool *pool)
        if (!page_pool_release(pool))
                return;
 
+       page_pool_detached(pool);
        pool->defer_start = jiffies;
        pool->defer_warn  = jiffies + DEFER_WARN_INTERVAL;
 

diff --git a/net/core/page_pool_priv.h b/net/core/page_pool_priv.h
index 72fb21ea1ddc1bec50420acc1bd7478ee73f2e39..90665d40f1eb73fe6d41daf099da1e49d9ab56ed 100644 (file)
--- a/net/core/page_pool_priv.h
+++ b/net/core/page_pool_priv.h
@@ -6,6 +6,7 @@
 s32 page_pool_inflight(const struct page_pool *pool, bool strict);
 
 int page_pool_list(struct page_pool *pool);
+void page_pool_detached(struct page_pool *pool);
 void page_pool_unlist(struct page_pool *pool);
 
 #endif

diff --git a/net/core/page_pool_user.c b/net/core/page_pool_user.c
index 2db71e718485962e2d44a213f6f67f28c33c542f..bd5ca94f683f80a81ce2c4675612d67b67d1a3b6 100644 (file)
--- a/net/core/page_pool_user.c
+++ b/net/core/page_pool_user.c
@@ -134,6 +134,10 @@ page_pool_nl_fill(struct sk_buff *rsp, const struct page_pool *pool,
            nla_put_uint(rsp, NETDEV_A_PAGE_POOL_INFLIGHT_MEM,
                         inflight * refsz))
                goto err_cancel;
+       if (pool->user.detach_time &&
+           nla_put_uint(rsp, NETDEV_A_PAGE_POOL_DETACH_TIME,
+                        pool->user.detach_time))
+               goto err_cancel;
 
        genlmsg_end(rsp, hdr);
 
@@ -219,6 +223,14 @@ err_unlock:
        return err;
 }
 
+void page_pool_detached(struct page_pool *pool)
+{
+       mutex_lock(&page_pools_lock);
+       pool->user.detach_time = ktime_get_boottime_seconds();
+       netdev_nl_page_pool_event(pool, NETDEV_CMD_PAGE_POOL_CHANGE_NTF);
+       mutex_unlock(&page_pools_lock);
+}
+
 void page_pool_unlist(struct page_pool *pool)
 {
        mutex_lock(&page_pools_lock);