Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77cfeb27 authored by Yunshui Jiang's avatar Yunshui Jiang Committed by Greg Kroah-Hartman
Browse files

net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD() 



[ 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: default avatarYunshui Jiang <jiangyunshui@kylinos.cn>
Message-ID: <20240531080739.2608969-1-jiangyunshui@kylinos.cn>
Signed-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6f5c552b

net/mac802154/tx.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -42,8 +42,8 @@ void ieee802154_xmit_worker(struct work_struct *work) 
	if (res)

	if (res)

		goto err_tx;

		goto err_tx;





	dev->stats.tx_packets++;

	DEV_STATS_INC(dev, tx_packets);

	dev->stats.tx_bytes += skb->len;

	DEV_STATS_ADD(dev, tx_bytes, skb->len);





	ieee802154_xmit_complete(&local->hw, skb, false);

	ieee802154_xmit_complete(&local->hw, skb, false);
@@ -94,8 +94,8 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb) 
			goto err_tx;

			goto err_tx;

		}

		}





		dev->stats.tx_packets++;

		DEV_STATS_INC(dev, tx_packets);

		dev->stats.tx_bytes += len;

		DEV_STATS_ADD(dev, tx_bytes, len);

	} else {

	} else {

		local->tx_skb = skb;

		local->tx_skb = skb;

		queue_work(local->workqueue, &local->tx_work);

		queue_work(local->workqueue, &local->tx_work);