Skip to contentSkip to conversation

IPI updates for v2.6.30

GIT PULL Ingo Molnar 1 participant 1 message Mar 31, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest ipi-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git ipi-for-linus

Highlights:

- Removal of the kmalloc() from smp_call_function*() and the resulting simplification and refactoring, as discussed in great detail at:

      http://lkml.org/lkml/2009/2/16/217

Known risks:

- The removal of the kmalloc() might in theory affect performance on large SMP systems:

     8969a5e: generic-ipi: remove kmalloc()

There are no known regressions.

Thanks,

Ingo

------------------>
Heiko Carstens (1):
s390: remove arch specific smp_send_stop()

Ingo Molnar (5):
generic-ipi: cleanups
generic-ipi: eliminate WARN_ON()s during oops/panic
panic: decrease oops_in_progress only after having done the panic panic, smp: provide smp_send_stop() wrapper on UP too
panic: clean up kernel/panic.c

Nick Piggin (1):
generic IPI: simplify barriers and locking

Peter Zijlstra (2):
generic-ipi: remove kmalloc()
generic-ipi: remove CSD_FLAG_WAIT

 arch/s390/include/asm/smp.h |    6 -
 block/blk-softirq.c         |    2 +-
 include/linux/smp.h         |    7 +-
 kernel/panic.c              |  115 ++++++------
 kernel/sched.c              |    2 +-
 kernel/smp.c                |  432 +++++++++++++++++++++++--------------------
 kernel/softirq.c            |    2 +-
 7 files changed, 304 insertions(+), 262 deletions(-)
arch/s390/include/asm/smp.h +0 -6
index 2009158..72137bc 100644
@@ -92,12 +92,6 @@ extern void arch_send_call_function_ipi(cpumask_t mask);
 #endif
 
 #ifndef CONFIG_SMP
-static inline void smp_send_stop(void)
-{
-	/* Disable all interrupts/machine checks */
-	__load_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK);
-}
-
 #define hard_smp_processor_id()		0
 #define smp_cpu_not_running(cpu)	1
 #endif
block/blk-softirq.c +1 -1
index ce0efc6..ee9c216 100644
@@ -64,7 +64,7 @@ static int raise_blk_irq(int cpu, struct request *rq)
 		data->info = rq;
 		data->flags = 0;
 
-		__smp_call_function_single(cpu, data);
+		__smp_call_function_single(cpu, data, 0);
 		return 0;
 	}
 
include/linux/smp.h +5 -2
index bbacb7b..a69db82 100644
@@ -38,7 +38,7 @@ int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
 /*
  * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc.
  * (defined in asm header):
- */ 
+ */
 
 /*
  * stops all CPUs but the current one:
@@ -82,7 +82,8 @@ smp_call_function_mask(cpumask_t mask, void(*func)(void *info), void *info,
 	return 0;
 }
 
-void __smp_call_function_single(int cpuid, struct call_single_data *data);
+void __smp_call_function_single(int cpuid, struct call_single_data *data,
+				int wait);
 
 /*
  * Generic and arch helpers
@@ -121,6 +122,8 @@ extern unsigned int setup_max_cpus;
 
 #else /* !SMP */
 
+static inline void smp_send_stop(void) { }
+
 /*
  *	These macros fold the SMP functionality into a single CPU system
  */
kernel/panic.c +60 -55

218 lines not on this page · raw message

kernel/sched.c +1 -1
index 196d48b..518ffe5 100644
@@ -1110,7 +1110,7 @@ static void hrtick_start(struct rq *rq, u64 delay)
 	if (rq == this_rq()) {
 		hrtimer_restart(timer);
 	} else if (!rq->hrtick_csd_pending) {
-		__smp_call_function_single(cpu_of(rq), &rq->hrtick_csd);
+		__smp_call_function_single(cpu_of(rq), &rq->hrtick_csd, 0);
 		rq->hrtick_csd_pending = 1;
 	}
 }
kernel/smp.c +236 -196

626 lines not on this page · raw message

kernel/softirq.c +1 -1
index 57d3f67..c349a03 100644
@@ -496,7 +496,7 @@ static int __try_remote_softirq(struct call_single_data *cp, int cpu, int softir
 		cp->flags = 0;
 		cp->priv = softirq;
 
-		__smp_call_function_single(cpu, cp);
+		__smp_call_function_single(cpu, cp, 0);
 		return 0;
 	}
 	return 1;