]> 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:38:31 +0000 (10:38 +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 c829e4a7532564d401c0d2d1f90f56c2fe030b2c..7cea95d0b78f91f364d48a1bf208e4c5439c7299 100644 (file)
@@ -34,8 +34,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);
 
@@ -86,8 +86,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);