Skip to contentSkip to conversation

RISC-V: Fix /proc/cpuinfo cpumask warning

PATCH Superseded Andrew Jones 1 participant 2 messages Oct 11, 2022 RISC-V

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RISC-V: Fix /proc/cpuinfo cpumask warning

Upcoming cpumask changes will start issuing warnings[*] when cpu indices equal to nr_cpu_ids are passed to cpumask_next* functions. Ensure we don't generate a warning when reading /proc/cpuinfo by validating the cpu index before calling cpumask_next().

[*] Warnings will only appear with DEBUG_PER_CPU_MAPS enabled.

---
 arch/riscv/kernel/cpu.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
arch/riscv/kernel/cpu.c +6 -3
index 4aa8cd749441..592ff065e09f 100644
@@ -166,9 +166,12 @@ static void print_mmu(struct seq_file *f)
 
 static void *c_start(struct seq_file *m, loff_t *pos)
 {
-	*pos = cpumask_next(*pos - 1, cpu_online_mask);
-	if ((*pos) < nr_cpu_ids)
-		return (void *)(uintptr_t)(1 + *pos);
+	if (*pos < nr_cpu_ids) {
+		*pos = cpumask_next(*pos - 1, cpu_online_mask);
+		if (*pos < nr_cpu_ids)
+			return (void *)(uintptr_t)(1 + *pos);
+	}
+
 	return NULL;
 }
 
Signature · 1 line
2.37.3
#1 lore raw

Boris pointed out on my x86 version of this patch that I didn't give nearly enough information on why I sent it. Sorry about that! I've tried to fill in some of that information in my reply to him [1]. Sorry for lazily just pointing to that link here, but I'll send a v2 with the information properly added tomorrow.

[1] https://lore.kernel.org/all/20221011181715.dpayrpjueha7kxoj@kamzik/

Thanks,
drew

Quoted 36 lines · Andrew Jones

Upcoming cpumask changes will start issuing warnings[*] when cpu indices equal to nr_cpu_ids are passed to cpumask_next* functions. Ensure we don't generate a warning when reading /proc/cpuinfo by validating the cpu index before calling cpumask_next().

[*] Warnings will only appear with DEBUG_PER_CPU_MAPS enabled.

---
 arch/riscv/kernel/cpu.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
arch/riscv/kernel/cpu.c +6 -3
index 4aa8cd749441..592ff065e09f 100644
@@ -166,9 +166,12 @@ static void print_mmu(struct seq_file *f)
 
 static void *c_start(struct seq_file *m, loff_t *pos)
 {
-	*pos = cpumask_next(*pos - 1, cpu_online_mask);
-	if ((*pos) < nr_cpu_ids)
-		return (void *)(uintptr_t)(1 + *pos);
+	if (*pos < nr_cpu_ids) {
+		*pos = cpumask_next(*pos - 1, cpu_online_mask);
+		if (*pos < nr_cpu_ids)
+			return (void *)(uintptr_t)(1 + *pos);
+	}
+
 	return NULL;
 }
 
Signature · 1 line
2.37.3

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv