From: Jesper Dangaard Brouer <brouer@redhat.com>
To: Ilias Apalodimas <ilias.apalodimas@linaro.org>,
netdev@vger.kernel.org, Eric Dumazet <eric.dumazet@gmail.com>,
linux-mm@kvack.org, Mel Gorman <mgorman@techsingularity.net>
Cc: "Jesper Dangaard Brouer" <brouer@redhat.com>,
lorenzo@kernel.org, "Toke Høiland-Jørgensen" <toke@redhat.com>,
linyunsheng@huawei.com, bpf@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
willy@infradead.org
Subject: [PATCH RFC net-next/mm V1 2/3] page_pool: Use static_key for shutdown phase
Date: Tue, 25 Apr 2023 19:15:43 +0200 [thread overview]
Message-ID: <168244294384.1741095.6037010854411310099.stgit@firesoul> (raw)
In-Reply-To: <168244288038.1741095.1092368365531131826.stgit@firesoul>
Performance is very important for page pool (PP). This add the use of
static_key APIs for regaining a single instruction, which makes the
new PP shutdown scheme zero impact.
We are uncertain if this is 100% correct, because static_key APIs uses
a mutex lock and it is uncertain if all contexts that can return pages
can support this. We could spawn a workqueue (like we just removed) to
workaround this issue.
Seeking input if this is worth the complexity.
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
---
net/core/page_pool.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index ce7e8dda6403..3821d8874b15 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -25,6 +25,8 @@
#define BIAS_MAX LONG_MAX
+DEFINE_STATIC_KEY_FALSE(pp_shutdown_phase);
+
#ifdef CONFIG_PAGE_POOL_STATS
/* alloc_stat_inc is intended to be used in softirq context */
#define alloc_stat_inc(pool, __stat) (pool->alloc_stats.__stat++)
@@ -378,7 +380,8 @@ static struct page *__page_pool_alloc_pages_slow(struct page_pool *pool,
int i, nr_pages;
/* API usage BUG: PP in shutdown phase, cannot alloc new pages */
- if (WARN_ON(pool->p.flags & PP_FLAG_SHUTDOWN))
+ if (static_key_enabled(&pp_shutdown_phase) &&
+ WARN_ON(pool->p.flags & PP_FLAG_SHUTDOWN))
return NULL;
/* Don't support bulk alloc for high-order pages */
@@ -609,7 +612,7 @@ void page_pool_put_defragged_page(struct page_pool *pool, struct page *page,
recycle_stat_inc(pool, ring_full);
page_pool_return_page(pool, page);
}
- if (pool->p.flags & PP_FLAG_SHUTDOWN)
+ if (static_branch_unlikely(&pp_shutdown_phase))
page_pool_shutdown_attempt(pool);
}
EXPORT_SYMBOL(page_pool_put_defragged_page);
@@ -659,7 +662,7 @@ void page_pool_put_page_bulk(struct page_pool *pool, void **data,
page_pool_return_page(pool, data[i]);
out:
- if (pool->p.flags & PP_FLAG_SHUTDOWN)
+ if (static_branch_unlikely(&pp_shutdown_phase))
page_pool_shutdown_attempt(pool);
}
EXPORT_SYMBOL(page_pool_put_page_bulk);
@@ -817,7 +820,15 @@ static int page_pool_release(struct page_pool *pool)
noinline
static void page_pool_shutdown_attempt(struct page_pool *pool)
{
- page_pool_release(pool);
+ int inflight;
+
+ if (!(pool->p.flags & PP_FLAG_SHUTDOWN))
+ return;
+
+ inflight = page_pool_release(pool);
+
+ if (static_key_enabled(&pp_shutdown_phase) && !inflight)
+ static_branch_dec(&pp_shutdown_phase);
}
void page_pool_use_xdp_mem(struct page_pool *pool, void (*disconnect)(void *),
@@ -861,6 +872,7 @@ void page_pool_destroy(struct page_pool *pool)
* Enter into shutdown phase, and retry release to handle races.
*/
pool->p.flags |= PP_FLAG_SHUTDOWN;
+ static_branch_inc(&pp_shutdown_phase);
page_pool_shutdown_attempt(pool);
}
EXPORT_SYMBOL(page_pool_destroy);
next prev parent reply other threads:[~2023-04-25 17:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-25 17:15 [PATCH RFC net-next/mm V1 0/3] page_pool: new approach for leak detection and " Jesper Dangaard Brouer
2023-04-25 17:15 ` [PATCH RFC net-next/mm V1 1/3] page_pool: Remove workqueue in new shutdown scheme Jesper Dangaard Brouer
2023-04-27 0:57 ` Yunsheng Lin
2023-04-27 10:47 ` Jesper Dangaard Brouer
2023-04-27 18:29 ` Jesper Dangaard Brouer
2023-04-25 17:15 ` Jesper Dangaard Brouer [this message]
2023-04-25 23:30 ` [PATCH RFC net-next/mm V1 2/3] page_pool: Use static_key for shutdown phase Alexei Starovoitov
2023-04-26 15:15 ` Jesper Dangaard Brouer
2023-04-25 17:15 ` [PATCH RFC net-next/mm V1 3/3] mm/page_pool: catch page_pool memory leaks Jesper Dangaard Brouer
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=168244294384.1741095.6037010854411310099.stgit@firesoul \
--to=brouer@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bpf@vger.kernel.org \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=ilias.apalodimas@linaro.org \
--cc=kuba@kernel.org \
--cc=linux-mm@kvack.org \
--cc=linyunsheng@huawei.com \
--cc=lorenzo@kernel.org \
--cc=mgorman@techsingularity.net \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=toke@redhat.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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