diff mbox series

wifi: cfg80211: use system_unbound_wq for wiphy work

Message ID 20231009101800.bb75408bf635.I6528d97e24b3da36cdf633b4738327d77c7276f2@changeid (mailing list archive)
State Accepted
Delegated to: Johannes Berg
Headers show
Series wifi: cfg80211: use system_unbound_wq for wiphy work | expand

Commit Message

Johannes Berg Oct. 9, 2023, 8:18 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

Since wiphy work items can run pretty much arbitrary
code in the stack/driver, it can take longer to run
all of this, so we shouldn't be using system_wq via
schedule_work(). Also, we lock the wiphy (which is
the reason this exists), so use system_unbound_wq.

Reported-by: Kalle Valo <kvalo@kernel.org>
Fixes: a3ee4dc84c4e ("wifi: cfg80211: add a work abstraction with special semantics")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/wireless/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kalle Valo Oct. 9, 2023, 9:18 a.m. UTC | #1 
Johannes Berg <johannes@sipsolutions.net> writes:

> From: Johannes Berg <johannes.berg@intel.com>
>
> Since wiphy work items can run pretty much arbitrary
> code in the stack/driver, it can take longer to run
> all of this, so we shouldn't be using system_wq via
> schedule_work(). Also, we lock the wiphy (which is
> the reason this exists), so use system_unbound_wq.
>
> Reported-by: Kalle Valo <kvalo@kernel.org>
> Fixes: a3ee4dc84c4e ("wifi: cfg80211: add a work abstraction with special semantics")
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Thanks!

So the background of this is that I enabled
CONFIG_WQ_CPU_INTENSIVE_REPORT on my ath11k test box and saw:

[  290.475631] workqueue: cfg80211_wiphy_work [cfg80211] hogged CPU for >10000us 4 times, consider switching to WQ_UNBOUND

With Johannes' patch I don't see it anymore so:

Tested-by: Kalle Valo <kvalo@kernel.org>

I do see one other warning about gc_worker but that's from netfilter and
nothing to do with wireless:

[  440.486683] workqueue: gc_worker hogged CPU for >10000us 128 times, consider switching to WQ_UNBOUND
diff mbox series

Patch

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 7df8ffcfa0c4..758c9a2a12c0 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1613,7 +1613,7 @@  void wiphy_work_queue(struct wiphy *wiphy, struct wiphy_work *work)
 		list_add_tail(&work->entry, &rdev->wiphy_work_list);
 	spin_unlock_irqrestore(&rdev->wiphy_work_lock, flags);
 
-	schedule_work(&rdev->wiphy_work);
+	queue_work(system_unbound_wq, &rdev->wiphy_work);
 }
 EXPORT_SYMBOL_GPL(wiphy_work_queue);