From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1ABDE3A7D74 for ; Sun, 24 May 2026 16:12:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779639152; cv=none; b=YaqUhtfwLBVFXSNE44H2G6/BO8n6uW+UdppDMAp2ug8ltOaMFk4PAAiMzBPd2fugWKrhtLFEO63TMSLhCLE+9exAD3QpTgFT2bOqGbIE77EM32hw3QxHY99HsU3vR+7b+E8Upu1N/O9OypsygxYzWqg9JlNl75z8KPdiFobP5qw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779639152; c=relaxed/simple; bh=2+kUJ9MLWgAjyqEnqV6PmrQCVE8DwsUu4Xz4X+NXL/8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O3Jx4z1ALjVm/8onpu1nDneW+ayWW9hUDtD2NLrHY4K20lZZoqmdROli+sI4v+l+oaUu0ofqf2nh7ptQGioVAA2CPjfvQckUoXO3ABwXQQEyksdl2+yc4HJRMmXhJ+PlYh8CpMNUZukWwyEyurfi2h//Bg+h35RvBLou7Uy9ZR0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.160.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-43a2ad7bcc4so4076675fac.1 for ; Sun, 24 May 2026 09:12:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779639149; x=1780243949; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=xKgkaHoit0BwRCJTQUnz/viZDI3hhr4+HERagrPW2J0=; b=Qs3/uy9VDRI2mwxPcaFv01Sd3Y9shFa1R0SI3+zZI5KW4T0UbgagcxPxaZEU0pqI8d 0dXa5NpPMCL2RU2nHV9q8Q+IBBYGzufR+xrSUcmTwS3B+5yupkFtOUBXYWhtAVHLooRB wljmDYvMtPETDXpLwpgk9YfUWw+Gko3Y9f4TW0ATTHhDq5vQgdpofbrb3lNvuD5AEqhO yBe45SsN0JvMd/4UagyQd/zGZeYLyUPDxXoZoFYrqJN2qnBPtw4CFSVdkczbj7K8YWFO G57YYFTlhgXUbQ05tVFje2oj1rfYK8dKc5Ws/02JfulysrnojVqGHQeA5e1m2BiS2rTx H28Q== X-Forwarded-Encrypted: i=1; AFNElJ9YMZYlVlXt3wrFYQ9/SxpxwGwekQIbj3XaedsuY94dI6z23bItspSeTU2wQKek3izX4TjpNUy3O4jPR90=@vger.kernel.org X-Gm-Message-State: AOJu0Ywg6nrM8Bod/jc4V+ErUZaHAmIwfNaHT9W7jpAiHrTMycifG+2H +/Sx34XXRQ3XUcgaGIF0kNmf4Sdf9bVEKsqinfh5+Ur8YyCEWA1h2w7C X-Gm-Gg: Acq92OH0JOu5ZOdmWm1dLEOXbaGf+HKeaU7iNUuXeCcZ8CQbZkyEnETlwVRRWHHJeRK 9pB8Ha89n2taHBoYTK6aoasZB0+7xXKc+IiDC3UmchS2fwlrYOFmC+XXJo1ZzoMy+B1DomWYbkK DZQPM6a2zLOujupTxfKFUBbHczV68gcbFcNweUN0vIz7V1wbD+ABPO/4TAuJIcKBBtQucZZlSTv 36GUp1fTyXKJYD3Bd36eEdyk/S0A5fP2UR9Q1eRzE8KTy4Vb/LGC/0FA53BUJ8QAWHx6vxzDO1E +iU4SSWLP3GgKei4BbE9T0GkSIeMu+OoEDQAHwoSzN1NgfhkbHcMTqeoOaBKPlDS5qLSwsqDF5b xl7vF/BPKlg7aKWsvXCG33m+haHljxNs5+GpmzC0HZQHnTsYf9DVZI7FkShNsovWvIPs6v7Dbbk ypGdDehj0hxg4z54wBL0Kobqmm X-Received: by 2002:a05:6808:1455:b0:485:1173:f62a with SMTP id 5614622812f47-48549d8fb9fmr6366031b6e.1.1779639148953; Sun, 24 May 2026 09:12:28 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:71::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-43b635d1551sm7990476fac.5.2026.05.24.09.12.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 May 2026 09:12:28 -0700 (PDT) From: Breno Leitao Date: Sun, 24 May 2026 09:12:21 -0700 Subject: [PATCH 5/9] netconsole: move skb_pool_flush() from netpoll Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260524-netconsole_move_more-v1-5-909d1ab398b4@debian.org> References: <20260524-netconsole_move_more-v1-0-909d1ab398b4@debian.org> In-Reply-To: <20260524-netconsole_move_more-v1-0-909d1ab398b4@debian.org> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, gustavold@gmail.com, asantostc@gmail.com, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.16-dev-d5d98 X-Developer-Signature: v=1; a=openpgp-sha256; l=2321; i=leitao@debian.org; h=from:subject:message-id; bh=2+kUJ9MLWgAjyqEnqV6PmrQCVE8DwsUu4Xz4X+NXL/8=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBqEyNlWZOrmYcQhvL8Zz9oK7ZJzlc8K4A2EKmR7 XyRlec+oAOJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCahMjZQAKCRA1o5Of/Hh3 bSV6D/4v+pU1rFx8RcKdVfCwz9IpWpp0qlv/6RwmeOCKfR9IsDj4acmmjA9DPOEiBwKtxQ+Z00c AxXZMUiKxOyu1T+w51IYFhedw5K+VJsG8H1JomrLTnWKhu1fZjanVYd6CihGP4RLzh7aCynnLwk CLqf16BeadcOr3LF456e8d/+FCi5USBT/Ix/cLCW6MQJNWeg2i9z9+zN+CQeDc7dBfJcSncoUh6 JXngMlJdGcLcd5N/Vv18SfGI/vVmrf3DlSZjMEZvH8k97vbbI+OaStWU5u3IeD4GQCA2D28FZtO R0p6BLzJT/MT9v4VYS9Q8FNd5o6Iy78MfbTESDIOCFoep/9fnXvbm7ZBXrqmxsYAybktSbQ90cf K1tN9ajtdbHd+8EpNTAJABnHKR6bwzAjbV2eryeBugrO1TKywOEMyfku36IzhY5aMqKmY0zFdOQ nwKBrbvk59TwxLV9BgQmuBdsYKQVamcqBdeHh6uQrGHByjJ4rWv48pUrnME2V6r3fWNsl15ScTa YWXhueqWTA0eG2Arcg4ttDxMvl7lrYR8ivJfjmWY4zC3v1HU91qeVv3LzSLtWnZb7OQzDdu7KJb XQ7WTm6690eYWfcNug4L9yPLHHZ6eIGAc3dXOMz0Ulb7NdjhPzpa7WSX1Fn7GZjR7qaK+eBAeC3 x6QUVyI/9hklzlg== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D skb_pool_flush() has no callers left in net/core/netpoll.c after netconsole took over the pool lifecycle. Inline its body into netconsole_skb_pool_flush() (the only caller) and drop the function and its export from netpoll. The prototype goes from . Pure code motion: cancel_work_sync() + skb_queue_purge_reason() semantics are unchanged. Signed-off-by: Breno Leitao --- drivers/net/netconsole.c | 5 ++++- include/linux/netpoll.h | 1 - net/core/netpoll.c | 10 ---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 76a569d487db..a8ced60bef7a 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -333,7 +333,10 @@ static void netconsole_skb_pool_init(struct netconsole_target *nt) static void netconsole_skb_pool_flush(struct netconsole_target *nt) { - skb_pool_flush(&nt->np); + struct netpoll *np = &nt->np; + + cancel_work_sync(&np->refill_wq); + skb_queue_purge_reason(&np->skb_pool, SKB_CONSUMED); } /* Attempts to resume logging to a deactivated target. */ diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index bc491f600a71..e4b8f1f91e54 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h @@ -74,7 +74,6 @@ void netpoll_cleanup(struct netpoll *np); void do_netpoll_cleanup(struct netpoll *np); netdev_tx_t netpoll_send_skb(struct netpoll *np, struct sk_buff *skb); void netpoll_zap_completion_queue(void); -void skb_pool_flush(struct netpoll *np); #ifdef CONFIG_NETPOLL static inline void *netpoll_poll_lock(struct napi_struct *napi) diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 2fca74b4ea75..796aab90e26e 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -327,16 +327,6 @@ netdev_tx_t netpoll_send_skb(struct netpoll *np, struct sk_buff *skb) } EXPORT_SYMBOL(netpoll_send_skb); -void skb_pool_flush(struct netpoll *np) -{ - struct sk_buff_head *skb_pool; - - cancel_work_sync(&np->refill_wq); - skb_pool = &np->skb_pool; - skb_queue_purge_reason(skb_pool, SKB_CONSUMED); -} -EXPORT_SYMBOL_GPL(skb_pool_flush); - int __netpoll_setup(struct netpoll *np, struct net_device *ndev) { struct netpoll_info *npinfo; -- 2.54.0