net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()
Subsystems (6)
Sasha Levin
maintainerPATCH 1/3 net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()
From: Yunshui Jiang <[email protected]>
[ 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.
Message-ID: <[email protected]>
--- net/mac802154/tx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/mac802154/tx.c +4 -4
@@ -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);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 2/3 Bluetooth: hci_core: cancel all works upon hci_unregister_dev()
From: Tetsuo Handa <[email protected]>
[ Upstream commit 0d151a103775dd9645c78c97f77d6e2a5298d913 ]
syzbot is reporting that calling hci_release_dev() from hci_error_reset() due to hci_dev_put() from hci_error_reset() can cause deadlock at destroy_workqueue(), for hci_error_reset() is called from hdev->req_workqueue which destroy_workqueue() needs to flush.
We need to make sure that hdev->{rx_work,cmd_work,tx_work} which are queued into hdev->workqueue and hdev->{power_on,error_reset} which are queued into hdev->req_workqueue are no longer running by the moment
destroy_workqueue(hdev->workqueue);
destroy_workqueue(hdev->req_workqueue);are called from hci_release_dev().
Call cancel_work_sync() on these work items from hci_unregister_dev() as soon as hdev->list is removed from hci_dev_list.
--- net/bluetooth/hci_core.c | 4 ++++ 1 file changed, 4 insertions(+)
net/bluetooth/hci_core.c +4 -0
@@ -3288,7 +3288,11 @@ void hci_unregister_dev(struct hci_dev *hdev)list_del (&hdev->list);write_unlock (&hci_dev_list_lock); +cancel_work_sync (&hdev->rx_work); +cancel_work_sync (&hdev->cmd_work); +cancel_work_sync (&hdev->tx_work);cancel_work_sync (&hdev->power_on); +cancel_work_sync (&hdev->error_reset);hci_dev_do_close (hdev);
Signature · 1 line
2.43.0
Sasha Levin
maintainerPATCH 3/3 fs: better handle deep ancestor chains in is_subdir()
In reply to Sasha LevinFrom: Christian Brauner <[email protected]>
[ Upstream commit 391b59b045004d5b985d033263ccba3e941a7740 ]
Jan reported that 'cd ..' may take a long time in deep directory hierarchies under a bind-mount. If concurrent renames happen it is possible to livelock in is_subdir() because it will keep retrying.
Change is_subdir() from simply retrying over and over to retry once and then acquire the rename lock to handle deep ancestor chains better. The list of alternatives to this approach were less then pleasant. Change the scope of rcu lock to cover the whole walk while at it.
A big thanks to Jan and Linus. Both Jan and Linus had proposed effectively the same thing just that one version ended up being slightly more elegant.
--- fs/dcache.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)
fs/dcache.c +14 -17
@@ -3003,28 +3003,25 @@ EXPORT_SYMBOL(d_splice_alias);bool is_subdir (struct dentry *new_dentry,struct dentry *old_dentry) { -bool result; +bool subdir;unsigned seq;if (new_dentry == old_dentry)return true; -do { -/* for restarting inner loop in case of seq retry */ - seq =read_seqbegin (&rename_lock); -/* -* Need rcu_readlock to protect against the d_parent trashing -* due to d_move -*/ -rcu_read_lock (); -if (d_ancestor (old_dentry, new_dentry)) - result = true; -else - result = false; -rcu_read_unlock (); - }while (read_seqretry (&rename_lock, seq)); - -return result; +/* Access d_parent under rcu as d_move() may change it. */ +rcu_read_lock (); + seq =read_seqbegin (&rename_lock); + subdir =d_ancestor (old_dentry, new_dentry); +/* Try lockless once... */ +if (read_seqretry (&rename_lock, seq)) { +/* ...else acquire lock for progress even on deep chains. */ +read_seqlock_excl (&rename_lock); + subdir =d_ancestor (old_dentry, new_dentry); +read_sequnlock_excl (&rename_lock); + } +rcu_read_unlock (); +return subdir; }EXPORT_SYMBOL (is_subdir);
Signature · 1 line
2.43.0