]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: cfg80211: replace use of system_unbound_wq with system_dfl_wq
authorMarco Crivellari <marco.crivellari@suse.com>
Thu, 13 Nov 2025 16:20:32 +0000 (17:20 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 20 Nov 2025 09:26:17 +0000 (10:26 +0100)
Currently if a user enqueues a work item using schedule_delayed_work() the
used wq is "system_wq" (per-cpu wq) while queue_delayed_work() use
WORK_CPU_UNBOUND (used when a cpu is not specified). The same applies to
schedule_work() that is using system_wq and queue_work(), that makes use
again of WORK_CPU_UNBOUND.

This lack of consistency cannot be addressed without refactoring the API.
For more details see the Link tag below.

This continues the effort to refactor workqueue APIs, which began with
the introduction of new workqueues and a new alloc_workqueue flag in:

commit 128ea9f6ccfb ("workqueue: Add system_percpu_wq and system_dfl_wq")
commit 930c2ea566af ("workqueue: Add new WQ_PERCPU flag")

Switch to using system_dfl_wq because system_unbound_wq is going away as part of
a workqueue restructuring.

Suggested-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Marco Crivellari <marco.crivellari@suse.com>
Link: https://lore.kernel.org/all/20250221112003.1dSuoGyc@linutronix.de/
Link: https://patch.msgid.link/20251113162032.394804-4-marco.crivellari@suse.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/core.c
net/wireless/sysfs.c

index aa78dbaaf093b8749cf027356a0ab2c75c738966..7be25b9ae36ed452c2f5a9295e496af511f754a5 100644 (file)
@@ -431,7 +431,7 @@ static void cfg80211_wiphy_work(struct work_struct *work)
        if (wk) {
                list_del_init(&wk->entry);
                if (!list_empty(&rdev->wiphy_work_list))
-                       queue_work(system_unbound_wq, work);
+                       queue_work(system_dfl_wq, work);
                spin_unlock_irq(&rdev->wiphy_work_lock);
 
                trace_wiphy_work_run(&rdev->wiphy, wk);
@@ -1713,7 +1713,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);
 
-       queue_work(system_unbound_wq, &rdev->wiphy_work);
+       queue_work(system_dfl_wq, &rdev->wiphy_work);
 }
 EXPORT_SYMBOL_GPL(wiphy_work_queue);
 
index 62f26618f674741a5163fa8e8d14c5319b2ceff8..8d142856e385c1db16606eb6040e70293c00daf3 100644 (file)
@@ -137,7 +137,7 @@ static int wiphy_resume(struct device *dev)
        if (rdev->wiphy.registered && rdev->ops->resume)
                ret = rdev_resume(rdev);
        rdev->suspended = false;
-       queue_work(system_unbound_wq, &rdev->wiphy_work);
+       queue_work(system_dfl_wq, &rdev->wiphy_work);
        wiphy_unlock(&rdev->wiphy);
 
        if (ret)