workqueue: validate cpumask_first() result in llc_populate_cpu_shard_id()
PATCH v2 1/1 workqueue: validate cpumask_first() result in llc_populate_cpu_shard_id()
On uniprocessor (UP) configs such as nios2, NR_CPUS is 1, so cpu_shard_id[] is a single-element array (int[1]). In llc_populate_cpu_shard_id(), cpumask_first(sibling_cpus) returns an unsigned int that the compiler cannot prove is always 0, triggering a -Warray-bounds warning when the result is used to index cpu_shard_id[]:
kernel/workqueue.c:8321:55: warning: array subscript 1 is above array bounds of 'int[1]' [-Warray-bounds]
8321 | cpu_shard_id[c] = cpu_shard_id[cpumask_first(sibling_cpus)];
| ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~This is a false positive: sibling_cpus can never be empty here because 'c' itself is always set in it, so cpumask_first() will always return a valid CPU. However, the compiler cannot prove this statically, and the warning only manifests on UP configs where the array size is 1.
Add a bounds check with WARN_ON_ONCE to silence the warning, and store the result in a local variable to make the code clearer and avoid calling cpumask_first() twice.
---
Changes in v2:
- Better describe the fix and that it only happens on UP configurations
(tejun)
- Declare leader as unsigned.
- Link to v1: https://patch.msgid.link/[email protected]
--- kernel/workqueue.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
kernel/workqueue.c +12 -1
@@ -8298,6 +8298,7 @@ static void __init llc_populate_cpu_shard_id(const struct cpumask *pod_cpus,const struct cpumask *sibling_cpus;/* Count the number of cores in the current shard_id */ int cores_in_shard =0 ; +unsigned int leader;/* This is a cursor for the shards. Go from zero to nr_shards - 1*/ int shard_id =0 ;int c;
@@ -8318,7 +8319,17 @@ static void __init llc_populate_cpu_shard_id(const struct cpumask *pod_cpus,* The siblings' shard MUST be the same as the leader. * never split threads in the same core. */ - cpu_shard_id[c] = cpu_shard_id[cpumask_first (sibling_cpus)]; + leader =cpumask_first (sibling_cpus); + +/* +* This check silences a Warray-bounds warning on UP +* configs where NR_CPUS=1 makes cpu_shard_id[] +* a single-element array, and the compiler can't +* prove the index is always 0. +*/ +if (WARN_ON_ONCE (leader >= nr_cpu_ids)) +continue ; + cpu_shard_id[c] = cpu_shard_id[leader]; } }
---
base-commit: 3fa7d958829eb9bc3b469ed07f11de3d2804ef71
change-id: 20260410-workqueue_fix_nios-e6763904aee9
Best regards,
Signature · 1 line
Breno Leitao <[email protected]>
Hello,
Quoted 2 lines
Breno Leitao (1): workqueue: validate
cpumask_first()result in
llc_populate_cpu_shard_id()
Applied to wq/for-7.1.
Thanks.
--
tejun