x86: Fix /proc/cpuinfo cpumask warning
PATCH v2 1/1 x86: Fix /proc/cpuinfo cpumask warning
Commit 78e5a3399421 ("cpumask: fix checking valid cpu range") has started issuing warnings[*] when cpu indices equal to nr_cpu_ids - 1 are passed to cpumask_next* functions. seq_read_iter() and cpuinfo's start and next seq operations implement a pattern like
n = cpumask_next(n - 1, mask);
show(n);
while (1) {
++n;
n = cpumask_next(n - 1, mask);
if (n >= nr_cpu_ids)
break;
show(n);
}which will issue the warning when reading /proc/cpuinfo. Ensure no warning is generated by validating the cpu index before calling cpumask_next().
[*] Warnings will only appear with DEBUG_PER_CPU_MAPS enabled.
--- arch/x86/kernel/cpu/proc.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kernel/cpu/proc.c +3 -0
@@ -153,6 +153,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)static void *c_start (struct seq_file *m,loff_t *pos) { +if (*pos >= nr_cpu_ids) +return NULL ; + *pos =cpumask_next (*pos -1 , cpu_online_mask);if ((*pos) < nr_cpu_ids)return &cpu_data (*pos);
Signature · 1 line
2.37.3
Quoted 19 lines · Andrew Jones
Commit
78e5a3399421("cpumask: fix checking valid cpu range") has started issuing warnings[*] when cpu indices equal tonr_cpu_ids- 1 are passed to cpumask_next* functions.seq_read_iter()and cpuinfo's start and next seq operations implement a pattern liken = cpumask_next(n - 1, mask); show(n); while (1) { ++n; n = cpumask_next(n - 1, mask); if (n >= nr_cpu_ids) break; show(n); }which will issue the warning when reading
/proc/cpuinfo. Ensure no warning is generated by validating the cpu index before callingcpumask_next().
Quoted 5 lines
[*] Warnings will only appear with
DEBUG_PER_CPU_MAPSenabled.Signed-off-by Andrew Jones <[email protected]>Cc Yury Norov <[email protected]>---
Forgot the changelog...
v2:
- Added all the information I should have in the first place to the commit message [Boris]
- Changed style of fix [Boris]
Quoted 20 lines
arch/x86/kernel/cpu/proc.c | 3 +++ 1 file changed, 3 insertions(+)arch/x86/kernel/cpu/proc.c +3
-0@@ -153,6 +153,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)static void *c_start (struct seq_file *m,loff_t *pos) { +if (*pos >= nr_cpu_ids) +return NULL ; + *pos =cpumask_next (*pos -1 , cpu_online_mask);if ((*pos) < nr_cpu_ids)return &cpu_data (*pos);Signature · 1 line
2.37.3
Adding more people and lists to CC in order to point this patch out, because, based on a quick grep of cpuinfo seq operations, I think at least openrisc, powerpc, and s390 also need an equivalent patch (and I've already sent a patch for riscv). While the test is simple (see next paragraph) I'm not equipped to test on each architecture.
To test, just build a kernel with DEBUG_PER_CPU_MAPS enabled, boot to a shell, do 'cat /proc/cpuinfo', and look for a kernel warning.
Thanks,
drew
Quoted 53 lines · Andrew Jones
Quoted 19 lines · Andrew Jones
Commit
78e5a3399421("cpumask: fix checking valid cpu range") has started issuing warnings[*] when cpu indices equal tonr_cpu_ids- 1 are passed to cpumask_next* functions.seq_read_iter()and cpuinfo's start and next seq operations implement a pattern liken = cpumask_next(n - 1, mask); show(n); while (1) { ++n; n = cpumask_next(n - 1, mask); if (n >= nr_cpu_ids) break; show(n); }which will issue the warning when reading
/proc/cpuinfo. Ensure no warning is generated by validating the cpu index before callingcpumask_next().Quoted 5 lines
[*] Warnings will only appear with
DEBUG_PER_CPU_MAPSenabled.Signed-off-by Andrew Jones <[email protected]>Cc Yury Norov <[email protected]>---
Forgot the changelog...
v2:
- Added all the information I should have in the first place to the commit message [Boris]
- Changed style of fix [Boris]Quoted 20 lines
arch/x86/kernel/cpu/proc.c | 3 +++ 1 file changed, 3 insertions(+)arch/x86/kernel/cpu/proc.c +3
-0@@ -153,6 +153,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)static void *c_start (struct seq_file *m,loff_t *pos) { +if (*pos >= nr_cpu_ids) +return NULL ; + *pos =cpumask_next (*pos -1 , cpu_online_mask);if ((*pos) < nr_cpu_ids)return &cpu_data (*pos);Signature · 1 line
2.37.3