* [patch V2 18/67] powerpc/perf: Convert book3s notifier to state machine callbacks
[not found] <20160713153219.128052238@linutronix.de>
@ 2016-07-13 17:16 ` Anna-Maria Gleixner
2016-07-13 17:16 ` [patch V2 30/67] powerpc/numa: Convert to hotplug state machine Anna-Maria Gleixner
1 sibling, 0 replies; 9+ messages in thread
From: Anna-Maria Gleixner @ 2016-07-13 17:16 UTC (permalink / raw)
To: LKML
Cc: Peter Zijlstra, Ingo Molnar, Thomas Gleixner, rt,
Sebastian Andrzej Siewior, Anshuman Khandual,
Benjamin Herrenschmidt, Linus Torvalds, Madhavan Srinivasan,
Michael Ellerman, Paul Mackerras, Sukadev Bhattiprolu,
linuxppc-dev, Anna-Maria Gleixner
From: Thomas Gleixner <tglx@linutronix.de>
Install the callbacks via the state machine and let the core invoke
the callbacks on the already online CPUs.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
---
arch/powerpc/perf/core-book3s.c | 30 +++++++-----------------------
include/linux/cpuhotplug.h | 1 +
2 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 97a1d40..ffd61d5 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -2158,31 +2158,15 @@ static void perf_event_interrupt(struct pt_regs *regs)
irq_exit();
}
-static void power_pmu_setup(int cpu)
+int power_pmu_prepare_cpu(unsigned int cpu)
{
struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu);
- if (!ppmu)
- return;
- memset(cpuhw, 0, sizeof(*cpuhw));
- cpuhw->mmcr[0] = MMCR0_FC;
-}
-
-static int
-power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
-{
- unsigned int cpu = (long)hcpu;
-
- switch (action & ~CPU_TASKS_FROZEN) {
- case CPU_UP_PREPARE:
- power_pmu_setup(cpu);
- break;
-
- default:
- break;
+ if (ppmu) {
+ memset(cpuhw, 0, sizeof(*cpuhw));
+ cpuhw->mmcr[0] = MMCR0_FC;
}
-
- return NOTIFY_OK;
+ return 0;
}
int register_power_pmu(struct power_pmu *pmu)
@@ -2205,7 +2189,7 @@ int register_power_pmu(struct power_pmu *pmu)
#endif /* CONFIG_PPC64 */
perf_pmu_register(&power_pmu, "cpu", PERF_TYPE_RAW);
- perf_cpu_notifier(power_pmu_notifier);
-
+ cpuhp_setup_state(CPUHP_PERF_POWER, "PERF_POWER",
+ power_pmu_prepare_cpu, NULL);
return 0;
}
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index d54973e..b265e99 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -10,6 +10,7 @@ enum cpuhp_state {
CPUHP_PERF_X86_AMD_UNCORE_PREP,
CPUHP_PERF_X86_RAPL_PREP,
CPUHP_PERF_BFIN,
+ CPUHP_PERF_POWER,
CPUHP_NOTIFY_PREPARE,
CPUHP_BRINGUP_CPU,
CPUHP_AP_IDLE_DEAD,
--
2.8.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [patch V2 30/67] powerpc/numa: Convert to hotplug state machine
[not found] <20160713153219.128052238@linutronix.de>
2016-07-13 17:16 ` [patch V2 18/67] powerpc/perf: Convert book3s notifier to state machine callbacks Anna-Maria Gleixner
@ 2016-07-13 17:16 ` Anna-Maria Gleixner
2016-07-14 21:42 ` Anton Blanchard
1 sibling, 1 reply; 9+ messages in thread
From: Anna-Maria Gleixner @ 2016-07-13 17:16 UTC (permalink / raw)
To: LKML
Cc: Peter Zijlstra, Ingo Molnar, Thomas Gleixner, rt,
Sebastian Andrzej Siewior, Andrew Morton, Benjamin Herrenschmidt,
Bharata B Rao, Christophe Jaillet, Linus Torvalds,
Michael Ellerman, Nikunj A Dadhania, Paul Mackerras,
Raghavendra K T, linuxppc-dev, Anna-Maria Gleixner
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Install the callbacks via the state machine and let the core invoke
the callbacks on the already online CPUs.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Bharata B Rao <bharata@linux.vnet.ibm.com>
Cc: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
---
arch/powerpc/mm/numa.c | 46 ++++++++++++++++------------------------------
include/linux/cpuhotplug.h | 1 +
2 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 669a15e..d48ac48 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -581,30 +581,22 @@ static void verify_cpu_node_mapping(int cpu, int node)
}
}
-static int cpu_numa_callback(struct notifier_block *nfb, unsigned long action,
- void *hcpu)
+/* Must run before sched domains notifier. */
+static int ppc_numa_cpu_prepare(unsigned int cpu)
{
- unsigned long lcpu = (unsigned long)hcpu;
- int ret = NOTIFY_DONE, nid;
+ int nid;
- switch (action) {
- case CPU_UP_PREPARE:
- case CPU_UP_PREPARE_FROZEN:
- nid = numa_setup_cpu(lcpu);
- verify_cpu_node_mapping((int)lcpu, nid);
- ret = NOTIFY_OK;
- break;
+ nid = numa_setup_cpu(cpu);
+ verify_cpu_node_mapping(cpu, nid);
+ return 0;
+}
+
+static int ppc_numa_cpu_dead(unsigned int cpu)
+{
#ifdef CONFIG_HOTPLUG_CPU
- case CPU_DEAD:
- case CPU_DEAD_FROZEN:
- case CPU_UP_CANCELED:
- case CPU_UP_CANCELED_FROZEN:
- unmap_cpu_from_node(lcpu);
- ret = NOTIFY_OK;
- break;
+ unmap_cpu_from_node(cpu);
#endif
- }
- return ret;
+ return 0;
}
/*
@@ -913,11 +905,6 @@ static void __init dump_numa_memory_topology(void)
}
}
-static struct notifier_block ppc64_numa_nb = {
- .notifier_call = cpu_numa_callback,
- .priority = 1 /* Must run before sched domains notifier. */
-};
-
/* Initialize NODE_DATA for a node on the local memory */
static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)
{
@@ -953,7 +940,7 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)
void __init initmem_init(void)
{
- int nid, cpu;
+ int nid;
max_low_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;
max_pfn = max_low_pfn;
@@ -985,15 +972,14 @@ void __init initmem_init(void)
setup_node_to_cpumask_map();
reset_numa_cpu_lookup_table();
- register_cpu_notifier(&ppc64_numa_nb);
+
/*
* We need the numa_cpu_lookup_table to be accurate for all CPUs,
* even before we online them, so that we can use cpu_to_{node,mem}
* early in boot, cf. smp_prepare_cpus().
*/
- for_each_present_cpu(cpu) {
- numa_setup_cpu((unsigned long)cpu);
- }
+ cpuhp_setup_state(CPUHP_POWER_NUMA_PREPARE, "POWER_NUMA_PREPARE",
+ ppc_numa_cpu_prepare, ppc_numa_cpu_dead);
}
static int __init early_numa(char *p)
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index 7449081..01133ec 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -14,6 +14,7 @@ enum cpuhp_state {
CPUHP_PERF_SUPERH,
CPUHP_X86_HPET_DEAD,
CPUHP_WORKQUEUE_PREP,
+ CPUHP_POWER_NUMA_PREPARE,
CPUHP_NOTIFY_PREPARE,
CPUHP_BRINGUP_CPU,
CPUHP_AP_IDLE_DEAD,
--
2.8.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [patch V2 30/67] powerpc/numa: Convert to hotplug state machine
2016-07-13 17:16 ` [patch V2 30/67] powerpc/numa: Convert to hotplug state machine Anna-Maria Gleixner
@ 2016-07-14 21:42 ` Anton Blanchard
2016-07-14 23:37 ` Anna-Maria Gleixner
0 siblings, 1 reply; 9+ messages in thread
From: Anton Blanchard @ 2016-07-14 21:42 UTC (permalink / raw)
To: Anna-Maria Gleixner
Cc: LKML, Peter Zijlstra, Ingo Molnar, Thomas Gleixner, rt,
Sebastian Andrzej Siewior, Andrew Morton, Benjamin Herrenschmidt,
Bharata B Rao, Christophe Jaillet, Linus Torvalds,
Michael Ellerman, Nikunj A Dadhania, Paul Mackerras,
Raghavendra K T, linuxppc-dev
Hi,
> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>
> Install the callbacks via the state machine and let the core invoke
> the callbacks on the already online CPUs.
This is causing an oops on ppc64le QEMU, looks like a NULL pointer:
percpu: Embedded 3 pages/cpu @c00000001fe00000 s145816 r0 d50792 u1048576
Unable to handle kernel paging request for data at address 0x00001e08
Faulting instruction address: 0xc0000000001e6b78
Oops: Kernel access of bad area, sig: 11 [#1]
SMP NR_CPUS=2048 NUMA pSeries
Modules linked in:
CPU: 0 PID: 0 Comm: swapper Not tainted 4.7.0-rc7-00198-g425209e #14
task: c000000000d82a00 ti: c000000000dc4000 task.ti: c000000000dc4000
NIP: c0000000001e6b78 LR: c0000000001e6df4 CTR: 0000000000000000
REGS: c000000000dc7b60 TRAP: 0300 Not tainted (4.7.0-rc7-00198-g425209e)
MSR: 8000000002001033 <SF,VEC,ME,IR,DR,RI,LE> CR: 44000220 XER: 00000000
CFAR: 0000000000008468 DAR: 0000000000001e08 DSISR: 40000000 SOFTE: 0
GPR00: 0000000000000006 c000000000dc7de0 c000000000dc6c00 0000000000000000
GPR04: 0000000000000000 0000000000000000 c00000001fe1fb70 0000000000000010
GPR08: c000000000dfe918 c000000000e50dd0 c000000000e56c00 0000000000000001
GPR12: 0000000000000000 c00000000fe00000 0000000000000060 0000000000f1d618
GPR16: 0000000000efccd8 0000000000efcb20 fffffffffffffffd 0000000000000000
GPR20: 000000001f150000 c000000000dfa8e0 c000000000ccfafc c000000000dfeb18
GPR24: c000000000dfee34 c000000000ccfaf8 0000000000000000 0000000000000001
GPR28: c000000000ebad20 c000000000ccfb00 0000000000000000 c00000001fe1fb00
NIP [c0000000001e6b78] local_memory_node+0x18/0x80
LR [c0000000001e6df4] __build_all_zonelists+0x214/0x2d0
Call Trace:
[c000000000dc7de0] [c0000000001e6ccc] __build_all_zonelists+0xec/0x2d0 (unreliable)
[c000000000dc7e70] [c000000000c39fbc] build_all_zonelists_init+0x1c/0x3c
[c000000000dc7e90] [c000000000282acc] build_all_zonelists+0x17c/0x18c
[c000000000dc7f00] [c000000000c13c54] start_kernel+0x18c/0x514
[c000000000dc7f90] [c000000000008c60] start_here_common+0x20/0xa0
Instruction dump:
38810178 7f63db78 48769171 60000000 4bfffd2c 60420000 3c4c00be 384200a0
3d420009 78631f24 392aa1d0 7c69182a <81231e08> 38631e00 2b890002 419d001c
Anton
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Bharata B Rao <bharata@linux.vnet.ibm.com>
> Cc: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
> ---
> arch/powerpc/mm/numa.c | 46
> ++++++++++++++++------------------------------
> include/linux/cpuhotplug.h | 1 + 2 files changed, 17 insertions(+),
> 30 deletions(-)
>
> diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
> index 669a15e..d48ac48 100644
> --- a/arch/powerpc/mm/numa.c
> +++ b/arch/powerpc/mm/numa.c
> @@ -581,30 +581,22 @@ static void verify_cpu_node_mapping(int cpu,
> int node) }
> }
>
> -static int cpu_numa_callback(struct notifier_block *nfb, unsigned
> long action,
> - void *hcpu)
> +/* Must run before sched domains notifier. */
> +static int ppc_numa_cpu_prepare(unsigned int cpu)
> {
> - unsigned long lcpu = (unsigned long)hcpu;
> - int ret = NOTIFY_DONE, nid;
> + int nid;
>
> - switch (action) {
> - case CPU_UP_PREPARE:
> - case CPU_UP_PREPARE_FROZEN:
> - nid = numa_setup_cpu(lcpu);
> - verify_cpu_node_mapping((int)lcpu, nid);
> - ret = NOTIFY_OK;
> - break;
> + nid = numa_setup_cpu(cpu);
> + verify_cpu_node_mapping(cpu, nid);
> + return 0;
> +}
> +
> +static int ppc_numa_cpu_dead(unsigned int cpu)
> +{
> #ifdef CONFIG_HOTPLUG_CPU
> - case CPU_DEAD:
> - case CPU_DEAD_FROZEN:
> - case CPU_UP_CANCELED:
> - case CPU_UP_CANCELED_FROZEN:
> - unmap_cpu_from_node(lcpu);
> - ret = NOTIFY_OK;
> - break;
> + unmap_cpu_from_node(cpu);
> #endif
> - }
> - return ret;
> + return 0;
> }
>
> /*
> @@ -913,11 +905,6 @@ static void __init
> dump_numa_memory_topology(void) }
> }
>
> -static struct notifier_block ppc64_numa_nb = {
> - .notifier_call = cpu_numa_callback,
> - .priority = 1 /* Must run before sched domains notifier. */
> -};
> -
> /* Initialize NODE_DATA for a node on the local memory */
> static void __init setup_node_data(int nid, u64 start_pfn, u64
> end_pfn) {
> @@ -953,7 +940,7 @@ static void __init setup_node_data(int nid, u64
> start_pfn, u64 end_pfn)
> void __init initmem_init(void)
> {
> - int nid, cpu;
> + int nid;
>
> max_low_pfn = memblock_end_of_DRAM() >> PAGE_SHIFT;
> max_pfn = max_low_pfn;
> @@ -985,15 +972,14 @@ void __init initmem_init(void)
> setup_node_to_cpumask_map();
>
> reset_numa_cpu_lookup_table();
> - register_cpu_notifier(&ppc64_numa_nb);
> +
> /*
> * We need the numa_cpu_lookup_table to be accurate for all
> CPUs,
> * even before we online them, so that we can use
> cpu_to_{node,mem}
> * early in boot, cf. smp_prepare_cpus().
> */
> - for_each_present_cpu(cpu) {
> - numa_setup_cpu((unsigned long)cpu);
> - }
> + cpuhp_setup_state(CPUHP_POWER_NUMA_PREPARE,
> "POWER_NUMA_PREPARE",
> + ppc_numa_cpu_prepare, ppc_numa_cpu_dead);
> }
>
> static int __init early_numa(char *p)
> diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
> index 7449081..01133ec 100644
> --- a/include/linux/cpuhotplug.h
> +++ b/include/linux/cpuhotplug.h
> @@ -14,6 +14,7 @@ enum cpuhp_state {
> CPUHP_PERF_SUPERH,
> CPUHP_X86_HPET_DEAD,
> CPUHP_WORKQUEUE_PREP,
> + CPUHP_POWER_NUMA_PREPARE,
> CPUHP_NOTIFY_PREPARE,
> CPUHP_BRINGUP_CPU,
> CPUHP_AP_IDLE_DEAD,
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [patch V2 30/67] powerpc/numa: Convert to hotplug state machine
2016-07-14 21:42 ` Anton Blanchard
@ 2016-07-14 23:37 ` Anna-Maria Gleixner
2016-07-15 0:28 ` Anton Blanchard
0 siblings, 1 reply; 9+ messages in thread
From: Anna-Maria Gleixner @ 2016-07-14 23:37 UTC (permalink / raw)
To: Anton Blanchard
Cc: LKML, Peter Zijlstra, Ingo Molnar, Thomas Gleixner, rt,
Sebastian Andrzej Siewior, Andrew Morton, Benjamin Herrenschmidt,
Bharata B Rao, Christophe Jaillet, Linus Torvalds,
Michael Ellerman, Nikunj A Dadhania, Paul Mackerras,
Raghavendra K T, linuxppc-dev
Hi,
On 2016-07-14 23:42, Anton Blanchard wrote:
> Hi,
>
>> From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
>>
>> Install the callbacks via the state machine and let the core invoke
>> the callbacks on the already online CPUs.
>
> This is causing an oops on ppc64le QEMU, looks like a NULL pointer:
Did you tested it against tip WIP.hotplug?
Regards,
Anna-Maria
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [patch V2 30/67] powerpc/numa: Convert to hotplug state machine
2016-07-14 23:37 ` Anna-Maria Gleixner
@ 2016-07-15 0:28 ` Anton Blanchard
2016-07-15 8:43 ` Ingo Molnar
2016-07-15 16:20 ` Sebastian Andrzej Siewior
0 siblings, 2 replies; 9+ messages in thread
From: Anton Blanchard @ 2016-07-15 0:28 UTC (permalink / raw)
To: Anna-Maria Gleixner
Cc: LKML, Peter Zijlstra, Ingo Molnar, Thomas Gleixner, rt,
Sebastian Andrzej Siewior, Andrew Morton, Benjamin Herrenschmidt,
Bharata B Rao, Christophe Jaillet, Linus Torvalds,
Michael Ellerman, Nikunj A Dadhania, Paul Mackerras,
Raghavendra K T, linuxppc-dev
Hi Anna-Maria,
> >> Install the callbacks via the state machine and let the core invoke
> >> the callbacks on the already online CPUs.
> >
> > This is causing an oops on ppc64le QEMU, looks like a NULL
> > pointer:
>
> Did you tested it against tip WIP.hotplug?
I noticed tip started failing in my CI environment which tests on QEMU.
The failure bisected to commit 425209e0abaf2c6e3a90ce4fedb935c10652bf80
It reproduces running ppc64le QEMU on a x86-64 box. On Ubuntu:
sudo apt-get install qemu-system-ppc gcc-powerpc64le-linux-gnu
make ARCH=powerpc pseries_le_defconfig
make ARCH=powerpc CROSS_COMPILE=powerpc64le-linux-gnu- vmlinux -j4
qemu-system-ppc64 -nographic -vga none -kernel vmlinux
Anton
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [patch V2 30/67] powerpc/numa: Convert to hotplug state machine
2016-07-15 0:28 ` Anton Blanchard
@ 2016-07-15 8:43 ` Ingo Molnar
2016-07-15 12:14 ` Anton Blanchard
2016-07-15 16:20 ` Sebastian Andrzej Siewior
1 sibling, 1 reply; 9+ messages in thread
From: Ingo Molnar @ 2016-07-15 8:43 UTC (permalink / raw)
To: Anton Blanchard
Cc: Anna-Maria Gleixner, LKML, Peter Zijlstra, Thomas Gleixner, rt,
Sebastian Andrzej Siewior, Andrew Morton, Benjamin Herrenschmidt,
Bharata B Rao, Christophe Jaillet, Linus Torvalds,
Michael Ellerman, Nikunj A Dadhania, Paul Mackerras,
Raghavendra K T, linuxppc-dev
* Anton Blanchard <anton@samba.org> wrote:
> Hi Anna-Maria,
>
> > >> Install the callbacks via the state machine and let the core invoke
> > >> the callbacks on the already online CPUs.
> > >
> > > This is causing an oops on ppc64le QEMU, looks like a NULL
> > > pointer:
> >
> > Did you tested it against tip WIP.hotplug?
>
> I noticed tip started failing in my CI environment which tests on QEMU.
> The failure bisected to commit 425209e0abaf2c6e3a90ce4fedb935c10652bf80
That's very useful, thanks Anton!
I have removed this commit from the series for the time being, refactored the
followup commits (there was one trivial conflict). We can re-try this patch when a
fix is found.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [patch V2 30/67] powerpc/numa: Convert to hotplug state machine
2016-07-15 8:43 ` Ingo Molnar
@ 2016-07-15 12:14 ` Anton Blanchard
0 siblings, 0 replies; 9+ messages in thread
From: Anton Blanchard @ 2016-07-15 12:14 UTC (permalink / raw)
To: Ingo Molnar
Cc: Anna-Maria Gleixner, LKML, Peter Zijlstra, Thomas Gleixner, rt,
Sebastian Andrzej Siewior, Andrew Morton, Benjamin Herrenschmidt,
Bharata B Rao, Christophe Jaillet, Linus Torvalds,
Michael Ellerman, Nikunj A Dadhania, Paul Mackerras,
Raghavendra K T, linuxppc-dev
> > I noticed tip started failing in my CI environment which tests on
> > QEMU. The failure bisected to commit
> > 425209e0abaf2c6e3a90ce4fedb935c10652bf80
>
> That's very useful, thanks Anton!
>
> I have removed this commit from the series for the time being,
> refactored the followup commits (there was one trivial conflict). We
> can re-try this patch when a fix is found.
Thanks Ingo, my tests are passing again after your last push.
Anton
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [patch V2 30/67] powerpc/numa: Convert to hotplug state machine
2016-07-15 0:28 ` Anton Blanchard
2016-07-15 8:43 ` Ingo Molnar
@ 2016-07-15 16:20 ` Sebastian Andrzej Siewior
2016-07-18 14:07 ` [PATCH v2] " Sebastian Andrzej Siewior
1 sibling, 1 reply; 9+ messages in thread
From: Sebastian Andrzej Siewior @ 2016-07-15 16:20 UTC (permalink / raw)
To: Anton Blanchard
Cc: Anna-Maria Gleixner, LKML, Peter Zijlstra, Ingo Molnar,
Thomas Gleixner, rt, Andrew Morton, Benjamin Herrenschmidt,
Bharata B Rao, Christophe Jaillet, Linus Torvalds,
Michael Ellerman, Nikunj A Dadhania, Paul Mackerras,
Raghavendra K T, linuxppc-dev
* Anton Blanchard | 2016-07-15 10:28:25 [+1000]:
>Hi Anna-Maria,
Hi Anton,
>> >> Install the callbacks via the state machine and let the core invoke
>> >> the callbacks on the already online CPUs. =20
>> >
>> > This is causing an oops on ppc64le QEMU, looks like a NULL
>> > pointer: =20
>>=20
>> Did you tested it against tip WIP.hotplug?
>
>I noticed tip started failing in my CI environment which tests on QEMU.
>The failure bisected to commit 425209e0abaf2c6e3a90ce4fedb935c10652bf80
>
>It reproduces running ppc64le QEMU on a x86-64 box. On Ubuntu:
=E2=80=A6
Thanks for that. I can reproduce this ontop of latest WIP.hotplug with
this patch.
>Anton
Sebastian
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] powerpc/numa: Convert to hotplug state machine
2016-07-15 16:20 ` Sebastian Andrzej Siewior
@ 2016-07-18 14:07 ` Sebastian Andrzej Siewior
0 siblings, 0 replies; 9+ messages in thread
From: Sebastian Andrzej Siewior @ 2016-07-18 14:07 UTC (permalink / raw)
To: Anton Blanchard, Ingo Molnar, tglx
Cc: linuxppc-dev, Andrew Morton, Nikunj A Dadhania, Peter Zijlstra,
Benjamin Herrenschmidt, Michael Ellerman, Raghavendra K T, LKML,
Linus Torvalds, Christophe Jaillet, rt, Bharata B Rao,
Paul Mackerras, Anna-Maria Gleixner
Install the callbacks via the state machine and let the core invoke
the callbacks on the already online CPUs.
v1=E2=80=A6v2: manual callback invocation on boot-CPU (cpuhp is not up yet =
and
we need them all before additional CPUs are up).
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Bharata B Rao <bharata@linux.vnet.ibm.com>
Cc: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
---
arch/powerpc/mm/numa.c | 48 ++++++++++++++++++------------------------=
----
include/linux/cpuhotplug.h | 1 +
2 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 669a15e7fa76..6dc07ddbfd04 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -581,30 +581,22 @@ static void verify_cpu_node_mapping(int cpu, int node)
}
}
=20
-static int cpu_numa_callback(struct notifier_block *nfb, unsigned long act=
ion,
- void *hcpu)
+/* Must run before sched domains notifier. */
+static int ppc_numa_cpu_prepare(unsigned int cpu)
{
- unsigned long lcpu =3D (unsigned long)hcpu;
- int ret =3D NOTIFY_DONE, nid;
+ int nid;
=20
- switch (action) {
- case CPU_UP_PREPARE:
- case CPU_UP_PREPARE_FROZEN:
- nid =3D numa_setup_cpu(lcpu);
- verify_cpu_node_mapping((int)lcpu, nid);
- ret =3D NOTIFY_OK;
- break;
+ nid =3D numa_setup_cpu(cpu);
+ verify_cpu_node_mapping(cpu, nid);
+ return 0;
+}
+
+static int ppc_numa_cpu_dead(unsigned int cpu)
+{
#ifdef CONFIG_HOTPLUG_CPU
- case CPU_DEAD:
- case CPU_DEAD_FROZEN:
- case CPU_UP_CANCELED:
- case CPU_UP_CANCELED_FROZEN:
- unmap_cpu_from_node(lcpu);
- ret =3D NOTIFY_OK;
- break;
+ unmap_cpu_from_node(cpu);
#endif
- }
- return ret;
+ return 0;
}
=20
/*
@@ -913,11 +905,6 @@ static void __init dump_numa_memory_topology(void)
}
}
=20
-static struct notifier_block ppc64_numa_nb =3D {
- .notifier_call =3D cpu_numa_callback,
- .priority =3D 1 /* Must run before sched domains notifier. */
-};
-
/* Initialize NODE_DATA for a node on the local memory */
static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)
{
@@ -985,15 +972,18 @@ void __init initmem_init(void)
setup_node_to_cpumask_map();
=20
reset_numa_cpu_lookup_table();
- register_cpu_notifier(&ppc64_numa_nb);
+
/*
* We need the numa_cpu_lookup_table to be accurate for all CPUs,
* even before we online them, so that we can use cpu_to_{node,mem}
* early in boot, cf. smp_prepare_cpus().
+ * _nocalls() + manual invocation is used because cpuhp is not yet
+ * initialized for the boot CPU.
*/
- for_each_present_cpu(cpu) {
- numa_setup_cpu((unsigned long)cpu);
- }
+ cpuhp_setup_state_nocalls(CPUHP_POWER_NUMA_PREPARE, "POWER_NUMA_PREPARE",
+ ppc_numa_cpu_prepare, ppc_numa_cpu_dead);
+ for_each_present_cpu(cpu)
+ numa_setup_cpu(cpu);
}
=20
static int __init early_numa(char *p)
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index 09ef54bcba39..5015f463d314 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -15,6 +15,7 @@ enum cpuhp_state {
CPUHP_X86_HPET_DEAD,
CPUHP_X86_APB_DEAD,
CPUHP_WORKQUEUE_PREP,
+ CPUHP_POWER_NUMA_PREPARE,
CPUHP_HRTIMERS_PREPARE,
CPUHP_PROFILE_PREPARE,
CPUHP_X2APIC_PREPARE,
--=20
2.8.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-07-18 14:07 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20160713153219.128052238@linutronix.de>
2016-07-13 17:16 ` [patch V2 18/67] powerpc/perf: Convert book3s notifier to state machine callbacks Anna-Maria Gleixner
2016-07-13 17:16 ` [patch V2 30/67] powerpc/numa: Convert to hotplug state machine Anna-Maria Gleixner
2016-07-14 21:42 ` Anton Blanchard
2016-07-14 23:37 ` Anna-Maria Gleixner
2016-07-15 0:28 ` Anton Blanchard
2016-07-15 8:43 ` Ingo Molnar
2016-07-15 12:14 ` Anton Blanchard
2016-07-15 16:20 ` Sebastian Andrzej Siewior
2016-07-18 14:07 ` [PATCH v2] " Sebastian Andrzej Siewior
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).