From: Jakub Kicinski <kuba@kernel•org>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, edumazet@google•com, pabeni@redhat•com,
almasrymina@google•com, hawk@kernel•org,
ilias.apalodimas@linaro•org, dsahern@gmail•com,
dtatulea@nvidia•com, Jakub Kicinski <kuba@kernel•org>
Subject: [PATCH net-next v2 12/15] net: page_pool: report when page pool was destroyed
Date: Mon, 20 Nov 2023 16:00:45 -0800 [thread overview]
Message-ID: <20231121000048.789613-13-kuba@kernel.org> (raw)
In-Reply-To: <20231121000048.789613-1-kuba@kernel.org>
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>
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
Documentation/netlink/specs/netdev.yaml | 9 +++++++++
include/net/page_pool/types.h | 1 +
include/uapi/linux/netdev.h | 1 +
net/core/page_pool.c | 1 +
net/core/page_pool_priv.h | 1 +
net/core/page_pool_user.c | 12 ++++++++++++
6 files changed, 25 insertions(+)
diff --git a/Documentation/netlink/specs/netdev.yaml b/Documentation/netlink/specs/netdev.yaml
index 85209e19dca9..8dafa2a8a4dd 100644
--- a/Documentation/netlink/specs/netdev.yaml
+++ b/Documentation/netlink/specs/netdev.yaml
@@ -125,6 +125,14 @@ name: netdev
type: uint
doc: |
Amount of memory held by inflight pages.
+ -
+ name: destroyed
+ type: uint
+ doc: |
+ Seconds in CLOCK_BOOTTIME of when Page Pool was destroyed.
+ Page Pools wait for all the memory allocated from them to be freed
+ before truly disappearing.
+ Absent if Page Pool hasn't been destroyed.
operations:
list:
@@ -176,6 +184,7 @@ name: netdev
- napi-id
- inflight
- inflight-mem
+ - destroyed
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 7e47d7bb2c1e..f0c51ef5e345 100644
--- 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 destroyed;
u32 napi_id;
u32 id;
} user;
diff --git a/include/uapi/linux/netdev.h b/include/uapi/linux/netdev.h
index 26ae5bdd3187..e5bf66d2aa31 100644
--- 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_DESTROYED,
__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 566390759294..0f3f525c457a 100644
--- 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_destroyed(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 72fb21ea1ddc..7fe6f842a270 100644
--- 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_destroyed(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 d889b347f8f4..d0f778f358fc 100644
--- 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.destroyed &&
+ nla_put_uint(rsp, NETDEV_A_PAGE_POOL_DESTROYED,
+ pool->user.destroyed))
+ goto err_cancel;
genlmsg_end(rsp, hdr);
@@ -219,6 +223,14 @@ int page_pool_list(struct page_pool *pool)
return err;
}
+void page_pool_destroyed(struct page_pool *pool)
+{
+ mutex_lock(&page_pools_lock);
+ pool->user.destroyed = 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);
--
2.42.0
next prev parent reply other threads:[~2023-11-21 0:01 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 0:00 [PATCH net-next v2 00/15] net: page_pool: add netlink-based introspection Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 01/15] net: page_pool: split the page_pool_params into fast and slow Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 02/15] net: page_pool: avoid touching slow on the fastpath Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 03/15] net: page_pool: factor out uninit Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 04/15] net: page_pool: id the page pools Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 05/15] net: page_pool: record pools per netdev Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 06/15] net: page_pool: stash the NAPI ID for easier access Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 07/15] eth: link netdev to page_pools in drivers Jakub Kicinski
2023-11-21 13:13 ` kernel test robot
2023-11-21 21:25 ` kernel test robot
2023-11-21 0:00 ` [PATCH net-next v2 08/15] net: page_pool: add nlspec for basic access to page pools Jakub Kicinski
2023-11-21 18:24 ` Willem de Bruijn
2023-11-21 20:37 ` Jakub Kicinski
2023-11-21 21:33 ` Willem de Bruijn
2023-11-21 22:00 ` Jakub Kicinski
2023-11-21 22:49 ` David Ahern
2023-11-21 23:42 ` Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 09/15] net: page_pool: implement GET in the netlink API Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 10/15] net: page_pool: add netlink notifications for state changes Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 11/15] net: page_pool: report amount of memory held by page pools Jakub Kicinski
2023-11-21 0:00 ` Jakub Kicinski [this message]
2023-11-21 20:45 ` [PATCH net-next v2 12/15] net: page_pool: report when page pool was destroyed Jesper Dangaard Brouer
2023-11-21 21:49 ` Jakub Kicinski
2023-11-22 8:53 ` Jesper Dangaard Brouer
2023-11-21 0:00 ` [PATCH net-next v2 13/15] net: page_pool: expose page pool stats via netlink Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 14/15] net: page_pool: mute the periodic warning for visible page pools Jakub Kicinski
2023-11-21 0:00 ` [PATCH net-next v2 15/15] tools: ynl: add sample for getting page-pool information Jakub Kicinski
2023-11-22 1:31 ` [PATCH net-next v2 00/15] net: page_pool: add netlink-based introspection Jakub Kicinski
2023-11-22 8:45 ` Jesper Dangaard Brouer
2023-11-22 1:40 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231121000048.789613-13-kuba@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=almasrymina@google$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dsahern@gmail$(echo .)com \
--cc=dtatulea@nvidia$(echo .)com \
--cc=edumazet@google$(echo .)com \
--cc=hawk@kernel$(echo .)org \
--cc=ilias.apalodimas@linaro$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox