[PATCH 2/2] smp: allow on_each_cpu() to be called whileearly_boot_irqs_disabled status to init/main.c

[Tejun Heo]

percpu may end up calling vfree() during early boot which in turn may
call on_each_cpu() for TLB flushes.  The function of on_each_cpu() can
be done safely while IRQ is disabled during early boot but it assumed
that the function is always called with local IRQ enabled which ended
up enabling local IRQ prematurely during boot and triggering a couple
of warnings.

This patch updates on_each_cpu() and smp_call_function_many() such
on_each_cpu() can be used safely while early_boot_irqs_disabled is
set.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Reported-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
---
 kernel/smp.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Index: work/kernel/smp.c
===================================================================
--- work.orig/kernel/smp.c
+++ work/kernel/smp.c
@@ -430,7 +430,7 @@ void smp_call_function_many(const struct
 	 * can't happen.
 	 */
 	WARN_ON_ONCE(cpu_online(this_cpu) && irqs_disabled()
-		     && !oops_in_progress);
+		     && !oops_in_progress && !early_boot_irqs_disabled);
 
 	/* So, what's a CPU they want? Ignoring this one. */
 	cpu = cpumask_first_and(mask, cpu_online_mask);
@@ -533,17 +533,20 @@ void ipi_call_unlock_irq(void)
 #endif /* USE_GENERIC_SMP_HELPERS */
 
 /*
- * Call a function on all processors
+ * Call a function on all processors.  May be used during early boot while
+ * early_boot_irqs_disabled is set.  Use local_irq_save/restore() instead
+ * of local_irq_disable/enable().
  */
 int on_each_cpu(void (*func) (void *info), void *info, int wait)
 {
+	unsigned long flags;
 	int ret = 0;
 
 	preempt_disable();
 	ret = smp_call_function(func, info, wait);
-	local_irq_disable();
+	local_irq_save(flags);
 	func(info);
-	local_irq_enable();
+	local_irq_restore(flags);
 	preempt_enable();
 	return ret;
 }
--
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/