From patchwork Thu Jun 20 13:21:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 13705506 X-Patchwork-Delegate: kuba@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 9AAEF1B1408; Thu, 20 Jun 2024 13:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718890057; cv=none; b=F89eylRBnJ6DabwSo6xiHMf1NRwaNjo7G8OrqY38g+tNWIpY5hFqn2exrmbw1QsRJL/5BqrEvfBcLBQV4KrZFkzs1NX46AFCjv1Bvhi8XAyBi2DSOhkok9tIGWAH8TMaQxGH3Otu+ZUrRs/OWSBVKP183kgqXQXRchm8VuzUIDc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718890057; c=relaxed/simple; bh=O2tI7pfDIUiUwjHbETV4/u0vZ9+INFp6Dgn3XS7NXNU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sEIb2Ahhm4lPlnrh38VNjpNQkPjxZ5yjgaPmFPwMMe2gj/iy1SRwt7NYkXM5o7H6iUCNiCnQyB16rq2sdTwt9A3Q/f4d00tSfKDShnbBkapGHPj5sOvyvLASQXtf0SDFKqKeefBgYaoimpv5XFdXxCuOPyn3Co8uiAajdgWIUas= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=X2hjGknx; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=6BbUkkr3; arc=none smtp.client-ip=193.142.43.55 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="X2hjGknx"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="6BbUkkr3" From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1718890053; 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=qmZ697yP2U6PaDAL2e1HtmX8k+6jlbTJ0LVJ//UsoYk=; b=X2hjGknxZnmx9eSJ4tlEFkckXkzotPTmV7zn49x/IVyvozJCnRMbqHQg99gE16LO1WI0Tt GCSEoEmwlmJ/9+0k598Qnvb/GPxoUiurjPSBPvZAFUGvTpYQuBBr9TIJ6BXEYYrTz0tEcw 0j2LXGp0ERI80KFXNGSD8PLvI94IwIx6U4Y2L3VKO6Z/soOo0w8y6pEpd9kV7qpBv/avD0 o5nVezuJfE/erosff7D/Gz0u6V22NPYqvdav4KKSZKwnZts1fOS5VxHmOZvqwB0tpJ5/wf oJ/LGNJrMXaphs3+hw+WYuf5JuofE82AK9FpDyBbMdcC1wuGmop3SbGBPUqwsA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1718890053; 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=qmZ697yP2U6PaDAL2e1HtmX8k+6jlbTJ0LVJ//UsoYk=; b=6BbUkkr3vd8U5MNHlQMHFFFjDSTyv6ggTkWch3D5s6xQmmYlYhXVDQyI2gEOtLgpiholRY rQkY+Kr8d6dON4Ag== To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: "David S. Miller" , Daniel Bristot de Oliveira , 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 Subject: [PATCH v9 net-next 09/15] dev: Remove PREEMPT_RT ifdefs from backlog_lock.*(). Date: Thu, 20 Jun 2024 15:21:59 +0200 Message-ID: <20240620132727.660738-10-bigeasy@linutronix.de> In-Reply-To: <20240620132727.660738-1-bigeasy@linutronix.de> References: <20240620132727.660738-1-bigeasy@linutronix.de> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The backlog_napi locking (previously RPS) relies on explicit locking if either RPS or backlog NAPI is enabled. If both are disabled then locking was achieved by disabling interrupts except on PREEMPT_RT. PREEMPT_RT was excluded because the needed synchronisation was already provided local_bh_disable(). Since the introduction of backlog NAPI and making it mandatory for PREEMPT_RT the ifdef within backlog_lock.*() is obsolete and can be removed. Remove the ifdefs in backlog_lock.*(). Signed-off-by: Sebastian Andrzej Siewior --- net/core/dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 95b9e4cc17676..73c4d14e4febc 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -229,7 +229,7 @@ static inline void backlog_lock_irq_save(struct softnet_data *sd, { if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads()) spin_lock_irqsave(&sd->input_pkt_queue.lock, *flags); - else if (!IS_ENABLED(CONFIG_PREEMPT_RT)) + else local_irq_save(*flags); } @@ -237,7 +237,7 @@ static inline void backlog_lock_irq_disable(struct softnet_data *sd) { if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads()) spin_lock_irq(&sd->input_pkt_queue.lock); - else if (!IS_ENABLED(CONFIG_PREEMPT_RT)) + else local_irq_disable(); } @@ -246,7 +246,7 @@ static inline void backlog_unlock_irq_restore(struct softnet_data *sd, { if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads()) spin_unlock_irqrestore(&sd->input_pkt_queue.lock, *flags); - else if (!IS_ENABLED(CONFIG_PREEMPT_RT)) + else local_irq_restore(*flags); } @@ -254,7 +254,7 @@ static inline void backlog_unlock_irq_enable(struct softnet_data *sd) { if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads()) spin_unlock_irq(&sd->input_pkt_queue.lock); - else if (!IS_ENABLED(CONFIG_PREEMPT_RT)) + else local_irq_enable(); }