From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Yunshui Jiang <jiangyunshui@kylinos.cn>,
Stefan Schmidt <stefan@datenfreihafen.org>,
Sasha Levin <sashal@kernel.org>,
alex.aring@gmail.com, miquel.raynal@bootlin.com,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, linux-wpan@vger.kernel.org,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 6.9 02/22] net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()
Date: Tue, 16 Jul 2024 10:24:09 -0400 [thread overview]
Message-ID: <20240716142519.2712487-2-sashal@kernel.org> (raw)
In-Reply-To: <20240716142519.2712487-1-sashal@kernel.org>
From: Yunshui Jiang <jiangyunshui@kylinos.cn>
[ 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 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 2a6f1ed763c9b..6fbed5bb5c3e0 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -34,8 +34,8 @@ void ieee802154_xmit_sync_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);
@@ -90,8 +90,8 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
if (ret)
goto err_wake_netif_queue;
- 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->sync_tx_work);
--
2.43.0
next prev parent reply other threads:[~2024-07-16 14:25 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-16 14:24 [PATCH AUTOSEL 6.9 01/22] clk: qcom: apss-ipq-pll: remove 'config_ctl_hi_val' from Stromer pll configs Sasha Levin
2024-07-16 14:24 ` Sasha Levin [this message]
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 03/22] powerpc/pseries: Whitelist dtl slub object for copying to userspace Sasha Levin
2024-07-16 14:24 ` Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 04/22] powerpc/eeh: avoid possible crash when edev->pdev changes Sasha Levin
2024-07-16 14:24 ` Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 05/22] scsi: libsas: Fix exp-attached device scan after probe failure scanned in again after probe failed Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 06/22] tee: optee: ffa: Fix missing-field-initializers warning Sasha Levin
2024-07-16 14:24 ` Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 07/22] Bluetooth: hci_core: cancel all works upon hci_unregister_dev() Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 08/22] Bluetooth: btnxpuart: Enable Power Save feature on startup Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 09/22] bluetooth/l2cap: sync sock recv cb and release Sasha Levin
2024-07-16 18:59 ` Pauli Virtanen
2024-07-16 19:06 ` Luiz Augusto von Dentz
2024-07-22 12:45 ` Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 10/22] erofs: ensure m_llen is reset to 0 if metadata is invalid Sasha Levin
2024-07-16 14:24 ` Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 11/22] drm/amd/display: Reset freesync config before update new state Sasha Levin
2024-07-16 14:48 ` Hamza Mahfooz
2024-07-22 12:44 ` Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 12/22] drm/amd/display: Add refresh rate range check Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 13/22] drm/amd/display: Account for cursor prefetch BW in DML1 mode support Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 14/22] drm/amd/display: Fix refresh rate range for some panel Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 15/22] drm/amd/display: Update efficiency bandwidth for dcn351 Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 16/22] drm/amd/display: Fix array-index-out-of-bounds in dml2/FCLKChangeSupport Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 17/22] drm/radeon: check bo_va->bo is non-NULL before using it Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 18/22] btrfs: fix uninitialized return value in the ref-verify tool Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 19/22] fs: better handle deep ancestor chains in is_subdir() Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 20/22] wifi: iwlwifi: properly set WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 21/22] drivers/perf: riscv: Reset the counter to hpmevent mapping while starting cpus Sasha Levin
2024-07-16 14:24 ` Sasha Levin
2024-07-16 14:24 ` [PATCH AUTOSEL 6.9 22/22] riscv: stacktrace: fix usage of ftrace_graph_ret_addr() Sasha Levin
2024-07-16 14:24 ` Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240716142519.2712487-2-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alex.aring@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jiangyunshui@kylinos.cn \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.org \
--cc=stefan@datenfreihafen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.