From: Breno Leitao <leitao@debian.org>
To: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Clark Williams <clrkwllms@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-rt-devel@lists.linux.dev, kernel-team@meta.com,
efault@gmx.de, calvin@wbinvd.org,
Breno Leitao <leitao@debian.org>
Subject: [PATCH 6/7] netpoll: Move find_skb() to netconsole and make it static
Date: Tue, 02 Sep 2025 07:36:28 -0700 [thread overview]
Message-ID: <20250902-netpoll_untangle_v3-v1-6-51a03d6411be@debian.org> (raw)
In-Reply-To: <20250902-netpoll_untangle_v3-v1-0-51a03d6411be@debian.org>
Complete the SKB pool management refactoring by moving find_skb() from
netpoll core to netconsole driver, making it a static function.
This is the final step in removing SKB pool management from the generic
netpoll infrastructure. With this change:
1. Netpoll core is now purely transmission-focused: Contains only
the essential netpoll_send_skb() function for low-level packet
transmission, with no knowledge of SKB allocation or pool management.
2. Complete encapsulation in netconsole: All SKB lifecycle
management (allocation, pool handling, packet construction) is now
contained within the netconsole driver where it belongs.
3. Cleaner API surface: Removes the last SKB management export from
netpoll, leaving only zap_completion_queue() as a utility function
and netpoll_send_skb() for transmission.
4. Better maintainability: Changes to SKB allocation strategies or
pool management can now be made entirely within netconsole without
affecting the core netpoll infrastructure.
The find_skb() function is made static since it's now only used within
netconsole.c for its internal SKB allocation needs.
This completes the architectural cleanup that separates generic netpoll
transmission capabilities from console-specific resource management.
Signed-off-by: Breno Leitao <leitao@debian.org>
---
drivers/net/netconsole.c | 27 +++++++++++++++++++++++++++
include/linux/netpoll.h | 1 -
net/core/netpoll.c | 28 ----------------------------
3 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 3fe55db07cfe5..bf7bab7a9c2f0 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -1655,6 +1655,33 @@ static void push_eth(struct netpoll *np, struct sk_buff *skb)
eth->h_proto = htons(ETH_P_IP);
}
+static struct sk_buff *find_skb(struct netpoll *np, int len, int reserve)
+{
+ int count = 0;
+ struct sk_buff *skb;
+
+ zap_completion_queue();
+repeat:
+
+ skb = alloc_skb(len, GFP_ATOMIC);
+ if (!skb) {
+ skb = skb_dequeue(&np->skb_pool);
+ schedule_work(&np->refill_wq);
+ }
+
+ if (!skb) {
+ if (++count < 10) {
+ netpoll_poll_dev(np->dev);
+ goto repeat;
+ }
+ return NULL;
+ }
+
+ refcount_set(&skb->users, 1);
+ skb_reserve(skb, reserve);
+ return skb;
+}
+
static struct sk_buff *netpoll_prepare_skb(struct netpoll *np, const char *msg,
int len)
{
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 7f8b4d758a1e7..f89bc9fb1f773 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -74,7 +74,6 @@ int netpoll_setup(struct netpoll *np);
void __netpoll_free(struct netpoll *np);
void do_netpoll_cleanup(struct netpoll *np);
netdev_tx_t netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);
-struct sk_buff *find_skb(struct netpoll *np, int len, int reserve);
void zap_completion_queue(void);
#ifdef CONFIG_NETPOLL
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 94c75f39787bb..5aa83c9c09e05 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -235,34 +235,6 @@ void zap_completion_queue(void)
}
EXPORT_SYMBOL_GPL(zap_completion_queue);
-struct sk_buff *find_skb(struct netpoll *np, int len, int reserve)
-{
- int count = 0;
- struct sk_buff *skb;
-
- zap_completion_queue();
-repeat:
-
- skb = alloc_skb(len, GFP_ATOMIC);
- if (!skb) {
- skb = skb_dequeue(&np->skb_pool);
- schedule_work(&np->refill_wq);
- }
-
- if (!skb) {
- if (++count < 10) {
- netpoll_poll_dev(np->dev);
- goto repeat;
- }
- return NULL;
- }
-
- refcount_set(&skb->users, 1);
- skb_reserve(skb, reserve);
- return skb;
-}
-EXPORT_SYMBOL_GPL(find_skb);
-
static int netpoll_owner_active(struct net_device *dev)
{
struct napi_struct *napi;
--
2.47.3
next prev parent reply other threads:[~2025-09-02 14:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-02 14:36 [PATCH 0/7] netpoll: Untangle netpoll and netconsole Breno Leitao
2025-09-02 14:36 ` [PATCH 1/7] netconsole: Split UDP message building and sending operations Breno Leitao
2025-09-02 22:41 ` Willem de Bruijn
2025-09-02 14:36 ` [PATCH 2/7] netpoll: move prepare skb functions to netconsole Breno Leitao
2025-09-02 22:44 ` Willem de Bruijn
2025-09-02 14:36 ` [PATCH 3/7] netpoll: Move netpoll_cleanup implementation " Breno Leitao
2025-09-02 22:49 ` Willem de Bruijn
2025-09-03 16:44 ` Breno Leitao
2025-09-03 17:13 ` Willem de Bruijn
2025-09-02 14:36 ` [PATCH 4/7] netpoll: Export zap_completion_queue Breno Leitao
2025-09-02 22:50 ` Willem de Bruijn
2025-09-03 16:51 ` Breno Leitao
2025-09-03 17:16 ` Willem de Bruijn
2025-09-02 14:36 ` [PATCH 5/7] netpoll: Move SKBs pool to netconsole side Breno Leitao
2025-09-02 22:56 ` Willem de Bruijn
2025-09-02 14:36 ` Breno Leitao [this message]
2025-09-02 23:07 ` [PATCH 6/7] netpoll: Move find_skb() to netconsole and make it static Willem de Bruijn
2025-09-02 14:36 ` [PATCH 7/7] netpoll: Flush skb_pool as part of netconsole cleanup Breno Leitao
2025-09-02 23:09 ` Willem de Bruijn
2025-09-03 0:09 ` Jakub Kicinski
2025-09-03 16:55 ` Breno Leitao
2025-09-02 15:23 ` [PATCH 0/7] netpoll: Untangle netpoll and netconsole Breno Leitao
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=20250902-netpoll_untangle_v3-v1-6-51a03d6411be@debian.org \
--to=leitao@debian.org \
--cc=andrew+netdev@lunn.ch \
--cc=bigeasy@linutronix.de \
--cc=calvin@wbinvd.org \
--cc=clrkwllms@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=efault@gmx.de \
--cc=horms@kernel.org \
--cc=kernel-team@meta.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-devel@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rostedt@goodmis.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;
as well as URLs for NNTP newsgroup(s).