Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp3214484rwb; Sat, 3 Dec 2022 00:48:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf630uDMGS8OxGpy2mBsMYJ8NVbXBWwjRCtqx8YZDVDO5W7r6OrwFGkr8ooY8rXLSoAjlRrd X-Received: by 2002:a17:90a:610:b0:218:dd87:9cf8 with SMTP id j16-20020a17090a061000b00218dd879cf8mr54740506pjj.131.1670057287731; Sat, 03 Dec 2022 00:48:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670057287; cv=none; d=google.com; s=arc-20160816; b=1KT8k/EEthfR6We1H8LZ7i7LssZEA2TzgnduC/CDCw6CT5VghtqUQXliA9kUtzvzlW Wg+yyjpU/MNf1qHHGAt9GUsVl46zq/eMxVW7TfuCZa3Ksioqfp0eeKwF88fwhNAUXn3h 6kGmSJsb3GSk7kDSiCUF9EubpaL5889uktkTbAVEjleL+m2whFC028C3pgVIK7Fd7EiY mMOAg4JsvC8SKcYdPCt5L6FeEpmqMq/cDiJ/N0eEP9fGMuvyKpZyEhYg3D/71ovyaNu/ J9BOcrR2MdB8AxBH5fQVXmof8qbkCU6oLVQfdxKVx98TSLB7sWrEy1wcLFikBSCWjlcf QQSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=xsuNkw6fCaR7AzjTSr4RpJ63Za3mHj+jI4B9YhqDd0Q=; b=eNj+JR8k511BPLUeldIa4VT1apnCasQFxVc+LLvItAbPaKdhJXK3i1foZPPtaxGbmD nL8bopyMzaDYNBGp0b/hZ2zqd59YZ7S2+uJTyylqs6IfoHvWJdvxlD2bkepkRyKAzFsK I1gljvKoOHbkKXDkwJ4S4LKsncQ3OfN0eFfYVo3UKhiwhV61QZDN3mGd9TeDm2+b5zsf PwXrSIWnZwsGcF98rrOufazwtG78QU95ACbYbWFBW03dYTY+S7a5MgAdXPgAfGlQ4nCg PJfTCYvEqWOHH3PKIOUYjhVif+7YuPGetvqjsJlB5KLviQT2x650XWPwSGi2KL7HmaWE 4rYA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j9-20020aa78dc9000000b0056c92bd3c48si8720187pfr.242.2022.12.03.00.47.54; Sat, 03 Dec 2022 00:48:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231397AbiLCIMR (ORCPT + 82 others); Sat, 3 Dec 2022 03:12:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229781AbiLCIMP (ORCPT ); Sat, 3 Dec 2022 03:12:15 -0500 Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E153115730; Sat, 3 Dec 2022 00:12:12 -0800 (PST) Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (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 4NPMwp4Gt0z4y0v8; Sat, 3 Dec 2022 16:12:10 +0800 (CST) Received: from szxlzmapp01.zte.com.cn ([10.5.231.85]) by mse-fl1.zte.com.cn with SMTP id 2B38C3OV026108; Sat, 3 Dec 2022 16:12:03 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp02[null]) by mapi (Zmail) with MAPI id mid14; Sat, 3 Dec 2022 16:12:05 +0800 (CST) Date: Sat, 3 Dec 2022 16:12:05 +0800 (CST) X-Zmail-TransId: 2b04638b04d5ffffffffba98b1a0 X-Mailer: Zmail v1.0 Message-ID: <202212031612057505056@zte.com.cn> Mime-Version: 1.0 From: To: , , Cc: , , , , , , , , Subject: =?UTF-8?B?W1BBVENIIGxpbnV4LW5leHRdIG5ldDogcmVjb3JkIHRpbWVzIG9mIG5ldGRldl9idWRnZXQgZXhoYXVzdGVk?= Content-Type: text/plain; charset="UTF-8" X-MAIL: mse-fl1.zte.com.cn 2B38C3OV026108 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.251.13.novalocal with ID 638B04DA.000 by FangMail milter! X-FangMail-Envelope: 1670055130/4NPMwp4Gt0z4y0v8/638B04DA.000/10.5.228.132/[10.5.228.132]/mse-fl1.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 638B04DA.000/4NPMwp4Gt0z4y0v8 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 netdev_budget exhausted from netdev_budget_usecs elapsed, so add a new recorder 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 --- 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 softirq_action *h) budget -= 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 time and packet budget. + * See Documentation/admin-guide/sysctl/net.rst for details. */ - if (unlikely(budget <= 0 || - time_after_eq(jiffies, time_limit))) { + if (unlikely(budget <= 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, void *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 %08x\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; } -- 2.15.2