From patchwork Fri Dec 15 17:07:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 179425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9434873dys; Fri, 15 Dec 2023 09:15:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IEKleLPAejZIDt6N3kfRUooANtOvPPZtGb98IdwW4Wj7t1AvNUW0yfwa1M6k5e/E4+HCl/0 X-Received: by 2002:a05:6e02:144d:b0:35f:692e:2062 with SMTP id p13-20020a056e02144d00b0035f692e2062mr9171097ilo.0.1702660504460; Fri, 15 Dec 2023 09:15:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702660504; cv=none; d=google.com; s=arc-20160816; b=AJxz24lbOe4qiiAuIdVOVdXWY5o1vE//+U0z45VKJ+kp/fEwtHQ7vMHv5GL41C/BIb XsGgyuenwaErkEiSVmNGV0ya+3acShRrxluYbeXgtrc6bpxHZUyMiPBtxOfjLHi5WSSE 9m5rK/JpoGcnD/16cipxcAEPW+CzlxdbUNHR5Xn51AW/lTLYMkAY2+KUZd5M+V95Y7tU 6sHi62JvWbmXObf+426hFdapfV2n9UwVKipKA66uP3ffuUnebkmxu7uITptggyuSYCRq LzXYyepdJI+CUC9acQSpDVR530u3Zc1bRS/EQJip1GEjCwDAmmkRy5YwHkP4R0FZAtfy Vteg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=Vs9x26/0xa1tcBYKbgQAR4XHVyOmk1j4LbahtbGEJ58=; fh=la8dAWQWYzWYJq1HFXsNz8dq5YUOIzYRDgfCPvUcTL0=; b=cohDqVTWXhVh9hrV5FldC7Y4NICmu/N1WnW+m1lccktKLJxek4koIwgsm9dr5Be6ps k8M3fXt53ysA1/2iGnIWDVmpqUQi2zvcapmyO5nE/XFH1EL3MD9JxsUNjeQ4IN9zVTKf l855QnpMpPRRA7Wh6ieHmEXnQHrHb5z/2nwoXcF0jfPNFd0eAdE4jYgEpKmCKDxfDNk3 JKq2jVxPf9/9EfG0mqjdKozqBanVAa3nIQcJPvovL5lQvycLxkjkty/ZGo2/Lc4XWbiQ 46DiiPZVnWxVCmLWoBbPmF2uCCgwrtYsKkwz2dnxGCDMjyjbpXj4FmnEpMpUAjRZeFes J88g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=QPPNb1XU; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel+bounces-1369-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1369-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id g184-20020a636bc1000000b005c668a5a906si13216677pgc.282.2023.12.15.09.15.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 09:15:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-1369-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=QPPNb1XU; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel+bounces-1369-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-1369-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id DBCCD281D6B for ; Fri, 15 Dec 2023 17:14:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6A32B66AC0; Fri, 15 Dec 2023 17:10:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="QPPNb1XU"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="KDbhOqx2" X-Original-To: linux-kernel@vger.kernel.org Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 683CB4187D; Fri, 15 Dec 2023 17:10:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1702660235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vs9x26/0xa1tcBYKbgQAR4XHVyOmk1j4LbahtbGEJ58=; b=QPPNb1XUv1JJZyXkWSJEfN4hs115WhG65vgXF8+eYS2NVCHUiR5bdf+0Te2De9CMkDVhX5 kg+4nxjhReF+U9wcdzwufFTgCeQwQjWs5e258Ldrv1vqqYXu667680eap2RXNzFS97oZ97 Hl80mYjI7MI1SsnnbfyfgeagmgvnlzY0xr283cnFTp45haOfEGAsbdu95tuNqd14AFBlLh IoqH0SrvRHQagmfhbpovRgr2lo+JMaXjSOlPqfVO52gdeCf/JjymwJKCmpvPAqjwoyc52q NsJz+5hhs3fygtd4N4fSYjKv7jyo4nbagYTuZK1T6MBDaNXVxUcOQLb/XpjnNg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1702660235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vs9x26/0xa1tcBYKbgQAR4XHVyOmk1j4LbahtbGEJ58=; b=KDbhOqx2pyNuV88W7bRpl2paKK1qKcH6+JJCM/aNDU55/cuO1o1cA8YMiXZu0qz812rB0f YrGOeFqrjm1A/SAQ== To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: "David S. Miller" , Boqun Feng , Daniel Borkmann , Eric Dumazet , Frederic Weisbecker , Ingo Molnar , Jakub Kicinski , Paolo Abeni , Peter Zijlstra , Thomas Gleixner , Waiman Long , Will Deacon , Sebastian Andrzej Siewior , Ben Segall , Daniel Bristot de Oliveira , Dietmar Eggemann , Juri Lelli , Mel Gorman , Steven Rostedt , Valentin Schneider , Vincent Guittot Subject: [PATCH net-next 08/24] net: softnet_data: Make xmit.recursion per task. Date: Fri, 15 Dec 2023 18:07:27 +0100 Message-ID: <20231215171020.687342-9-bigeasy@linutronix.de> In-Reply-To: <20231215171020.687342-1-bigeasy@linutronix.de> References: <20231215171020.687342-1-bigeasy@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785368940771383053 X-GMAIL-MSGID: 1785368940771383053 Softirq is preemptible on PREEMPT_RT. Without a per-CPU lock in local_bh_disable() there is no guarantee that only one device is transmitting at a time. With preemption and multiple senders it is possible that the per-CPU recursion counter gets incremented by different threads and exceeds XMIT_RECURSION_LIMIT leading to a false positive recursion alert. Instead of adding a lock to protect the per-CPU variable it is simpler to make the counter per-task. Sending and receiving skbs happens always in thread context anyway. Having a lock to protected the per-CPU counter would block/ serialize two sending threads needlessly. It would also require a recursive lock to ensure that the owner can increment the counter further. Make the recursion counter a task_struct member on PREEMPT_RT. Cc: Ben Segall Cc: Daniel Bristot de Oliveira Cc: Dietmar Eggemann Cc: Juri Lelli Cc: Mel Gorman Cc: Steven Rostedt Cc: Valentin Schneider Cc: Vincent Guittot Signed-off-by: Sebastian Andrzej Siewior --- include/linux/netdevice.h | 30 +++++++++++++++++++++++++++++- include/linux/sched.h | 4 +++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 2564e209465ea..06436695c3679 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3260,7 +3260,9 @@ struct softnet_data { #endif /* written and read only by owning cpu: */ struct { +#ifndef CONFIG_PREEMPT_RT u16 recursion; +#endif u8 more; #ifdef CONFIG_NET_EGRESS u8 skip_txqueue; @@ -3308,12 +3310,36 @@ static inline void input_queue_tail_incr_save(struct softnet_data *sd, DECLARE_PER_CPU_ALIGNED(struct softnet_data, softnet_data); +#define XMIT_RECURSION_LIMIT 8 +#ifdef CONFIG_PREEMPT_RT + +static inline int dev_recursion_level(void) +{ + return current->net_xmit_recursion; +} + +static inline bool dev_xmit_recursion(void) +{ + return unlikely(current->net_xmit_recursion > XMIT_RECURSION_LIMIT); +} + +static inline void dev_xmit_recursion_inc(void) +{ + current->net_xmit_recursion++; +} + +static inline void dev_xmit_recursion_dec(void) +{ + current->net_xmit_recursion--; +} + +#else + static inline int dev_recursion_level(void) { return this_cpu_read(softnet_data.xmit.recursion); } -#define XMIT_RECURSION_LIMIT 8 static inline bool dev_xmit_recursion(void) { return unlikely(__this_cpu_read(softnet_data.xmit.recursion) > @@ -3330,6 +3356,8 @@ static inline void dev_xmit_recursion_dec(void) __this_cpu_dec(softnet_data.xmit.recursion); } +#endif + void __netif_schedule(struct Qdisc *q); void netif_schedule_queue(struct netdev_queue *txq); diff --git a/include/linux/sched.h b/include/linux/sched.h index 292c316972485..26b1b7d674b5d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -964,7 +964,9 @@ struct task_struct { /* delay due to memory thrashing */ unsigned in_thrashing:1; #endif - +#ifdef CONFIG_PREEMPT_RT + u8 net_xmit_recursion; +#endif unsigned long atomic_flags; /* Flags requiring atomic access. */ struct restart_block restart_block;