From patchwork Tue Jun 18 07:13:25 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: 13701890 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 EA247156C7A; Tue, 18 Jun 2024 07:25:38 +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=1718695540; cv=none; b=VVmiwBW+TmY5Sq+ARjaVLBRmVHWItTGFOKD7HD+zAj1jOnAPr9K8s8c4nphec3z7kITKNnqvbDnqz96oFCZOs4d0kxu46AU8maMXEk6tUVRTSvpaCdBuXoKei8HIBQDRhL7xB52fmIBt5QVRNn0kN+kWALxTQLc+xZ1fTKrzvFw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718695540; c=relaxed/simple; bh=pSf/Z0JsPY9xuccDTq3qRsA+msduJP12GujlmQ1ybu4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VIVgYhzNwwghyNMBfeot0PMVzezr+TIXSw09DnXKzu5Lww2TlXeTMWm/GdDPiEU+rP5DAXFDhnY6s1x1yCfInkB8arSC0NpRfoefUzjeRBHgv8ForEm8Hw64CInnFCPWZm6w2ZF3P+Jqati9ix1nXokgNLHxQVqDPATJwY8h58o= 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=cDNIU5iU; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=CAtJhWfY; 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="cDNIU5iU"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="CAtJhWfY" From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1718695534; 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=I13A++imoQhao8gFnSZ3Ll5CYpEUTnm71Pum08/yKbQ=; b=cDNIU5iUj8Ec+svPwhAatD2zaQ/xAykMcTWhsjChxXvn4gOdBvA0w+QjaAuSOaE2DXEbo7 d0P6SIOK+i+RJR/lnqP9jSFtwKI7WiPUmq1llgAf7g25PerMLjmJKnEt23Q0FuxR++kPg2 7AiafSSdhOhUqYXLTG79cAeSeHjQKtqWtFXNCPXXmELyZHhKLvsrmu6A99ME4hGm7+hWxP AI0JFz1znAXt/5d4FfNNfITa4LihFjY+fmPwMoSF9E8Z8/rtIT1b4MDsdQWO+QyifUcNWS cJ6scTlZkJX8IrUqu+RWw5MWfOMz3O2h/uemARVQOcDdsQcMaPW9IdpVWoVwuQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1718695534; 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=I13A++imoQhao8gFnSZ3Ll5CYpEUTnm71Pum08/yKbQ=; b=CAtJhWfYjBI5xTKrzzuGSQgSjKPtxcQmA7ujnxjhGuU5daRQKDOOayJf9vajfMu67PDUpx fVVx44vZiKnroKDg== 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 v7 net-next 09/15] dev: Remove PREEMPT_RT ifdefs from backlog_lock.*(). Date: Tue, 18 Jun 2024 09:13:25 +0200 Message-ID: <20240618072526.379909-10-bigeasy@linutronix.de> In-Reply-To: <20240618072526.379909-1-bigeasy@linutronix.de> References: <20240618072526.379909-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 c15b0215a66b7..2745001d09eb4 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(); }