From nobody Sun Apr 28 07:59:12 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4FD2C4332F for ; Mon, 5 Dec 2022 01:36:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231273AbiLEBg1 (ORCPT ); Sun, 4 Dec 2022 20:36:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231266AbiLEBgY (ORCPT ); Sun, 4 Dec 2022 20:36:24 -0500 Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 590D11054C; Sun, 4 Dec 2022 17:36:22 -0800 (PST) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4NQR3811dHz501Qf; Mon, 5 Dec 2022 09:36:20 +0800 (CST) Received: from szxlzmapp03.zte.com.cn ([10.5.231.207]) by mse-fl2.zte.com.cn with SMTP id 2B51aB3v062841; Mon, 5 Dec 2022 09:36:11 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp02[null]) by mapi (Zmail) with MAPI id mid14; Mon, 5 Dec 2022 09:36:12 +0800 (CST) Date: Mon, 5 Dec 2022 09:36:12 +0800 (CST) X-Zmail-TransId: 2b04638d4b0cffffffff9459153f X-Mailer: Zmail v1.0 Message-ID: <202212050936120314474@zte.com.cn> Mime-Version: 1.0 From: To: , , Cc: , , , , , , , , Subject: =?UTF-8?B?W1BBVENIIGxpbnV4LW5leHQgdjJdIG5ldDogcmVjb3JkIHRpbWVzIG9mIG5ldGRldl9idWRnZXQgZXhoYXVzdGVk?= X-MAIL: mse-fl2.zte.com.cn 2B51aB3v062841 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.251.13.novalocal with ID 638D4B14.000 by FangMail milter! X-FangMail-Envelope: 1670204180/4NQR3811dHz501Qf/638D4B14.000/10.5.228.133/[10.5.228.133]/mse-fl2.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 638D4B14.000/4NQR3811dHz501Qf Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Yang Yang A long time ago time_squeeze was used to only record netdev_budget exhausted[1]. Then we added netdev_budget_usecs to enable softirq tuning[2]. And when polling elapsed netdev_budget_usecs, it's also record by time_squeeze. For tuning netdev_budget and netdev_budget_usecs respectively, we'd better distinguish from netdev_budget exhausted and netdev_budget_usecs elapsed, so add budget_exhaust to record netdev_budget exhausted. [1] commit 1da177e4c3f4("Linux-2.6.12-rc2") [2] commit 7acf8a1e8a28("Replace 2 jiffies with sysctl netdev_budget_usecs = to enable softirq tuning") Signed-off-by: Yang Yang Reviewed-by: xu xin Reviewed-by: Zhang Yunkai --- Changes since v1: - Fix compile error of patch making error --- include/linux/netdevice.h | 1 + net/core/dev.c | 11 +++++++---- net/core/net-procfs.c | 5 +++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5aa35c58c342..a77719b956a6 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3135,6 +3135,7 @@ struct softnet_data { /* stats */ unsigned int processed; unsigned int time_squeeze; + unsigned int budget_exhaust; #ifdef CONFIG_RPS struct softnet_data *rps_ipi_list; #endif diff --git a/net/core/dev.c b/net/core/dev.c index 7627c475d991..42ae2dc62661 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6663,11 +6663,14 @@ static __latent_entropy void net_rx_action(struct s= oftirq_action *h) budget -=3D napi_poll(n, &repoll); /* If softirq window is exhausted then punt. - * Allow this to run for 2 jiffies since which will allow - * an average latency of 1.5/HZ. + * The window is controlled by packets budget and time. + * See Documentation/admin-guide/sysctl/net.rst for details. */ - if (unlikely(budget <=3D 0 || - time_after_eq(jiffies, time_limit))) { + if (unlikely(budget <=3D 0)) { + sd->budget_exhaust++; + break; + } + if (unlikely(time_after_eq(jiffies, time_limit))) { sd->time_squeeze++; break; } diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c index 1ec23bf8b05c..e09e245125f0 100644 --- a/net/core/net-procfs.c +++ b/net/core/net-procfs.c @@ -169,12 +169,13 @@ static int softnet_seq_show(struct seq_file *seq, voi= d *v) * mapping the data a specific CPU */ seq_printf(seq, - "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n", + "%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08= x\n", sd->processed, sd->dropped, sd->time_squeeze, 0, 0, 0, 0, 0, /* was fastroute */ 0, /* was cpu_collision */ sd->received_rps, flow_limit_count, - softnet_backlog_len(sd), (int)seq->index); + softnet_backlog_len(sd), (int)seq->index, + sd->budget_exhaust); return 0; } --=20 2.15.2