diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-04-16 15:18:00 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-04-16 16:05:07 -0400 |
commit | 7918c92ae9638eb8a6ec18e2b4a0de84557cccc8 (patch) | |
tree | add2dafeac3f5a085f7e19ea34508595e812a1b7 /arch/x86/xen/enlighten.c | |
parent | 66ff0fe9e7bda8aec99985b24daad03652f7304e (diff) |
xen/time: Fix kasprintf splat when allocating timer%d IRQ line.
When we online the CPU, we get this splat:
smpboot: Booting Node 0 Processor 1 APIC 0x2
installing Xen timer for CPU 1
BUG: sleeping function called from invalid context at /home/konrad/ssd/konrad/linux/mm/slab.c:3179
in_atomic(): 1, irqs_disabled(): 0, pid: 0, name: swapper/1
Pid: 0, comm: swapper/1 Not tainted 3.9.0-rc6upstream-00001-g3884fad #1
Call Trace:
[<ffffffff810c1fea>] __might_sleep+0xda/0x100
[<ffffffff81194617>] __kmalloc_track_caller+0x1e7/0x2c0
[<ffffffff81303758>] ? kasprintf+0x38/0x40
[<ffffffff813036eb>] kvasprintf+0x5b/0x90
[<ffffffff81303758>] kasprintf+0x38/0x40
[<ffffffff81044510>] xen_setup_timer+0x30/0xb0
[<ffffffff810445af>] xen_hvm_setup_cpu_clockevents+0x1f/0x30
[<ffffffff81666d0a>] start_secondary+0x19c/0x1a8
The solution to that is use kasprintf in the CPU hotplug path
that 'online's the CPU. That is, do it in in xen_hvm_cpu_notify,
and remove the call to in xen_hvm_setup_cpu_clockevents.
Unfortunatly the later is not a good idea as the bootup path
does not use xen_hvm_cpu_notify so we would end up never allocating
timer%d interrupt lines when booting. As such add the check for
atomic() to continue.
CC: stable@vger.kernel.org
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 47d32434d0b6..ddbd54a9b845 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -1641,8 +1641,11 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self, | |||
1641 | switch (action) { | 1641 | switch (action) { |
1642 | case CPU_UP_PREPARE: | 1642 | case CPU_UP_PREPARE: |
1643 | xen_vcpu_setup(cpu); | 1643 | xen_vcpu_setup(cpu); |
1644 | if (xen_have_vector_callback) | 1644 | if (xen_have_vector_callback) { |
1645 | xen_init_lock_cpu(cpu); | 1645 | xen_init_lock_cpu(cpu); |
1646 | if (xen_feature(XENFEAT_hvm_safe_pvclock)) | ||
1647 | xen_setup_timer(cpu); | ||
1648 | } | ||
1646 | break; | 1649 | break; |
1647 | default: | 1650 | default: |
1648 | break; | 1651 | break; |