workqueue: Correct declaration of cpu_pwq in struct workqueue_struct
PATCH 1/1 workqueue: Correct declaration of cpu_pwq in struct workqueue_struct
cpu_pwq is used in various percpu functions that expect variable in __percpu address space. Correct the declaration of cpu_pwq to
struct pool_workqueue __rcu * __percpu *cpu_pwq
to declare the variable as __percpu pointer.
The patch also fixes following sparse errors:
workqueue.c:380:37: warning: duplicate [noderef]
workqueue.c:380:37: error: multiple address spaces given: __rcu & __percpu workqueue.c:2271:15: error: incompatible types in comparison expression (different address spaces):
workqueue.c:2271:15: struct pool_workqueue [noderef] __rcu *
workqueue.c:2271:15: struct pool_workqueue [noderef] __percpu *
and uncovers a couple of exisiting "incorrect type in assignment" warnings (from __rcu address space), which this patch does not address.
Found by GCC's named address space checks.
There were no changes in the resulting object files.
--- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/workqueue.c +1 -1
@@ -377,7 +377,7 @@ struct workqueue_struct {/* hot fields used during command issue, aligned to cacheline */ unsigned int flags____cacheline_aligned ;/* WQ: WQ_* flags */ -struct pool_workqueue __percpu __rcu **cpu_pwq;/* I: per-cpu pwqs */ +struct pool_workqueue __rcu *__percpu *cpu_pwq;/* I: per-cpu pwqs */ struct wq_node_nr_active *node_nr_active[];/* I: per-node nr_active */ };
Signature · 1 line
2.45.2
Quoted 18 lines · Uros Bizjak
cpu_pwqis used in various percpu functions that expect variable in__percpuaddress space. Correct the declaration ofcpu_pwqtostruct
pool_workqueue__rcu*__percpu*cpu_pwqto declare the variable as
__percpupointer.The patch also fixes following sparse errors:
workqueue.c:380:37: warning: duplicate [noderef]
workqueue.c:380:37: error: multiple address spaces given:__rcu&__percpuworkqueue.c:2271:15: error: incompatible types in comparison expression (different address spaces):
workqueue.c:2271:15: structpool_workqueue[noderef]__rcu*
workqueue.c:2271:15: structpool_workqueue[noderef]__percpu*and uncovers a couple of exisiting "incorrect type in assignment" warnings (from
__rcuaddress space), which this patch does not address.
Quoted 7 lines
Found by GCC's named address space checks.
There were no changes in the resulting object files.
Signed-off-by Uros Bizjak <[email protected]>Cc Tejun Heo <[email protected]>Cc Lai Jiangshan <[email protected]>
Applied to wq/for-6.11-fixes.
Thanks.
Signature · 1 line
tejun