From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 975752940B; Mon, 23 Jun 2025 22:00:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716019; cv=none; b=ol5Ekiijunk5DNn7p0j7PkoYK4i3bslJ9DKj0Vk3CTlzS9XChSl9aGSlIDr6ag6kIwpieFw87VulC2x2yC+CLtAOSWWOW2YEmN2w0fTaSjJvWnD+VRumrNRlOci0II3WppDcrnGrACyJyHQkSvTgXXJaHIqfg1wLF56WvUS0RlQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716019; c=relaxed/simple; bh=e92JNlxMuk8SOG7kOY7Xv7d7Fn4X13eo1YZbUpnSaVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g0j6UKwByFFeC6Z8tr2Ly0XNGYn+iyZ1bnWqiiqu0btW4W7grTYK7WHCWORCKyLmNu3HdQ1aEFE5iRmSIHeuf8Ob8y9teRKGZF697SpzhbnEMl1XH4LD8Fu3FXqWJi90Z6fH4qUEqJFu6OjniwNu0DSP0iXcBSnNrUw45Jz6P9I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DvDrpmR2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DvDrpmR2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F483C4CEED; Mon, 23 Jun 2025 22:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750716019; bh=e92JNlxMuk8SOG7kOY7Xv7d7Fn4X13eo1YZbUpnSaVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DvDrpmR2F/eANVk1fuYnmQ59mXVftSeHt3TT+e5XI0Hs9IFiK6mnJZSLr+Tfxtz9r m1UeJe5vQMgZPKME/oT3qQ6eeSIH2qv2FBK8/XXL/TYol4TKopH3i9pFytTvdzS2Gp Jig4WwbvsiLZG4BbNf0jhlnLbnIVlOyldYgkkwPw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Ahern , Sebastian Andrzej Siewior , Paolo Abeni , Sasha Levin Subject: [PATCH 6.12 222/414] ipv4/route: Use this_cpu_inc() for stats on PREEMPT_RT Date: Mon, 23 Jun 2025 15:05:59 +0200 Message-ID: <20250623130647.575665176@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130642.015559452@linuxfoundation.org> References: <20250623130642.015559452@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sebastian Andrzej Siewior [ Upstream commit 1c0829788a6e6e165846b9bedd0b908ef16260b6 ] The statistics are incremented with raw_cpu_inc() assuming it always happens with bottom half disabled. Without per-CPU locking in local_bh_disable() on PREEMPT_RT this is no longer true. Use this_cpu_inc() on PREEMPT_RT for the increment to not worry about preemption. Cc: David Ahern Signed-off-by: Sebastian Andrzej Siewior Link: https://patch.msgid.link/20250512092736.229935-4-bigeasy@linutronix.de Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/ipv4/route.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 41b320f0c20eb..88d7c96bfac06 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -189,7 +189,11 @@ const __u8 ip_tos2prio[16] = { EXPORT_SYMBOL(ip_tos2prio); static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat); +#ifndef CONFIG_PREEMPT_RT #define RT_CACHE_STAT_INC(field) raw_cpu_inc(rt_cache_stat.field) +#else +#define RT_CACHE_STAT_INC(field) this_cpu_inc(rt_cache_stat.field) +#endif #ifdef CONFIG_PROC_FS static void *rt_cache_seq_start(struct seq_file *seq, loff_t *pos) -- 2.39.5