From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.84]) (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 5C70142AF9F for ; Fri, 24 Jul 2026 10:23:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=85.215.255.84 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784888624; cv=pass; b=X5SxkWhUGoCOLZaLS0oazTLHwx+uhtdoz7u6ZUcpxrC8+XD3d4yUhMTJf2tRiYthf1GILmsH53E772tUS0EDGh9odyxPfZXyUo0V0Vq+oVrYIm3pbwQY3sepEKHczHNoIoysU4nT1gDNGloIaUcmywXr73nN5k2L5p8aiqX/Iic= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784888624; c=relaxed/simple; bh=n4mIYpVwgXfoP+it1cq45fgFfDXBtjqv/PorSWhrl7E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pZML6S+HRxo5FlvERSD+lc3kGWEBFmbOttcp2httbmcjWTgF3kAqH63LM81MjmGqXTIVhRBqWLiWggE2bBrvb/OlmQjjyhA93+SOZWRzhZfMqqqF89rzkwcIi1PZYW6qK7YXo03m1awGTpQ/+kWQXiuSkcMSMl7WoJmX0LqrtWQ= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=hartkopp.net; spf=fail smtp.mailfrom=hartkopp.net; dkim=pass (2048-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b=hK+efQDm; dkim=permerror (0-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b=UOd7/xtt; arc=pass smtp.client-ip=85.215.255.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=hartkopp.net Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=hartkopp.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b="hK+efQDm"; dkim=permerror (0-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b="UOd7/xtt" ARC-Seal: i=1; a=rsa-sha256; t=1784888616; cv=none; d=strato.com; s=strato-dkim-0002; b=QFzBlYAersnAbiaLJiqSZZ5sdEUKTSx8GuRvNvwvfFdYPMZbNbb3lo2qG17zaqg7qE WlmbHByplXbOW+bQjae5c11zNvjgA7sEBtDxfbs8l3BTJI88w+VTgI0fPu0ZWyxJMMgm QZ8y8Nj0SXn9eUXcZ1oNYPbxt7wMU82dEXsI3e65IANRTXx187fax9nyOROOAsWqvW/u Vk12LJlc7TTVQZZ7AqNq9Vfsn4F5jmoVwTFdbvjGusNEaAeX589yxglVsgKpJdPZP8DP tKwpKQwmi4sCKLq/UmlyMooidzyq5glwvEe0oP/BozxJVHozC7oxslSfBGEVKjXAoVOj g+RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1784888616; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=+5CGd8nR5DBrkWQSbmek/90YFDpPOn7fZCqP21O1uZc=; b=EhUQcTVX26TgpD9sTOHQT7bZEVLWFvTQnxAlgRC1oSDmAGj+a/GqG6POgPvQ6G3/cF n2ZG7wJ5tqg3zItOEGtKAt5ptQF+/46iU/K5um3FCxMAIvmxdAUmNiiBbe+/H4ZT5lb1 ZHt9I+bjBKNpnMnP4ChXfKAUq/5wNUDQczePTC/M0qiLaAuE+YfuUrLUGHU1Hp/nqUQ8 kvT0n9EAWVwotE/RpKTbrpvEFu5TFxUYLZzuFOcXULCS6an85dLcSJtilReDLl9mnb/+ w3uVYcXi6oftWdZ6bdfFeJU9Z3fZdpPC8vv4ijh4SEgw+oinNRXT5N7oA6nL4jX2rKDO MJBQ== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1784888616; s=strato-dkim-0002; d=hartkopp.net; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=+5CGd8nR5DBrkWQSbmek/90YFDpPOn7fZCqP21O1uZc=; b=hK+efQDmHLh3+mpuFTlTyiGNNu2vbCEKC4spzOeqxqkaJZEfEiBL6tWfT061BaO9vH 6mm8eoJAfaeFEIErBUyb6UZT9N2vYq9Vd/z8+4D2hxR/YQVV41iqLHbCzNu9EqOONvSy mxdTBpM85Amaj7/iVAWH69HluRIbiQTK+eHnhNLIXJN9CDOfEJVpRq/gpvFSjX8o6RAg t9IoAmSX2aTbWZSLBPVOQYT9rauvU+yql2MxEvjSd2FAlgK2FKNWY1MCFbAhrVNyvCnI KM8/t/J7HBAKNGHygHc/C0cJzRLaeHVnNzasShPYCuneMWkB0qIaK//l43N5gmWRsrAL P0fw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1784888616; s=strato-dkim-0003; d=hartkopp.net; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=+5CGd8nR5DBrkWQSbmek/90YFDpPOn7fZCqP21O1uZc=; b=UOd7/xttMijXbG1OLNtqom/iM5xA/F58c0WQ19W79nyWF8yEdaaTUYgr+zGWIVTHMa StMgxWqMXRDOMP774YCg== X-RZG-AUTH: ":P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrDxb8mjH4JKvMdQv2tRkI16oOSW1Ti/f4PoH8=" Received: from vivo.lan by smtp.strato.de (RZmta 55.5.6 SBL|AUTH) with ESMTPSA id K5281926OANZtIF (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 24 Jul 2026 12:23:35 +0200 (CEST) From: Oliver Hartkopp To: stable@vger.kernel.org Cc: Oliver Hartkopp , Marc Kleine-Budde Subject: [PATCH 6.1.y 2/8] can: bcm: fix CAN frame rx/tx statistics Date: Fri, 24 Jul 2026 12:23:23 +0200 Message-ID: <20260724102329.16572-2-socketcan@hartkopp.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260724102329.16572-1-socketcan@hartkopp.net> References: <2026072012-repair-flip-109e@gregkh> <20260724102329.16572-1-socketcan@hartkopp.net> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="us-ascii" commit e6c24ba95fc3f1b5e1dcd28b1c6e59ef61a9daa5 upstream. KCSAN detected a data race within the bcm_rx_handler() when two CAN frames have been simultaneously received and processed in a single rx op by two different CPUs. Use atomic operations with (signed) long data types to access the statistics in the hot path to fix the KCSAN complaint. Additionally simplify the update and check of statistics overflow by using the atomic operations in separate bcm_update_[rx|tx]_stats() functions. The rx variant runs under bcm_rx_update_lock to prevent races when resetting the two rx counters; the tx variant runs under bcm_tx_lock and only needs to guard its own counter's overflow. As the rx path resets its values already at LONG_MAX / 100, there is no conflict between the two locking domains (bcm_rx_update_lock vs. bcm_tx_lock) even for ops that use both paths. The rx statistics update and the frames_filtered update in bcm_rx_changed() were previously performed in two separate bcm_rx_update_lock sections. For an rx op subscribed on all interfaces (ifindex == 0), bcm_rx_handler() can run concurrently on different CPUs, so a counter reset by one CPU between these two sections could leave frames_filtered larger than frames_abs on another CPU, producing a bogus (even negative) reduction percentage in procfs. Update the statistics in the same critical section as bcm_rx_changed() to close this gap, which also removes the now unneeded extra lock/unlock pair around the traffic_flags calculation. Fixes: ffd980f976e7 ("[CAN]: Add broadcast manager (bcm) protocol") Signed-off-by: Oliver Hartkopp Link: https://patch.msgid.link/20260714-bcm_fixes-v15-4-562f7e3e42da@hartkopp.net Cc: stable@kernel.org Signed-off-by: Marc Kleine-Budde Signed-off-by: Oliver Hartkopp --- net/can/bcm.c | 67 +++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/net/can/bcm.c b/net/can/bcm.c index fccb573..2ce83f8 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -109,7 +109,7 @@ struct bcm_op { int ifindex; canid_t can_id; u32 flags; - unsigned long frames_abs, frames_filtered; + atomic_long_t frames_abs, frames_filtered; struct bcm_timeval ival1, ival2; struct hrtimer timer, thrtimer; ktime_t rx_stamp, kt_ival1, kt_ival2, kt_lastmsg; @@ -216,10 +216,13 @@ static int bcm_proc_show(struct seq_file *m, void *v) list_for_each_entry_rcu(op, &bo->rx_ops, list) { - unsigned long reduction; + long reduction, frames_filtered, frames_abs; + + frames_filtered = atomic_long_read(&op->frames_filtered); + frames_abs = atomic_long_read(&op->frames_abs); /* print only active entries & prevent division by zero */ - if (!op->frames_abs) + if (!frames_abs) continue; seq_printf(m, "rx_op: %03X %-5s ", op->can_id, @@ -241,9 +244,9 @@ static int bcm_proc_show(struct seq_file *m, void *v) (long long)ktime_to_us(op->kt_ival2)); seq_printf(m, "# recv %ld (%ld) => reduction: ", - op->frames_filtered, op->frames_abs); + frames_filtered, frames_abs); - reduction = 100 - (op->frames_filtered * 100) / op->frames_abs; + reduction = 100 - (frames_filtered * 100) / frames_abs; seq_printf(m, "%s%ld%%\n", (reduction == 100) ? "near " : "", reduction); @@ -267,7 +270,8 @@ static int bcm_proc_show(struct seq_file *m, void *v) seq_printf(m, "t2=%lld ", (long long)ktime_to_us(op->kt_ival2)); - seq_printf(m, "# sent %ld\n", op->frames_abs); + seq_printf(m, "# sent %ld\n", + atomic_long_read(&op->frames_abs)); } seq_putc(m, '\n'); @@ -277,6 +281,24 @@ static int bcm_proc_show(struct seq_file *m, void *v) } #endif /* CONFIG_PROC_FS */ +static void bcm_update_rx_stats(struct bcm_op *op) +{ + /* prevent overflow of the reduction% calculation in bcm_proc_show() */ + if (atomic_long_inc_return(&op->frames_abs) > LONG_MAX / 100) { + atomic_long_set(&op->frames_filtered, 0); + atomic_long_set(&op->frames_abs, 0); + } +} + +static void bcm_update_tx_stats(struct bcm_op *op) +{ + /* tx_op has no reduction% calculation - use the full range and + * just keep the displayed counter non-negative on overflow + */ + if (atomic_long_inc_return(&op->frames_abs) == LONG_MAX) + atomic_long_set(&op->frames_abs, 0); +} + /* * bcm_can_tx - send the (next) CAN frame to the appropriate CAN interface * of the given bcm tx op @@ -328,7 +350,7 @@ static void bcm_can_tx(struct bcm_op *op, struct canfd_frame *cf) spin_lock_bh(&op->bcm_tx_lock); if (!err) - op->frames_abs++; + bcm_update_tx_stats(op); /* only advance the cyclic sequence if nothing reset currframe while * we were sending - a concurrent TX_RESET_MULTI_IDX means this @@ -473,12 +495,9 @@ static void bcm_rx_changed(struct bcm_op *op, struct canfd_frame *data) { struct bcm_msg_head head; - /* update statistics */ - op->frames_filtered++; - - /* prevent statistics overflow */ - if (op->frames_filtered > ULONG_MAX/100) - op->frames_filtered = op->frames_abs = 0; + /* update statistics (frames_filtered <= frames_abs) */ + if (atomic_long_read(&op->frames_abs)) + atomic_long_inc(&op->frames_filtered); /* this element is not throttled anymore */ data->flags &= (BCM_CAN_FLAGS_MASK|RX_RECV); @@ -718,25 +737,29 @@ static void bcm_rx_handler(struct sk_buff *skb, void *data) op->rx_stamp = skb->tstamp; /* save originator for recvfrom() */ op->rx_ifindex = skb->dev->ifindex; - /* update statistics */ - op->frames_abs++; - /* snapshot the flag under lock: op->flags/op->frames may be updated - * concurrently by bcm_rx_setup(). - */ + /* op->flags/op->frames may be updated concurrently by bcm_rx_setup() */ spin_lock_bh(&op->bcm_rx_update_lock); + rtr_frame = op->flags & RX_RTR_FRAME; - if (rtr_frame) + if (rtr_frame) { + bcm_update_rx_stats(op); + /* snapshot RTR content under lock */ memcpy(&rtrframe, op->frames, op->cfsiz); - spin_unlock_bh(&op->bcm_rx_update_lock); + spin_unlock_bh(&op->bcm_rx_update_lock); - if (rtr_frame) { /* send reply for RTR-request (placed in op->frames[0]) */ bcm_can_tx(op, &rtrframe); return; } - spin_lock_bh(&op->bcm_rx_update_lock); + /* update statistics in the same critical section as bcm_rx_changed() + * below: frames_filtered must never be checked/incremented against a + * frames_abs snapshot from a concurrent bcm_rx_handler() call on + * another CPU for the same (wildcard) op, or frames_filtered can end + * up larger than frames_abs. + */ + bcm_update_rx_stats(op); if (op->flags & RX_FILTER_ID) { /* the easiest case */ -- 2.43.0