Received-SPF: pass (google.com: domain of linux-kernel+bounces-191653-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Yunshui Jiang <jiangyunshui@kylinos.cn>
To: linux-kernel@vger.kernel.org,
	linux-bluetooth@vger.kernel.org
Cc: marcel@holtmann.org,
	johan.hedberg@gmail.com,
	luiz.dentz@gmail.com,
	Yunshui Jiang <jiangyunshui@kylinos.cn>
Subject: [PATCH -v3] Bluetooth: 6lowpan: use DEV_STAT_INC() to avoid races
Date: Tue, 28 May 2024 10:26:13 +0800
Message-Id: <20240528022613.1974961-1-jiangyunshui@kylinos.cn>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

syzbot/KCSAN reported that races happen when multiple cpus
updating dev->stats.tx_error concurrently.

Adopt SMP safe DEV_STATS_INC() to update dev->stats fields.

Signed-off-by: Yunshui Jiang <jiangyunshui@kylinos.cn>
---
 net/bluetooth/6lowpan.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 50cfec8ccac4..8eb2cf58c00e 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -295,8 +295,8 @@ static int recv_pkt(struct sk_buff *skb, struct net_d=
evice *dev,
 			goto drop;
 		}
=20
-		dev->stats.rx_bytes +=3D skb->len;
-		dev->stats.rx_packets++;
+		DEV_STATS_ADD(dev, rx_bytes, skb->len);
+		DEV_STATS_INC(dev, rx_packets);
=20
 		consume_skb(local_skb);
 		consume_skb(skb);
@@ -323,8 +323,8 @@ static int recv_pkt(struct sk_buff *skb, struct net_d=
evice *dev,
 			goto drop;
 		}
=20
-		dev->stats.rx_bytes +=3D skb->len;
-		dev->stats.rx_packets++;
+		DEV_STATS_ADD(dev, rx_bytes, skb->len);
+		DEV_STATS_INC(dev, rx_packets);
=20
 		consume_skb(local_skb);
 		consume_skb(skb);
@@ -336,7 +336,7 @@ static int recv_pkt(struct sk_buff *skb, struct net_d=
evice *dev,
 	return NET_RX_SUCCESS;
=20
 drop:
-	dev->stats.rx_dropped++;
+	DEV_STATS_INC(dev, rx_dropped);
 	return NET_RX_DROP;
 }
=20
@@ -445,13 +445,13 @@ static int send_pkt(struct l2cap_chan *chan, struct=
 sk_buff *skb,
=20
 	err =3D l2cap_chan_send(chan, &msg, skb->len);
 	if (err > 0) {
-		netdev->stats.tx_bytes +=3D err;
-		netdev->stats.tx_packets++;
+		DEV_STATS_ADD(netdev, tx_bytes, err);
+		DEV_STATS_INC(netdev, tx_packets);
 		return 0;
 	}
=20
 	if (err < 0)
-		netdev->stats.tx_errors++;
+		DEV_STATS_INC(netdev, tx_errors);
=20
 	return err;
 }
--=20
2.34.1