]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()
authorYunshui Jiang <jiangyunshui@kylinos.cn>
Fri, 31 May 2024 08:07:39 +0000 (16:07 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Jul 2024 08:33:42 +0000 (10:33 +0200)
[ Upstream commit b8ec0dc3845f6c9089573cb5c2c4b05f7fc10728 ]

mac802154 devices update their dev->stats fields locklessly. Therefore
these counters should be updated atomically. Adopt SMP safe DEV_STATS_INC()
and DEV_STATS_ADD() to achieve this.

Signed-off-by: Yunshui Jiang <jiangyunshui@kylinos.cn>
Message-ID: <20240531080739.2608969-1-jiangyunshui@kylinos.cn>
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac802154/tx.c

index 2f873a0dc5836272d52fa0b2419d1bbde915f558..0f192174a569371bba3ead4abf3f49065d6733df 100644 (file)
@@ -42,8 +42,8 @@ void ieee802154_xmit_worker(struct work_struct *work)
        if (res)
                goto err_tx;
 
-       dev->stats.tx_packets++;
-       dev->stats.tx_bytes += skb->len;
+       DEV_STATS_INC(dev, tx_packets);
+       DEV_STATS_ADD(dev, tx_bytes, skb->len);
 
        ieee802154_xmit_complete(&local->hw, skb, false);
 
@@ -94,8 +94,8 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
                        goto err_tx;
                }
 
-               dev->stats.tx_packets++;
-               dev->stats.tx_bytes += len;
+               DEV_STATS_INC(dev, tx_packets);
+               DEV_STATS_ADD(dev, tx_bytes, len);
        } else {
                local->tx_skb = skb;
                queue_work(local->workqueue, &local->tx_work);