Skip to content

Commit aa86847

Browse files
Lai Jiangshanhtejun
authored andcommitted
workqueue: Remove unneeded lockdep_assert_cpus_held()
The commit 19af457 ("workqueue: Remove cpus_read_lock() from apply_wqattrs_lock()") removes the unneed cpus_read_lock() after the pwq creations and installations have been reworked based on wq_online_cpumask rather than cpu_online_mask making cpus_read_lock() is unneeded during wqattrs changes. But it desn't remove the lockdep_assert_cpus_held() checks during wqattrs changes, which leads to complaints from lockdep reported by kernel test robot: [ 15.726567][ T131] ------------[ cut here ]------------ [ 15.728117][ T131] WARNING: CPU: 1 PID: 131 at kernel/cpu.c:525 lockdep_assert_cpus_held (kernel/cpu.c:525) [ 15.731191][ T131] Modules linked in: floppy(+) parport_pc(+) parport qemu_fw_cfg rtc_cmos [ 15.733423][ T131] CPU: 1 PID: 131 Comm: systemd-udevd Tainted: G T 6.10.0-rc2-00254-g19af45757383 #1 df6f039f42e8818bf9a534449362ebad1aad32e2 [ 15.737011][ T131] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.2-debian-1.16.2-1 04/01/2014 [ 15.739760][ T131] EIP: lockdep_assert_cpus_held (kernel/cpu.c:525) [ 15.741326][ T131] Code: 97 c2 03 72 20 83 3d f4 73 97 c2 00 74 17 55 89 e5 b8 fc bd 4d c2 ba ff ff ff ff e8 e4 57 d1 00 85 c0 74 06 5d 31 c0 31 d2 c3 <0f> 0b eb f6 90 90 90 90 90 90 90 90 90 90 90 90 90 90 55 89 e5 b8 Fix it by removing the unneeded lockdep_assert_cpus_held(). Also remove the unneed cpus_read_lock() from wq_affn_dfl_set(). tj: Dropped the removal of cpus_read_lock/unlock() in wq_affn_dfl_set() to keep this patch fix only. Cc: kernel test robot <[email protected]> Fixes: 19af457("workqueue: Remove cpus_read_lock() from apply_wqattrs_lock()") Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-lkp/[email protected] Signed-off-by: Lai Jiangshan <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
1 parent b02c520 commit aa86847

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

kernel/workqueue.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5342,17 +5342,13 @@ static int apply_workqueue_attrs_locked(struct workqueue_struct *wq,
53425342
*
53435343
* Performs GFP_KERNEL allocations.
53445344
*
5345-
* Assumes caller has CPU hotplug read exclusion, i.e. cpus_read_lock().
5346-
*
53475345
* Return: 0 on success and -errno on failure.
53485346
*/
53495347
int apply_workqueue_attrs(struct workqueue_struct *wq,
53505348
const struct workqueue_attrs *attrs)
53515349
{
53525350
int ret;
53535351

5354-
lockdep_assert_cpus_held();
5355-
53565352
mutex_lock(&wq_pool_mutex);
53575353
ret = apply_workqueue_attrs_locked(wq, attrs);
53585354
mutex_unlock(&wq_pool_mutex);
@@ -5434,7 +5430,6 @@ static int alloc_and_link_pwqs(struct workqueue_struct *wq)
54345430
bool highpri = wq->flags & WQ_HIGHPRI;
54355431
int cpu, ret;
54365432

5437-
lockdep_assert_cpus_held();
54385433
lockdep_assert_held(&wq_pool_mutex);
54395434

54405435
wq->cpu_pwq = alloc_percpu(struct pool_workqueue *);
@@ -5695,8 +5690,7 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,
56955690

56965691
/*
56975692
* wq_pool_mutex protects the workqueues list, allocations of PWQs,
5698-
* and the global freeze state. alloc_and_link_pwqs() also requires
5699-
* cpus_read_lock() for PWQs' affinities.
5693+
* and the global freeze state.
57005694
*/
57015695
apply_wqattrs_lock();
57025696

@@ -6862,8 +6856,7 @@ static int workqueue_apply_unbound_cpumask(const cpumask_var_t unbound_cpumask)
68626856
* @exclude_cpumask: the cpumask to be excluded from wq_unbound_cpumask
68636857
*
68646858
* This function can be called from cpuset code to provide a set of isolated
6865-
* CPUs that should be excluded from wq_unbound_cpumask. The caller must hold
6866-
* either cpus_read_lock or cpus_write_lock.
6859+
* CPUs that should be excluded from wq_unbound_cpumask.
68676860
*/
68686861
int workqueue_unbound_exclude_cpumask(cpumask_var_t exclude_cpumask)
68696862
{
@@ -6873,7 +6866,6 @@ int workqueue_unbound_exclude_cpumask(cpumask_var_t exclude_cpumask)
68736866
if (!zalloc_cpumask_var(&cpumask, GFP_KERNEL))
68746867
return -ENOMEM;
68756868

6876-
lockdep_assert_cpus_held();
68776869
mutex_lock(&wq_pool_mutex);
68786870

68796871
/*

0 commit comments

Comments
 (0)