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 946513D88FE; Wed, 8 Apr 2026 18:08:03 +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=1775671683; cv=none; b=typYGlNB9CiiSme245yQSx75/9cCHQci0U2QPxk+LlGdbxLi7STXOV8KS9p2PUPlkFLu6rNWwOq+mtLFuYZc5MTgifThCyXp8MNAZW+wUmER+INKvO21HS0O8n7IGFQjklzk/epPE+7gQR/0gzqVRH2SzPTTigJgFGT6uO0kqig= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775671683; c=relaxed/simple; bh=yyP1Xu6zgqh5fzyJrn7BQVMvXg9aRUatxf92oPyOaFs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mO5/uNfDt4TQMEVQO3cPI1V/6GbViUlZyEjOp5Pno68hPwmrDo65CEdfJKjFMdmEV4Fe5UuPwGZkNq7Jft5WTW5r4tWOL1Kk+2BKoZ1KJEHeLB0mQqzHCu5mQd9JY917v5fypn7mrNE6tZMfl67Ooe/K3TfqRsdCrVXzFXoXss4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pwcPkues; 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="pwcPkues" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3E24C19421; Wed, 8 Apr 2026 18:08:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775671683; bh=yyP1Xu6zgqh5fzyJrn7BQVMvXg9aRUatxf92oPyOaFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pwcPkuesCzIYw1n46TcJaO/V/SlfGfWQqXe6OcKl9G/rlrWHaGe6jxzm+l31EGe3f jYxslgJCOXur4OCRYD+5m9dlNUiNHgIXvIhIxgh0vVR6KPq6VEV0pr1gHGfK2prhu3 UfWmbXtsKIHlsaLNQvrG+GZF7em5iBx9r9+8K2Cc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Oliver Hartkopp , Marc Kleine-Budde , Sasha Levin Subject: [PATCH 6.1 028/312] can: statistics: add missing atomic access in hot path Date: Wed, 8 Apr 2026 19:59:05 +0200 Message-ID: <20260408175934.779068077@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408175933.715315542@linuxfoundation.org> References: <20260408175933.715315542@linuxfoundation.org> User-Agent: quilt/0.69 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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver Hartkopp [ Upstream commit 46eee1661aa9b49966e6c43d07126fe408edda57 ] Commit 80b5f90158d1 ("can: statistics: use atomic access in hot path") fixed a KCSAN issue in can_receive() but missed to convert the 'matches' variable used in can_rcv_filter(). Fixes: 80b5f90158d1 ("can: statistics: use atomic access in hot path") Signed-off-by: Oliver Hartkopp Link: https://patch.msgid.link/20260318173413.28235-1-socketcan@hartkopp.net Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- net/can/af_can.c | 4 ++-- net/can/af_can.h | 2 +- net/can/proc.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/can/af_can.c b/net/can/af_can.c index bbd8e959137d9..851d2c90901c5 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -468,7 +468,7 @@ int can_rx_register(struct net *net, struct net_device *dev, canid_t can_id, rcv->can_id = can_id; rcv->mask = mask; - rcv->matches = 0; + atomic_long_set(&rcv->matches, 0); rcv->func = func; rcv->data = data; rcv->ident = ident; @@ -572,7 +572,7 @@ EXPORT_SYMBOL(can_rx_unregister); static inline void deliver(struct sk_buff *skb, struct receiver *rcv) { rcv->func(skb, rcv->data); - rcv->matches++; + atomic_long_inc(&rcv->matches); } static int can_rcv_filter(struct can_dev_rcv_lists *dev_rcv_lists, struct sk_buff *skb) diff --git a/net/can/af_can.h b/net/can/af_can.h index 22f3352c77fec..87887014f5628 100644 --- a/net/can/af_can.h +++ b/net/can/af_can.h @@ -52,7 +52,7 @@ struct receiver { struct hlist_node list; canid_t can_id; canid_t mask; - unsigned long matches; + atomic_long_t matches; void (*func)(struct sk_buff *skb, void *data); void *data; char *ident; diff --git a/net/can/proc.c b/net/can/proc.c index 25fdf060e30d0..2f78ea8ac30b0 100644 --- a/net/can/proc.c +++ b/net/can/proc.c @@ -196,7 +196,8 @@ static void can_print_rcvlist(struct seq_file *m, struct hlist_head *rx_list, " %-5s %03x %08x %pK %pK %8ld %s\n"; seq_printf(m, fmt, DNAME(dev), r->can_id, r->mask, - r->func, r->data, r->matches, r->ident); + r->func, r->data, atomic_long_read(&r->matches), + r->ident); } } -- 2.51.0