workqueue: Simple fix and cleanup for exclusive cpumasks
Lai Jiangshan
reviewercover workqueue: Simple fix and cleanup for exclusive cpumasks
From: Lai Jiangshan <[email protected]>
Simple fix and cleanup for the commit fe28f631fa94("workqueue:
Add workqueue_unbound_exclude_cpumask() to exclude CPUs from wq_unbound_cpumask")
Lai Jiangshan (2):
workqueue: Update cpumasks after only applying it successfully
workqueue: Simplify goto statement
kernel/workqueue.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
Signature · 1 line
2.19.1.6.gb485710b
Lai Jiangshan
reviewerPATCH 1/2 workqueue: Update cpumasks after only applying it successfully
From: Lai Jiangshan <[email protected]>
Make workqueue_unbound_exclude_cpumask() and workqueue_set_unbound_cpumask() only update wq_isolated_cpumask and wq_requested_unbound_cpumask when workqueue_apply_unbound_cpumask() returns successfully.
--- kernel/workqueue.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/workqueue.c +6 -4
@@ -6853,9 +6853,6 @@ int workqueue_unbound_exclude_cpumask(cpumask_var_t exclude_cpumask)lockdep_assert_cpus_held ();mutex_lock (&wq_pool_mutex); -/* Save the current isolated cpumask & export it via sysfs */ -cpumask_copy (wq_isolated_cpumask, exclude_cpumask); -/* * If the operation fails, it will fall back to * wq_requested_unbound_cpumask which is initially set to
@@ -6867,6 +6864,10 @@ int workqueue_unbound_exclude_cpumask(cpumask_var_t exclude_cpumask)if (!cpumask_equal (cpumask, wq_unbound_cpumask)) ret =workqueue_apply_unbound_cpumask (cpumask); +/* Save the current isolated cpumask & export it via sysfs */ +if (!ret) +cpumask_copy (wq_isolated_cpumask, exclude_cpumask); +mutex_unlock (&wq_pool_mutex);free_cpumask_var (cpumask);return ret;
@@ -7202,7 +7203,6 @@ static int workqueue_set_unbound_cpumask(cpumask_var_t cpumask)cpumask_and (cpumask, cpumask, cpu_possible_mask);if (!cpumask_empty (cpumask)) {apply_wqattrs_lock (); -cpumask_copy (wq_requested_unbound_cpumask, cpumask);if (cpumask_equal (cpumask, wq_unbound_cpumask)) { ret =0 ; goto out_unlock;
@@ -7211,6 +7211,8 @@ static int workqueue_set_unbound_cpumask(cpumask_var_t cpumask) ret =workqueue_apply_unbound_cpumask (cpumask); out_unlock: +if (!ret) +cpumask_copy (wq_requested_unbound_cpumask, cpumask);apply_wqattrs_unlock (); }
Signature · 1 line
2.19.1.6.gb485710b
Lai Jiangshan
reviewerPATCH 2/2 workqueue: Simplify goto statement
In reply to Lai JiangshanFrom: Lai Jiangshan <[email protected]>
Use a simple if-statement to replace the cumbersome goto-statement in workqueue_set_unbound_cpumask().
--- kernel/workqueue.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
kernel/workqueue.c +3 -8
@@ -7202,15 +7202,10 @@ static int workqueue_set_unbound_cpumask(cpumask_var_t cpumask)*/ cpumask_and (cpumask, cpumask, cpu_possible_mask);if (!cpumask_empty (cpumask)) { + ret =0 ;apply_wqattrs_lock (); -if (cpumask_equal (cpumask, wq_unbound_cpumask)) { - ret =0 ; - goto out_unlock; - } - - ret =workqueue_apply_unbound_cpumask (cpumask); - -out_unlock: +if (!cpumask_equal (cpumask, wq_unbound_cpumask)) + ret =workqueue_apply_unbound_cpumask (cpumask);if (!ret)cpumask_copy (wq_requested_unbound_cpumask, cpumask);apply_wqattrs_unlock ();
Signature · 1 line
2.19.1.6.gb485710b
Tejun Heo
maintainerQuoted 9 lines · Lai Jiangshan
From: Lai Jiangshan <[email protected]>
Simple fix and cleanup for the commit fe28f631fa94("workqueue:
Addworkqueue_unbound_exclude_cpumask()to exclude CPUs fromwq_unbound_cpumask")Lai Jiangshan (2):
workqueue: Update cpumasks after only applying it successfully
workqueue: Simplify goto statement
Applied 1-2 to wq/for-6.11.
Thanks.
Signature · 1 line
tejun
Quoted 10 lines · Lai Jiangshan
From: Lai Jiangshan <[email protected]>
Simple fix and cleanup for the commit fe28f631fa94("workqueue:
Addworkqueue_unbound_exclude_cpumask()to exclude CPUs fromwq_unbound_cpumask")Lai Jiangshan (2):
workqueue: Update cpumasks after only applying it successfully
workqueue: Simplify goto statement
Quoted 6 lines
Cc Tejun Heo <[email protected]>Cc Waiman Long <[email protected]>kernel/workqueue.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
Thanks for the improvements.
For the series,