2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* SMP support for ppc.
|
|
|
|
*
|
|
|
|
* Written by Cort Dougan (cort@cs.nmt.edu) borrowing a great
|
|
|
|
* deal of code from the sparc and intel versions.
|
|
|
|
*
|
|
|
|
* Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
|
|
|
|
*
|
|
|
|
* PowerPC-64 Support added by Dave Engebretsen, Peter Bergner, and
|
|
|
|
* Mike Corrigan {engebret|bergner|mikec}@us.ibm.com
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#undef DEBUG
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
2011-07-23 06:24:23 +08:00
|
|
|
#include <linux/export.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/cache.h>
|
|
|
|
#include <linux/err.h>
|
2011-12-22 06:29:42 +08:00
|
|
|
#include <linux/device.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/notifier.h>
|
2005-12-13 03:56:47 +08:00
|
|
|
#include <linux/topology.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#include <asm/ptrace.h>
|
2011-07-27 07:09:06 +08:00
|
|
|
#include <linux/atomic.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/irq.h>
|
|
|
|
#include <asm/page.h>
|
|
|
|
#include <asm/pgtable.h>
|
|
|
|
#include <asm/prom.h>
|
|
|
|
#include <asm/smp.h>
|
|
|
|
#include <asm/time.h>
|
|
|
|
#include <asm/machdep.h>
|
2008-07-27 13:24:52 +08:00
|
|
|
#include <asm/cputhreads.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/cputable.h>
|
2005-09-27 11:51:59 +08:00
|
|
|
#include <asm/mpic.h>
|
2005-11-11 18:15:21 +08:00
|
|
|
#include <asm/vdso_datapage.h>
|
2005-11-05 07:33:55 +08:00
|
|
|
#ifdef CONFIG_PPC64
|
|
|
|
#include <asm/paca.h>
|
|
|
|
#endif
|
2012-07-05 04:37:11 +08:00
|
|
|
#include <asm/vdso.h>
|
2012-03-29 01:30:02 +08:00
|
|
|
#include <asm/debug.h>
|
2005-11-05 07:33:55 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef DEBUG
|
2005-11-15 12:16:38 +08:00
|
|
|
#include <asm/udbg.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#define DBG(fmt...) udbg_printf(fmt)
|
|
|
|
#else
|
|
|
|
#define DBG(fmt...)
|
|
|
|
#endif
|
|
|
|
|
2011-03-08 11:40:04 +08:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
2011-09-20 01:44:49 +08:00
|
|
|
/* State of each CPU during hotplug phases */
|
|
|
|
static DEFINE_PER_CPU(int, cpu_state) = { 0 };
|
2011-03-08 11:40:04 +08:00
|
|
|
#endif
|
|
|
|
|
2005-11-15 12:16:38 +08:00
|
|
|
struct thread_info *secondary_ti;
|
|
|
|
|
2010-04-26 23:32:41 +08:00
|
|
|
DEFINE_PER_CPU(cpumask_var_t, cpu_sibling_map);
|
|
|
|
DEFINE_PER_CPU(cpumask_var_t, cpu_core_map);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-10-16 16:24:05 +08:00
|
|
|
EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
|
2008-07-27 13:24:53 +08:00
|
|
|
EXPORT_PER_CPU_SYMBOL(cpu_core_map);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2005-11-05 07:33:55 +08:00
|
|
|
/* SMP operations for this machine */
|
2005-04-17 06:20:36 +08:00
|
|
|
struct smp_ops_t *smp_ops;
|
|
|
|
|
2009-06-19 07:30:07 +08:00
|
|
|
/* Can't be static due to PowerMac hackery */
|
|
|
|
volatile unsigned int cpu_callin_map[NR_CPUS];
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
int smt_enabled_at_boot = 1;
|
|
|
|
|
2005-12-04 15:39:43 +08:00
|
|
|
static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;
|
|
|
|
|
2013-08-06 03:58:34 +08:00
|
|
|
/*
|
|
|
|
* Returns 1 if the specified cpu should be brought up during boot.
|
|
|
|
* Used to inhibit booting threads if they've been disabled or
|
|
|
|
* limited on the command line
|
|
|
|
*/
|
|
|
|
int smp_generic_cpu_bootable(unsigned int nr)
|
|
|
|
{
|
|
|
|
/* Special case - we inhibit secondary thread startup
|
|
|
|
* during boot if the user requests it.
|
|
|
|
*/
|
|
|
|
if (system_state == SYSTEM_BOOTING && cpu_has_feature(CPU_FTR_SMT)) {
|
|
|
|
if (!smt_enabled_at_boot && cpu_thread_in_core(nr) != 0)
|
|
|
|
return 0;
|
|
|
|
if (smt_enabled_at_boot
|
|
|
|
&& cpu_thread_in_core(nr) >= smt_enabled_at_boot)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-11-05 07:33:55 +08:00
|
|
|
#ifdef CONFIG_PPC64
|
2012-12-22 06:04:10 +08:00
|
|
|
int smp_generic_kick_cpu(int nr)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
BUG_ON(nr < 0 || nr >= NR_CPUS);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The processor is currently spinning, waiting for the
|
|
|
|
* cpu_start field to become non-zero After we set cpu_start,
|
|
|
|
* the processor will continue on to secondary_start
|
|
|
|
*/
|
2011-09-20 01:44:49 +08:00
|
|
|
if (!paca[nr].cpu_start) {
|
|
|
|
paca[nr].cpu_start = 1;
|
|
|
|
smp_mb();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
/*
|
|
|
|
* Ok it's not there, so it might be soft-unplugged, let's
|
|
|
|
* try to bring it back
|
|
|
|
*/
|
2012-07-20 20:42:34 +08:00
|
|
|
generic_set_cpu_up(nr);
|
2011-09-20 01:44:49 +08:00
|
|
|
smp_wmb();
|
|
|
|
smp_send_reschedule(nr);
|
|
|
|
#endif /* CONFIG_HOTPLUG_CPU */
|
2011-04-12 05:46:19 +08:00
|
|
|
|
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2011-09-20 01:44:49 +08:00
|
|
|
#endif /* CONFIG_PPC64 */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-11-15 04:11:49 +08:00
|
|
|
static irqreturn_t call_function_action(int irq, void *data)
|
|
|
|
{
|
|
|
|
generic_smp_call_function_interrupt();
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static irqreturn_t reschedule_action(int irq, void *data)
|
|
|
|
{
|
2011-04-05 23:23:39 +08:00
|
|
|
scheduler_ipi();
|
2008-11-15 04:11:49 +08:00
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static irqreturn_t call_function_single_action(int irq, void *data)
|
|
|
|
{
|
|
|
|
generic_smp_call_function_single_interrupt();
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
2011-05-25 04:34:18 +08:00
|
|
|
static irqreturn_t debug_ipi_action(int irq, void *data)
|
2008-11-15 04:11:49 +08:00
|
|
|
{
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
if (crash_ipi_function_ptr) {
|
|
|
|
crash_ipi_function_ptr(get_irq_regs());
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_DEBUGGER
|
|
|
|
debugger_ipi(get_irq_regs());
|
|
|
|
#endif /* CONFIG_DEBUGGER */
|
|
|
|
|
2008-11-15 04:11:49 +08:00
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static irq_handler_t smp_ipi_action[] = {
|
|
|
|
[PPC_MSG_CALL_FUNCTION] = call_function_action,
|
|
|
|
[PPC_MSG_RESCHEDULE] = reschedule_action,
|
|
|
|
[PPC_MSG_CALL_FUNC_SINGLE] = call_function_single_action,
|
|
|
|
[PPC_MSG_DEBUGGER_BREAK] = debug_ipi_action,
|
|
|
|
};
|
|
|
|
|
|
|
|
const char *smp_ipi_name[] = {
|
|
|
|
[PPC_MSG_CALL_FUNCTION] = "ipi call function",
|
|
|
|
[PPC_MSG_RESCHEDULE] = "ipi reschedule",
|
|
|
|
[PPC_MSG_CALL_FUNC_SINGLE] = "ipi call function single",
|
|
|
|
[PPC_MSG_DEBUGGER_BREAK] = "ipi debugger",
|
|
|
|
};
|
|
|
|
|
|
|
|
/* optional function to request ipi, for controllers with >= 4 ipis */
|
|
|
|
int smp_request_message_ipi(int virq, int msg)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (msg < 0 || msg > PPC_MSG_DEBUGGER_BREAK) {
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
#if !defined(CONFIG_DEBUGGER) && !defined(CONFIG_KEXEC)
|
|
|
|
if (msg == PPC_MSG_DEBUGGER_BREAK) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
2011-10-05 10:30:50 +08:00
|
|
|
err = request_irq(virq, smp_ipi_action[msg],
|
2012-07-20 20:47:01 +08:00
|
|
|
IRQF_PERCPU | IRQF_NO_THREAD | IRQF_NO_SUSPEND,
|
2013-08-07 00:01:24 +08:00
|
|
|
smp_ipi_name[msg], NULL);
|
2008-11-15 04:11:49 +08:00
|
|
|
WARN(err < 0, "unable to request_irq %d for %s (rc %d)\n",
|
|
|
|
virq, smp_ipi_name[msg], err);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-05-11 03:29:42 +08:00
|
|
|
#ifdef CONFIG_PPC_SMP_MUXED_IPI
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
struct cpu_messages {
|
2011-05-11 03:29:46 +08:00
|
|
|
int messages; /* current messages */
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
unsigned long data; /* data for cause ipi */
|
|
|
|
};
|
|
|
|
static DEFINE_PER_CPU_SHARED_ALIGNED(struct cpu_messages, ipi_message);
|
|
|
|
|
|
|
|
void smp_muxed_ipi_set_data(int cpu, unsigned long data)
|
|
|
|
{
|
|
|
|
struct cpu_messages *info = &per_cpu(ipi_message, cpu);
|
|
|
|
|
|
|
|
info->data = data;
|
|
|
|
}
|
|
|
|
|
|
|
|
void smp_muxed_ipi_message_pass(int cpu, int msg)
|
|
|
|
{
|
|
|
|
struct cpu_messages *info = &per_cpu(ipi_message, cpu);
|
2011-05-11 03:29:46 +08:00
|
|
|
char *message = (char *)&info->messages;
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
|
2012-09-05 02:33:08 +08:00
|
|
|
/*
|
|
|
|
* Order previous accesses before accesses in the IPI handler.
|
|
|
|
*/
|
|
|
|
smp_mb();
|
2011-05-11 03:29:46 +08:00
|
|
|
message[msg] = 1;
|
2012-09-05 02:33:08 +08:00
|
|
|
/*
|
|
|
|
* cause_ipi functions are required to include a full barrier
|
|
|
|
* before doing whatever causes the IPI.
|
|
|
|
*/
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
smp_ops->cause_ipi(cpu, info->data);
|
|
|
|
}
|
|
|
|
|
|
|
|
irqreturn_t smp_ipi_demux(void)
|
|
|
|
{
|
|
|
|
struct cpu_messages *info = &__get_cpu_var(ipi_message);
|
2011-05-11 03:29:46 +08:00
|
|
|
unsigned int all;
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
|
|
|
|
mb(); /* order any irq clear */
|
2011-05-11 03:29:46 +08:00
|
|
|
|
|
|
|
do {
|
2012-09-05 02:33:08 +08:00
|
|
|
all = xchg(&info->messages, 0);
|
2011-05-11 03:29:46 +08:00
|
|
|
|
|
|
|
#ifdef __BIG_ENDIAN
|
|
|
|
if (all & (1 << (24 - 8 * PPC_MSG_CALL_FUNCTION)))
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
generic_smp_call_function_interrupt();
|
2011-05-11 03:29:46 +08:00
|
|
|
if (all & (1 << (24 - 8 * PPC_MSG_RESCHEDULE)))
|
2011-05-20 13:36:52 +08:00
|
|
|
scheduler_ipi();
|
2011-05-11 03:29:46 +08:00
|
|
|
if (all & (1 << (24 - 8 * PPC_MSG_CALL_FUNC_SINGLE)))
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
generic_smp_call_function_single_interrupt();
|
2011-05-11 03:29:46 +08:00
|
|
|
if (all & (1 << (24 - 8 * PPC_MSG_DEBUGGER_BREAK)))
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
debug_ipi_action(0, NULL);
|
2011-05-11 03:29:46 +08:00
|
|
|
#else
|
|
|
|
#error Unsupported ENDIAN
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
#endif
|
2011-05-11 03:29:46 +08:00
|
|
|
} while (info->messages);
|
|
|
|
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
2011-05-11 03:29:42 +08:00
|
|
|
#endif /* CONFIG_PPC_SMP_MUXED_IPI */
|
powerpc: Consolidate ipi message mux and demux
Consolidate the mux and demux of ipi messages into smp.c and call
a new smp_ops callback to actually trigger the ipi.
The powerpc architecture code is optimised for having 4 distinct
ipi triggers, which are mapped to 4 distinct messages (ipi many, ipi
single, scheduler ipi, and enter debugger). However, several interrupt
controllers only provide a single software triggered interrupt that
can be delivered to each cpu. To resolve this limitation, each smp_ops
implementation created a per-cpu variable that is manipulated with atomic
bitops. Since these lines will be contended they are optimialy marked as
shared_aligned and take a full cache line for each cpu. Distro kernels
may have 2 or 3 of these in their config, each taking per-cpu space
even though at most one will be in use.
This consolidation removes smp_message_recv and replaces the single call
actions cases with direct calls from the common message recognition loop.
The complicated debugger ipi case with its muxed crash handling code is
moved to debug_ipi_action which is now called from the demux code (instead
of the multi-message action calling smp_message_recv).
I put a call to reschedule_action to increase the likelyhood of correctly
merging the anticipated scheduler_ipi() hook coming from the scheduler
tree; that single required call can be inlined later.
The actual message decode is a copy of the old pseries xics code with its
memory barriers and cache line spacing, augmented with a per-cpu unsigned
long based on the book-e doorbell code. The optional data is set via a
callback from the implementation and is passed to the new cause-ipi hook
along with the logical cpu number. While currently only the doorbell
implemntation uses this data it should be almost zero cost to retrieve and
pass it -- it adds a single register load for the argument from the same
cache line to which we just completed a store and the register is dead
on return from the call. I extended the data element from unsigned int
to unsigned long in case some other code wanted to associate a pointer.
The doorbell check_self is replaced by a call to smp_muxed_ipi_resend,
conditioned on the CPU_DBELL feature. The ifdef guard could be relaxed
to CONFIG_SMP but I left it with BOOKE for now.
Also, the doorbell interrupt vector for book-e was not calling irq_enter
and irq_exit, which throws off cpu accounting and causes code to not
realize it is running in interrupt context. Add the missing calls.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2011-05-11 03:29:39 +08:00
|
|
|
|
2011-05-26 07:34:12 +08:00
|
|
|
static inline void do_message_pass(int cpu, int msg)
|
|
|
|
{
|
|
|
|
if (smp_ops->message_pass)
|
|
|
|
smp_ops->message_pass(cpu, msg);
|
|
|
|
#ifdef CONFIG_PPC_SMP_MUXED_IPI
|
|
|
|
else
|
|
|
|
smp_muxed_ipi_message_pass(cpu, msg);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
void smp_send_reschedule(int cpu)
|
|
|
|
{
|
2006-07-04 12:09:36 +08:00
|
|
|
if (likely(smp_ops))
|
2011-05-26 07:34:12 +08:00
|
|
|
do_message_pass(cpu, PPC_MSG_RESCHEDULE);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
KVM: PPC: Add support for Book3S processors in hypervisor mode
This adds support for KVM running on 64-bit Book 3S processors,
specifically POWER7, in hypervisor mode. Using hypervisor mode means
that the guest can use the processor's supervisor mode. That means
that the guest can execute privileged instructions and access privileged
registers itself without trapping to the host. This gives excellent
performance, but does mean that KVM cannot emulate a processor
architecture other than the one that the hardware implements.
This code assumes that the guest is running paravirtualized using the
PAPR (Power Architecture Platform Requirements) interface, which is the
interface that IBM's PowerVM hypervisor uses. That means that existing
Linux distributions that run on IBM pSeries machines will also run
under KVM without modification. In order to communicate the PAPR
hypercalls to qemu, this adds a new KVM_EXIT_PAPR_HCALL exit code
to include/linux/kvm.h.
Currently the choice between book3s_hv support and book3s_pr support
(i.e. the existing code, which runs the guest in user mode) has to be
made at kernel configuration time, so a given kernel binary can only
do one or the other.
This new book3s_hv code doesn't support MMIO emulation at present.
Since we are running paravirtualized guests, this isn't a serious
restriction.
With the guest running in supervisor mode, most exceptions go straight
to the guest. We will never get data or instruction storage or segment
interrupts, alignment interrupts, decrementer interrupts, program
interrupts, single-step interrupts, etc., coming to the hypervisor from
the guest. Therefore this introduces a new KVMTEST_NONHV macro for the
exception entry path so that we don't have to do the KVM test on entry
to those exception handlers.
We do however get hypervisor decrementer, hypervisor data storage,
hypervisor instruction storage, and hypervisor emulation assist
interrupts, so we have to handle those.
In hypervisor mode, real-mode accesses can access all of RAM, not just
a limited amount. Therefore we put all the guest state in the vcpu.arch
and use the shadow_vcpu in the PACA only for temporary scratch space.
We allocate the vcpu with kzalloc rather than vzalloc, and we don't use
anything in the kvmppc_vcpu_book3s struct, so we don't allocate it.
We don't have a shared page with the guest, but we still need a
kvm_vcpu_arch_shared struct to store the values of various registers,
so we include one in the vcpu_arch struct.
The POWER7 processor has a restriction that all threads in a core have
to be in the same partition. MMU-on kernel code counts as a partition
(partition 0), so we have to do a partition switch on every entry to and
exit from the guest. At present we require the host and guest to run
in single-thread mode because of this hardware restriction.
This code allocates a hashed page table for the guest and initializes
it with HPTEs for the guest's Virtual Real Memory Area (VRMA). We
require that the guest memory is allocated using 16MB huge pages, in
order to simplify the low-level memory management. This also means that
we can get away without tracking paging activity in the host for now,
since huge pages can't be paged or swapped.
This also adds a few new exports needed by the book3s_hv code.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
2011-06-29 08:21:34 +08:00
|
|
|
EXPORT_SYMBOL_GPL(smp_send_reschedule);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-06-26 17:22:13 +08:00
|
|
|
void arch_send_call_function_single_ipi(int cpu)
|
|
|
|
{
|
2011-05-26 07:34:12 +08:00
|
|
|
do_message_pass(cpu, PPC_MSG_CALL_FUNC_SINGLE);
|
2008-06-26 17:22:13 +08:00
|
|
|
}
|
|
|
|
|
2009-09-24 23:34:45 +08:00
|
|
|
void arch_send_call_function_ipi_mask(const struct cpumask *mask)
|
2008-06-26 17:22:13 +08:00
|
|
|
{
|
|
|
|
unsigned int cpu;
|
|
|
|
|
2009-09-24 23:34:45 +08:00
|
|
|
for_each_cpu(cpu, mask)
|
2011-05-26 07:34:12 +08:00
|
|
|
do_message_pass(cpu, PPC_MSG_CALL_FUNCTION);
|
2008-06-26 17:22:13 +08:00
|
|
|
}
|
|
|
|
|
2011-05-11 03:29:06 +08:00
|
|
|
#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
|
|
|
|
void smp_send_debugger_break(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2011-05-11 03:29:06 +08:00
|
|
|
int cpu;
|
|
|
|
int me = raw_smp_processor_id();
|
|
|
|
|
|
|
|
if (unlikely(!smp_ops))
|
|
|
|
return;
|
|
|
|
|
|
|
|
for_each_online_cpu(cpu)
|
|
|
|
if (cpu != me)
|
2011-05-26 07:34:12 +08:00
|
|
|
do_message_pass(cpu, PPC_MSG_DEBUGGER_BREAK);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-12-04 15:39:43 +08:00
|
|
|
#ifdef CONFIG_KEXEC
|
|
|
|
void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *))
|
|
|
|
{
|
|
|
|
crash_ipi_function_ptr = crash_ipi_callback;
|
2011-05-11 03:29:06 +08:00
|
|
|
if (crash_ipi_callback) {
|
2005-12-04 15:39:43 +08:00
|
|
|
mb();
|
2011-05-11 03:29:06 +08:00
|
|
|
smp_send_debugger_break();
|
2005-12-04 15:39:43 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static void stop_this_cpu(void *dummy)
|
|
|
|
{
|
2009-11-25 19:48:52 +08:00
|
|
|
/* Remove this CPU */
|
|
|
|
set_cpu_online(smp_processor_id(), false);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
local_irq_disable();
|
|
|
|
while (1)
|
|
|
|
;
|
|
|
|
}
|
|
|
|
|
2007-09-18 07:43:40 +08:00
|
|
|
void smp_send_stop(void)
|
|
|
|
{
|
2008-06-06 17:18:06 +08:00
|
|
|
smp_call_function(stop_this_cpu, NULL, 0);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
struct thread_info *current_set[NR_CPUS];
|
|
|
|
|
2012-12-22 06:04:10 +08:00
|
|
|
static void smp_store_cpu_info(int id)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2009-10-29 21:34:14 +08:00
|
|
|
per_cpu(cpu_pvr, id) = mfspr(SPRN_PVR);
|
2011-06-29 03:54:47 +08:00
|
|
|
#ifdef CONFIG_PPC_FSL_BOOK3E
|
|
|
|
per_cpu(next_tlbcam_idx, id)
|
|
|
|
= (mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) - 1;
|
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void __init smp_prepare_cpus(unsigned int max_cpus)
|
|
|
|
{
|
|
|
|
unsigned int cpu;
|
|
|
|
|
|
|
|
DBG("smp_prepare_cpus\n");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* setup_cpu may need to be called on the boot cpu. We havent
|
|
|
|
* spun any cpus up but lets be paranoid.
|
|
|
|
*/
|
|
|
|
BUG_ON(boot_cpuid != smp_processor_id());
|
|
|
|
|
|
|
|
/* Fixup boot cpu */
|
|
|
|
smp_store_cpu_info(boot_cpuid);
|
|
|
|
cpu_callin_map[boot_cpuid] = 1;
|
|
|
|
|
2010-04-26 23:32:41 +08:00
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
zalloc_cpumask_var_node(&per_cpu(cpu_sibling_map, cpu),
|
|
|
|
GFP_KERNEL, cpu_to_node(cpu));
|
|
|
|
zalloc_cpumask_var_node(&per_cpu(cpu_core_map, cpu),
|
|
|
|
GFP_KERNEL, cpu_to_node(cpu));
|
|
|
|
}
|
|
|
|
|
|
|
|
cpumask_set_cpu(boot_cpuid, cpu_sibling_mask(boot_cpuid));
|
|
|
|
cpumask_set_cpu(boot_cpuid, cpu_core_mask(boot_cpuid));
|
|
|
|
|
2006-07-04 12:09:36 +08:00
|
|
|
if (smp_ops)
|
2009-09-09 01:38:52 +08:00
|
|
|
if (smp_ops->probe)
|
|
|
|
max_cpus = smp_ops->probe();
|
|
|
|
else
|
|
|
|
max_cpus = NR_CPUS;
|
2006-07-04 12:09:36 +08:00
|
|
|
else
|
|
|
|
max_cpus = 1;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2012-12-22 06:04:10 +08:00
|
|
|
void smp_prepare_boot_cpu(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
BUG_ON(smp_processor_id() != boot_cpuid);
|
2005-11-05 07:33:55 +08:00
|
|
|
#ifdef CONFIG_PPC64
|
2005-04-17 06:20:36 +08:00
|
|
|
paca[boot_cpuid].__current = current;
|
2005-11-05 07:33:55 +08:00
|
|
|
#endif
|
2006-01-12 17:06:01 +08:00
|
|
|
current_set[boot_cpuid] = task_thread_info(current);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
|
|
|
|
int generic_cpu_disable(void)
|
|
|
|
{
|
|
|
|
unsigned int cpu = smp_processor_id();
|
|
|
|
|
|
|
|
if (cpu == boot_cpuid)
|
|
|
|
return -EBUSY;
|
|
|
|
|
2009-09-24 23:34:48 +08:00
|
|
|
set_cpu_online(cpu, false);
|
2005-11-10 10:37:51 +08:00
|
|
|
#ifdef CONFIG_PPC64
|
2005-11-11 18:15:21 +08:00
|
|
|
vdso_data->processorCount--;
|
2005-11-10 11:26:12 +08:00
|
|
|
#endif
|
2011-02-11 10:05:17 +08:00
|
|
|
migrate_irqs();
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void generic_cpu_die(unsigned int cpu)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 100; i++) {
|
2005-05-01 23:58:47 +08:00
|
|
|
smp_rmb();
|
2005-04-17 06:20:36 +08:00
|
|
|
if (per_cpu(cpu_state, cpu) == CPU_DEAD)
|
|
|
|
return;
|
|
|
|
msleep(100);
|
|
|
|
}
|
|
|
|
printk(KERN_ERR "CPU%d didn't die...\n", cpu);
|
|
|
|
}
|
|
|
|
|
|
|
|
void generic_mach_cpu_die(void)
|
|
|
|
{
|
|
|
|
unsigned int cpu;
|
|
|
|
|
|
|
|
local_irq_disable();
|
2011-02-10 15:46:50 +08:00
|
|
|
idle_task_exit();
|
2005-04-17 06:20:36 +08:00
|
|
|
cpu = smp_processor_id();
|
|
|
|
printk(KERN_DEBUG "CPU%d offline\n", cpu);
|
|
|
|
__get_cpu_var(cpu_state) = CPU_DEAD;
|
2005-05-01 23:58:47 +08:00
|
|
|
smp_wmb();
|
2005-04-17 06:20:36 +08:00
|
|
|
while (__get_cpu_var(cpu_state) != CPU_UP_PREPARE)
|
|
|
|
cpu_relax();
|
|
|
|
}
|
2011-04-01 06:23:37 +08:00
|
|
|
|
|
|
|
void generic_set_cpu_dead(unsigned int cpu)
|
|
|
|
{
|
|
|
|
per_cpu(cpu_state, cpu) = CPU_DEAD;
|
|
|
|
}
|
2011-09-20 01:44:49 +08:00
|
|
|
|
2012-07-20 20:42:34 +08:00
|
|
|
/*
|
|
|
|
* The cpu_state should be set to CPU_UP_PREPARE in kick_cpu(), otherwise
|
|
|
|
* the cpu_state is always CPU_DEAD after calling generic_set_cpu_dead(),
|
|
|
|
* which makes the delay in generic_cpu_die() not happen.
|
|
|
|
*/
|
|
|
|
void generic_set_cpu_up(unsigned int cpu)
|
|
|
|
{
|
|
|
|
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
|
|
|
|
}
|
|
|
|
|
2011-09-20 01:44:49 +08:00
|
|
|
int generic_check_cpu_restart(unsigned int cpu)
|
|
|
|
{
|
|
|
|
return per_cpu(cpu_state, cpu) == CPU_UP_PREPARE;
|
|
|
|
}
|
2012-10-15 09:15:41 +08:00
|
|
|
|
|
|
|
static atomic_t secondary_inhibit_count;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't allow secondary CPU threads to come online
|
|
|
|
*/
|
|
|
|
void inhibit_secondary_onlining(void)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* This makes secondary_inhibit_count stable during cpu
|
|
|
|
* online/offline operations.
|
|
|
|
*/
|
|
|
|
get_online_cpus();
|
|
|
|
|
|
|
|
atomic_inc(&secondary_inhibit_count);
|
|
|
|
put_online_cpus();
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(inhibit_secondary_onlining);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allow secondary CPU threads to come online again
|
|
|
|
*/
|
|
|
|
void uninhibit_secondary_onlining(void)
|
|
|
|
{
|
|
|
|
get_online_cpus();
|
|
|
|
atomic_dec(&secondary_inhibit_count);
|
|
|
|
put_online_cpus();
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(uninhibit_secondary_onlining);
|
|
|
|
|
|
|
|
static int secondaries_inhibited(void)
|
|
|
|
{
|
|
|
|
return atomic_read(&secondary_inhibit_count);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else /* HOTPLUG_CPU */
|
|
|
|
|
|
|
|
#define secondaries_inhibited() 0
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
|
|
|
|
2012-04-20 21:05:48 +08:00
|
|
|
static void cpu_idle_thread_init(unsigned int cpu, struct task_struct *idle)
|
2011-03-08 11:40:04 +08:00
|
|
|
{
|
2012-04-20 21:05:48 +08:00
|
|
|
struct thread_info *ti = task_thread_info(idle);
|
2011-03-08 11:40:04 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_PPC64
|
2012-04-20 21:05:48 +08:00
|
|
|
paca[cpu].__current = idle;
|
2011-03-08 11:40:04 +08:00
|
|
|
paca[cpu].kstack = (unsigned long)ti + THREAD_SIZE - STACK_FRAME_OVERHEAD;
|
|
|
|
#endif
|
|
|
|
ti->cpu = cpu;
|
2012-04-20 21:05:48 +08:00
|
|
|
secondary_ti = current_set[cpu] = ti;
|
2011-03-08 11:40:04 +08:00
|
|
|
}
|
|
|
|
|
2013-06-25 03:30:09 +08:00
|
|
|
int __cpu_up(unsigned int cpu, struct task_struct *tidle)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2011-03-08 11:40:04 +08:00
|
|
|
int rc, c;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-10-15 09:15:41 +08:00
|
|
|
/*
|
|
|
|
* Don't allow secondary threads to come online if inhibited
|
|
|
|
*/
|
|
|
|
if (threads_per_core > 1 && secondaries_inhibited() &&
|
|
|
|
cpu % threads_per_core != 0)
|
|
|
|
return -EBUSY;
|
|
|
|
|
2006-07-04 12:09:36 +08:00
|
|
|
if (smp_ops == NULL ||
|
|
|
|
(smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu)))
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2012-04-20 21:05:48 +08:00
|
|
|
cpu_idle_thread_init(cpu, tidle);
|
2011-05-18 07:57:11 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Make sure callin-map entry is 0 (can be leftover a CPU
|
|
|
|
* hotplug
|
|
|
|
*/
|
|
|
|
cpu_callin_map[cpu] = 0;
|
|
|
|
|
|
|
|
/* The information for processor bringup must
|
|
|
|
* be written out to main store before we release
|
|
|
|
* the processor.
|
|
|
|
*/
|
2005-05-01 23:58:47 +08:00
|
|
|
smp_mb();
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* wake up cpus */
|
|
|
|
DBG("smp: kicking cpu %d\n", cpu);
|
2011-04-12 05:46:19 +08:00
|
|
|
rc = smp_ops->kick_cpu(cpu);
|
|
|
|
if (rc) {
|
|
|
|
pr_err("smp: failed starting cpu %d (rc %d)\n", cpu, rc);
|
|
|
|
return rc;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* wait to see if the cpu made a callin (is actually up).
|
|
|
|
* use this value that I found through experimentation.
|
|
|
|
* -- Cort
|
|
|
|
*/
|
|
|
|
if (system_state < SYSTEM_RUNNING)
|
2006-06-18 06:52:44 +08:00
|
|
|
for (c = 50000; c && !cpu_callin_map[cpu]; c--)
|
2005-04-17 06:20:36 +08:00
|
|
|
udelay(100);
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
else
|
|
|
|
/*
|
|
|
|
* CPUs can take much longer to come up in the
|
|
|
|
* hotplug case. Wait five seconds.
|
|
|
|
*/
|
2009-06-24 07:26:37 +08:00
|
|
|
for (c = 5000; c && !cpu_callin_map[cpu]; c--)
|
|
|
|
msleep(1);
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if (!cpu_callin_map[cpu]) {
|
2010-08-05 02:28:34 +08:00
|
|
|
printk(KERN_ERR "Processor %u is stuck.\n", cpu);
|
2005-04-17 06:20:36 +08:00
|
|
|
return -ENOENT;
|
|
|
|
}
|
|
|
|
|
2010-08-05 02:28:34 +08:00
|
|
|
DBG("Processor %u found.\n", cpu);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (smp_ops->give_timebase)
|
|
|
|
smp_ops->give_timebase();
|
|
|
|
|
|
|
|
/* Wait until cpu puts itself in the online map */
|
|
|
|
while (!cpu_online(cpu))
|
|
|
|
cpu_relax();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-27 13:24:54 +08:00
|
|
|
/* Return the value of the reg property corresponding to the given
|
|
|
|
* logical cpu.
|
|
|
|
*/
|
|
|
|
int cpu_to_core_id(int cpu)
|
|
|
|
{
|
|
|
|
struct device_node *np;
|
|
|
|
const int *reg;
|
|
|
|
int id = -1;
|
|
|
|
|
|
|
|
np = of_get_cpu_node(cpu, NULL);
|
|
|
|
if (!np)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
reg = of_get_property(np, "reg", NULL);
|
|
|
|
if (!reg)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
id = *reg;
|
|
|
|
out:
|
|
|
|
of_node_put(np);
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
2010-10-06 16:36:59 +08:00
|
|
|
/* Helper routines for cpu to core mapping */
|
|
|
|
int cpu_core_index_of_thread(int cpu)
|
|
|
|
{
|
|
|
|
return cpu >> threads_shift;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(cpu_core_index_of_thread);
|
|
|
|
|
|
|
|
int cpu_first_thread_of_core(int core)
|
|
|
|
{
|
|
|
|
return core << threads_shift;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(cpu_first_thread_of_core);
|
|
|
|
|
2011-04-28 13:07:23 +08:00
|
|
|
/* Must be called when no change can occur to cpu_present_mask,
|
2008-07-27 13:24:53 +08:00
|
|
|
* i.e. during cpu online or offline.
|
|
|
|
*/
|
|
|
|
static struct device_node *cpu_to_l2cache(int cpu)
|
|
|
|
{
|
|
|
|
struct device_node *np;
|
2008-12-11 04:16:07 +08:00
|
|
|
struct device_node *cache;
|
2008-07-27 13:24:53 +08:00
|
|
|
|
|
|
|
if (!cpu_present(cpu))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
np = of_get_cpu_node(cpu, NULL);
|
|
|
|
if (np == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2008-12-11 04:16:07 +08:00
|
|
|
cache = of_find_next_cache_node(np);
|
|
|
|
|
2008-07-27 13:24:53 +08:00
|
|
|
of_node_put(np);
|
|
|
|
|
2008-12-11 04:16:07 +08:00
|
|
|
return cache;
|
2008-07-27 13:24:53 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Activate a secondary processor. */
|
2013-06-25 03:30:09 +08:00
|
|
|
void start_secondary(void *unused)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
unsigned int cpu = smp_processor_id();
|
2008-07-27 13:24:53 +08:00
|
|
|
struct device_node *l2_cache;
|
2008-07-27 13:24:52 +08:00
|
|
|
int i, base;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
atomic_inc(&init_mm.mm_count);
|
|
|
|
current->active_mm = &init_mm;
|
|
|
|
|
|
|
|
smp_store_cpu_info(cpu);
|
2005-11-05 07:33:55 +08:00
|
|
|
set_dec(tb_ticks_per_jiffy);
|
2005-11-10 07:45:30 +08:00
|
|
|
preempt_disable();
|
2005-04-17 06:20:36 +08:00
|
|
|
cpu_callin_map[cpu] = 1;
|
|
|
|
|
2009-09-09 01:38:52 +08:00
|
|
|
if (smp_ops->setup_cpu)
|
|
|
|
smp_ops->setup_cpu(cpu);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (smp_ops->take_timebase)
|
|
|
|
smp_ops->take_timebase();
|
|
|
|
|
2007-09-21 11:26:03 +08:00
|
|
|
secondary_cpu_time_init();
|
|
|
|
|
2011-03-08 11:49:33 +08:00
|
|
|
#ifdef CONFIG_PPC64
|
|
|
|
if (system_state == SYSTEM_RUNNING)
|
|
|
|
vdso_data->processorCount++;
|
2012-07-05 04:37:11 +08:00
|
|
|
|
|
|
|
vdso_getcpu_init();
|
2011-03-08 11:49:33 +08:00
|
|
|
#endif
|
2008-07-27 13:24:52 +08:00
|
|
|
/* Update sibling maps */
|
2010-10-06 16:36:59 +08:00
|
|
|
base = cpu_first_thread_sibling(cpu);
|
2008-07-27 13:24:52 +08:00
|
|
|
for (i = 0; i < threads_per_core; i++) {
|
powerpc: Set cpu sibling mask before online cpu
It seems following race is possible:
cpu0 cpux
smp_init->cpu_up->_cpu_up
__cpu_up
kick_cpu(1)
-------------------------------------------------------------------------
waiting online ...
... notify CPU_STARTING
set cpux active
set cpux online
-------------------------------------------------------------------------
finish waiting online
...
sched_init_smp
init_sched_domains(cpu_active_mask)
build_sched_domains
set cpux sibling info
-------------------------------------------------------------------------
Execution of cpu0 and cpux could be concurrent between two separator
lines.
So if the cpux sibling information was set too late (normally
impossible, but could be triggered by adding some delay in
start_secondary, after setting cpu online), build_sched_domains()
running on cpu0 might see cpux active, with an empty sibling mask, then
cause some bad address accessing like following:
[ 0.099855] Unable to handle kernel paging request for data at address 0xc00000038518078f
[ 0.099868] Faulting instruction address: 0xc0000000000b7a64
[ 0.099883] Oops: Kernel access of bad area, sig: 11 [#1]
[ 0.099895] PREEMPT SMP NR_CPUS=16 DEBUG_PAGEALLOC NUMA pSeries
[ 0.099922] Modules linked in:
[ 0.099940] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.0-rc1-00120-gb973425-dirty #16
[ 0.099956] task: c0000001fed80000 ti: c0000001fed7c000 task.ti: c0000001fed7c000
[ 0.099971] NIP: c0000000000b7a64 LR: c0000000000b7a40 CTR: c0000000000b4934
[ 0.099985] REGS: c0000001fed7f760 TRAP: 0300 Not tainted (3.10.0-rc1-00120-gb973425-dirty)
[ 0.099997] MSR: 8000000000009032 <SF,EE,ME,IR,DR,RI> CR: 24272828 XER: 20000003
[ 0.100045] SOFTE: 1
[ 0.100053] CFAR: c000000000445ee8
[ 0.100064] DAR: c00000038518078f, DSISR: 40000000
[ 0.100073]
GPR00: 0000000000000080 c0000001fed7f9e0 c000000000c84d48 0000000000000010
GPR04: 0000000000000010 0000000000000000 c0000001fc55e090 0000000000000000
GPR08: ffffffffffffffff c000000000b80b30 c000000000c962d8 00000003845ffc5f
GPR12: 0000000000000000 c00000000f33d000 c00000000000b9e4 0000000000000000
GPR16: 0000000000000000 0000000000000000 0000000000000001 0000000000000000
GPR20: c000000000ccf750 0000000000000000 c000000000c94d48 c0000001fc504000
GPR24: c0000001fc504000 c0000001fecef848 c000000000c94d48 c000000000ccf000
GPR28: c0000001fc522090 0000000000000010 c0000001fecef848 c0000001fed7fae0
[ 0.100293] NIP [c0000000000b7a64] .get_group+0x84/0xc4
[ 0.100307] LR [c0000000000b7a40] .get_group+0x60/0xc4
[ 0.100318] Call Trace:
[ 0.100332] [c0000001fed7f9e0] [c0000000000dbce4] .lock_is_held+0xa8/0xd0 (unreliable)
[ 0.100354] [c0000001fed7fa70] [c0000000000bf62c] .build_sched_domains+0x728/0xd14
[ 0.100375] [c0000001fed7fbe0] [c000000000af67bc] .sched_init_smp+0x4fc/0x654
[ 0.100394] [c0000001fed7fce0] [c000000000adce24] .kernel_init_freeable+0x17c/0x30c
[ 0.100413] [c0000001fed7fdb0] [c00000000000ba08] .kernel_init+0x24/0x12c
[ 0.100431] [c0000001fed7fe30] [c000000000009f74] .ret_from_kernel_thread+0x5c/0x68
[ 0.100445] Instruction dump:
[ 0.100456] 38800010 38a00000 4838e3f5 60000000 7c6307b4 2fbf0000 419e0040 3d220001
[ 0.100496] 78601f24 39491590 e93e0008 7d6a002a <7d69582a> f97f0000 7d4a002a e93e0010
[ 0.100559] ---[ end trace 31fd0ba7d8756001 ]---
This patch tries to move the sibling maps updating before
notify_cpu_starting() and cpu online, and a write barrier there to make
sure sibling maps are updated before active and online mask.
Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-05-16 18:20:26 +08:00
|
|
|
if (cpu_is_offline(base + i) && (cpu != base + i))
|
2008-07-27 13:24:52 +08:00
|
|
|
continue;
|
2010-04-26 23:32:41 +08:00
|
|
|
cpumask_set_cpu(cpu, cpu_sibling_mask(base + i));
|
|
|
|
cpumask_set_cpu(base + i, cpu_sibling_mask(cpu));
|
2008-07-27 13:24:53 +08:00
|
|
|
|
|
|
|
/* cpu_core_map should be a superset of
|
|
|
|
* cpu_sibling_map even if we don't have cache
|
|
|
|
* information, so update the former here, too.
|
|
|
|
*/
|
2010-04-26 23:32:41 +08:00
|
|
|
cpumask_set_cpu(cpu, cpu_core_mask(base + i));
|
|
|
|
cpumask_set_cpu(base + i, cpu_core_mask(cpu));
|
2008-07-27 13:24:52 +08:00
|
|
|
}
|
2008-07-27 13:24:53 +08:00
|
|
|
l2_cache = cpu_to_l2cache(cpu);
|
|
|
|
for_each_online_cpu(i) {
|
|
|
|
struct device_node *np = cpu_to_l2cache(i);
|
|
|
|
if (!np)
|
|
|
|
continue;
|
|
|
|
if (np == l2_cache) {
|
2010-04-26 23:32:41 +08:00
|
|
|
cpumask_set_cpu(cpu, cpu_core_mask(i));
|
|
|
|
cpumask_set_cpu(i, cpu_core_mask(cpu));
|
2008-07-27 13:24:53 +08:00
|
|
|
}
|
|
|
|
of_node_put(np);
|
|
|
|
}
|
|
|
|
of_node_put(l2_cache);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
powerpc: Set cpu sibling mask before online cpu
It seems following race is possible:
cpu0 cpux
smp_init->cpu_up->_cpu_up
__cpu_up
kick_cpu(1)
-------------------------------------------------------------------------
waiting online ...
... notify CPU_STARTING
set cpux active
set cpux online
-------------------------------------------------------------------------
finish waiting online
...
sched_init_smp
init_sched_domains(cpu_active_mask)
build_sched_domains
set cpux sibling info
-------------------------------------------------------------------------
Execution of cpu0 and cpux could be concurrent between two separator
lines.
So if the cpux sibling information was set too late (normally
impossible, but could be triggered by adding some delay in
start_secondary, after setting cpu online), build_sched_domains()
running on cpu0 might see cpux active, with an empty sibling mask, then
cause some bad address accessing like following:
[ 0.099855] Unable to handle kernel paging request for data at address 0xc00000038518078f
[ 0.099868] Faulting instruction address: 0xc0000000000b7a64
[ 0.099883] Oops: Kernel access of bad area, sig: 11 [#1]
[ 0.099895] PREEMPT SMP NR_CPUS=16 DEBUG_PAGEALLOC NUMA pSeries
[ 0.099922] Modules linked in:
[ 0.099940] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.10.0-rc1-00120-gb973425-dirty #16
[ 0.099956] task: c0000001fed80000 ti: c0000001fed7c000 task.ti: c0000001fed7c000
[ 0.099971] NIP: c0000000000b7a64 LR: c0000000000b7a40 CTR: c0000000000b4934
[ 0.099985] REGS: c0000001fed7f760 TRAP: 0300 Not tainted (3.10.0-rc1-00120-gb973425-dirty)
[ 0.099997] MSR: 8000000000009032 <SF,EE,ME,IR,DR,RI> CR: 24272828 XER: 20000003
[ 0.100045] SOFTE: 1
[ 0.100053] CFAR: c000000000445ee8
[ 0.100064] DAR: c00000038518078f, DSISR: 40000000
[ 0.100073]
GPR00: 0000000000000080 c0000001fed7f9e0 c000000000c84d48 0000000000000010
GPR04: 0000000000000010 0000000000000000 c0000001fc55e090 0000000000000000
GPR08: ffffffffffffffff c000000000b80b30 c000000000c962d8 00000003845ffc5f
GPR12: 0000000000000000 c00000000f33d000 c00000000000b9e4 0000000000000000
GPR16: 0000000000000000 0000000000000000 0000000000000001 0000000000000000
GPR20: c000000000ccf750 0000000000000000 c000000000c94d48 c0000001fc504000
GPR24: c0000001fc504000 c0000001fecef848 c000000000c94d48 c000000000ccf000
GPR28: c0000001fc522090 0000000000000010 c0000001fecef848 c0000001fed7fae0
[ 0.100293] NIP [c0000000000b7a64] .get_group+0x84/0xc4
[ 0.100307] LR [c0000000000b7a40] .get_group+0x60/0xc4
[ 0.100318] Call Trace:
[ 0.100332] [c0000001fed7f9e0] [c0000000000dbce4] .lock_is_held+0xa8/0xd0 (unreliable)
[ 0.100354] [c0000001fed7fa70] [c0000000000bf62c] .build_sched_domains+0x728/0xd14
[ 0.100375] [c0000001fed7fbe0] [c000000000af67bc] .sched_init_smp+0x4fc/0x654
[ 0.100394] [c0000001fed7fce0] [c000000000adce24] .kernel_init_freeable+0x17c/0x30c
[ 0.100413] [c0000001fed7fdb0] [c00000000000ba08] .kernel_init+0x24/0x12c
[ 0.100431] [c0000001fed7fe30] [c000000000009f74] .ret_from_kernel_thread+0x5c/0x68
[ 0.100445] Instruction dump:
[ 0.100456] 38800010 38a00000 4838e3f5 60000000 7c6307b4 2fbf0000 419e0040 3d220001
[ 0.100496] 78601f24 39491590 e93e0008 7d6a002a <7d69582a> f97f0000 7d4a002a e93e0010
[ 0.100559] ---[ end trace 31fd0ba7d8756001 ]---
This patch tries to move the sibling maps updating before
notify_cpu_starting() and cpu online, and a write barrier there to make
sure sibling maps are updated before active and online mask.
Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2013-05-16 18:20:26 +08:00
|
|
|
smp_wmb();
|
|
|
|
notify_cpu_starting(cpu);
|
|
|
|
set_cpu_online(cpu, true);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
local_irq_enable();
|
|
|
|
|
2013-03-22 05:49:56 +08:00
|
|
|
cpu_startup_entry(CPUHP_ONLINE);
|
2011-02-10 15:45:24 +08:00
|
|
|
|
|
|
|
BUG();
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int setup_profiling_timer(unsigned int multiplier)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init smp_cpus_done(unsigned int max_cpus)
|
|
|
|
{
|
2010-04-26 23:32:34 +08:00
|
|
|
cpumask_var_t old_mask;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* We want the setup_cpu() here to be called from CPU 0, but our
|
|
|
|
* init thread may have been "borrowed" by another CPU in the meantime
|
|
|
|
* se we pin us down to CPU 0 for a short while
|
|
|
|
*/
|
2010-04-26 23:32:34 +08:00
|
|
|
alloc_cpumask_var(&old_mask, GFP_NOWAIT);
|
2011-04-28 13:07:23 +08:00
|
|
|
cpumask_copy(old_mask, tsk_cpus_allowed(current));
|
2010-03-26 20:03:29 +08:00
|
|
|
set_cpus_allowed_ptr(current, cpumask_of(boot_cpuid));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-09-09 01:38:52 +08:00
|
|
|
if (smp_ops && smp_ops->setup_cpu)
|
2006-07-04 12:09:36 +08:00
|
|
|
smp_ops->setup_cpu(boot_cpuid);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-04-26 23:32:34 +08:00
|
|
|
set_cpus_allowed_ptr(current, old_mask);
|
|
|
|
|
|
|
|
free_cpumask_var(old_mask);
|
2005-12-13 03:56:47 +08:00
|
|
|
|
2011-03-08 10:50:37 +08:00
|
|
|
if (smp_ops && smp_ops->bringup_done)
|
|
|
|
smp_ops->bringup_done();
|
|
|
|
|
2005-12-13 03:56:47 +08:00
|
|
|
dump_numa_cpu_topology();
|
2011-03-08 10:50:37 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2010-08-11 04:02:05 +08:00
|
|
|
int arch_sd_sibling_asym_packing(void)
|
|
|
|
{
|
|
|
|
if (cpu_has_feature(CPU_FTR_ASYM_SMT)) {
|
|
|
|
printk_once(KERN_INFO "Enabling Asymmetric SMT scheduling\n");
|
|
|
|
return SD_ASYM_PACKING;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
int __cpu_disable(void)
|
|
|
|
{
|
2008-07-27 13:24:53 +08:00
|
|
|
struct device_node *l2_cache;
|
2008-07-27 13:24:52 +08:00
|
|
|
int cpu = smp_processor_id();
|
|
|
|
int base, i;
|
|
|
|
int err;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-07-27 13:24:52 +08:00
|
|
|
if (!smp_ops->cpu_disable)
|
|
|
|
return -ENOSYS;
|
|
|
|
|
|
|
|
err = smp_ops->cpu_disable();
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/* Update sibling maps */
|
2010-10-06 16:36:59 +08:00
|
|
|
base = cpu_first_thread_sibling(cpu);
|
2008-07-27 13:24:52 +08:00
|
|
|
for (i = 0; i < threads_per_core; i++) {
|
2010-04-26 23:32:41 +08:00
|
|
|
cpumask_clear_cpu(cpu, cpu_sibling_mask(base + i));
|
|
|
|
cpumask_clear_cpu(base + i, cpu_sibling_mask(cpu));
|
|
|
|
cpumask_clear_cpu(cpu, cpu_core_mask(base + i));
|
|
|
|
cpumask_clear_cpu(base + i, cpu_core_mask(cpu));
|
2008-07-27 13:24:53 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
l2_cache = cpu_to_l2cache(cpu);
|
|
|
|
for_each_present_cpu(i) {
|
|
|
|
struct device_node *np = cpu_to_l2cache(i);
|
|
|
|
if (!np)
|
|
|
|
continue;
|
|
|
|
if (np == l2_cache) {
|
2010-04-26 23:32:41 +08:00
|
|
|
cpumask_clear_cpu(cpu, cpu_core_mask(i));
|
|
|
|
cpumask_clear_cpu(i, cpu_core_mask(cpu));
|
2008-07-27 13:24:53 +08:00
|
|
|
}
|
|
|
|
of_node_put(np);
|
2008-07-27 13:24:52 +08:00
|
|
|
}
|
2008-07-27 13:24:53 +08:00
|
|
|
of_node_put(l2_cache);
|
|
|
|
|
2008-07-27 13:24:52 +08:00
|
|
|
|
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void __cpu_die(unsigned int cpu)
|
|
|
|
{
|
|
|
|
if (smp_ops->cpu_die)
|
|
|
|
smp_ops->cpu_die(cpu);
|
|
|
|
}
|
2010-01-14 17:52:44 +08:00
|
|
|
|
|
|
|
static DEFINE_MUTEX(powerpc_cpu_hotplug_driver_mutex);
|
|
|
|
|
|
|
|
void cpu_hotplug_driver_lock()
|
|
|
|
{
|
|
|
|
mutex_lock(&powerpc_cpu_hotplug_driver_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
void cpu_hotplug_driver_unlock()
|
|
|
|
{
|
|
|
|
mutex_unlock(&powerpc_cpu_hotplug_driver_mutex);
|
|
|
|
}
|
2010-05-19 10:56:29 +08:00
|
|
|
|
|
|
|
void cpu_die(void)
|
|
|
|
{
|
|
|
|
if (ppc_md.cpu_die)
|
|
|
|
ppc_md.cpu_die();
|
2011-02-10 15:45:24 +08:00
|
|
|
|
|
|
|
/* If we return, we re-enter start_secondary */
|
|
|
|
start_secondary_resume();
|
2010-05-19 10:56:29 +08:00
|
|
|
}
|
2011-02-10 15:45:24 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|