[PATCH] kdb: avoid on-stack cpumask, old-style accessors

[Rusty Russell]

That's quite a big stack already; I assume moving it to a static bitmap
is OK for this usage (a cpumask_var_t might require kmalloc, not sure
that's a good idea here).

Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: kgdb-bugreport@xxxxxxxxxxxxxxxxxxxxx
Cc: Jason Wessel <jason.wessel@xxxxxxxxxxxxx>
---
 kernel/debug/kdb/kdb_main.c |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -2598,6 +2598,9 @@ static int kdb_summary(int argc, const c
 	return 0;
 }
 
+/* Not sure when to initialize this, so make it a static bitmap. */
+static DECLARE_BITMAP(per_cpu_suppress, NR_CPUS);
+
 /*
  * kdb_per_cpu - This function implements the 'per_cpu' command.
  */
@@ -2605,7 +2608,7 @@ static int kdb_per_cpu(int argc, const c
 {
 	char buf[256], fmtstr[64];
 	kdb_symtab_t symtab;
-	cpumask_t suppress = CPU_MASK_NONE;
+	struct cpumask *suppress = to_cpumask(per_cpu_suppress);
 	int cpu, diag;
 	unsigned long addr, val, bytesperword = 0, whichcpu = ~0UL;
 
@@ -2649,7 +2652,7 @@ static int kdb_per_cpu(int argc, const c
 #define KDB_PCU(cpu) 0
 #endif
 #endif
-
+	cpumask_clear(suppress);
 	for_each_online_cpu(cpu) {
 		if (whichcpu != ~0UL && whichcpu != cpu)
 			continue;
@@ -2662,7 +2665,7 @@ static int kdb_per_cpu(int argc, const c
 		}
 #ifdef	CONFIG_SMP
 		if (!val) {
-			cpu_set(cpu, suppress);
+			cpumask_set_cpu(cpu, suppress);
 			continue;
 		}
 #endif	/* CONFIG_SMP */
@@ -2671,17 +2674,16 @@ static int kdb_per_cpu(int argc, const c
 			bytesperword == KDB_WORD_SIZE,
 			1, bytesperword, 1, 1, 0);
 	}
-	if (cpus_weight(suppress) == 0)
+	if (cpumask_weight(suppress) == 0)
 		return 0;
 	kdb_printf("Zero suppressed cpu(s):");
-	for (cpu = first_cpu(suppress); cpu < num_possible_cpus();
-	     cpu = next_cpu(cpu, suppress)) {
+	for_each_cpu(cpu, suppress) {
 		kdb_printf(" %d", cpu);
-		if (cpu == num_possible_cpus() - 1 ||
-		    next_cpu(cpu, suppress) != cpu + 1)
+		if (cpu == nr_cpu_ids - 1 ||
+		    cpumask_next(cpu, suppress) != cpu + 1)
 			continue;
-		while (cpu < num_possible_cpus() &&
-		       next_cpu(cpu, suppress) == cpu + 1)
+		while (cpu < nr_cpu_ids &&
+		       cpumask_next(cpu, suppress) == cpu + 1)
 			++cpu;
 		kdb_printf("-%d", cpu);
 	}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/