smp_call_function_single lockups
Linus, Thomas, Jens..
During the 3.18 - 3.19 "frequent lockups discussion", in some point you have observed csd_lock() and csd_unlock() possible synchronization problems. I think we have managed to reproduce that issue in a constant basis with 3.13 (ubuntu) and 3.19 (latest vanilla).
- When running "open-stack tempest" in a nested-kvm environment we are able to cause a lockup in question of hours (from 2 to 20 hours usually). Trace from nested hypervisor (ubuntu 3.13):
crash> bt
PID: 29130 TASK: ffff8804288ac800 CPU: 1 COMMAND: "qemu-system-x86"
#0 [ffff88043fd03d18] machine_kexec at ffffffff8104ac02 #1 [ffff88043fd03d68] crash_kexec at ffffffff810e7203
#2 [ffff88043fd03e30] panic at ffffffff81719ff4
#3 [ffff88043fd03ea8] watchdog_timer_fn at ffffffff8110d7c5 #4 [ffff88043fd03ed8] __run_hrtimer at ffffffff8108e787 #5 [ffff88043fd03f18] hrtimer_interrupt at ffffffff8108ef4f #6 [ffff88043fd03f80] local_apic_timer_interrupt at ffffffff81043537 #7 [ffff88043fd03f98] smp_apic_timer_interrupt at ffffffff81733d4f #8 [ffff88043fd03fb0] apic_timer_interrupt at ffffffff817326dd
--- <IRQ stack> ---
#9 [ffff8804284a3bc8] apic_timer_interrupt at ffffffff817326dd
[exception RIP: generic_exec_single+130]
RIP: ffffffff810dbe62 RSP: ffff8804284a3c70 RFLAGS: 00000202
RAX: 0000000000000002 RBX: ffff8804284a3c40 RCX: 0000000000000001
RDX: ffffffff8180ad60 RSI: 0000000000000000 RDI: 0000000000000286
RBP: ffff8804284a3ca0 R8: ffffffff8180ad48 R9: 0000000000000001
R10: ffffffff81185cac R11: ffffea00109b4a00 R12: ffff88042829f400
R13: 0000000000000000 R14: ffffea001017d640 R15:0000000000000005 ORIG_RAX: ffffffffffffff10 CS: 0010 SS: 0018
#10 [ffff8804284a3ca8] smp_call_function_single at ffffffff810dbf75 #11 [ffff8804284a3d20] smp_call_function_many at ffffffff810dc3a6 #12 [ffff8804284a3d80] native_flush_tlb_others at ffffffff8105c8f7 #13 [ffff8804284a3da8] flush_tlb_mm_range at ffffffff8105c9cb #14 [ffff8804284a3dd8] tlb_flush_mmu at ffffffff811755b3 #15 [ffff8804284a3e00] tlb_finish_mmu at ffffffff81176145 #16 [ffff8804284a3e20] unmap_region at ffffffff8117e013 #17 [ffff8804284a3ee0] do_munmap at ffffffff81180356
#18 [ffff8804284a3f30] vm_munmap at ffffffff81180521
#19 [ffff8804284a3f60] sys_munmap at ffffffff81181482 #20 [ffff8804284a3f80] system_call_fastpath at ffffffff8173196d
RIP: 00007fa3ed16c587 RSP: 00007fa3536f5c10 RFLAGS: 00000246
RAX: 000000000000000b RBX: ffffffff8173196d RCX: 0000001d00000007
RDX: 0000000000000000 RSI: 0000000000801000 RDI: 00007fa315ff4000
RBP: 00007fa3167f49c0 R8: 0000000000000000 R9: 00007fa3f5396738
R10: 00007fa3536f5a60 R11: 0000000000000202 R12: 00007fa3ed6562a0
R13: 00007fa350ef19c0 R14: ffffffff81181482 R15: ffff8804284a3f78
ORIG_RAX: 000000000000000b CS: 0033 SS: 002b- After applying patch provided by Thomas we were able to cause the lockup only after 6 days (also locked inside smp_call_function_single). Test performance (even for a nested kvm) was reduced substantially with 3.19 + this patch. Trace from the nested hypervisor (3.19 + patch):
crash> bt
PID: 10467 TASK: ffff880817b3b1c0 CPU: 1 COMMAND: "qemu-system-x86"
#0 [ffff88083fd03cc0] machine_kexec at ffffffff81052052 #1 [ffff88083fd03d10] crash_kexec at ffffffff810f91c3
#2 [ffff88083fd03de0] panic at ffffffff8176f713
#3 [ffff88083fd03e60] watchdog_timer_fn at ffffffff8112316b #4 [ffff88083fd03ea0] __run_hrtimer at ffffffff810da087 #5 [ffff88083fd03ef0] hrtimer_interrupt at ffffffff810da467 #6 [ffff88083fd03f70] local_apic_timer_interrupt at ffffffff81049769 #7 [ffff88083fd03f90] smp_apic_timer_interrupt at ffffffff8177fc25 #8 [ffff88083fd03fb0] apic_timer_interrupt at ffffffff8177dcbd
--- <IRQ stack> ---
#9 [ffff880817973a68] apic_timer_interrupt at ffffffff8177dcbd
[exception RIP: generic_exec_single+218]
RIP: ffffffff810ee0ca RSP: ffff880817973b18 RFLAGS: 00000202
RAX: 0000000000000002 RBX: 0000000000000292 RCX: 0000000000000001
RDX: ffffffff8180e6e0 RSI: 0000000000000000 RDI: 0000000000000292
RBP: ffff880817973b58 R8: ffffffff8180e6c8 R9: 0000000000000001
R10: 000000000000b6e0 R11: 0000000000000001 R12: ffffffff811f6626
R13: ffff880817973ab8 R14: ffffffff8109cfd2 R15: ffff880817973a78
ORIG_RAX: ffffffffffffff10 CS: 0010 SS: 0018#10 [ffff880817973b60] smp_call_function_single at ffffffff810ee1c7 #11 [ffff880817973b90] loaded_vmcs_clear at ffffffffa0309097 [kvm_intel] #12 [ffff880817973ba0] vmx_vcpu_load at ffffffffa030defe [kvm_intel] #13 [ffff880817973be0] kvm_arch_vcpu_load at ffffffffa01eba53 [kvm] #14 [ffff880817973c00] kvm_sched_in at ffffffffa01d94a9 [kvm] #15 [ffff880817973c20] finish_task_switch at ffffffff81099148 #16 [ffff880817973c60] __schedule at ffffffff817781ec
#17 [ffff880817973cd0] schedule at ffffffff81778699
#18 [ffff880817973ce0] kvm_vcpu_block at ffffffffa01d8dfd [kvm] #19 [ffff880817973d40] kvm_arch_vcpu_ioctl_run at ffffffffa01ef64c [kvm] #20 [ffff880817973e10] kvm_vcpu_ioctl at ffffffffa01dbc19 [kvm] #21 [ffff880817973eb0] do_vfs_ioctl at ffffffff811f5948
#22 [ffff880817973f30] sys_ioctl at ffffffff811f5be1
#23 [ffff880817973f80] system_call_fastpath at ffffffff8177cc2d
RIP: 00007f42f987fec7 RSP: 00007f42ef1bebd8 RFLAGS: 00000246
RAX: ffffffffffffffda RBX: ffffffff8177cc2d RCX: ffffffffffffffff
RDX: 0000000000000000 RSI: 000000000000ae80 RDI: 000000000000000e
RBP: 00007f430047b040 R8: 0000000000000000 R9: 00000000000000ff
R10: 0000000000000000 R11: 0000000000000246 R12: 00007f42ff920240
R13: 0000000000000000 R14: 0000000000000001 R15: 0000000000000001
ORIG_RAX: 0000000000000010 CS: 0033 SS: 002bNot sure if you are still pursuing this, anyway.. let me know if you think of any other change, I'll keep the environment.
-Tinoco
Quoted 20 lines · Thomas Gleixner
Quoted 7 lines · Linus Torvalds
llist_for_each_entry_safe(csd, csd_next, entry, llist){
-csd->func(csd->info);
+smp_call_func_tfunc =csd->func;
+ void *info =csd->info;
csd_unlock(csd);
+
+ func(info);No, that won't work for synchronous calls:
CPU 0 CPU 1 csd_lock(csd); queue_csd(); ipi(); func = csd->func; info = csd->info; csd_unlock(csd); csd_lock_wait();
Quoted 8 lines
func(info);
The
csd_lock_wait()side will succeed and therefor assume that the call has been completed while the function has not been called at all. Interesting explosions to follow.The proper solution is to revert that commit and properly analyze the problem which Jens was trying to solve and work from there.
So a combo of both (Jens and yours) might do the trick. Patch below.
I think what Jens was trying to solve is:
CPU 0 CPU 1
csd_lock(csd);
queue_csd();
ipi();
csd->func(csd->info);
wait_for_completion(csd);
complete(csd);
reuse_csd(csd);csd_unlock(csd);
Thanks,
tglx
kernel/smp.c +18 -3
@@ -126,7 +126,7 @@ static void csd_lock(struct call_single_static void csd_unlock (struct call_single_data *csd) { -WARN_ON ((csd->flags &CSD_FLAG_WAIT ) && !(csd->flags &CSD_FLAG_LOCK )); +WARN_ON (!(csd->flags &CSD_FLAG_LOCK ));/* * ensure we're all done before releasing data:
@@ -250,8 +250,23 @@ static void flush_smp_call_function_queu }llist_for_each_entry_safe (csd, csd_next, entry, llist) { - csd->func (csd->info); -csd_unlock (csd); + +/* +* For synchronous calls we are not allowed to unlock +* before the callback returned. For the async case +* its the responsibility of the caller to keep +* csd->info consistent while the callback runs. +*/ +if (csd->flags &CSD_FLAG_WAIT ) { + csd->func (csd->info); +csd_unlock (csd); + }else { +smp_call_func_t func = csd->func; +void *info = csd->info; + +csd_unlock (csd); +func (info); + } }/*
Quoted 5 lines · Rafael David Tinoco
- After applying patch provided by Thomas we were able to cause the lockup only after 6 days (also locked inside
smp_call_function_single). Test performance (even for a nested kvm) was reduced substantially with 3.19 + this patch.
I think that just means that the patch from Thomas doesn't change anything - the reason it takes longer to lock up is just that performance reduction, so whatever race it is that causes the problem was just harder to hit, but not fundamentally affected.
I think a more interesting thing to get is the traces from the other CPU's when this happens. In a virtualized environment, that might be easier to get than on real hardware, and if you are able to reproduce this at will - especially with something recent like 3.19, and could get that, that would be really good.
I'll think about this all, but we couldn't figure anything out last time we looked at it, so without more clues, don't hold your breath.
That said, it *would* be good if we could get rid of the synchronous behavior entirely, and make it a rule that if somebody wants to wait for it, they'll have to do their own waiting. Because I still think that that CSD_FLAG_WAIT is pure and utter garbage. And I think that Jens said that it is probably bogus to begin with.
I also don't even see where the CSD_FLAG_WAIT bit woudl ever be cleared, so it all looks completely buggy anyway.
Does this (COMPLETELY UNTESTED!) attached patch change anything?
Linus
kernel/smp.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
kernel/smp.c +4 -10
@@ -19,7 +19,6 @@enum {CSD_FLAG_LOCK =0x01 , -CSD_FLAG_WAIT =0x02 , };struct call_function_data {
@@ -114,26 +113,24 @@ static void csd_lock_wait(struct call_single_data *csd)static void csd_lock (struct call_single_data *csd) {csd_lock_wait (csd); - csd->flags |=CSD_FLAG_LOCK ; + csd->flags =CSD_FLAG_LOCK ;/* * prevent CPU from reordering the above assignment * to ->flags with any subsequent assignments to other * fields of the specified call_single_data structure: */ -smp_mb (); +smp_wmb (); }static void csd_unlock (struct call_single_data *csd) { -WARN_ON ((csd->flags &CSD_FLAG_WAIT ) && !(csd->flags &CSD_FLAG_LOCK )); +WARN_ON (!(csd->flags &CSD_FLAG_LOCK ));/* * ensure we're all done before releasing data: */ -smp_mb (); - - csd->flags &= ~CSD_FLAG_LOCK ; +smp_store_release (&csd->flags,0 ); } static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_data, csd_data);
@@ -173,9 +170,6 @@ static int generic_exec_single(int cpu, struct call_single_data *csd, csd->func = func; csd->info = info; -if (wait) - csd->flags |=CSD_FLAG_WAIT ; -/* * The list addition should be visible before sending the IPI * handler locks the list to pull the entry off it because of
Quoted 3 lines · Linus Torvalds
I'll think about this all, but we couldn't figure anything out last time we looked at it, so without more clues, don't hold your breath.
So having looked at it once more, one thing struck me:
Look at smp_call_function_single_async(). The comment says
* Like smp_call_function_single(), but the call is asynchonous and
* can thus be done from contexts with disabled interrupts.
but that is *only* true if we don't have to wait for the csd lock. The comments even clarify that:
* The caller passes his own pre-allocated data structure
* (ie: embedded in an object) and is responsible for synchronizing it
* such that the IPIs performed on the @csd are strictly serialized.
but it's not at all clear that the caller *can* do that. Since the "csd_unlock()" is done *after* the call to the callback function, any serialization done by the caller is fundamentally not trustworthy, since it cannot serialize with the csd lock - if it releases things in the callback, the csd lock will still be set after releasing things.
So the caller has a really hard time guaranteeing that CSD_LOCK isn't set. And if the call is done in interrupt context, for all we know it is interrupting the code that is going to clear CSD_LOCK, so CSD_LOCK will never be cleared at all, and csd_lock() will wait forever.
So I actually think that for the async case, we really *should* unlock before doing the callback (which is what Thomas' old patch did).
And we migth well be better off doing something like
WARN_ON_ONCE(csd->flags & CSD_LOCK);
in smp_call_function_single_async(), because that really is a hard requirement.
And it strikes me that hrtick_csd is one of these cases that do this with interrupts disabled, and use the callback for serialization. So I really wonder if this is part of the problem..
Thomas? Am I missing something?
Linus
[ Added Frederic to the cc, since he's touched this file/area most ]
Quoted 13 lines · Linus Torvalds
So the caller has a really hard time guaranteeing that
CSD_LOCKisn't set. And if the call is done in interrupt context, for all we know it is interrupting the code that is going to clearCSD_LOCK, soCSD_LOCKwill never be cleared at all, andcsd_lock()will wait forever.So I actually think that for the async case, we really *should* unlock before doing the callback (which is what Thomas' old patch did).
And we migth well be better off doing something like
WARN_ON_ONCE(csd->flags & CSD_LOCK);
Quoted 7 lines
in
smp_call_function_single_async(), because that really is a hard requirement.And it strikes me that
hrtick_csdis one of these cases that do this with interrupts disabled, and use the callback for serialization. So I really wonder if this is part of the problem..Thomas? Am I missing something?
Ok, this is a more involved patch than I'd like, but making the *caller* do all the CSD maintenance actually cleans things up.
And this is still completely untested, and may be entirely buggy. What do you guys think?
Linus
kernel/smp.c | 78 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 31 deletions(-)
kernel/smp.c +47 -31
@@ -19,7 +19,7 @@enum {CSD_FLAG_LOCK =0x01 , -CSD_FLAG_WAIT =0x02 , +CSD_FLAG_SYNCHRONOUS =0x02 , };struct call_function_data {
@@ -107,7 +107,7 @@ void __init call_function_init(void)*/ static void csd_lock_wait (struct call_single_data *csd) { -while (csd->flags &CSD_FLAG_LOCK ) +while (smp_load_acquire (&csd->flags) &CSD_FLAG_LOCK )cpu_relax (); }
@@ -121,19 +121,17 @@ static void csd_lock(struct call_single_data *csd)* to ->flags with any subsequent assignments to other * fields of the specified call_single_data structure: */ -smp_mb (); +smp_wmb (); }static void csd_unlock (struct call_single_data *csd) { -WARN_ON ((csd->flags &CSD_FLAG_WAIT ) && !(csd->flags &CSD_FLAG_LOCK )); +WARN_ON (!(csd->flags &CSD_FLAG_LOCK ));/* * ensure we're all done before releasing data: */ -smp_mb (); - - csd->flags &= ~CSD_FLAG_LOCK ; +smp_store_release (&csd->flags,0 ); } static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_data, csd_data);
@@ -144,13 +142,16 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_data, csd_data);* ->func, ->info, and ->flags set. */ static int generic_exec_single (int cpu,struct call_single_data *csd, -smp_call_func_t func,void *info,int wait) +smp_call_func_t func,void *info) { -struct call_single_data csd_stack = { .flags =0 }; -unsigned long flags; - -if (cpu ==smp_processor_id ()) { +unsigned long flags; + +/* +* We can unlock early even for the synchronous on-stack case, +* since we're doing this from the same CPU.. +*/ +csd_unlock (csd);local_irq_save (flags);func (info);local_irq_restore (flags);
@@ -161,21 +162,9 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,if ((unsigned )cpu >= nr_cpu_ids || !cpu_online (cpu))return -ENXIO ; - -if (!csd) { - csd = &csd_stack; -if (!wait) - csd =this_cpu_ptr (&csd_data); - } - -csd_lock (csd); - csd->func = func; csd->info = info; -if (wait) - csd->flags |=CSD_FLAG_WAIT ; -/* * The list addition should be visible before sending the IPI * handler locks the list to pull the entry off it because of
@@ -190,9 +179,6 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,if (llist_add (&csd->llist, &per_cpu (call_single_queue, cpu)))arch_send_call_function_single_ipi (cpu); -if (wait) -csd_lock_wait (csd); -return 0 ; }
@@ -250,8 +236,17 @@ static void flush_smp_call_function_queue(bool warn_cpu_offline) }llist_for_each_entry_safe (csd, csd_next, entry, llist) { - csd->func (csd->info); -csd_unlock (csd); +smp_call_func_t func = csd->func; +void *info = csd->info; + +/* Do we wait until *after* callback? */ +if (csd->flags &CSD_FLAG_SYNCHRONOUS ) { +func (info); +csd_unlock (csd); + }else { +csd_unlock (csd); +func (info); + } }/*
@@ -274,6 +269,8 @@ static void flush_smp_call_function_queue(bool warn_cpu_offline)int smp_call_function_single (int cpu,smp_call_func_t func,void *info,int wait) { +struct call_single_data *csd; +struct call_single_data csd_stack = { .flags =CSD_FLAG_LOCK |CSD_FLAG_SYNCHRONOUS };int this_cpu;int err;
@@ -292,7 +289,16 @@ int smp_call_function_single(int cpu, smp_call_func_t func, void *info,WARN_ON_ONCE (cpu_online (this_cpu) &&irqs_disabled () && !oops_in_progress); - err =generic_exec_single (cpu,NULL , func, info, wait); + csd = &csd_stack; +if (!wait) { + csd =this_cpu_ptr (&csd_data); +csd_lock (csd); + } + + err =generic_exec_single (cpu, csd, func, info); + +if (wait) +csd_lock_wait (csd);put_cpu ();
@@ -321,7 +327,15 @@ int smp_call_function_single_async(int cpu, struct call_single_data *csd)int err =0 ;preempt_disable (); - err =generic_exec_single (cpu, csd, csd->func, csd->info,0 ); + +/* We could deadlock if we have to wait here with interrupts disabled! */ +if (WARN_ON_ONCE (csd->flags &CSD_FLAG_LOCK )) +csd_lock_wait (csd); + + csd->flags =CSD_FLAG_LOCK ; +smp_wmb (); + + err =generic_exec_single (cpu, csd, csd->func, csd->info);preempt_enable ();return err;
@@ -433,6 +447,8 @@ void smp_call_function_many(const struct cpumask *mask,struct call_single_data *csd =per_cpu_ptr (cfd->csd, cpu);csd_lock (csd); +if (wait) + csd->flags |=CSD_FLAG_SYNCHRONOUS ; csd->func = func; csd->info = info;llist_add (&csd->llist, &per_cpu (call_single_queue, cpu));
Meanwhile we'll take the opportunity to run same tests with the "smp_load_acquire/smp_store_release + outside sync/async" approach made by your latest patch on top of 3.19. If anything comes up I'll provide full back traces (2 vcpus).
Here I can only reproduce this inside nested kvm on top of Proliant DL360 Gen8 machines with:
- no opt out from x2apic (gen8 firmware asks for opting out but HP says x2apic should be used for >= gen8)
- no intel_idle since proliant firmware is causing NMIs during MWAIT instructions
As observed before, reducing performance made the problem to be triggered only after some days so, if nothing goes wrong with performance this time, I expect to have results in between 10 to 30 hours.
Thank you
Tinoco
Quoted 33 lines · Linus Torvalds
[ Added Frederic to the cc, since he's touched this file/area most ]
Quoted 13 lines · Linus Torvalds
So the caller has a really hard time guaranteeing that
CSD_LOCKisn't set. And if the call is done in interrupt context, for all we know it is interrupting the code that is going to clearCSD_LOCK, soCSD_LOCKwill never be cleared at all, andcsd_lock()will wait forever.So I actually think that for the async case, we really *should* unlock before doing the callback (which is what Thomas' old patch did).
And we migth well be better off doing something like
WARN_ON_ONCE(csd->flags & CSD_LOCK);Quoted 7 lines
in
smp_call_function_single_async(), because that really is a hard requirement.And it strikes me that
hrtick_csdis one of these cases that do this with interrupts disabled, and use the callback for serialization. So I really wonder if this is part of the problem..Thomas? Am I missing something?
Ok, this is a more involved patch than I'd like, but making the *caller* do all the CSD maintenance actually cleans things up.
And this is still completely untested, and may be entirely buggy. What do you guys think?
Linus
Peter Zijlstra
Acked-byQuoted 5 lines · Linus Torvalds
Ok, this is a more involved patch than I'd like, but making the *caller* do all the CSD maintenance actually cleans things up.
And this is still completely untested, and may be entirely buggy. What do you guys think?
I think it makes perfect sense.
Linus, Peter, Thomas
Just a quick feedback, We were able to reproduce the lockup with this proposed patch (3.19 + patch). Unfortunately we had problems with the core file and I have only the stack trace for now but I think we are able to reproduce it again and provide more details (sorry for the delay... after a reboot it took some days for us to reproduce this again).
It looks like RIP is still smp_call_function_single.
Same environment as before: Nested KVM (2 vcpus) on top of Proliant DL380G8 with acpi_idle and no x2apic optout.
[47708.068013] CPU: 0 PID: 29869 Comm: qemu-system-x86 Tainted: G
E 3.19.0-c7671cf-lp1413540v2 #31
[47708.068013] Hardware name: OpenStack Foundation OpenStack Nova,
BIOS Bochs 01/01/2011
[47708.068013] task: ffff88081b9beca0 ti: ffff88081a7a0000 task.ti:
ffff88081a7a0000
[47708.068013] RIP: 0010:[<ffffffff810f537a>] [<ffffffff810f537a>]
smp_call_function_single+0xca/0x120
[47708.068013] RSP: 0018:ffff88081a7a3b38 EFLAGS: 00000202
[47708.068013] RAX: 0000000000000000 RBX: 0000000000000001 RCX: 0000000000000002
[47708.068013] RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000000000000296
[47708.068013] RBP: ffff88081a7a3b78 R08: ffffffff81815168 R09: ffff880818192000
[47708.068013] R10: 000000000000bdf6 R11: 000000000001bf90 R12: 00080000810b66f8
[47708.068013] R13: 00000000000000fb R14: 0000000000000296 R15: 0000000000000000
[47708.068013] FS: 00007fa143fff700(0000) GS:ffff88083fc00000(0000)
knlGS:0000000000000000
[47708.068013] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[47708.068013] CR2: 00007f5d76f5d050 CR3: 00000008190cc000 CR4: 00000000000426f0
[47708.068013] Stack:
[47708.068013] ffff88083fd151b8 0000000000000001 0000000000000000
ffffffffc0589320
[47708.068013] ffff88081a547a80 0000000000000003 ffff88081a543f80
0000000000000000
[47708.068013] ffff88081a7a3b88 ffffffffc0586097 ffff88081a7a3bc8
ffffffffc058aefe
[47708.068013] Call Trace:
[47708.068013] [<ffffffffc0589320>] ?
copy_shadow_to_vmcs12+0x110/0x110 [kvm_intel]
[47708.068013] [<ffffffffc0586097>] loaded_vmcs_clear+0x27/0x30 [kvm_intel]
[47708.068013] [<ffffffffc058aefe>] vmx_vcpu_load+0x17e/0x1a0 [kvm_intel]
[47708.068013] [<ffffffff810a918d>] ? set_next_entity+0x9d/0xb0
[47708.068013] [<ffffffffc04660e3>] kvm_arch_vcpu_load+0x33/0x1f0 [kvm]
[47708.068013] [<ffffffffc0452529>] kvm_sched_in+0x39/0x40 [kvm]
[47708.068013] [<ffffffff8109e8e8>] finish_task_switch+0x98/0x1a0
[47708.068013] [<ffffffff817aa81b>] __schedule+0x33b/0x900
[47708.068013] [<ffffffff817aae17>] schedule+0x37/0x90
[47708.068013] [<ffffffffc0451e7d>] kvm_vcpu_block+0x6d/0xb0 [kvm]
[47708.068013] [<ffffffff810b6ec0>] ? prepare_to_wait_event+0x110/0x110
[47708.068013] [<ffffffffc0469d3c>] kvm_arch_vcpu_ioctl_run+0x10c/0x1290 [kvm]
[47708.068013] [<ffffffffc04551ce>] kvm_vcpu_ioctl+0x2ce/0x670 [kvm]
[47708.068013] [<ffffffff811ef441>] ? new_sync_write+0x81/0xb0
[47708.068013] [<ffffffff812034e8>] do_vfs_ioctl+0x2f8/0x510
[47708.068013] [<ffffffff811f2215>] ? __sb_end_write+0x35/0x70
[47708.068013] [<ffffffffc045cf84>] ? kvm_on_user_return+0x74/0x80 [kvm]
[47708.068013] [<ffffffff81203781>] SyS_ioctl+0x81/0xa0
[47708.068013] [<ffffffff817aefad>] system_call_fastpath+0x16/0x1b
[47708.068013] Code: 30 5b 41 5c 5d c3 0f 1f 00 48 8d 75 d0 48 89 d1
89 df 4c 89 e2 e8 57 fe ff ff 0f b7 55 e8 83 e2 01 74 da 66 0f 1f 44
00 00 f3 90 <0f> b7 55 e8 83 e2 01 75 f5 eb c7 0f 1f 00 8b 05 ca e6 dd
00 85
[47708.068013] Kernel panic - not syncing: softlockup: hung tasks
[47708.068013] CPU: 0 PID: 29869 Comm: qemu-system-x86 Tainted: G
EL 3.19.0-c7671cf-lp1413540v2 #31
[47708.068013] Hardware name: OpenStack Foundation OpenStack Nova,
BIOS Bochs 01/01/2011
[47708.068013] ffff88081b9beca0 ffff88083fc03de8 ffffffff817a6bf6
0000000000000000
[47708.068013] ffffffff81ab30d4 ffff88083fc03e68 ffffffff817a1aec
0000000000000e92
[47708.068013] 0000000000000008 ffff88083fc03e78 ffff88083fc03e18
ffff88083fc03e68
[47708.068013] Call Trace:
[47708.068013] <IRQ> [<ffffffff817a6bf6>] dump_stack+0x45/0x57
[47708.068013] [<ffffffff817a1aec>] panic+0xc1/0x1f5
[47708.068013] [<ffffffff8112ba0b>] watchdog_timer_fn+0x1db/0x1f0
[47708.068013] [<ffffffff810e0e37>] __run_hrtimer+0x77/0x1d0
[47708.068013] [<ffffffff8112b830>] ? watchdog+0x30/0x30
[47708.068013] [<ffffffff810e1203>] hrtimer_interrupt+0xf3/0x220
[47708.068013] [<ffffffffc0589320>] ?
copy_shadow_to_vmcs12+0x110/0x110 [kvm_intel]
[47708.068013] [<ffffffff8104b0a9>] local_apic_timer_interrupt+0x39/0x60
[47708.068013] [<ffffffff817b1fb5>] smp_apic_timer_interrupt+0x45/0x60
[47708.068013] [<ffffffff817b002d>] apic_timer_interrupt+0x6d/0x80
[47708.068013] <EOI> [<ffffffff810f537a>] ?
smp_call_function_single+0xca/0x120
[47708.068013] [<ffffffff810f5369>] ? smp_call_function_single+0xb9/0x120
[47708.068013] [<ffffffffc0589320>] ?
copy_shadow_to_vmcs12+0x110/0x110 [kvm_intel]
[47708.068013] [<ffffffffc0586097>] loaded_vmcs_clear+0x27/0x30 [kvm_intel]
[47708.068013] [<ffffffffc058aefe>] vmx_vcpu_load+0x17e/0x1a0 [kvm_intel]
[47708.068013] [<ffffffff810a918d>] ? set_next_entity+0x9d/0xb0
[47708.068013] [<ffffffffc04660e3>] kvm_arch_vcpu_load+0x33/0x1f0 [kvm]
[47708.068013] [<ffffffffc0452529>] kvm_sched_in+0x39/0x40 [kvm]
[47708.068013] [<ffffffff8109e8e8>] finish_task_switch+0x98/0x1a0
[47708.068013] [<ffffffff817aa81b>] __schedule+0x33b/0x900
[47708.068013] [<ffffffff817aae17>] schedule+0x37/0x90
[47708.068013] [<ffffffffc0451e7d>] kvm_vcpu_block+0x6d/0xb0 [kvm]
[47708.068013] [<ffffffff810b6ec0>] ? prepare_to_wait_event+0x110/0x110
[47708.068013] [<ffffffffc0469d3c>] kvm_arch_vcpu_ioctl_run+0x10c/0x1290 [kvm]
[47708.068013] [<ffffffffc04551ce>] kvm_vcpu_ioctl+0x2ce/0x670 [kvm]
[47708.068013] [<ffffffff811ef441>] ? new_sync_write+0x81/0xb0
[47708.068013] [<ffffffff812034e8>] do_vfs_ioctl+0x2f8/0x510
[47708.068013] [<ffffffff811f2215>] ? __sb_end_write+0x35/0x70
[47708.068013] [<ffffffffc045cf84>] ? kvm_on_user_return+0x74/0x80 [kvm]
[47708.068013] [<ffffffff81203781>] SyS_ioctl+0x81/0xa0
[47708.068013] [<ffffffff817aefad>] system_call_fastpath+0x16/0x1bTks
Rafael Tinoco
Quoted 10 lines · Peter Zijlstra
Quoted 5 lines · Linus Torvalds
Ok, this is a more involved patch than I'd like, but making the *caller* do all the CSD maintenance actually cleans things up.
And this is still completely untested, and may be entirely buggy. What do you guys think?
I think it makes perfect sense.
Quoted 9 lines · Rafael David Tinoco
Just a quick feedback, We were able to reproduce the lockup with this proposed patch (3.19 + patch). Unfortunately we had problems with the core file and I have only the stack trace for now but I think we are able to reproduce it again and provide more details (sorry for the delay... after a reboot it took some days for us to reproduce this again).
It looks like RIP is still
smp_call_function_single.
Hmm. Still just the stack trace for the CPU that is blocked (CPU0), if you can get the core-file to work and figure out where the other CPU is, that would be good.
Linus
Quoted 5 lines · Linus Torvalds
Hmm. Still just the stack trace for the CPU that is blocked (CPU0), if you can get the core-file to work and figure out where the other CPU is, that would be good.
This is v3.19 + your patch (smp acquire/release)
- (nested kvm with 2 vcpus on top of proliant with x2apic cluster mode and acpi_idle)
* http://people.canonical.com/~inaddy/lp1413540/STACK_TRACE.txt
http://people.canonical.com/~inaddy/lp1413540/BACKTRACES.txt
http://people.canonical.com/~inaddy/lp1413540/FOREACH_BT.txt
* It looks like we got locked because of reentrant flush_tlb_* through smp_call_*
but I'll leave it to you. let me know if you need any more info..
-
Rafael Tinoco
Quoted 4 lines · Rafael David Tinoco
This is v3.19 + your patch (smp acquire/release)
- (nested kvm with 2 vcpus on top of proliant with x2apic cluster mode andacpi_idle)
Hmm. There is absolutely nothing else going on on that machine, except for the single call to smp_call_function_single() that is waiting for the CSD to be released.
Quoted 3 lines
* It looks like we got locked because of reentrant flush_tlb_* through smp_call_*
but I'll leave it to you.
No, that is all a perfectly regular callchain:
.. native_flush_tlb_others -> smp_call_function_many ->smp_call_function_single
but the stack contains some stale addresses (one is probably just from smp_call_function_single() calling into "generic_exec_single()", and thus the stack contains the return address inside smp_call_function_single() in _addition_ to the actual place where the watchdog timer then interrupted it).
It all really looks very regular and sane, and looks like smp_call_function_single() is happily just waiting for the IPI to finish in the (inlined) csd_lock_wait().
I see nothing wrong at all.
However, here's a patch to the actual x86 smp_call_function_single_interrupt() handler, which probably doesn't make any difference at all, but does:
- gets rid of the incredibly crazy and ugly smp_entering_irq() that
inexplicably pairs with irq_exit()
- makes the SMP IPI functions dot he APIC ACK cycle at the *end*
rather than at the beginning.
The exact placement of the ACK should make absolutely no difference, since interrupts should be disabled for the whole period anyway. But I'm desperate and am flailing around worrying about x2apic bugs and whatnot in addition to whatever bugs we migth have in this area in sw.
So maybe there is some timing thing. This makes us consistently ack the IPI _after_ we have cleared the list of smp call actions, and executed the list, rather than ack it before, and then go on to muck with the list.
Plus that old code really annoyed me anyway.
So I don't see why this should matter, but since I don't see how the bug could happen in the first place, might as well try it..
Linus
arch/x86/kernel/smp.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-)
arch/x86/kernel/smp.c +23 -12
@@ -265,12 +265,23 @@ __visible void smp_reschedule_interrupt(struct pt_regs *regs)*/ } -static inline void smp_entering_irq (void ) +/* +* This is the same as "entering_irq()", except it doesn't +* do the 'exit_idle()'. +* +* It pairs with smp_irq_exit(). +*/ +static inline void smp_irq_enter (void ) { -ack_APIC_irq ();irq_enter (); } +static inline void smp_irq_exit (void ) +{ +irq_exit (); +ack_APIC_irq (); +} + __visible void smp_trace_reschedule_interrupt(struct pt_regs *regs) {/*
@@ -279,11 +290,11 @@ __visible void smp_trace_reschedule_interrupt(struct pt_regs *regs)* scheduler_ipi(). This is OK, since those functions are allowed * to nest. */ -smp_entering_irq (); +smp_irq_enter ();trace_reschedule_entry (RESCHEDULE_VECTOR );__smp_reschedule_interrupt ();trace_reschedule_exit (RESCHEDULE_VECTOR ); -exiting_irq (); +smp_irq_exit ();/* * KVM uses this interrupt to force a cpu out of guest mode */
@@ -297,18 +308,18 @@ static inline void __smp_call_function_interrupt(void) __visible void smp_call_function_interrupt(struct pt_regs *regs) { -smp_entering_irq (); +smp_irq_enter ();__smp_call_function_interrupt (); -exiting_irq (); +smp_irq_exit (); } __visible void smp_trace_call_function_interrupt(struct pt_regs *regs) { -smp_entering_irq (); +smp_irq_enter ();trace_call_function_entry (CALL_FUNCTION_VECTOR );__smp_call_function_interrupt ();trace_call_function_exit (CALL_FUNCTION_VECTOR ); -exiting_irq (); +smp_irq_exit (); }static inline void __smp_call_function_single_interrupt (void )
@@ -319,18 +330,18 @@ static inline void __smp_call_function_single_interrupt(void) __visible void smp_call_function_single_interrupt(struct pt_regs *regs) { -smp_entering_irq (); +smp_irq_enter ();__smp_call_function_single_interrupt (); -exiting_irq (); +smp_irq_exit (); } __visible void smp_trace_call_function_single_interrupt(struct pt_regs *regs) { -smp_entering_irq (); +smp_irq_enter ();trace_call_function_single_entry (CALL_FUNCTION_SINGLE_VECTOR );__smp_call_function_single_interrupt ();trace_call_function_single_exit (CALL_FUNCTION_SINGLE_VECTOR ); -exiting_irq (); +smp_irq_exit (); }static int __init nonmi_ipi_setup (char *str)
Quoted 25 lines · Linus Torvalds
Quoted 4 lines · Rafael David Tinoco
This is v3.19 + your patch (smp acquire/release)
- (nested kvm with 2 vcpus on top of proliant with x2apic cluster mode andacpi_idle)Hmm. There is absolutely nothing else going on on that machine, except for the single call to
smp_call_function_single()that is waiting for the CSD to be released.Quoted 3 lines
* It looks like we got locked because of reentrant flush_tlb_* through smp_call_*
but I'll leave it to you.No, that is all a perfectly regular callchain:
..
native_flush_tlb_others->smp_call_function_many->smp_call_function_singlebut the stack contains some stale addresses (one is probably just from
smp_call_function_single()calling into "generic_exec_single()", and thus the stack contains the return address insidesmp_call_function_single()in _addition_ to the actual place where the watchdog timer then interrupted it).
Quoted 5 lines
It all really looks very regular and sane, and looks like
smp_call_function_single()is happily just waiting for the IPI to finish in the (inlined)csd_lock_wait().I see nothing wrong at all.
[11396.096002] Hardware name: OpenStack Foundation OpenStack Nova, BIOS Bochs 01/01/2011
But its a virtual machine right? Its not running bare metal, its running a !virt kernel on a virt machine, so maybe some of the virt muck is borked?
A very subtly broken APIC emulation would be heaps of 'fun'.
Quoted 8 lines
[11396.096002] Hardware name: OpenStack Foundation OpenStack Nova, BIOS Bochs 01/01/2011But its a virtual machine right? Its not running bare metal, its running a !virt kernel on a virt machine, so maybe some of the virt muck is borked?
A very subtly broken APIC emulation would be heaps of 'fun'.
Indeed, I'll dig hypervisor changes... Anyway, this initial stack trace was first seen during the "frequent lockups in 3.18rc4" discussion:
https://lkml.org/lkml/2014/11/14/656
RIP: 0010:[<ffffffff9c11e98a>] [<ffffffff9c11e98a>] generic_exec_single+0xea/0x1d0
At that time seen by Dave Jones, and running bare metal (if i remember correctly).
Signature · 1 line
Rafael Tinoco
Quoted 10 lines · Rafael David Tinoco
Linus, Peter, Thomas
Just a quick feedback, We were able to reproduce the lockup with this proposed patch (3.19 + patch). Unfortunately we had problems with the core file and I have only the stack trace for now but I think we are able to reproduce it again and provide more details (sorry for the delay... after a reboot it took some days for us to reproduce this again).
It looks like RIP is still
smp_call_function_single.
So Linus' patch mostly fixes smp_call_function_single_async() which is not what you're using.
It would be very good to see traces of other CPUs; if for some reason the target CPU doesn't get around to running your callback, then we'll forever wait on it.
loaded_vmcs_clear() uses smp_call_function_single(.wait = 1), that should work as before.
Quoted 3 lines · Rafael David Tinoco
Same environment as before: Nested KVM (2 vcpus) on top of Proliant DL380G8 with
acpi_idleand no x2apic optout.
Btw, which apic model does that end up using? Does "no x2apic optout" mean you're using the x2apic?
What does "dmesg | grep apic" report? Something like
Switched APIC routing to cluster x2apic.
or what?
Side note to the apic guys: I think the "single CPU" case ends up being one of the most important ones, but the stupid APIC model doesn't allow that, so sending an IPI to a single CPU ends up being "send a mask with a single bit set", and then we have that horrible "for_each_cpu(cpu, mask)" crap.
Would it make sense to perhaps add a "send_IPI_single()" function call, and then for the APIC models that always are based on masks, use a wrapper that just does that "cpumask_of(cpu)" thing..
Hmm?
Linus
For the host, we are using "intremap=no_x2apic_optout intel_idle.max_cstate=0" for cmdline. It looks like that DL360/DL380 Gen8 firmware still asks to optout from x2apic but HP engineering team said that using x2apic for Gen8 would be ok (intel_idle causes these servers to generate NMIs when idling, probably related to packed c-states and this server's dependency on acpi tables for c-state).
Feb 19 08:21:28 derain kernel: [ 3.504676] Enabled IRQ remapping in x2apic mode Feb 19 08:21:28 derain kernel: [ 3.565451] Enabling x2apic Feb 19 08:21:28 derain kernel: [ 3.602134] Enabled x2apic Feb 19 08:21:28 derain kernel: [ 3.637682] Switched APIC routing to
cluster x2apic.
Quoted 27 lines · Linus Torvalds
Quoted 3 lines · Rafael David Tinoco
Same environment as before: Nested KVM (2 vcpus) on top of Proliant DL380G8 with
acpi_idleand no x2apic optout.Btw, which apic model does that end up using? Does "no x2apic optout" mean you're using the x2apic?
What does "dmesg | grep apic" report? Something like
Switched APIC routing to cluster x2apic.
or what?
Side note to the apic guys: I think the "single CPU" case ends up being one of the most important ones, but the stupid APIC model doesn't allow that, so sending an IPI to a single CPU ends up being "send a mask with a single bit set", and then we have that horrible "
for_each_cpu(cpu, mask)" crap.Would it make sense to perhaps add a "
send_IPI_single()" function call, and then for the APIC models that always are based on masks, use a wrapper that just does that "cpumask_of(cpu)" thing..Hmm?
Linus
Quoted 2 lines · Rafael David Tinoco
Feb 19 08:21:28 derain kernel: [ 3.637682] Switched APIC routing tocluster x2apic.
Ok. That "cluster x2apic" mode is just about the nastiest mode when it comes to sending a single ipi. We do that insane dance where we
- turn single cpu number into cpumask
- copy the cpumask to a percpu temporary storage
- walk each cpu in the cpumask
- for each cpu, look up the cluster siblings
- for each cluster sibling that is also in the cpumask, look up the
logical apic mask and add it to the actual ipi destination mask
- send an ipi to that final mask.
which is just insane. It's complicated, it's fragile, and it's unnecessary.
If we had a simple "send_IPI()" function, we could do this all with something much saner, and it would look sopmething like
static void x2apic_send_IPI(int cpu, int vector)
{
u32 dest = per_cpu(x86_cpu_to_logical_apicid, cpu);
x2apic_wrmsr_fence();
__x2apic_send_IPI_dest(dest, vector, APIC_DEST_LOGICAL);
}and then 'void native_send_call_func_single_ipi()' would just look like
void native_send_call_func_single_ipi(int cpu)
{
apic->send_IPI(cpu, CALL_FUNCTION_SINGLE_VECTOR);
}but I might have missed something (and we might want to have a wrapper that says "if the apic doesn't have a 'send_IPI' function, use "send_IPI_mask(cpumask_of(cpu, vector) instead"
The fact that you need that no_x2apic_optout (which in turn means that your ACPI tables seem to say "don't use x2apic") also makes me worry.
Are there known errata for the x2apic?
Linus
I could only find an advisory (regarding sr-iov and irq remaps) from HP to RHEL6.2 users stating that Gen8 firmware does not enable it by default.
http://h20564.www2.hp.com/hpsc/doc/public/display?docId=emr_na-c03645796
"""
The interrupt remapping capability depends on x2apic enabled in the BIOS and HP ProLiant Gen8 systems do not enable x2apic; therefore, the following workaround is required for device assignment: Edit the /etc/grub.conf and add intremap=no_x2apic_optout option to the kernel command line options.
"""
Probably for backwards compatibility... not sure if there is an option to enable/disable it in firmware (like DL390 seems to have). I don't think so... but I was told by HP team that I should use x2apic for >= Gen8.
Quoted 44 lines · Linus Torvalds
Quoted 2 lines · Rafael David Tinoco
Feb 19 08:21:28 derain kernel: [ 3.637682] Switched APIC routing tocluster x2apic.
Ok. That "cluster x2apic" mode is just about the nastiest mode when it comes to sending a single ipi. We do that insane dance where we
- turn single cpu number into cpumask
- copy the cpumask to a percpu temporary storage
- walk each cpu in the cpumask
- for each cpu, look up the cluster siblings
- for each cluster sibling that is also in the cpumask, look up the
logical apic mask and add it to the actual ipi destination mask
- send an ipi to that final mask.which is just insane. It's complicated, it's fragile, and it's unnecessary.
If we had a simple "
send_IPI()" function, we could do this all with something much saner, and it would look sopmething likestatic void x2apic_send_IPI(int cpu, int vector) { u32 dest = per_cpu(x86_cpu_to_logical_apicid, cpu); x2apic_wrmsr_fence(); __x2apic_send_IPI_dest(dest, vector, APIC_DEST_LOGICAL); }and then 'void
native_send_call_func_single_ipi()' would just look likevoid native_send_call_func_single_ipi(int cpu) { apic->send_IPI(cpu, CALL_FUNCTION_SINGLE_VECTOR); }but I might have missed something (and we might want to have a wrapper that says "if the apic doesn't have a '
send_IPI' function, use "send_IPI_mask(cpumask_of(cpu, vector) instead"The fact that you need that
no_x2apic_optout(which in turn means that your ACPI tables seem to say "don't use x2apic") also makes me worry.Are there known errata for the x2apic?
Linus
Quoted 2 lines · Linus Torvalds
Are there known errata for the x2apic?
.. and in particular, do we still have to worry about the traditional local apic "if there are more than two pending interrupts per priority level, things get lost" problem?
I forget the exact details. Hopefully somebody remembers.
Linus
Quoted 10 lines · Linus Torvalds
Quoted 2 lines · Linus Torvalds
Are there known errata for the x2apic?
.. and in particular, do we still have to worry about the traditional local apic "if there are more than two pending interrupts per priority level, things get lost" problem?
I forget the exact details. Hopefully somebody remembers.
I can't find it in the docs. I find the "two-entries per vector", but not anything that is per priority level (group of 16 vectors). Maybe that was the IO-APIC, in which case it's immaterial for IPI's.
However, having now mostly re-acquainted myself with the APIC details, it strikes me that we do have some oddities here.
In particular, a few interrupt types are very special: NMI, SMI, INIT, ExtINT, or SIPI are handled early in the interrupt acceptance logic, and are sent directly to the CPU core, without going through the usual intermediate IRR/ISR dance.
And why might this matter? It's important because it means that those kinds of interrupts must *not* do the apic EOI that ack_APIC_irq() does.
And we correctly don't do ack_APIC_irq() for NMI etc, but it strikes me that ExtINT is odd and special.
I think we still use ExtINT for some odd cases. We used to have some magic with the legacy timer interrupt, for example. And I think they all go through the normal "do_IRQ()" logic regardless of whether they are ExtINT or not.
Now, what happens if we send an EOI for an ExtINT interrupt? It basically ends up being a spurious IPI. And I *think* that what normally happens is absolutely nothing at all. But if in addition to the ExtINT, there was a pending IPI (or other pending ISR bit set), maybe we lose interrupts..
.. and it's entirely possible that I'm just completely full of shit. Who is the poor bastard who has worked most with things like ExtINT, and can educate me? I'm adding Ingo, hpa and Jiang Liu as primary contacts..
Linus
Quoted 11 lines · Linus Torvalds
Now, what happens if we send an EOI for an ExtINT interrupt? It basically ends up being a spurious IPI. And I *think* that what normally happens is absolutely nothing at all. But if in addition to the ExtINT, there was a pending IPI (or other pending ISR bit set), maybe we lose interrupts..
.. and it's entirely possible that I'm just completely full of shit. Who is the poor bastard who has worked most with things like ExtINT, and can educate me? I'm adding Ingo, hpa and Jiang Liu as primary contacts..
So quite frankly, trying to follow all the logic from do_IRQ() through handle_irq() to the actual low-level handler, I just couldn't do it.
So instead, I wrote a patch to verify that the ISR bit is actually set when we do ack_APIC_irq().
This was complicated by the fact that we don't actually pass in the vector number at all to the acking, so 99% of the patch is just doing that. A couple of places we don't really have a good vector number, so I said "screw it, a negative value means that we won't check the ISR).
The attached patch is quite possibly garbage, but it gives an interesting warning for me during i8042 probing, so who knows. Maybe it actually shows a real problem - or maybe I just screwed up the patch.
.. and maybe even if the patch is fine, it's actually never really a problem to have spurious APIC ACK cycles. Maybe it cannot make interrupts be ignored.
Anyway, the back-trace for the warning I get is during boot:
...
PNP: No PS/2 controller found. Probing ports directly.
------------[ cut here ]------------
WARNING: CPU: 0 PID: 1 at ./arch/x86/include/asm/apic.h:436
ir_ack_apic_edge+0x74/0x80()
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted
3.19.0-08857-g89d3fa45b4ad-dirty #2
Call Trace:
<IRQ>
dump_stack+0x45/0x57
warn_slowpath_common+0x80/0xc0
warn_slowpath_null+0x15/0x20
ir_ack_apic_edge+0x74/0x80
handle_edge_irq+0x51/0x110
handle_irq+0x74/0x140
do_IRQ+0x4a/0x140
common_interrupt+0x6a/0x6a
<EOI>
? _raw_spin_unlock_irqrestore+0x9/0x10
__setup_irq+0x239/0x5a0
request_threaded_irq+0xc2/0x180
i8042_probe+0x5b8/0x680
platform_drv_probe+0x2f/0xa0
driver_probe_device+0x8b/0x3e0
__driver_attach+0x93/0xa0
bus_for_each_dev+0x63/0xa0
driver_attach+0x19/0x20
bus_add_driver+0x178/0x250
driver_register+0x5f/0xf0
__platform_driver_register+0x45/0x50
__platform_driver_probe+0x26/0xa0
__platform_create_bundle+0xad/0xe0
i8042_init+0x3d0/0x3f6
do_one_initcall+0xb8/0x1d0
kernel_init_freeable+0x16d/0x1fa
kernel_init+0x9/0xf0
ret_from_fork+0x7c/0xb0
---[ end trace 1de82c4457c6a0f0 ]---
serio: i8042 KBD port at 0x60,0x64 irq 1
serio: i8042 AUX port at 0x60,0x64 irq 12
...and it looks not entirely insane.
Is this worth looking at? Or is it something spurious? I might have gotten the vectors wrong, and maybe the warning is not because the ISR bit isn't set, but because I test the wrong bit.
Linus
arch/x86/include/asm/apic.h | 22 ++++++++++++++-------- arch/x86/kernel/apic/apic.c | 10 +++++----- arch/x86/kernel/apic/io_apic.c | 5 +++-- arch/x86/kernel/apic/vector.c | 8 +++++--- arch/x86/kernel/cpu/mcheck/therm_throt.c | 4 ++-- arch/x86/kernel/cpu/mcheck/threshold.c | 4 ++-- arch/x86/kernel/irq.c | 11 ++++++----- arch/x86/kernel/irq_work.c | 8 ++++---- arch/x86/kernel/smp.c | 18 +++++++++--------- drivers/iommu/irq_remapping.c | 6 ++++-- 10 files changed, 54 insertions(+), 42 deletions(-)
arch/x86/include/asm/apic.h +14 -8
@@ -387,7 +387,7 @@ static inline void apic_write(u32 reg, u32 val) apic->write (reg, val); } -static inline void apic_eoi (void ) +static inline void apic_eoi (int vector) { apic->eoi_write (APIC_EOI ,APIC_EOI_ACK ); }
@@ -418,7 +418,7 @@ extern void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v));static inline u32 apic_read (u32 reg) {return 0 ; }static inline void apic_write (u32 reg,u32 val) { } -static inline void apic_eoi (void ) { } +static inline void apic_eoi (int vector) { }static inline u64 apic_icr_read (void ) {return 0 ; }static inline void apic_icr_write (u32 low,u32 high) { }static inline void apic_wait_icr_idle (void ) { }
@@ -427,13 +427,19 @@ static inline void apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v)) {}#endif /* CONFIG_X86_LOCAL_APIC */ -static inline void ack_APIC_irq (void ) +static inline void ack_APIC_irq (int vector) { +/* Is the ISR bit actually set for this vector? */ +if (vector >=16 ) { +unsigned v =apic_read (APIC_ISR + ((vector & ~0x1f ) >>1 )); + v >>= vector &0x1f ; +WARN_ON_ONCE (!(v &1 )); + }/* * ack_APIC_irq() actually gets compiled as a single instruction * ... yummie. */ -apic_eoi (); +apic_eoi (vector); }static inline unsigned default_get_apic_id (unsigned long x)
@@ -631,9 +637,9 @@ static inline void entering_irq(void)exit_idle (); } -static inline void entering_ack_irq (void ) +static inline void entering_ack_irq (int vector) { -ack_APIC_irq (); +ack_APIC_irq (vector);entering_irq (); }
@@ -642,11 +648,11 @@ static inline void exiting_irq(void)irq_exit (); } -static inline void exiting_ack_irq (void ) +static inline void exiting_ack_irq (int vector) {irq_exit ();/* Ack only at the end to avoid potential reentry */ -ack_APIC_irq (); +ack_APIC_irq (vector); }extern void ioapic_zap_locks (void );
arch/x86/kernel/apic/apic.c +5 -5
@@ -910,7 +910,7 @@ __visible void __irq_entry smp_apic_timer_interrupt(struct pt_regs *regs)* Besides, if we don't timer interrupts ignore the global * interrupt lock, which is the WrongThing (tm) to do. */ -entering_ack_irq (); +entering_ack_irq (LOCAL_TIMER_VECTOR );local_apic_timer_interrupt ();exiting_irq ();
@@ -929,7 +929,7 @@ __visible void __irq_entry smp_trace_apic_timer_interrupt(struct pt_regs *regs)* Besides, if we don't timer interrupts ignore the global * interrupt lock, which is the WrongThing (tm) to do. */ -entering_ack_irq (); +entering_ack_irq (LOCAL_TIMER_VECTOR );trace_local_timer_entry (LOCAL_TIMER_VECTOR );local_apic_timer_interrupt ();trace_local_timer_exit (LOCAL_TIMER_VECTOR );
@@ -1342,7 +1342,7 @@ void setup_local_APIC(void) value =apic_read (APIC_ISR + i*0x10 );for (j =31 ; j >=0 ; j--) {if (value & (1 <<j)) { -ack_APIC_irq (); +ack_APIC_irq (-1 ); acked++; } }
@@ -1868,7 +1868,7 @@ static inline void __smp_spurious_interrupt(u8 vector)*/ v =apic_read (APIC_ISR + ((vector & ~0x1f ) >>1 ));if (v & (1 << (vector &0x1f ))) -ack_APIC_irq (); +ack_APIC_irq (vector);inc_irq_stat (irq_spurious_count);
@@ -1917,7 +1917,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)if (lapic_get_maxlvt () >3 )/* Due to the Pentium erratum 3AP. */ apic_write (APIC_ESR ,0 ); v =apic_read (APIC_ESR ); -ack_APIC_irq (); +ack_APIC_irq (ERROR_APIC_VECTOR );atomic_inc (&irq_err_count); apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
arch/x86/kernel/apic/io_apic.c +3 -2
@@ -1993,7 +1993,7 @@ static void ack_ioapic_level(struct irq_data *data)* We must acknowledge the irq before we move it or the acknowledge will * not propagate properly. */ -ack_APIC_irq (); +ack_APIC_irq (i);/* * Tail end of clearing remote IRR bit (either by delivering the EOI
@@ -2067,7 +2067,8 @@ static void unmask_lapic_irq(struct irq_data *data)static void ack_lapic_irq (struct irq_data *data) { -ack_APIC_irq (); +struct irq_cfg *cfg =irqd_cfg (data); +ack_APIC_irq (cfg->vector); }static struct irq_chip lapic_chip__read_mostly = {
arch/x86/kernel/apic/vector.c +5 -3
@@ -335,9 +335,11 @@ int apic_retrigger_irq(struct irq_data *data)void apic_ack_edge (struct irq_data *data) { -irq_complete_move (irqd_cfg (data)); +struct irq_cfg *cfg =irqd_cfg (data); + +irq_complete_move (cfg);irq_move_irq (data); -ack_APIC_irq (); +ack_APIC_irq (cfg->vector); }/*
@@ -397,7 +399,7 @@ asmlinkage __visible void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me; -ack_APIC_irq (); +ack_APIC_irq (IRQ_MOVE_CLEANUP_VECTOR );irq_enter ();exit_idle ();
arch/x86/kernel/cpu/mcheck/therm_throt.c +2 -2
@@ -433,7 +433,7 @@ asmlinkage __visible void smp_thermal_interrupt(struct pt_regs *regs) {entering_irq ();__smp_thermal_interrupt (); -exiting_ack_irq (); +exiting_ack_irq (THERMAL_APIC_VECTOR ); } asmlinkage __visible void smp_trace_thermal_interrupt(struct pt_regs *regs)
@@ -442,7 +442,7 @@ asmlinkage __visible void smp_trace_thermal_interrupt(struct pt_regs *regs)trace_thermal_apic_entry (THERMAL_APIC_VECTOR );__smp_thermal_interrupt ();trace_thermal_apic_exit (THERMAL_APIC_VECTOR ); -exiting_ack_irq (); +exiting_ack_irq (THERMAL_APIC_VECTOR ); }/* Thermal monitoring depends on APIC, ACPI and clock modulation */
arch/x86/kernel/cpu/mcheck/threshold.c +2 -2
@@ -28,7 +28,7 @@ asmlinkage __visible void smp_threshold_interrupt(void) {entering_irq ();__smp_threshold_interrupt (); -exiting_ack_irq (); +exiting_ack_irq (THRESHOLD_APIC_VECTOR ); } asmlinkage __visible void smp_trace_threshold_interrupt(void)
@@ -37,5 +37,5 @@ asmlinkage __visible void smp_trace_threshold_interrupt(void)trace_threshold_apic_entry (THRESHOLD_APIC_VECTOR );__smp_threshold_interrupt ();trace_threshold_apic_exit (THRESHOLD_APIC_VECTOR ); -exiting_ack_irq (); +exiting_ack_irq (THRESHOLD_APIC_VECTOR ); }
arch/x86/kernel/irq.c +6 -5
@@ -45,7 +45,8 @@ void ack_bad_irq(unsigned int irq)* completely. * But only ack when the APIC is enabled -AK */ -ack_APIC_irq (); +/* This doesn't know the vector. It needs the irq descriptor */ +ack_APIC_irq (-1 ); }#define irq_stats (x) (&per_cpu(irq_stat, x))
@@ -198,7 +199,7 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs) irq =__this_cpu_read (vector_irq[vector]);if (!handle_irq (irq, regs)) { -ack_APIC_irq (); +ack_APIC_irq (vector);if (irq !=VECTOR_RETRIGGERED ) { pr_emerg_ratelimited("%s: %d.%d No irq handler for vector (irq %d)\n",
@@ -230,7 +231,7 @@ __visible void smp_x86_platform_ipi(struct pt_regs *regs) {struct pt_regs *old_regs =set_irq_regs (regs); -entering_ack_irq (); +entering_ack_irq (X86_PLATFORM_IPI_VECTOR );__smp_x86_platform_ipi ();exiting_irq ();set_irq_regs (old_regs);
@@ -244,7 +245,7 @@ __visible void smp_kvm_posted_intr_ipi(struct pt_regs *regs) {struct pt_regs *old_regs =set_irq_regs (regs); -ack_APIC_irq (); +ack_APIC_irq (POSTED_INTR_VECTOR );irq_enter ();
@@ -262,7 +263,7 @@ __visible void smp_trace_x86_platform_ipi(struct pt_regs *regs) {struct pt_regs *old_regs =set_irq_regs (regs); -entering_ack_irq (); +entering_ack_irq (X86_PLATFORM_IPI_VECTOR );trace_x86_platform_ipi_entry (X86_PLATFORM_IPI_VECTOR );__smp_x86_platform_ipi ();trace_x86_platform_ipi_exit (X86_PLATFORM_IPI_VECTOR );
arch/x86/kernel/irq_work.c +4 -4
@@ -10,10 +10,10 @@#include <asm/apic.h> #include <asm/trace/irq_vectors.h> -static inline void irq_work_entering_irq (void ) +static inline void irq_work_entering_irq (int vector) {irq_enter (); -ack_APIC_irq (); +ack_APIC_irq (vector); }static inline void __smp_irq_work_interrupt (void )
@@ -24,14 +24,14 @@ static inline void __smp_irq_work_interrupt(void) __visible void smp_irq_work_interrupt(struct pt_regs *regs) { -irq_work_entering_irq (); +irq_work_entering_irq (IRQ_WORK_VECTOR );__smp_irq_work_interrupt ();exiting_irq (); } __visible void smp_trace_irq_work_interrupt(struct pt_regs *regs) { -irq_work_entering_irq (); +irq_work_entering_irq (IRQ_WORK_VECTOR );trace_irq_work_entry (IRQ_WORK_VECTOR );__smp_irq_work_interrupt ();trace_irq_work_exit (IRQ_WORK_VECTOR );
arch/x86/kernel/smp.c +9 -9
@@ -170,7 +170,7 @@ static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs) asmlinkage __visible void smp_reboot_interrupt(void) { -ack_APIC_irq (); +ack_APIC_irq (REBOOT_VECTOR );irq_enter ();stop_this_cpu (NULL );irq_exit ();
@@ -258,16 +258,16 @@ static inline void __smp_reschedule_interrupt(void) __visible void smp_reschedule_interrupt(struct pt_regs *regs) { -ack_APIC_irq (); +ack_APIC_irq (RESCHEDULE_VECTOR );__smp_reschedule_interrupt ();/* * KVM uses this interrupt to force a cpu out of guest mode */ } -static inline void smp_entering_irq (void ) +static inline void smp_entering_irq (int vector) { -ack_APIC_irq (); +ack_APIC_irq (vector);irq_enter (); }
@@ -279,7 +279,7 @@ __visible void smp_trace_reschedule_interrupt(struct pt_regs *regs)* scheduler_ipi(). This is OK, since those functions are allowed * to nest. */ -smp_entering_irq (); +smp_entering_irq (RESCHEDULE_VECTOR );trace_reschedule_entry (RESCHEDULE_VECTOR );__smp_reschedule_interrupt ();trace_reschedule_exit (RESCHEDULE_VECTOR );
@@ -297,14 +297,14 @@ static inline void __smp_call_function_interrupt(void) __visible void smp_call_function_interrupt(struct pt_regs *regs) { -smp_entering_irq (); +smp_entering_irq (CALL_FUNCTION_VECTOR );__smp_call_function_interrupt ();exiting_irq (); } __visible void smp_trace_call_function_interrupt(struct pt_regs *regs) { -smp_entering_irq (); +smp_entering_irq (CALL_FUNCTION_VECTOR );trace_call_function_entry (CALL_FUNCTION_VECTOR );__smp_call_function_interrupt ();trace_call_function_exit (CALL_FUNCTION_VECTOR );
@@ -319,14 +319,14 @@ static inline void __smp_call_function_single_interrupt(void) __visible void smp_call_function_single_interrupt(struct pt_regs *regs) { -smp_entering_irq (); +smp_entering_irq (CALL_FUNCTION_SINGLE_VECTOR );__smp_call_function_single_interrupt ();exiting_irq (); } __visible void smp_trace_call_function_single_interrupt(struct pt_regs *regs) { -smp_entering_irq (); +smp_entering_irq (CALL_FUNCTION_SINGLE_VECTOR );trace_call_function_single_entry (CALL_FUNCTION_SINGLE_VECTOR );__smp_call_function_single_interrupt ();trace_call_function_single_exit (CALL_FUNCTION_SINGLE_VECTOR );
drivers/iommu/irq_remapping.c +4 -2
@@ -334,12 +334,14 @@ void panic_if_irq_remap(const char *msg)static void ir_ack_apic_edge (struct irq_data *data) { -ack_APIC_irq (); +struct irq_cfg *cfg =irqd_cfg (data); +ack_APIC_irq (cfg->vector); }static void ir_ack_apic_level (struct irq_data *data) { -ack_APIC_irq (); +struct irq_cfg *cfg =irqd_cfg (data); +ack_APIC_irq (cfg->vector);eoi_ioapic_irq (data->irq,irqd_cfg (data)); }
Quoted 4 lines · Linus Torvalds
Is this worth looking at? Or is it something spurious? I might have gotten the vectors wrong, and maybe the warning is not because the ISR bit isn't set, but because I test the wrong bit.
I edited the patch to do ratelimiting (one per 10s max) rather than "once". And tested it some more. It seems to work correctly. The irq case during 8042 probing is not repeatable, and I suspect it happens because the interrupt source goes away (some probe-time thing that first triggers an interrupt, but then clears it itself), so it doesn't happen every boot, and I've gotten it with slightly different backtraces.
But it's the only warning that happens for me, so I think my code is right (at least for the cases that trigger on this machine). It's definitely not a "every interrupt causes the warning because the code was buggy, and the WARN_ONCE() just printed the first one".
It would be interesting to hear if others see spurious APIC EOI cases too. In particular, the people seeing the IPI lockup. Because a lot of the lockups we've seen have *looked* like the IPI interrupt just never happened, and so we're waiting forever for the target CPU to react to it. And just maybe the spurious EOI could cause the wrong bit to be cleared in the ISR, and then the interrupt never shows up. Something like that would certainly explain why it only happens on some machines and under certain timing circumstances.
Linus
Quoted 29 lines · Linus Torvalds
Quoted 4 lines · Linus Torvalds
Is this worth looking at? Or is it something spurious? I might have gotten the vectors wrong, and maybe the warning is not because the ISR bit isn't set, but because I test the wrong bit.
I edited the patch to do ratelimiting (one per 10s max) rather than "once". And tested it some more. It seems to work correctly. The irq case during 8042 probing is not repeatable, and I suspect it happens because the interrupt source goes away (some probe-time thing that first triggers an interrupt, but then clears it itself), so it doesn't happen every boot, and I've gotten it with slightly different backtraces.
But it's the only warning that happens for me, so I think my code is right (at least for the cases that trigger on this machine). It's definitely not a "every interrupt causes the warning because the code was buggy, and the
WARN_ONCE()just printed the first one".It would be interesting to hear if others see spurious APIC EOI cases too. In particular, the people seeing the IPI lockup. Because a lot of the lockups we've seen have *looked* like the IPI interrupt just never happened, and so we're waiting forever for the target CPU to react to it. And just maybe the spurious EOI could cause the wrong bit to be cleared in the ISR, and then the interrupt never shows up. Something like that would certainly explain why it only happens on some machines and under certain timing circumstances.
Quoted 2 lines
Linus
Linus,
I'm able to reproduce this IPI lockup easily now when using specific hardware and nested KVM VMs. However, it seems to only occur when using certain host hardware. For example:
- Xeon E5620 (Westmere-EP) (fam: 06, model: 2c)
- Xeon E312xx (Sandy Bridge) (fam: 06, model: 2a)
Now I'm not sure if this indicates hardware LAPIC issues or if the timing in these processors make it more likely to hit this issue. So far I haven't seen the issue on other CPUs.
To set this up, I've done the following (L0 being the Xeon box):
1) Create an L1 KVM VM with 2 vCPUs (single vCPU case doesn't reproduce)
2) Create an L2 KVM VM inside the L1 VM with 1 vCPU
3) Run something like 'stress -c 1 -m 1 -d 1 -t 1200' inside the L2 VM
Sometimes this is sufficient to reproduce the issue, I've observed that running KSM in the L1 VM can agitate this issue (it calls native_flush_tlb_others). If this doesn't reproduce then you can do the following:
4) Migrate the L2 vCPU randomly (via virsh vcpupin --live OR tasksel) between L1 vCPUs until the hang occurs.
Pinning L1 vCPUs to L0 initially (i.e. 0->0 1->1) causes the hangs to not occur in my testing. (Which makes sense because we're unlikely to do real IPIs.)
I've been able to repro with your patch and observed the WARN_ON when booting a VM on affected hardware and non affected hardware:
[ 13.613531] ------------[ cut here ]------------ [ 13.613531] WARNING: CPU: 0 PID: 0 at ./arch/x86/include/asm/apic.h:444 apic_ack_edge+0x84/0x90() [ 13.613531] Modules linked in: ipt_MASQUERADE(E) nf_nat_masquerade_ipv4(E) iptable_nat(E) nf_nat_ipv4(E) nf_nat(E) nf_conntrack_ipv4(E) nf_defrag_ipv4(E) xt_conntrack(E) nf_conntrack(E) ipt_REJECT(E) nf_reject_ipv4(E) xt_CHECKSUM(E) iptable_mangle(E) xt_tcpudp(E) bridge(E) stp(E) llc(E) ip6table_filter(E) ip6_tables(E) iptable_filter(E) ip_tables(E) ebtable_nat(E) ebtables(E) x_tables(E) dm_crypt(E) ppdev(E) kvm_intel(E) kvm(E) serio_raw(E) i2c_piix4(E) parport_pc(E) pvpanic(E) parport(E) mac_hid(E) nls_utf8(E) isofs(E) psmouse(E) floppy(E) cirrus(E) syscopyarea(E) sysfillrect(E) sysimgblt(E) ttm(E) drm_kms_helper(E) drm(E) pata_acpi(E) [ 13.613531] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G E 4.0.0-rc6-460f8calinus1 #4 [ 13.613531] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 [ 13.613531] ffffffff81a911a6 ffff88013fc03eb8 ffffffff817999a7 0000000000000007 [ 13.613531] 0000000000000000 ffff88013fc03ef8 ffffffff810734ca 0000000000000092 [ 13.613531] 0000000000000011 ffff8800b8bbac00 000000000000001f 00000000000000b1 [ 13.613531] Call Trace: [ 13.613531] <IRQ> [<ffffffff817999a7>] dump_stack+0x45/0x57 [ 13.613531] [<ffffffff810734ca>] warn_slowpath_common+0x8a/0xc0 [ 13.613531] [<ffffffff810735ba>] warn_slowpath_null+0x1a/0x20 [ 13.613531] [<ffffffff8104d3f4>] apic_ack_edge+0x84/0x90 [ 13.613531] [<ffffffff810cf8e7>] handle_edge_irq+0x57/0x120 [ 13.613531] [<ffffffff81016aa2>] handle_irq+0x22/0x40 [ 13.613531] [<ffffffff817a3b9f>] do_IRQ+0x4f/0x140 [ 13.613531] [<ffffffff817a196d>] common_interrupt+0x6d/0x6d [ 13.613531] <EOI> [<ffffffff810def08>] ? hrtimer_start+0x18/0x20 [ 13.613531] [<ffffffff8105a356>] ? native_safe_halt+0x6/0x10 [ 13.613531] [<ffffffff810d5623>] ? rcu_eqs_enter+0xa3/0xb0 [ 13.613531] [<ffffffff8101ecde>] default_idle+0x1e/0xc0 [ 13.613531] [<ffffffff8101f6cf>] arch_cpu_idle+0xf/0x20 [ 13.613531] [<ffffffff810b5d6f>] cpu_startup_entry+0x2ff/0x420 [ 13.613531] [<ffffffff8178e9b7>] rest_init+0x77/0x80 [ 13.613531] [<ffffffff81d50f97>] start_kernel+0x43c/0x449 [ 13.613531] [<ffffffff81d50120>] ? early_idt_handlers+0x120/0x120 [ 13.613531] [<ffffffff81d504d7>] x86_64_start_reservations+0x2a/0x2c [ 13.613531] [<ffffffff81d5062b>] x86_64_start_kernel+0x152/0x161 [ 13.613531] ---[ end trace 4512c19aad733ce8 ]---
I modified the posted patch with the following:
arch/x86/include/asm/apic.h +1 -1
@@ -441,7 +441,7 @@ static inline void ack_APIC_irq(int vector)if (vector >=16 ) {unsigned v =apic_read (APIC_ISR + ((vector & ~0x1f ) >>1 )); v >>= vector &0x1f ; -WARN_ON_ONCE (!(v &1 )); +WARN (!(v &1 ),"ack_APIC_irq: vector = %0x\n" , vector); }/* * ack_APIC_irq() actually gets compiled as a single instruction
And it showed vector = 1b when booting. However, when I run the reproducer on an affected machine I get the following WARNs before the hang:
[ 36.301282] ------------[ cut here ]------------ [ 36.301299] WARNING: CPU: 0 PID: 0 at ./arch/x86/include/asm/apic.h:444 apic_ack_edge+0x93/0xa0() [ 36.301301] ack_APIC_irq: vector = e1 [ 36.301303] Modules linked in: ipt_MASQUERADE(E) nf_nat_masquerade_ipv4(E) iptable_nat(E) nf_nat_ipv4(E) nf_nat(E) nf_conntrack_ipv4(E) nf_defrag_ipv4(E) xt_conntrack(E) nf_conntrack(E) ipt_REJECT(E) nf_reject_ipv4(E) xt_CHECKS UM(E) iptable_mangle(E) xt_tcpudp(E) bridge(E) stp(E) llc(E) ip6table_filter(E) ip6_tables(E) iptable_filter(E) ip_tables(E) ebtable_nat(E) ebtables(E) x_tables(E) dm_crypt(E) ppdev(E) kvm_intel(E) kvm(E) parport_pc(E) pvpanic(E) parport(E) serio_raw(E) mac_hid(E) i2c_piix4(E) nls_utf8(E) isofs(E) cirrus(E) psmouse(E) syscopyarea(E) sysfillrect(E) sysimgblt(E) ttm(E) floppy(E) drm_kms_helper(E) drm(E) pata_acpi(E) [ 36.301344] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W E 4.0.0-rc6-655d7f2linus2 #5 [ 36.301346] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 [ 36.301348] ffffffff81a910f2 ffff88013fc03e68 ffffffff817998e7 0000000000000007 [ 36.301352] ffff88013fc03eb8 ffff88013fc03ea8 ffffffff810734ca ffffffff81c0c0f8 [ 36.301355] 0000000000000001 00000000000000e1 0000000000000019 0000000000000051 [ 36.301359] Call Trace: [ 36.301361] <IRQ> [<ffffffff817998e7>] dump_stack+0x45/0x57 [ 36.301373] [<ffffffff810734ca>] warn_slowpath_common+0x8a/0xc0 [ 36.301377] [<ffffffff81073546>] warn_slowpath_fmt+0x46/0x50 [ 36.301383] [<ffffffff81405420>] ? pci_msi_unmask_irq+0x10/0x20 [ 36.301387] [<ffffffff8104d3b3>] apic_ack_edge+0x93/0xa0 [ 36.301392] [<ffffffff810cf8e7>] handle_edge_irq+0x57/0x120 [ 36.301399] [<ffffffff81016aa2>] handle_irq+0x22/0x40 [ 36.301403] [<ffffffff817a3adf>] do_IRQ+0x4f/0x140 [ 36.301407] [<ffffffff817a18ad>] common_interrupt+0x6d/0x6d [ 36.301409] <EOI> [<ffffffff810def08>] ? hrtimer_start+0x18/0x20 [ 36.301417] [<ffffffff8105a356>] ? native_safe_halt+0x6/0x10 [ 36.301422] [<ffffffff810d5623>] ? rcu_eqs_enter+0xa3/0xb0 [ 36.301426] [<ffffffff8101ecce>] default_idle+0x1e/0xc0 [ 36.301430] [<ffffffff8101f6bf>] arch_cpu_idle+0xf/0x20 [ 36.301433] [<ffffffff810b5d6f>] cpu_startup_entry+0x2ff/0x420 [ 36.301438] [<ffffffff8178e8f7>] rest_init+0x77/0x80 [ 36.301443] [<ffffffff81d50f97>] start_kernel+0x43c/0x449 [ 36.301446] [<ffffffff81d50120>] ? early_idt_handlers+0x120/0x120 [ 36.301450] [<ffffffff81d504d7>] x86_64_start_reservations+0x2a/0x2c [ 36.301453] [<ffffffff81d5062b>] x86_64_start_kernel+0x152/0x161 [ 36.301455] ---[ end trace 8f10e066e6d6eddf ]--- [ 40.430515] ------------[ cut here ]------------ [ 40.430531] WARNING: CPU: 0 PID: 0 at ./arch/x86/include/asm/apic.h:444 apic_ack_edge+0x93/0xa0() [ 40.430533] ack_APIC_irq: vector = 22 [ 40.430535] Modules linked in: ipt_MASQUERADE(E) nf_nat_masquerade_ipv4(E) iptable_nat(E) nf_nat_ipv4(E) nf_nat(E) nf_conntrack_ipv4(E) nf_defrag_ipv4(E) xt_conntrack(E) nf_conntrack(E) ipt_REJECT(E) nf_reject_ipv4(E) xt_CHECKS UM(E) iptable_mangle(E) xt_tcpudp(E) bridge(E) stp(E) llc(E) ip6table_filter(E) ip6_tables(E) iptable_filter(E) ip_tables(E) ebtable_nat(E) ebtables(E) x_tables(E) dm_crypt(E) ppdev(E) kvm_intel(E) kvm(E) parport_pc(E) pvpanic(E) parport(E) serio_raw(E) mac_hid(E) i2c_piix4(E) nls_utf8(E) isofs(E) cirrus(E) psmouse(E) syscopyarea(E) sysfillrect(E) sysimgblt(E) ttm(E) floppy(E) drm_kms_helper(E) drm(E) pata_acpi(E) [ 40.430576] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W E 4.0.0-rc6-655d7f2linus2 #5 [ 40.430578] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 [ 40.430581] ffffffff81a910f2 ffff88013fc03e68 ffffffff817998e7 0000000000000007 [ 40.430584] ffff88013fc03eb8 ffff88013fc03ea8 ffffffff810734ca 0000000000000202 [ 40.430587] 0000000000000002 0000000000000022 000000000000001d 0000000000000091 [ 40.430591] Call Trace: [ 40.430593] <IRQ> [<ffffffff817998e7>] dump_stack+0x45/0x57 [ 40.430605] [<ffffffff810734ca>] warn_slowpath_common+0x8a/0xc0 [ 40.430609] [<ffffffff81073546>] warn_slowpath_fmt+0x46/0x50 [ 40.430615] [<ffffffff81405420>] ? pci_msi_unmask_irq+0x10/0x20 [ 40.430631] [<ffffffff8104d3b3>] apic_ack_edge+0x93/0xa0 [ 40.430637] [<ffffffff810cf8e7>] handle_edge_irq+0x57/0x120 [ 40.430643] [<ffffffff81016aa2>] handle_irq+0x22/0x40 [ 40.430647] [<ffffffff817a3adf>] do_IRQ+0x4f/0x140 [ 40.430651] [<ffffffff817a18ad>] common_interrupt+0x6d/0x6d [ 40.430653] <EOI> [<ffffffff810def08>] ? hrtimer_start+0x18/0x20 [ 40.430661] [<ffffffff8105a356>] ? native_safe_halt+0x6/0x10 [ 40.430666] [<ffffffff810d5623>] ? rcu_eqs_enter+0xa3/0xb0 [ 40.430670] [<ffffffff8101ecce>] default_idle+0x1e/0xc0 [ 40.430674] [<ffffffff8101f6bf>] arch_cpu_idle+0xf/0x20 [ 40.430678] [<ffffffff810b5d6f>] cpu_startup_entry+0x2ff/0x420 [ 40.430684] [<ffffffff8178e8f7>] rest_init+0x77/0x80 [ 40.430689] [<ffffffff81d50f97>] start_kernel+0x43c/0x449 [ 40.430693] [<ffffffff81d50120>] ? early_idt_handlers+0x120/0x120 [ 40.430696] [<ffffffff81d504d7>] x86_64_start_reservations+0x2a/0x2c [ 40.430699] [<ffffffff81d5062b>] x86_64_start_kernel+0x152/0x161 [ 40.430702] ---[ end trace 8f10e066e6d6ede0 ]---
So vector = e1 then 22 before the hang.
[ 45.728212] kvm [1602]: vcpu0 disabled perfctr wrmsr: 0xc1 data 0xffff [ 53.391974] random: nonblocking pool is initialized [ 80.076005] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [qemu-system-x86:1602]
Some things I've already done are:
- run with nox2apic on L0,L1 (so apic->name == "flat"), this still reproduces
- run with apic=off on L0,L1, this still reproduces
Anyway, maybe this sheds some more light on this issue. I can reproduce this at will, so let me know of other experiments to do.
Thanks,
--chris j arges
Quoted 3 lines · Chris J Arges
I've been able to repro with your patch and observed the
WARN_ONwhen booting a VM on affected hardware and non affected hardware:
Ok, interesting. So the whole "we try to do an APIC ACK with the ISR bit clear" seems to be a real issue.
arch/x86/include/asm/apic.h static inline void ack_APIC_irq(int vector) · line 444
Quoted 3 lines
I modified the posted patch with the following:
arch/x86/include/asm/apic.h +1
-1-WARN_ON_ONCE (!(v &1 )); +WARN (!(v &1 ),"ack_APIC_irq: vector = %0x\n" , vector);
Yes, makes sense, although I'm not sure what the vector translations end up being. See below.
Quoted 2 lines
And it showed vector = 1b when booting. However, when I run the reproducer on an affected machine I get the following WARNs before the hang:
Ok, so the boot-time thing I think happens because a device irq happens but goes away immediately because the CPU that triggers it also clears it immediately in the device initialization code, so it's a level-triggered interrupt that goes away "on its own".
But vector 0x1b seems odd. I thought we mapped external interrupts to 0x20+ (FIRST_EXTERNAL_VECTOR). Ingo/Peter? Is there any sane interface to look up the percpu apic vector data?
Chris, since this is repeatable for you, can you do
int irq;
irq = __this_cpu_read(vector_irq[vector]);and print that out too? That *should* show the actual hardware irq, although there are a few magic cases too (-1/-2 mean special things)
But the fact that you get the warning before the hang is much more interesting.
Quoted 2 lines
[ 36.301299] WARNING: CPU: 0 PID: 0 at ./arch/x86/include/asm/apic.h:444 apic_ack_edge+0x93/0xa0() [ 36.301301] ack_APIC_irq: vector = e1
Is this repeatable? Does it happen before *every* hang, or at least often enough to be a good pattern?
Quoted 3 lines
[ 40.430533] ack_APIC_irq: vector = 22So vector = e1 then 22 before the hang.
Is it always the same ones? I assume that on different machines the vector allocations would be different, but is it consistent on any particular machine? That's assuming the whole warning is consistent at all before the hang, of course.
Quoted 2 lines
Anyway, maybe this sheds some more light on this issue. I can reproduce this at will, so let me know of other experiments to do.
Somebody else who knows the apic needs to also take a look, but I'd love to hear what the actual hardware interrupt is (from that "vector_irq[vector]" thing above.
I'm not recognizing 0xe1 as any of the hardcoded SMP vectors (they are 0xf0-0xff), so it sounds like an external one. But that then requires the whole mapping table thing.
Ingo/Peter/Jiang - is there anything else useful we could print out? I worry about the irq movement code. Can we add printk's to when an irq is chasing from one CPU to another and doing that "move_in_progress" thing? I've always been scared of that code.
Linus
Quoted 2 lines · Linus Torvalds
Ok, interesting. So the whole "we try to do an APIC ACK with the ISR bit clear" seems to be a real issue.
It's interesting in particular when it happens with an edge-triggered interrupt source: it's much harder to miss level triggered IRQs, which stay around until actively handled. Edge triggered irqs are more fragile to loss of event processing.
Quoted 2 lines
Quoted 2 lines
Anyway, maybe this sheds some more light on this issue. I can reproduce this at will, so let me know of other experiments to do.
Btw., could you please describe (again) what your current best method for reproduction is? It's been a long discussion ...
Quoted 4 lines
Somebody else who knows the apic needs to also take a look, but I'd love to hear what the actual hardware interrupt is (from that "vector_irq[vector]" thing above.
Quoted 8 lines
I'm not recognizing
0xe1as any of the hardcoded SMP vectors (they are 0xf0-0xff), so it sounds like an external one. But that then requires the whole mapping table thing.Ingo/Peter/Jiang - is there anything else useful we could print out? I worry about the irq movement code. Can we add printk's to when an irq is chasing from one CPU to another and doing that "
move_in_progress" thing? I've always been scared of that code.
1)
So the irq_cfg::move_in_progress field originates from:
610142927b5b ("[PATCH] x86_64 irq: Safely cleanup an irq after moving it.")
and I agree that it looks fragile, so it would be nice to see how much (if at all?) it gets used, by sticking a few pr_info()s in it.
Debug patch for the vector movement state machine attached below. Untested.
2)
But ... having taken a quick look at the vector movement handling, I am scared more than ever,and I cannot convince myself that it's race free. It's possibly harmless, but still, famous last words ...
For example, most ->move_in_progress transitions happen with the vector_lock held - with the exception of send_cleanup_vector(): there we are only holding the desc->lock, but that's not enough! For example, this codepath:
static void __irq_complete_move(struct irq_cfg *cfg, unsigned vector)
{
unsigned me;
if (likely(!cfg->move_in_progress))
return;
me = smp_processor_id();
if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain))
send_cleanup_vector(cfg);...
void send_cleanup_vector(struct irq_cfg *cfg)
{
...
cfg->move_in_progress = 0; }
is blatantly racy, unless I missed something obvious?
2b)
Initially I thought this only affects slowpaths like driver unregister or CPU hotplug, but I think this would be relevant for the fastpath of edge triggered irqs as well:
void apic_ack_edge(struct irq_data *data)
{
irq_complete_move(irqd_cfg(data));
irq_move_irq(data);
ack_APIC_irq();
}and irq_complete_move() checks and clears cfg->move_in_progress as listed above.
So in most scenarios this is probably harmless, because it can in the worst case result in the missing of a ->move_in_progress flag setting.
But it does not look harmless in the apic_set_affinity() code path:
there we call into assign_irq_vector() without the desc->lock held, due to this gem in the IRQ core:
int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)
{
unsigned long flags;
struct irq_desc *desc = irq_get_desc_lock(irq, &flags, IRQ_GET_DESC_CHECK_GLOBAL);
if (!desc)
return -EINVAL;
desc->affinity_hint = m;
irq_put_desc_unlock(desc, flags);
/* set the initial affinity to prevent every interrupt being on CPU0 */
if (m)
__irq_set_affinity(irq, m, false);
return 0;
}argh!
Now if this ever crosses path with an assign_irq_vector() call on another CPU, then I really cannot see what would save us from deep
trouble: we use cfg->vector while that is possibly being modified, right?
So I'd suggest to put a printk into irq_set_affinity_hint() as well, to make sure it's not used during this test. In particular:
drivers/virtio/virtio_pci_common.c: irq_set_affinity_hint(irq, NULL);drivers/virtio/virtio_pci_common.c: irq_set_affinity_hint(irq, mask);
might be triggering it in the virtualization code...
The second patch below adds the relevant pr_info(). (untested)
Now this too might be unrelated, because the affinity hint was added ages ago, in:
e7a297b0d7d6 ("genirq: Add CPU mask affinity hint")
and the potentially racy nature of calling into set_affinity without the desc lock held was probably not realized back then.
VirtIO's use of the affinity-hint was added a while ago as well, four years ago, in:
75a0a52be3c2 ("virtio: introduce an API to set affinity for a virtqueue")
2c)
The other thing that worries me here is that we apparently send an IRQ-move IPI while having an un-acked local APIC (!). I have vague memories that this was problematic and fragile before.
To ease my worries in this area I've attached a third patch below that changes the order around.
This too is ancient behavior - but might be more prominent on certain hardware (and virtualization) variants, so it has a chance to be relevant.
3)
Furthermore, I also noticed that the whole vector_lock()/unlock() business is actively misleading IMHO, the vector_lock looks local to vector.c, while we have these two calls that essentially export it ...
Some of that damage was inflicted in this ancient commit:
d388e5fdc461 ("x86: Restore proper vector locking during cpu hotplug")
the proper approach would be to protect against hotplug events in assign_irq_vector(), not the other way around!
Probably not a functional problem, yet somewhat disgusting.
-------------------------------
So ... all in one, these various problems might be related to the regression or not, but they sure need addressing.
Thanks,
Ingo
arch/x86/kernel/apic/vector.c +6 -0
@@ -143,6 +143,8 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask)cpumask_andnot (cfg->old_domain, cfg->domain, tmp_mask); cfg->move_in_progress =cpumask_intersects (cfg->old_domain, cpu_online_mask); +if (cfg->move_in_progress) +pr_info ("apic: vector %02x, same-domain move in progress\n" , cfg->vector);cpumask_and (cfg->domain, cfg->domain, tmp_mask);break ; }
@@ -178,6 +180,8 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask)cpumask_copy (cfg->old_domain, cfg->domain); cfg->move_in_progress =cpumask_intersects (cfg->old_domain, cpu_online_mask); +if (cfg->move_in_progress) +pr_info ("apic: vector %02x, new-domain move in progress\n" , cfg->vector); }for_each_cpu_and (new_cpu, tmp_mask, cpu_online_mask)per_cpu (vector_irq, new_cpu)[vector] = irq;
@@ -232,6 +236,7 @@ void clear_irq_vector(int irq, struct irq_cfg *cfg) } } cfg->move_in_progress =0 ; +pr_info ("apic: vector %02x, vector cleared, move completed\n" , cfg->vector);raw_spin_unlock_irqrestore (&vector_lock, flags); }
@@ -391,6 +396,7 @@ void send_cleanup_vector(struct irq_cfg *cfg)free_cpumask_var (cleanup_mask); } cfg->move_in_progress =0 ; +pr_info ("apic: vector %02x, sent cleanup vector, move completed\n" , cfg->vector); } asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)
kernel/irq/manage.c +3 -1
@@ -250,8 +250,10 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m) desc->affinity_hint = m;irq_put_desc_unlock (desc, flags);/* set the initial affinity to prevent every interrupt being on CPU0 */ -if (m) +if (m) { +pr_info ("irq/core: Called irq_set_affinity_hint(%d)\n" , irq);__irq_set_affinity (irq, m, false); + }return 0 ; }EXPORT_SYMBOL_GPL (irq_set_affinity_hint);
arch/x86/kernel/apic/vector.c +3 -1
@@ -335,9 +340,11 @@ int apic_retrigger_irq(struct irq_data *data)void apic_ack_edge (struct irq_data *data) { +ack_APIC_irq (); + +/* Might generate IPIs, so do this after having ACKed the APIC: */ irq_complete_move (irqd_cfg (data));irq_move_irq (data); -ack_APIC_irq (); }/*
Quoted 11 lines · Ingo Molnar
Quoted 2 lines · Linus Torvalds
Ok, interesting. So the whole "we try to do an APIC ACK with the ISR bit clear" seems to be a real issue.
It's interesting in particular when it happens with an edge-triggered interrupt source: it's much harder to miss level triggered IRQs, which stay around until actively handled. Edge triggered irqs are more fragile to loss of event processing.
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
Anyway, maybe this sheds some more light on this issue. I can reproduce this at will, so let me know of other experiments to do.
Btw., could you please describe (again) what your current best method for reproduction is? It's been a long discussion ...
Ingo,
To set this up, I've done the following on a Xeon E5620 / Xeon E312xx machine ( Although I've heard of others that have reproduced on other machines. )
1) Create an L1 KVM VM with 2 vCPUs (single vCPU case doesn't reproduce)
2) Create an L2 KVM VM inside the L1 VM with 1 vCPU
3) Add the following to the L1 cmdline:
nmi_watchdog=panic hung_task_panic=1 softlockup_panic=1 unknown_nmi_panic
3) Run something like 'stress -c 1 -m 1 -d 1 -t 1200' inside the L2 VM
Sometimes this is sufficient to reproduce the issue, I've observed that running KSM in the L1 VM can agitate this issue (it calls native_flush_tlb_others). If this doesn't reproduce then you can do the following:
4) Migrate the L2 vCPU randomly (via virsh vcpupin --live OR tasksel) between L1 vCPUs until the hang occurs.
I attempted to write a module that used smp_call_function_single calls to trigger IPIs but have been unable to create a more simple reproducer.
Quoted 155 lines
Quoted 4 lines
Somebody else who knows the apic needs to also take a look, but I'd love to hear what the actual hardware interrupt is (from that "vector_irq[vector]" thing above.
Quoted 8 lines
I'm not recognizing
0xe1as any of the hardcoded SMP vectors (they are 0xf0-0xff), so it sounds like an external one. But that then requires the whole mapping table thing.Ingo/Peter/Jiang - is there anything else useful we could print out? I worry about the irq movement code. Can we add printk's to when an irq is chasing from one CPU to another and doing that "
move_in_progress" thing? I've always been scared of that code.1)
So the
irq_cfg::move_in_progressfield originates from:
610142927b5b("[PATCH]x86_64irq: Safely cleanup an irq after moving it.")and I agree that it looks fragile, so it would be nice to see how much (if at all?) it gets used, by sticking a few pr_info()s in it.
Debug patch for the vector movement state machine attached below. Untested.
2)
But ... having taken a quick look at the vector movement handling, I am scared more than ever,and I cannot convince myself that it's race free. It's possibly harmless, but still, famous last words ...
For example, most ->move_in_progress transitions happen with the
vector_lockheld - with the exception ofsend_cleanup_vector(): there we are only holding thedesc->lock, but that's not enough! For example, this codepath:static void
__irq_complete_move(struct irq_cfg *cfg, unsigned vector){ unsigned me; if (likely(!cfg->move_in_progress)) return; me = smp_processor_id(); if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain)) send_cleanup_vector(cfg);...
void
send_cleanup_vector(struct irq_cfg *cfg)
{
...cfg->move_in_progress = 0; }is blatantly racy, unless I missed something obvious?
2b)
Initially I thought this only affects slowpaths like driver unregister or CPU hotplug, but I think this would be relevant for the fastpath of edge triggered irqs as well:
void
apic_ack_edge(struct irq_data *data){ irq_complete_move(irqd_cfg(data)); irq_move_irq(data); ack_APIC_irq(); }and
irq_complete_move()checks and clearscfg->move_in_progressas listed above.So in most scenarios this is probably harmless, because it can in the worst case result in the missing of a ->move_in_progress flag setting.
But it does not look harmless in the
apic_set_affinity()code path:
there we call intoassign_irq_vector()without thedesc->lockheld, due to this gem in the IRQ core:int
irq_set_affinity_hint(unsigned int irq, const struct cpumask *m){ unsigned long flags; struct irq_desc *desc = irq_get_desc_lock(irq, &flags, IRQ_GET_DESC_CHECK_GLOBAL); if (!desc) return -EINVAL; desc->affinity_hint = m; irq_put_desc_unlock(desc, flags); /* set the initial affinity to prevent every interrupt being on CPU0 */ if (m) __irq_set_affinity(irq, m, false); return 0; }argh!
Now if this ever crosses path with an
assign_irq_vector()call on another CPU, then I really cannot see what would save us from deep
trouble: we usecfg->vectorwhile that is possibly being modified, right?So I'd suggest to put a printk into
irq_set_affinity_hint()as well, to make sure it's not used during this test. In particular:
drivers/virtio/virtio_pci_common.c:irq_set_affinity_hint(irq, NULL);drivers/virtio/virtio_pci_common.c:irq_set_affinity_hint(irq, mask);might be triggering it in the virtualization code...
The second patch below adds the relevant
pr_info(). (untested)Now this too might be unrelated, because the affinity hint was added ages ago, in:
e7a297b0d7d6("genirq: Add CPU mask affinity hint")and the potentially racy nature of calling into
set_affinitywithout the desc lock held was probably not realized back then.VirtIO's use of the affinity-hint was added a while ago as well, four years ago, in:
75a0a52be3c2("virtio: introduce an API to set affinity for a virtqueue")2c)
The other thing that worries me here is that we apparently send an IRQ-move IPI while having an un-acked local APIC (!). I have vague memories that this was problematic and fragile before.
To ease my worries in this area I've attached a third patch below that changes the order around.
This too is ancient behavior - but might be more prominent on certain hardware (and virtualization) variants, so it has a chance to be relevant.
3)
Furthermore, I also noticed that the whole vector_lock()/unlock() business is actively misleading IMHO, the
vector_locklooks local tovector.c, while we have these two calls that essentially export it ...Some of that damage was inflicted in this ancient commit:
d388e5fdc461("x86: Restore proper vector locking during cpu hotplug")the proper approach would be to protect against hotplug events in
assign_irq_vector(), not the other way around!Probably not a functional problem, yet somewhat disgusting.
Quoted 9 lines
-------------------------------
So ... all in one, these various problems might be related to the regression or not, but they sure need addressing.
Thanks,
Ingo
I've merged the below patch with Linus' patch here:
https://lkml.org/lkml/2015/3/31/955
This was only tested only on the L1, so I can put this on the L0 host and run this as well. The results:
[ 124.897002] apic: vector c1, new-domain move in progress [ 124.954827] apic: vector d1, sent cleanup vector, move completed [ 163.477270] apic: vector d1, new-domain move in progress [ 164.041938] apic: vector e1, sent cleanup vector, move completed [ 213.466971] apic: vector e1, new-domain move in progress [ 213.775639] apic: vector 22, sent cleanup vector, move completed [ 365.996747] apic: vector 22, new-domain move in progress [ 366.011136] apic: vector 42, sent cleanup vector, move completed [ 393.836032] apic: vector 42, new-domain move in progress [ 393.837727] apic: vector 52, sent cleanup vector, move completed [ 454.977514] apic: vector 52, new-domain move in progress [ 454.978880] apic: vector 62, sent cleanup vector, move completed [ 467.055730] apic: vector 62, new-domain move in progress [ 467.058129] apic: vector 72, sent cleanup vector, move completed [ 545.280125] apic: vector 72, new-domain move in progress [ 545.282801] apic: vector 82, sent cleanup vector, move completed [ 567.631652] apic: vector 82, new-domain move in progress [ 567.632207] apic: vector 92, sent cleanup vector, move completed [ 628.940638] apic: vector 92, new-domain move in progress [ 628.965274] apic: vector a2, sent cleanup vector, move completed [ 635.187433] apic: vector a2, new-domain move in progress [ 635.191643] apic: vector b2, sent cleanup vector, move completed [ 673.548020] apic: vector b2, new-domain move in progress [ 673.553843] apic: vector c2, sent cleanup vector, move completed [ 688.221906] apic: vector c2, new-domain move in progress [ 688.229487] apic: vector d2, sent cleanup vector, move completed [ 723.818916] apic: vector d2, new-domain move in progress [ 723.828970] apic: vector e2, sent cleanup vector, move completed [ 733.485435] apic: vector e2, new-domain move in progress [ 733.615007] apic: vector 23, sent cleanup vector, move completed [ 824.092036] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [ksmd:26]
Thanks,
--chris j arges
Quoted 74 lines
arch/x86/kernel/apic/vector.c +6
-0@@ -143,6 +143,8 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask)cpumask_andnot (cfg->old_domain, cfg->domain, tmp_mask); cfg->move_in_progress =cpumask_intersects (cfg->old_domain, cpu_online_mask); +if (cfg->move_in_progress) +pr_info ("apic: vector %02x, same-domain move in progress\n" , cfg->vector);cpumask_and (cfg->domain, cfg->domain, tmp_mask);break ; }@@ -178,6 +180,8 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask)cpumask_copy (cfg->old_domain, cfg->domain); cfg->move_in_progress =cpumask_intersects (cfg->old_domain, cpu_online_mask); +if (cfg->move_in_progress) +pr_info ("apic: vector %02x, new-domain move in progress\n" , cfg->vector); }for_each_cpu_and (new_cpu, tmp_mask, cpu_online_mask)per_cpu (vector_irq, new_cpu)[vector] = irq;@@ -232,6 +236,7 @@ void clear_irq_vector(int irq, struct irq_cfg *cfg) } } cfg->move_in_progress =0 ; +pr_info ("apic: vector %02x, vector cleared, move completed\n" , cfg->vector);raw_spin_unlock_irqrestore (&vector_lock, flags); }@@ -391,6 +396,7 @@ void send_cleanup_vector(struct irq_cfg *cfg)free_cpumask_var (cleanup_mask); } cfg->move_in_progress =0 ; +pr_info ("apic: vector %02x, sent cleanup vector, move completed\n" , cfg->vector); } asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)kernel/irq/manage.c +3
-1@@ -250,8 +250,10 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m) desc->affinity_hint = m;irq_put_desc_unlock (desc, flags);/* set the initial affinity to prevent every interrupt being on CPU0 */ -if (m) +if (m) { +pr_info ("irq/core: Called irq_set_affinity_hint(%d)\n" , irq);__irq_set_affinity (irq, m, false); + }return 0 ; }EXPORT_SYMBOL_GPL (irq_set_affinity_hint);arch/x86/kernel/apic/vector.c +3
-1@@ -335,9 +340,11 @@ int apic_retrigger_irq(struct irq_data *data)void apic_ack_edge (struct irq_data *data) { +ack_APIC_irq (); + +/* Might generate IPIs, so do this after having ACKed the APIC: */ irq_complete_move (irqd_cfg (data));irq_move_irq (data); -ack_APIC_irq (); }/*
Quoted 26 lines · Chris J Arges
This was only tested only on the L1, so I can put this on the L0 host and run this as well. The results:
[ 124.897002] apic: vector c1, new-domain move in progress [ 124.954827] apic: vector d1, sent cleanup vector, move completed [ 163.477270] apic: vector d1, new-domain move in progress [ 164.041938] apic: vector e1, sent cleanup vector, move completed [ 213.466971] apic: vector e1, new-domain move in progress [ 213.775639] apic: vector 22, sent cleanup vector, move completed [ 365.996747] apic: vector 22, new-domain move in progress [ 366.011136] apic: vector 42, sent cleanup vector, move completed [ 393.836032] apic: vector 42, new-domain move in progress [ 393.837727] apic: vector 52, sent cleanup vector, move completed [ 454.977514] apic: vector 52, new-domain move in progress [ 454.978880] apic: vector 62, sent cleanup vector, move completed [ 467.055730] apic: vector 62, new-domain move in progress [ 467.058129] apic: vector 72, sent cleanup vector, move completed [ 545.280125] apic: vector 72, new-domain move in progress [ 545.282801] apic: vector 82, sent cleanup vector, move completed [ 567.631652] apic: vector 82, new-domain move in progress [ 567.632207] apic: vector 92, sent cleanup vector, move completed [ 628.940638] apic: vector 92, new-domain move in progress [ 628.965274] apic: vector a2, sent cleanup vector, move completed [ 635.187433] apic: vector a2, new-domain move in progress [ 635.191643] apic: vector b2, sent cleanup vector, move completed [ 673.548020] apic: vector b2, new-domain move in progress
Quoted 8 lines
[ 673.553843] apic: vector c2, sent cleanup vector, move completed [ 688.221906] apic: vector c2, new-domain move in progress [ 688.229487] apic: vector d2, sent cleanup vector, move completed [ 723.818916] apic: vector d2, new-domain move in progress [ 723.828970] apic: vector e2, sent cleanup vector, move completed [ 733.485435] apic: vector e2, new-domain move in progress [ 733.615007] apic: vector 23, sent cleanup vector, move completed [ 824.092036] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [ksmd:26]
Are these all the messages? Looks like Linus's warnings went away, or did you filter them out?
But ... the affinity setting message does not appear to trigger, and that's the only real race I can see in the code. Also, the frequency of these messages appears to be low, while the race window is narrow. So I'm not sure the problem is related to the irq-move mechanism.
One thing that appears to be weird: why is there irq-movement activity to begin with? Is something changing irq-affinities?
Could you put a dump_stack() into the call? Something like the patch below, in addition to all patches so far. (if it conflicts with the previous debugging patches then just add the code manually to after the debug printout.)
Thanks,
Ingo
arch/x86/kernel/apic/vector.c +2 -0
@@ -144,6 +144,8 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) cfg->move_in_progress =cpumask_intersects (cfg->old_domain, cpu_online_mask);cpumask_and (cfg->domain, cfg->domain, tmp_mask); +if (cfg->move_in_progress) +dump_stack ();break ; }
Quoted 38 lines · Ingo Molnar
Quoted 26 lines · Chris J Arges
This was only tested only on the L1, so I can put this on the L0 host and run this as well. The results:
[ 124.897002] apic: vector c1, new-domain move in progress [ 124.954827] apic: vector d1, sent cleanup vector, move completed [ 163.477270] apic: vector d1, new-domain move in progress [ 164.041938] apic: vector e1, sent cleanup vector, move completed [ 213.466971] apic: vector e1, new-domain move in progress [ 213.775639] apic: vector 22, sent cleanup vector, move completed [ 365.996747] apic: vector 22, new-domain move in progress [ 366.011136] apic: vector 42, sent cleanup vector, move completed [ 393.836032] apic: vector 42, new-domain move in progress [ 393.837727] apic: vector 52, sent cleanup vector, move completed [ 454.977514] apic: vector 52, new-domain move in progress [ 454.978880] apic: vector 62, sent cleanup vector, move completed [ 467.055730] apic: vector 62, new-domain move in progress [ 467.058129] apic: vector 72, sent cleanup vector, move completed [ 545.280125] apic: vector 72, new-domain move in progress [ 545.282801] apic: vector 82, sent cleanup vector, move completed [ 567.631652] apic: vector 82, new-domain move in progress [ 567.632207] apic: vector 92, sent cleanup vector, move completed [ 628.940638] apic: vector 92, new-domain move in progress [ 628.965274] apic: vector a2, sent cleanup vector, move completed [ 635.187433] apic: vector a2, new-domain move in progress [ 635.191643] apic: vector b2, sent cleanup vector, move completed [ 673.548020] apic: vector b2, new-domain move in progressQuoted 8 lines
[ 673.553843] apic: vector c2, sent cleanup vector, move completed [ 688.221906] apic: vector c2, new-domain move in progress [ 688.229487] apic: vector d2, sent cleanup vector, move completed [ 723.818916] apic: vector d2, new-domain move in progress [ 723.828970] apic: vector e2, sent cleanup vector, move completed [ 733.485435] apic: vector e2, new-domain move in progress [ 733.615007] apic: vector 23, sent cleanup vector, move completed [ 824.092036] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [ksmd:26]
Quoted 3 lines
Are these all the messages? Looks like Linus's warnings went away, or did you filter them out?
Ingo,
The patch I ran with included both patches, but I had to modify your patch to accomodate Linus' vector tracking, I've inlined the complete patch below.
The above kernel log was all kernel messages (no grepping) leading up to the soft lockup on L1.
Quoted 8 lines
But ... the affinity setting message does not appear to trigger, and that's the only real race I can see in the code. Also, the frequency of these messages appears to be low, while the race window is narrow. So I'm not sure the problem is related to the irq-move mechanism.
One thing that appears to be weird: why is there irq-movement activity to begin with? Is something changing irq-affinities?
irqbalance is running on all VMs/Systems (L0,L1,L2) by default. I'll disable this and re-test.
Quoted 15 lines
Could you put a
dump_stack()into the call? Something like the patch below, in addition to all patches so far. (if it conflicts with the previous debugging patches then just add the code manually to after the debug printout.)Thanks,
Ingo
arch/x86/kernel/apic/vector.c +0
-0
arch/x86/kernel/apic/vector.c __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) · line 151
Quoted 8 lines
arch/x86/kernel/apic/vector.c +2
-0@@ -144,6 +144,8 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) cfg->move_in_progress =cpumask_intersects (cfg->old_domain, cpu_online_mask);cpumask_and (cfg->domain, cfg->domain, tmp_mask); +if (cfg->move_in_progress) +dump_stack ();break ; }
Should I add the dump_stack() to the 'new-domain move' area line ~184 since that's the path I seem to be triggering?
Thanks,
--chris
--
For completeness, here is the patch that I ran with previously:
arch/x86/include/asm/apic.h +0 -0
@@ -395,7 +395,7 @@ static inline void apic_write(u32 reg, u32 val)
apic->write(reg, val);
}
-static inline void apic_eoi(void)
+static inline void apic_eoi(int vector)
{
apic->eoi_write(APIC_EOI, APIC_EOI_ACK); }
@@ -426,7 +426,7 @@ extern void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v));
static inline u32 apic_read(u32 reg) { return 0; }
static inline void apic_write(u32 reg, u32 val) { }
-static inline void apic_eoi(void) { }
+static inline void apic_eoi(int vector) { }
static inline u64 apic_icr_read(void) { return 0; }
static inline void apic_icr_write(u32 low, u32 high) { }
static inline void apic_wait_icr_idle(void) { }
@@ -435,13 +435,26 @@ static inline void apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v)) {}
#endif /* CONFIG_X86_LOCAL_APIC */
-static inline void ack_APIC_irq(void)
+#include <asm/irq_vectors.h>
+typedef int vector_irq_t[NR_VECTORS];
+DECLARE_PER_CPU(vector_irq_t, vector_irq);
+
+static inline void ack_APIC_irq(int vector)
{
+ /* Is the ISR bit actually set for this vector? */
+ if (vector >= 0) {
+ unsigned v = apic_read(APIC_ISR + ((vector & ~0x1f) >> 1));
+ int irq;
+ v >>= vector & 0x1f;
+ irq = __this_cpu_read(vector_irq[vector]);
+
+ WARN(!(v & 1), "ack_APIC_irq: vector = %0x, irq = %0x\n", vector, irq);
+ }
/* * ack_APIC_irq() actually gets compiled as a single instruction * ... yummie. */
- apic_eoi();
+ apic_eoi(vector);
}
static inline unsigned default_get_apic_id(unsigned long x)
@@ -639,9 +652,9 @@ static inline void entering_irq(void)
exit_idle();
}
-static inline void entering_ack_irq(void)
+static inline void entering_ack_irq(int vector)
{
- ack_APIC_irq();
+ ack_APIC_irq(vector); entering_irq();
}
@@ -650,11 +663,11 @@ static inline void exiting_irq(void)
irq_exit();
}
-static inline void exiting_ack_irq(void)
+static inline void exiting_ack_irq(int vector)
{
irq_exit();
/* Ack only at the end to avoid potential reentry */- ack_APIC_irq();
+ ack_APIC_irq(vector);
}
extern void ioapic_zap_locks(void);
arch/x86/kernel/apic/apic.c +0 -0
@@ -910,7 +910,7 @@ __visible void __irq_entry smp_apic_timer_interrupt(struct pt_regs *regs)
* Besides, if we don't timer interrupts ignore the global
* interrupt lock, which is the WrongThing (tm) to do. */
- entering_ack_irq();
+ entering_ack_irq(LOCAL_TIMER_VECTOR); local_apic_timer_interrupt(); exiting_irq();
@@ -929,7 +929,7 @@ __visible void __irq_entry smp_trace_apic_timer_interrupt(struct pt_regs *regs)
* Besides, if we don't timer interrupts ignore the global
* interrupt lock, which is the WrongThing (tm) to do.
*/
- entering_ack_irq();
+ entering_ack_irq(LOCAL_TIMER_VECTOR);
trace_local_timer_entry(LOCAL_TIMER_VECTOR);
local_apic_timer_interrupt();
trace_local_timer_exit(LOCAL_TIMER_VECTOR);
@@ -1342,7 +1342,7 @@ void setup_local_APIC(void)
value = apic_read(APIC_ISR + i*0x10);
for (j = 31; j >= 0; j--) {
if (value & (1<<j)) {
- ack_APIC_irq();
+ ack_APIC_irq(-1);
acked++;
}
}
@@ -1868,7 +1868,7 @@ static inline void __smp_spurious_interrupt(u8 vector)
*/
v = apic_read(APIC_ISR + ((vector & ~0x1f) >> 1));
if (v & (1 << (vector & 0x1f)))- ack_APIC_irq();
+ ack_APIC_irq(vector);
inc_irq_stat(irq_spurious_count);
@@ -1917,7 +1917,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
if (lapic_get_maxlvt() > 3) /* Due to the Pentium erratum 3AP. */ apic_write(APIC_ESR, 0); v = apic_read(APIC_ESR); - ack_APIC_irq(); + ack_APIC_irq(ERROR_APIC_VECTOR); atomic_inc(&irq_err_count); apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
arch/x86/kernel/apic/io_apic.c +0 -0
@@ -1993,7 +1993,7 @@ static void ack_ioapic_level(struct irq_data *data)
* We must acknowledge the irq before we move it or the acknowledge will
* not propagate properly.
*/
- ack_APIC_irq();
+ ack_APIC_irq(i);
/* * Tail end of clearing remote IRR bit (either by delivering the EOI
@@ -2067,7 +2067,8 @@ static void unmask_lapic_irq(struct irq_data *data)
static void ack_lapic_irq(struct irq_data *data)
{
- ack_APIC_irq();
+ struct irq_cfg *cfg = irqd_cfg(data);
+ ack_APIC_irq(cfg->vector);
}
static struct irq_chip lapic_chip __read_mostly = {
arch/x86/kernel/apic/vector.c +0 -0
@@ -143,6 +143,8 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask)
cpumask_andnot(cfg->old_domain, cfg->domain, tmp_mask);
cfg->move_in_progress =
cpumask_intersects(cfg->old_domain, cpu_online_mask);
+ if (cfg->move_in_progress)
+ pr_info("apic: vector %02x, same-domain move in progress\n", cfg->vector);
cpumask_and(cfg->domain, cfg->domain, tmp_mask);
break;
}
@@ -178,6 +180,8 @@ next:
cpumask_copy(cfg->old_domain, cfg->domain);
cfg->move_in_progress =
cpumask_intersects(cfg->old_domain, cpu_online_mask);
+ if (cfg->move_in_progress)
+ pr_info("apic: vector %02x, new-domain move in progress\n", cfg->vector);
}
for_each_cpu_and(new_cpu, tmp_mask, cpu_online_mask)
per_cpu(vector_irq, new_cpu)[vector] = irq;
@@ -232,6 +236,7 @@ void clear_irq_vector(int irq, struct irq_cfg *cfg)
}
}
cfg->move_in_progress = 0;
+ pr_info("apic: vector %02x, vector cleared, move completed\n", cfg->vector);
raw_spin_unlock_irqrestore(&vector_lock, flags);}
@@ -335,9 +340,11 @@ int apic_retrigger_irq(struct irq_data *data)
void apic_ack_edge(struct irq_data *data)
{
- irq_complete_move(irqd_cfg(data));
+ struct irq_cfg *cfg = irqd_cfg(data);
+ ack_APIC_irq(cfg->vector);
+
+ irq_complete_move(cfg); irq_move_irq(data);
- ack_APIC_irq();
}
/*
@@ -391,13 +398,14 @@ void send_cleanup_vector(struct irq_cfg *cfg)
free_cpumask_var(cleanup_mask); } cfg->move_in_progress = 0;
+ pr_info("apic: vector %02x, sent cleanup vector, move completed\n", cfg->vector);
}
asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)
{
unsigned vector, me;- ack_APIC_irq();
+ ack_APIC_irq(IRQ_MOVE_CLEANUP_VECTOR); irq_enter(); exit_idle();
arch/x86/kernel/cpu/mcheck/therm_throt.c +0 -0
@@ -433,7 +433,7 @@ asmlinkage __visible void smp_thermal_interrupt(struct pt_regs *regs) {
entering_irq(); __smp_thermal_interrupt();
- exiting_ack_irq();
+ exiting_ack_irq(THERMAL_APIC_VECTOR);
}
asmlinkage __visible void smp_trace_thermal_interrupt(struct pt_regs *regs)
@@ -442,7 +442,7 @@ asmlinkage __visible void smp_trace_thermal_interrupt(struct pt_regs *regs)
trace_thermal_apic_entry(THERMAL_APIC_VECTOR); __smp_thermal_interrupt(); trace_thermal_apic_exit(THERMAL_APIC_VECTOR);
- exiting_ack_irq();
+ exiting_ack_irq(THERMAL_APIC_VECTOR);
}
/* Thermal monitoring depends on APIC, ACPI and clock modulation */
arch/x86/kernel/cpu/mcheck/threshold.c +0 -0
@@ -28,7 +28,7 @@ asmlinkage __visible void smp_threshold_interrupt(void) {
entering_irq(); __smp_threshold_interrupt();
- exiting_ack_irq();
+ exiting_ack_irq(THRESHOLD_APIC_VECTOR);
}
asmlinkage __visible void smp_trace_threshold_interrupt(void)
@@ -37,5 +37,5 @@ asmlinkage __visible void smp_trace_threshold_interrupt(void)
trace_threshold_apic_entry(THRESHOLD_APIC_VECTOR); __smp_threshold_interrupt(); trace_threshold_apic_exit(THRESHOLD_APIC_VECTOR);
- exiting_ack_irq();
+ exiting_ack_irq(THRESHOLD_APIC_VECTOR);
}
arch/x86/kernel/irq.c +0 -0
@@ -45,7 +45,8 @@ void ack_bad_irq(unsigned int irq)
* completely.
* But only ack when the APIC is enabled -AK */
- ack_APIC_irq();
+ /* This doesn't know the vector. It needs the irq descriptor */
+ ack_APIC_irq(-1);
}
#define irq_stats(x) (&per_cpu(irq_stat, x))
@@ -198,7 +199,7 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
irq = __this_cpu_read(vector_irq[vector]);
if (!handle_irq(irq, regs)) {- ack_APIC_irq();
+ ack_APIC_irq(vector);
if (irq != VECTOR_RETRIGGERED) {
pr_emerg_ratelimited("%s: %d.%d No irq handler for vector (irq %d)\n",
@@ -230,7 +231,7 @@ __visible void smp_x86_platform_ipi(struct pt_regs *regs)
{
struct pt_regs *old_regs = set_irq_regs(regs);- entering_ack_irq();
+ entering_ack_irq(X86_PLATFORM_IPI_VECTOR);
__smp_x86_platform_ipi();
exiting_irq();
set_irq_regs(old_regs);
@@ -244,7 +245,7 @@ __visible void smp_kvm_posted_intr_ipi(struct pt_regs *regs)
{
struct pt_regs *old_regs = set_irq_regs(regs);- ack_APIC_irq();
+ ack_APIC_irq(POSTED_INTR_VECTOR);
irq_enter();
@@ -262,7 +263,7 @@ __visible void smp_trace_x86_platform_ipi(struct pt_regs *regs)
{
struct pt_regs *old_regs = set_irq_regs(regs);- entering_ack_irq();
+ entering_ack_irq(X86_PLATFORM_IPI_VECTOR); trace_x86_platform_ipi_entry(X86_PLATFORM_IPI_VECTOR); __smp_x86_platform_ipi(); trace_x86_platform_ipi_exit(X86_PLATFORM_IPI_VECTOR);
arch/x86/kernel/irq_work.c +1 -1
@@ -10,10 +10,10 @@#include <asm/apic.h> #include <asm/trace/irq_vectors.h> -static inline void irq_work_entering_irq (void ) +static inline void irq_work_entering_irq (int vector) {
irq_enter();
- ack_APIC_irq();
+ ack_APIC_irq(vector);
}
static inline void __smp_irq_work_interrupt(void)
@@ -24,14 +24,14 @@ static inline void __smp_irq_work_interrupt(void)
__visible void smp_irq_work_interrupt(struct pt_regs *regs) {
- irq_work_entering_irq();
+ irq_work_entering_irq(IRQ_WORK_VECTOR); __smp_irq_work_interrupt(); exiting_irq();
}
__visible void smp_trace_irq_work_interrupt(struct pt_regs *regs) {
- irq_work_entering_irq();
+ irq_work_entering_irq(IRQ_WORK_VECTOR); trace_irq_work_entry(IRQ_WORK_VECTOR); __smp_irq_work_interrupt(); trace_irq_work_exit(IRQ_WORK_VECTOR);
arch/x86/kernel/smp.c +1 -1
@@ -170,7 +170,7 @@ static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs) asmlinkage __visible void smp_reboot_interrupt(void) { -ack_APIC_irq (); +ack_APIC_irq (REBOOT_VECTOR );
irq_enter(); stop_this_cpu(NULL); irq_exit();
@@ -258,16 +258,16 @@ static inline void __smp_reschedule_interrupt(void)
__visible void smp_reschedule_interrupt(struct pt_regs *regs) {
- ack_APIC_irq();
+ ack_APIC_irq(RESCHEDULE_VECTOR); __smp_reschedule_interrupt(); /* * KVM uses this interrupt to force a cpu out of guest mode */
}
-static inline void smp_entering_irq(void)
+static inline void smp_entering_irq(int vector)
{
- ack_APIC_irq();
+ ack_APIC_irq(vector); irq_enter();
}
@@ -279,7 +279,7 @@ __visible void smp_trace_reschedule_interrupt(struct pt_regs *regs)
* scheduler_ipi(). This is OK, since those functions are allowed
* to nest.
*/
- smp_entering_irq();
+ smp_entering_irq(RESCHEDULE_VECTOR); trace_reschedule_entry(RESCHEDULE_VECTOR); __smp_reschedule_interrupt(); trace_reschedule_exit(RESCHEDULE_VECTOR);
@@ -297,14 +297,14 @@ static inline void __smp_call_function_interrupt(void)
__visible void smp_call_function_interrupt(struct pt_regs *regs) {
- smp_entering_irq();
+ smp_entering_irq(CALL_FUNCTION_VECTOR); __smp_call_function_interrupt(); exiting_irq();
}
__visible void smp_trace_call_function_interrupt(struct pt_regs *regs) {
- smp_entering_irq();
+ smp_entering_irq(CALL_FUNCTION_VECTOR); trace_call_function_entry(CALL_FUNCTION_VECTOR); __smp_call_function_interrupt(); trace_call_function_exit(CALL_FUNCTION_VECTOR);
@@ -319,14 +319,14 @@ static inline void __smp_call_function_single_interrupt(void)
__visible void smp_call_function_single_interrupt(struct pt_regs *regs) {
- smp_entering_irq();
+ smp_entering_irq(CALL_FUNCTION_SINGLE_VECTOR); __smp_call_function_single_interrupt(); exiting_irq();
}
__visible void smp_trace_call_function_single_interrupt(struct pt_regs *regs) {
- smp_entering_irq();
+ smp_entering_irq(CALL_FUNCTION_SINGLE_VECTOR); trace_call_function_single_entry(CALL_FUNCTION_SINGLE_VECTOR); __smp_call_function_single_interrupt(); trace_call_function_single_exit(CALL_FUNCTION_SINGLE_VECTOR);
drivers/iommu/irq_remapping.c +4 -2
@@ -334,12 +334,14 @@ void panic_if_irq_remap(const char *msg)static void ir_ack_apic_edge (struct irq_data *data) { -ack_APIC_irq (); +struct irq_cfg *cfg =irqd_cfg (data); +ack_APIC_irq (cfg->vector); }static void ir_ack_apic_level (struct irq_data *data) { -ack_APIC_irq (); +struct irq_cfg *cfg =irqd_cfg (data); +ack_APIC_irq (cfg->vector);
eoi_ioapic_irq(data->irq, irqd_cfg(data));
}
kernel/irq/manage.c +0 -0
@@ -244,8 +244,10 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)
desc->affinity_hint = m;
irq_put_desc_unlock(desc, flags);
/* set the initial affinity to prevent every interrupt being on CPU0 */
- if (m)
+ if (m) {
+ pr_info("irq/core: Called irq_set_affinity_hint(%d)\n", irq);
__irq_set_affinity(irq, m, false);
+ }
return 0; }
EXPORT_SYMBOL_GPL(irq_set_affinity_hint);
Quoted 9 lines · Chris J Arges
Quoted 9 lines
arch/x86/kernel/apic/vector.c +1
-0@@ -144,6 +144,8 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) cfg->move_in_progress =cpumask_intersects (cfg->old_domain, cpu_online_mask);cpumask_and (cfg->domain, cfg->domain, tmp_mask); +if (cfg->move_in_progress)
Quoted 8 lines
arch/x86/kernel/apic/vector.c __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) · line 151
Quoted 5 lines
arch/x86/kernel/apic/vector.c +1
-0+dump_stack ();break ; }Should I add the
dump_stack()to the 'new-domain move' area line ~184 since that's the path I seem to be triggering?
Yeah, please do, that's what I wanted to mark.
My guess is that it will show a stack dump to within set_affinity().
Thanks,
Ingo
Quoted 10 lines · Chris J Arges
[ 13.613531] WARNING: CPU: 0 PID: 0 at ./arch/x86/include/asm/apic.h:444 apic_ack_edge+0x84/0x90() [ 13.613531] [<ffffffff8104d3f4>] apic_ack_edge+0x84/0x90 [ 13.613531] [<ffffffff810cf8e7>] handle_edge_irq+0x57/0x120 [ 13.613531] [<ffffffff81016aa2>] handle_irq+0x22/0x40 [ 13.613531] [<ffffffff817a3b9f>] do_IRQ+0x4f/0x140 [ 13.613531] [<ffffffff817a196d>] common_interrupt+0x6d/0x6d [ 13.613531] <EOI> [<ffffffff810def08>] ? hrtimer_start+0x18/0x20 [ 13.613531] [<ffffffff8105a356>] ? native_safe_halt+0x6/0x10 [ 13.613531] [<ffffffff810d5623>] ? rcu_eqs_enter+0xa3/0xb0 [ 13.613531] [<ffffffff8101ecde>] default_idle+0x1e/0xc0
Hmm. I didn't notice that "hrtimer_start" was always there as a stale entry on the stack when this happened.
That may well be immaterial - the CPU being idle means that the last thing it did before going to sleep was likely that "start timer" thing, but it's interesting even so.
Some issue with reprogramming the hrtimer as it is triggering, kind of similar to the bootup case I saw where the keyboard init sequence raises an interrupt that was already cleared by the time the interrupt happened.
So maybe something like this happens:
- local timer is about to go off and raises the interrupt line
- in the meantime, we're reprogramming the timer into the future
- the CPU takes the interrupt, but now the timer has been
reprogammed, so the irq line is no longer active, and ISR is zero even though we took the interrupt (which is why the new warning triggers)
- we're running the local timer interrupt (which happened due to the
*old* programmed value), but we do something wrong because when we read the timer state, we see the *new* programmed value and so we think that it's the new timer that triggered.
I dunno. I don't see why we'd lock up, but DaveJ's old lockup had several signs that it seemed to be timer-related.
It would be interesting to see the actual irq number. Maybe this has nothing what-so-ever to do with the hrtimer.
Linus
Quoted 2 lines · Chris J Arges
I modified the posted patch with the following:
Actually, in addition to Ingo's patches (and the irq printout), which you should try first, if none of that really gives any different behavior, can modify that ack_APIC_irq() debugging code a bit more:
arch/x86/include/asm/apic.h static inline void ack_APIC_irq(int vector) · line 447
Quoted 13 lines
arch/x86/include/asm/apic.h +1
-1@@ -441,7 +441,7 @@ static inline void ack_APIC_irq(int vector)if (vector >=16 ) {unsigned v =apic_read (APIC_ISR + ((vector & ~0x1f ) >>1 )); v >>= vector &0x1f ; -WARN_ON_ONCE (!(v &1 )); +WARN (!(v &1 ),"ack_APIC_irq: vector = %0x\n" , vector); }/* * ack_APIC_irq() actually gets compiled as a single instruction
So what I'd suggest doing is:
- change the test of "vector >= 16" to just "vector >= 0".
We still have "-1" as the "unknown vector" thing, but I think only
the ack_bad_irq() thing calls it, and that should print out its own message if it ever triggers, so it isn't an issue.
The reason for the ">= 16" was kind of bogus - the first 16 vectors
are system vectors, but we definitely shouldn't ack the apic for such vectors anyway, so giving a warning for them is very much appropriate. In particular, vector 2 is NMI, and maybe we do ACk it incorrectly.
- add a "return" if the warning triggers, and simply don't do the
actual ACK cycle at all if the ISR bit is clear.
IOW, make it do "if (WARN(..)) return;"
Now, we might get the vector number wrong for some reason, and in that case not ACK'ing at all might cause problems too, but it would be interesting to see if it changes behavior wrt the lockup.
I don't have any other ideas at the moment, but hopefully the suggested changes by me and Ingo will give some more data to go on and clarify what might be going on.
Linus
Quoted 45 lines · Linus Torvalds
Quoted 2 lines · Chris J Arges
I modified the posted patch with the following:
Actually, in addition to Ingo's patches (and the irq printout), which you should try first, if none of that really gives any different behavior, can modify that
ack_APIC_irq()debugging code a bit more:arch/x86/include/asm/apic.h static inline void ack_APIC_irq(int vector) · line 447
Quoted 13 lines
arch/x86/include/asm/apic.h +1
-1@@ -441,7 +441,7 @@ static inline void ack_APIC_irq(int vector)if (vector >=16 ) {unsigned v =apic_read (APIC_ISR + ((vector & ~0x1f ) >>1 )); v >>= vector &0x1f ; -WARN_ON_ONCE (!(v &1 )); +WARN (!(v &1 ),"ack_APIC_irq: vector = %0x\n" , vector); }/* * ack_APIC_irq() actually gets compiled as a single instruction So what I'd suggest doing is:
- change the test of "vector >= 16" to just "vector >= 0".
We still have "-1" as the "unknown vector" thing, but I think only
theack_bad_irq()thing calls it, and that should print out its own message if it ever triggers, so it isn't an issue.The reason for the ">= 16" was kind of bogus - the first 16 vectors
are system vectors, but we definitely shouldn't ack the apic for such vectors anyway, so giving a warning for them is very much appropriate. In particular, vector 2 is NMI, and maybe we do ACk it incorrectly.- add a "return" if the warning triggers, and simply don't do the
actual ACK cycle at all if the ISR bit is clear.IOW, make it do "if (WARN(..)) return;"
Now, we might get the vector number wrong for some reason, and in that case not ACK'ing at all might cause problems too, but it would be interesting to see if it changes behavior wrt the lockup.
Quoted 6 lines
I don't have any other ideas at the moment, but hopefully the suggested changes by me and Ingo will give some more data to go on and clarify what might be going on.
Linus
Linus,
I had a few runs with your patch plus modifications, and got the following results (modified patch inlined below):
[ 14.423916] ack_APIC_irq: vector = d1, irq = ffffffff [ 176.060005] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [qemu-system-x86:1630]
[ 17.995298] ack_APIC_irq: vector = d1, irq = ffffffff [ 182.993828] ack_APIC_irq: vector = e1, irq = ffffffff [ 202.919691] ack_APIC_irq: vector = 22, irq = ffffffff [ 484.132006] NMI watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [qemu-system-x86:1586]
[ 15.592032] ack_APIC_irq: vector = d1, irq = ffffffff [ 304.993490] ack_APIC_irq: vector = e1, irq = ffffffff [ 315.174755] ack_APIC_irq: vector = 22, irq = ffffffff [ 360.108007] NMI watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [ksmd:26]
[ 15.026077] ack_APIC_irq: vector = b1, irq = ffffffff [ 374.828531] ack_APIC_irq: vector = c1, irq = ffffffff [ 402.965942] ack_APIC_irq: vector = d1, irq = ffffffff [ 434.540814] ack_APIC_irq: vector = e1, irq = ffffffff [ 461.820768] ack_APIC_irq: vector = 22, irq = ffffffff [ 536.120027] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [qemu-system-x86:4243]
[ 17.889334] ack_APIC_irq: vector = d1, irq = ffffffff [ 291.888784] ack_APIC_irq: vector = e1, irq = ffffffff [ 297.824627] ack_APIC_irq: vector = 22, irq = ffffffff [ 336.960594] ack_APIC_irq: vector = 42, irq = ffffffff [ 367.012706] ack_APIC_irq: vector = 52, irq = ffffffff [ 377.025090] ack_APIC_irq: vector = 62, irq = ffffffff [ 417.088773] ack_APIC_irq: vector = 72, irq = ffffffff [ 447.136788] ack_APIC_irq: vector = 82, irq = ffffffff
-- stopped it since it wasn't reproducing / I was impatient --
So I'm seeing irq == VECTOR_UNDEFINED in all of these cases. Making (vector >= 0) didn't seem to expose any additional vectors.
This was only instrumented at the L1 level, I'm also planning on instrumenting the L0 kernel and seeing if we get these as well.
--chris j arges
--
arch/x86/include/asm/apic.h +0 -0
@@ -395,7 +395,7 @@ static inline void apic_write(u32 reg, u32 val)
apic->write(reg, val);
}
-static inline void apic_eoi(void)
+static inline void apic_eoi(int vector)
{
apic->eoi_write(APIC_EOI, APIC_EOI_ACK); }
@@ -426,7 +426,7 @@ extern void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v));
static inline u32 apic_read(u32 reg) { return 0; }
static inline void apic_write(u32 reg, u32 val) { }
-static inline void apic_eoi(void) { }
+static inline void apic_eoi(int vector) { }
static inline u64 apic_icr_read(void) { return 0; }
static inline void apic_icr_write(u32 low, u32 high) { }
static inline void apic_wait_icr_idle(void) { }
@@ -435,13 +435,26 @@ static inline void apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v)) {}
#endif /* CONFIG_X86_LOCAL_APIC */
-static inline void ack_APIC_irq(void)
+#include <asm/irq_vectors.h>
+typedef int vector_irq_t[NR_VECTORS];
+DECLARE_PER_CPU(vector_irq_t, vector_irq);
+
+static inline void ack_APIC_irq(int vector)
{
+ /* Is the ISR bit actually set for this vector? */
+ if (vector >= 0) {
+ unsigned v = apic_read(APIC_ISR + ((vector & ~0x1f) >> 1));
+ int irq;
+ v >>= vector & 0x1f;
+ irq = __this_cpu_read(vector_irq[vector]);
+
+ WARN(!(v & 1), "ack_APIC_irq: vector = %0x, irq = %0x\n", vector, irq);
+ }
/* * ack_APIC_irq() actually gets compiled as a single instruction * ... yummie. */
- apic_eoi();
+ apic_eoi(vector);
}
static inline unsigned default_get_apic_id(unsigned long x)
@@ -639,9 +652,9 @@ static inline void entering_irq(void)
exit_idle();
}
-static inline void entering_ack_irq(void)
+static inline void entering_ack_irq(int vector)
{
- ack_APIC_irq();
+ ack_APIC_irq(vector); entering_irq();
}
@@ -650,11 +663,11 @@ static inline void exiting_irq(void)
irq_exit();
}
-static inline void exiting_ack_irq(void)
+static inline void exiting_ack_irq(int vector)
{
irq_exit();
/* Ack only at the end to avoid potential reentry */- ack_APIC_irq();
+ ack_APIC_irq(vector);
}
extern void ioapic_zap_locks(void);
arch/x86/kernel/apic/apic.c +0 -0
@@ -910,7 +910,7 @@ __visible void __irq_entry smp_apic_timer_interrupt(struct pt_regs *regs)
* Besides, if we don't timer interrupts ignore the global
* interrupt lock, which is the WrongThing (tm) to do. */
- entering_ack_irq();
+ entering_ack_irq(LOCAL_TIMER_VECTOR); local_apic_timer_interrupt(); exiting_irq();
@@ -929,7 +929,7 @@ __visible void __irq_entry smp_trace_apic_timer_interrupt(struct pt_regs *regs)
* Besides, if we don't timer interrupts ignore the global
* interrupt lock, which is the WrongThing (tm) to do.
*/
- entering_ack_irq();
+ entering_ack_irq(LOCAL_TIMER_VECTOR);
trace_local_timer_entry(LOCAL_TIMER_VECTOR);
local_apic_timer_interrupt();
trace_local_timer_exit(LOCAL_TIMER_VECTOR);
@@ -1342,7 +1342,7 @@ void setup_local_APIC(void)
value = apic_read(APIC_ISR + i*0x10);
for (j = 31; j >= 0; j--) {
if (value & (1<<j)) {
- ack_APIC_irq();
+ ack_APIC_irq(-1);
acked++;
}
}
@@ -1868,7 +1868,7 @@ static inline void __smp_spurious_interrupt(u8 vector)
*/
v = apic_read(APIC_ISR + ((vector & ~0x1f) >> 1));
if (v & (1 << (vector & 0x1f)))- ack_APIC_irq();
+ ack_APIC_irq(vector);
inc_irq_stat(irq_spurious_count);
@@ -1917,7 +1917,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
if (lapic_get_maxlvt() > 3) /* Due to the Pentium erratum 3AP. */ apic_write(APIC_ESR, 0); v = apic_read(APIC_ESR); - ack_APIC_irq(); + ack_APIC_irq(ERROR_APIC_VECTOR); atomic_inc(&irq_err_count); apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
arch/x86/kernel/apic/io_apic.c +0 -0
@@ -1993,7 +1993,7 @@ static void ack_ioapic_level(struct irq_data *data)
* We must acknowledge the irq before we move it or the acknowledge will
* not propagate properly.
*/
- ack_APIC_irq();
+ ack_APIC_irq(i);
/* * Tail end of clearing remote IRR bit (either by delivering the EOI
@@ -2067,7 +2067,8 @@ static void unmask_lapic_irq(struct irq_data *data)
static void ack_lapic_irq(struct irq_data *data)
{
- ack_APIC_irq();
+ struct irq_cfg *cfg = irqd_cfg(data);
+ ack_APIC_irq(cfg->vector);
}
static struct irq_chip lapic_chip __read_mostly = {
arch/x86/kernel/apic/vector.c +3 -1
@@ -335,9 +335,11 @@ int apic_retrigger_irq(struct irq_data *data)void apic_ack_edge (struct irq_data *data) { -irq_complete_move (irqd_cfg (data)); +struct irq_cfg *cfg =irqd_cfg (data); + +irq_complete_move (cfg);
irq_move_irq(data);
- ack_APIC_irq();
+ ack_APIC_irq(cfg->vector);
}
/*
@@ -397,7 +399,7 @@ asmlinkage __visible void smp_irq_move_cleanup_interrupt(void)
{
unsigned vector, me;- ack_APIC_irq();
+ ack_APIC_irq(IRQ_MOVE_CLEANUP_VECTOR); irq_enter(); exit_idle();
arch/x86/kernel/cpu/mcheck/therm_throt.c +0 -0
@@ -433,7 +433,7 @@ asmlinkage __visible void smp_thermal_interrupt(struct pt_regs *regs) {
entering_irq(); __smp_thermal_interrupt();
- exiting_ack_irq();
+ exiting_ack_irq(THERMAL_APIC_VECTOR);
}
asmlinkage __visible void smp_trace_thermal_interrupt(struct pt_regs *regs)
@@ -442,7 +442,7 @@ asmlinkage __visible void smp_trace_thermal_interrupt(struct pt_regs *regs)
trace_thermal_apic_entry(THERMAL_APIC_VECTOR); __smp_thermal_interrupt(); trace_thermal_apic_exit(THERMAL_APIC_VECTOR);
- exiting_ack_irq();
+ exiting_ack_irq(THERMAL_APIC_VECTOR);
}
/* Thermal monitoring depends on APIC, ACPI and clock modulation */
arch/x86/kernel/cpu/mcheck/threshold.c +0 -0
@@ -28,7 +28,7 @@ asmlinkage __visible void smp_threshold_interrupt(void) {
entering_irq(); __smp_threshold_interrupt();
- exiting_ack_irq();
+ exiting_ack_irq(THRESHOLD_APIC_VECTOR);
}
asmlinkage __visible void smp_trace_threshold_interrupt(void)
@@ -37,5 +37,5 @@ asmlinkage __visible void smp_trace_threshold_interrupt(void)
trace_threshold_apic_entry(THRESHOLD_APIC_VECTOR); __smp_threshold_interrupt(); trace_threshold_apic_exit(THRESHOLD_APIC_VECTOR);
- exiting_ack_irq();
+ exiting_ack_irq(THRESHOLD_APIC_VECTOR);
}
arch/x86/kernel/irq.c +0 -0
@@ -45,7 +45,8 @@ void ack_bad_irq(unsigned int irq)
* completely.
* But only ack when the APIC is enabled -AK */
- ack_APIC_irq();
+ /* This doesn't know the vector. It needs the irq descriptor */
+ ack_APIC_irq(-1);
}
#define irq_stats(x) (&per_cpu(irq_stat, x))
@@ -198,7 +199,7 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
irq = __this_cpu_read(vector_irq[vector]);
if (!handle_irq(irq, regs)) {- ack_APIC_irq();
+ ack_APIC_irq(vector);
if (irq != VECTOR_RETRIGGERED) {
pr_emerg_ratelimited("%s: %d.%d No irq handler for vector (irq %d)\n",
@@ -230,7 +231,7 @@ __visible void smp_x86_platform_ipi(struct pt_regs *regs)
{
struct pt_regs *old_regs = set_irq_regs(regs);- entering_ack_irq();
+ entering_ack_irq(X86_PLATFORM_IPI_VECTOR);
__smp_x86_platform_ipi();
exiting_irq();
set_irq_regs(old_regs);
@@ -244,7 +245,7 @@ __visible void smp_kvm_posted_intr_ipi(struct pt_regs *regs)
{
struct pt_regs *old_regs = set_irq_regs(regs);- ack_APIC_irq();
+ ack_APIC_irq(POSTED_INTR_VECTOR);
irq_enter();
@@ -262,7 +263,7 @@ __visible void smp_trace_x86_platform_ipi(struct pt_regs *regs)
{
struct pt_regs *old_regs = set_irq_regs(regs);- entering_ack_irq();
+ entering_ack_irq(X86_PLATFORM_IPI_VECTOR); trace_x86_platform_ipi_entry(X86_PLATFORM_IPI_VECTOR); __smp_x86_platform_ipi(); trace_x86_platform_ipi_exit(X86_PLATFORM_IPI_VECTOR);
arch/x86/kernel/irq_work.c +1 -1
@@ -10,10 +10,10 @@#include <asm/apic.h> #include <asm/trace/irq_vectors.h> -static inline void irq_work_entering_irq (void ) +static inline void irq_work_entering_irq (int vector) {
irq_enter();
- ack_APIC_irq();
+ ack_APIC_irq(vector);
}
static inline void __smp_irq_work_interrupt(void)
@@ -24,14 +24,14 @@ static inline void __smp_irq_work_interrupt(void)
__visible void smp_irq_work_interrupt(struct pt_regs *regs) {
- irq_work_entering_irq();
+ irq_work_entering_irq(IRQ_WORK_VECTOR); __smp_irq_work_interrupt(); exiting_irq();
}
__visible void smp_trace_irq_work_interrupt(struct pt_regs *regs) {
- irq_work_entering_irq();
+ irq_work_entering_irq(IRQ_WORK_VECTOR); trace_irq_work_entry(IRQ_WORK_VECTOR); __smp_irq_work_interrupt(); trace_irq_work_exit(IRQ_WORK_VECTOR);
arch/x86/kernel/smp.c +1 -1
@@ -170,7 +170,7 @@ static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs) asmlinkage __visible void smp_reboot_interrupt(void) { -ack_APIC_irq (); +ack_APIC_irq (REBOOT_VECTOR );
irq_enter(); stop_this_cpu(NULL); irq_exit();
@@ -258,16 +258,16 @@ static inline void __smp_reschedule_interrupt(void)
__visible void smp_reschedule_interrupt(struct pt_regs *regs) {
- ack_APIC_irq();
+ ack_APIC_irq(RESCHEDULE_VECTOR); __smp_reschedule_interrupt(); /* * KVM uses this interrupt to force a cpu out of guest mode */
}
-static inline void smp_entering_irq(void)
+static inline void smp_entering_irq(int vector)
{
- ack_APIC_irq();
+ ack_APIC_irq(vector); irq_enter();
}
@@ -279,7 +279,7 @@ __visible void smp_trace_reschedule_interrupt(struct pt_regs *regs)
* scheduler_ipi(). This is OK, since those functions are allowed
* to nest.
*/
- smp_entering_irq();
+ smp_entering_irq(RESCHEDULE_VECTOR); trace_reschedule_entry(RESCHEDULE_VECTOR); __smp_reschedule_interrupt(); trace_reschedule_exit(RESCHEDULE_VECTOR);
@@ -297,14 +297,14 @@ static inline void __smp_call_function_interrupt(void)
__visible void smp_call_function_interrupt(struct pt_regs *regs) {
- smp_entering_irq();
+ smp_entering_irq(CALL_FUNCTION_VECTOR); __smp_call_function_interrupt(); exiting_irq();
}
__visible void smp_trace_call_function_interrupt(struct pt_regs *regs) {
- smp_entering_irq();
+ smp_entering_irq(CALL_FUNCTION_VECTOR); trace_call_function_entry(CALL_FUNCTION_VECTOR); __smp_call_function_interrupt(); trace_call_function_exit(CALL_FUNCTION_VECTOR);
@@ -319,14 +319,14 @@ static inline void __smp_call_function_single_interrupt(void)
__visible void smp_call_function_single_interrupt(struct pt_regs *regs) {
- smp_entering_irq();
+ smp_entering_irq(CALL_FUNCTION_SINGLE_VECTOR); __smp_call_function_single_interrupt(); exiting_irq();
}
__visible void smp_trace_call_function_single_interrupt(struct pt_regs *regs) {
- smp_entering_irq();
+ smp_entering_irq(CALL_FUNCTION_SINGLE_VECTOR); trace_call_function_single_entry(CALL_FUNCTION_SINGLE_VECTOR); __smp_call_function_single_interrupt(); trace_call_function_single_exit(CALL_FUNCTION_SINGLE_VECTOR);
drivers/iommu/irq_remapping.c +4 -2
@@ -334,12 +334,14 @@ void panic_if_irq_remap(const char *msg)static void ir_ack_apic_edge (struct irq_data *data) { -ack_APIC_irq (); +struct irq_cfg *cfg =irqd_cfg (data); +ack_APIC_irq (cfg->vector); }static void ir_ack_apic_level (struct irq_data *data) { -ack_APIC_irq (); +struct irq_cfg *cfg =irqd_cfg (data); +ack_APIC_irq (cfg->vector);
eoi_ioapic_irq(data->irq, irqd_cfg(data));
}
Quoted 3 lines · Chris J Arges
I had a few runs with your patch plus modifications, and got the following results (modified patch inlined below):
Ok, thanks.
Quoted 8 lines
[ 14.423916] ack_APIC_irq: vector = d1, irq = ffffffff [ 176.060005] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [qemu-system-x86:1630][ 17.995298] ack_APIC_irq: vector = d1, irq = ffffffff [ 182.993828] ack_APIC_irq: vector = e1, irq = ffffffff [ 202.919691] ack_APIC_irq: vector = 22, irq = ffffffff [ 484.132006] NMI watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [qemu-system-x86:1586]
Quoted 4 lines
[ 15.592032] ack_APIC_irq: vector = d1, irq = ffffffff [ 304.993490] ack_APIC_irq: vector = e1, irq = ffffffff [ 315.174755] ack_APIC_irq: vector = 22, irq = ffffffff [ 360.108007] NMI watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [ksmd:26]
.. snip snip ..
So yeah, that's VECTOR_UNDEFINED, and while it could happen as part of irq setup, I'm not seeing that being something that your load should trigger.
It could also obviously just be the vector being somehow corrupted, either due to crazy hardware or software.
But quite frankly, the most likely reason is that whole irq vector movement.
Especially since it sounds from your other email that when you apply Ingo's patches, the ack_APIC_irq warnings go away. Is that correct? Or did you just grep for "move" in the messages?
If you do get both movement messages (from Info's patch) _and_ the ack_APIC_irq warnings (from mine), it would be interesting to see if the vectors line up somehow..
Linus
Quoted 35 lines · Linus Torvalds
Quoted 3 lines · Chris J Arges
I had a few runs with your patch plus modifications, and got the following results (modified patch inlined below):
Ok, thanks.
Quoted 8 lines
[ 14.423916] ack_APIC_irq: vector = d1, irq = ffffffff [ 176.060005] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [qemu-system-x86:1630][ 17.995298] ack_APIC_irq: vector = d1, irq = ffffffff [ 182.993828] ack_APIC_irq: vector = e1, irq = ffffffff [ 202.919691] ack_APIC_irq: vector = 22, irq = ffffffff [ 484.132006] NMI watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [qemu-system-x86:1586]Quoted 4 lines
[ 15.592032] ack_APIC_irq: vector = d1, irq = ffffffff [ 304.993490] ack_APIC_irq: vector = e1, irq = ffffffff [ 315.174755] ack_APIC_irq: vector = 22, irq = ffffffff [ 360.108007] NMI watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [ksmd:26].. snip snip ..
So yeah, that's
VECTOR_UNDEFINED, and while it could happen as part of irq setup, I'm not seeing that being something that your load should trigger.It could also obviously just be the vector being somehow corrupted, either due to crazy hardware or software.
But quite frankly, the most likely reason is that whole irq vector movement.
Especially since it sounds from your other email that when you apply Ingo's patches, the
ack_APIC_irqwarnings go away. Is that correct? Or did you just grep for "move" in the messages?
Quoted 6 lines
If you do get both movement messages (from Info's patch) _and_ the
ack_APIC_irqwarnings (from mine), it would be interesting to see if the vectors line up somehow..Linus
Linus,
I included the full patch in reply to Ingo's email, and when running with that I no longer get the ack_APIC_irq WARNs.
My next homework assignments are:
- Testing with irqbalance disabled
- Testing w/ the appropriate dump_stack() in Ingo's patch
- L0 testing
Thanks,
--chris
Quoted 3 lines · Chris J Arges
I included the full patch in reply to Ingo's email, and when running with that I no longer get the
ack_APIC_irqWARNs.
Ok. That means that the printk's themselves just change timing enough, or change the compiler instruction scheduling so that it hides the apic problem.
Which very much indicates that these things are interconnected.
For example, Ingo's printk patch does
cfg->move_in_progress =
cpumask_intersects(cfg->old_domain, cpu_online_mask);
+ if (cfg->move_in_progress)
+ pr_info("apic: vector %02x,
same-domain move in progress\n", cfg->vector);
cpumask_and(cfg->domain, cfg->domain, tmp_mask);and that means that now the setting of move_in_progress is serialized with the cpumask_and() in a way that it wasn't before.
And while the code takes the "vector_lock" and disables interrupts, the interrupts themselves can happily continue on other cpu's, and they don't take the vector_lock. Neither does send_cleanup_vector(), which clears that bit, afaik.
I don't know. The locking there is odd.
Quoted 2 lines
My next homework assignments are:
- Testing with irqbalance disabled
Definitely.
Quoted 2 lines
- Testing w/ the appropriate
dump_stack()in Ingo's patch
- L0 testing
Thanks,
Linus
Quoted 9 lines · Linus Torvalds
Quoted 3 lines · Chris J Arges
I included the full patch in reply to Ingo's email, and when running with that I no longer get the
ack_APIC_irqWARNs.Ok. That means that the printk's themselves just change timing enough, or change the compiler instruction scheduling so that it hides the apic problem.
So another possibility would be that it's the third change causing this change in behavior:
arch/x86/kernel/apic/vector.c +3 -1
@@ -335,9 +340,11 @@ int apic_retrigger_irq(struct irq_data *data)void apic_ack_edge (struct irq_data *data) { +ack_APIC_irq (); + +/* Might generate IPIs, so do this after having ACKed the APIC: */ irq_complete_move (irqd_cfg (data));irq_move_irq (data); -ack_APIC_irq (); }/*
... since with this we won't send IPIs in a semi-nested fashion with an unacked APIC, which is a good idea to do in general. It's also a weird enough hardware pattern that virtualization's APIC emulation might get it slightly wrong or slightly different.
Quoted 11 lines
Which very much indicates that these things are interconnected.
For example, Ingo's printk patch does
cfg->move_in_progress = cpumask_intersects(cfg->old_domain, cpu_online_mask);(quoted diff) +2
-0+ if (cfg->move_in_progress) + pr_info("apic: vector %02x,same-domain move in progress\n", cfg->vector); cpumask_and(cfg->domain, cfg->domain, tmp_mask);
Quoted 2 lines
and that means that now the setting of
move_in_progressis serialized with thecpumask_and()in a way that it wasn't before.
Yeah, that's a possibility too. It all looks very fragile.
Thanks,
Ingo
Quoted 3 lines · Ingo Molnar
So another possibility would be that it's the third change causing this change in behavior:
Oh, yes, that looks much more likely. I overlooked that small change entirely.
Quoted 4 lines
... since with this we won't send IPIs in a semi-nested fashion with an unacked APIC, which is a good idea to do in general. It's also a weird enough hardware pattern that virtualization's APIC emulation might get it slightly wrong or slightly different.
Yup, that's more likely than the subtle timing/reordering differences of just the added debug printouts. I agree.
Linus
Quoted 33 lines · Chris J Arges
Linus,
I had a few runs with your patch plus modifications, and got the following results (modified patch inlined below):
[ 14.423916] ack_APIC_irq: vector = d1, irq = ffffffff [ 176.060005] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [qemu-system-x86:1630][ 17.995298] ack_APIC_irq: vector = d1, irq = ffffffff [ 182.993828] ack_APIC_irq: vector = e1, irq = ffffffff [ 202.919691] ack_APIC_irq: vector = 22, irq = ffffffff [ 484.132006] NMI watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [qemu-system-x86:1586][ 15.592032] ack_APIC_irq: vector = d1, irq = ffffffff [ 304.993490] ack_APIC_irq: vector = e1, irq = ffffffff [ 315.174755] ack_APIC_irq: vector = 22, irq = ffffffff [ 360.108007] NMI watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [ksmd:26][ 15.026077] ack_APIC_irq: vector = b1, irq = ffffffff [ 374.828531] ack_APIC_irq: vector = c1, irq = ffffffff [ 402.965942] ack_APIC_irq: vector = d1, irq = ffffffff [ 434.540814] ack_APIC_irq: vector = e1, irq = ffffffff [ 461.820768] ack_APIC_irq: vector = 22, irq = ffffffff [ 536.120027] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [qemu-system-x86:4243][ 17.889334] ack_APIC_irq: vector = d1, irq = ffffffff [ 291.888784] ack_APIC_irq: vector = e1, irq = ffffffff [ 297.824627] ack_APIC_irq: vector = 22, irq = ffffffff [ 336.960594] ack_APIC_irq: vector = 42, irq = ffffffff [ 367.012706] ack_APIC_irq: vector = 52, irq = ffffffff [ 377.025090] ack_APIC_irq: vector = 62, irq = ffffffff [ 417.088773] ack_APIC_irq: vector = 72, irq = ffffffff [ 447.136788] ack_APIC_irq: vector = 82, irq = ffffffff
Quoted 4 lines
-- stopped it since it wasn't reproducing / I was impatient --
So I'm seeing irq ==
VECTOR_UNDEFINEDin all of these cases. Making (vector >= 0) didn't seem to expose any additional vectors.
So, these vectors do seem to be lining up with the pattern of how new irq vectors get assigned and how we slowly rotate through all available ones.
The VECTOR_UNDEFINED might correspond to the fact that we already 'freed' that vector, as part of the irq-move mechanism - but it was likely in use shortly before.
So the irq-move code is not off the hook, to the contrary.
Have you already tested whether the hang goes away if you remove irq-affinity fiddling daemons from the system? Do you have irqbalance installed or similar mechanisms?
Thanks,
Ingo
On Wed, Apr 01, 2015 at 02:43:36PM +0200, Ingo Molnar wrote:
<snip>
Quoted 8 lines
Have you already tested whether the hang goes away if you remove irq-affinity fiddling daemons from the system? Do you have irqbalance installed or similar mechanisms?
Thanks,
Ingo
Even with irqbalance removed from the L0/L1 machines the hang still occurs. Using the debug patch as described here:
https://lkml.org/lkml/2015/4/1/338
This results in no 'apic: vector* or 'ack_APIC*' messages being displayed.
--chris
Quoted 4 lines · Chris J Arges
Even with irqbalance removed from the L0/L1 machines the hang still occurs.
This results in no 'apic: vector* or 'ack_APIC*' messages being displayed.
Ok. So the ack_APIC debug patch found *something*, but it seems to be unrelated to the hang.
Dang. Oh well. Back to square one.
Linus
Quoted 5 lines · Linus Torvalds
Quoted 3 lines · Chris J Arges
Even with irqbalance removed from the L0/L1 machines the hang still occurs.
Quoted 9 lines
Quoted 1 line
This results in no 'apic: vector* or 'ack_APIC*' messages being displayed.
Ok. So the
ack_APICdebug patch found *something*, but it seems to be unrelated to the hang.Dang. Oh well. Back to square one.
Linus
With my L0 testing I've normally used a 3.13 series kernel since it tends to reproduce the hang very quickly with the testcase. Note we have reproduced an identical hang with newer kernels (3.19+patches) using the openstack tempest on openstack reproducer, but the timing can vary between hours and days.
Installing a v4.0-rc6+patch kernel on L0 makes the problem very slow to reproduce, so I am running these tests now which may take day(s).
It is worthwhile to do a 'bisect' to see where on average it takes longer to reproduce? Perhaps it will point to a relevant change, or it may be completely useless.
--chris
Quoted 4 lines · Chris J Arges
It is worthwhile to do a 'bisect' to see where on average it takes longer to reproduce? Perhaps it will point to a relevant change, or it may be completely useless.
It's likely to be an exercise in futility. "git bisect" is realyl bad at "gray area" things, and when it's a question of "it takes hours or days to reproduce", it's almost certainly not worth it. Not unless there is some really clear cut-off that we can believably say "this causes it to get much slower". And in this case, I don't think it's that clear-cut. Judging by DaveJ's attempts at bisecting things, the timing just changes. And the differences might be due to entirely unrelated changes like cacheline alignment etc.
So unless we find a real clear signature of the bug (I was hoping that the ISR bit would be that sign), I don't think trying to bisect it based on how quickly you can reproduce things is worthwhile.
Linus
Quoted 3 lines · Linus Torvalds
So unless we find a real clear signature of the bug (I was hoping that the ISR bit would be that sign), I don't think trying to bisect it based on how quickly you can reproduce things is worthwhile.
So I'm wondering (and I might have missed some earlier report that outlines just that), now that the possible location of the bug is again sadly up to 15+ million lines of code, I have no better idea than to debug by symptoms again: what kind of effort was made to examine the locked up state itself?
Softlockups always have some direct cause, which task exactly causes scheduling to stop altogether, why does it lock up - or is it not a clear lockup, just a very slow system?
Thanks,
Ingo
Quoted 7 lines · Ingo Molnar
Quoted 3 lines · Linus Torvalds
So unless we find a real clear signature of the bug (I was hoping that the ISR bit would be that sign), I don't think trying to bisect it based on how quickly you can reproduce things is worthwhile.
Quoted 6 lines
So I'm wondering (and I might have missed some earlier report that outlines just that), now that the possible location of the bug is again sadly up to 15+ million lines of code, I have no better idea than to debug by symptoms again: what kind of effort was made to examine the locked up state itself?
Ingo,
Rafael did some analysis when I was out earlier here:
https://lkml.org/lkml/2015/2/23/234
My reproducer setup is as follows:
L0 - 8-way CPU, 48 GB memory
L1 - 2-way vCPU, 4 GB memory
L2 - 1-way vCPU, 1 GB memory
Stress is only run in the L2 VM, and running top on L0/L1 doesn't show excessive load.
Quoted 8 lines
Softlockups always have some direct cause, which task exactly causes scheduling to stop altogether, why does it lock up - or is it not a clear lockup, just a very slow system?
Thanks,
Ingo
Whenever we look through the crashdump we see csd_lock_wait waiting for CSD_FLAG_LOCK bit to be cleared. Usually the signature leading up to that looks like the following (in the openstack tempest on openstack and nested VM stress case)
(qemu-system-x86 task)kvm_sched_in
-> kvm_arch_vcpu_load
-> vmx_vcpu_load
-> loaded_vmcs_clear
-> smp_call_function_single
(ksmd task)pmdp_clear_flush
-> flush_tlb_mm_range
-> native_flush_tlb_others
-> smp_call_function_many
--chris
Quoted 10 lines · Chris J Arges
Whenever we look through the crashdump we see
csd_lock_waitwaiting forCSD_FLAG_LOCKbit to be cleared. Usually the signature leading up to that looks like the following (in the openstack tempest on openstack and nested VM stress case)(qemu-system-x86 task)
kvm_sched_in
->kvm_arch_vcpu_load
->vmx_vcpu_load
->loaded_vmcs_clear
Quoted 7 lines
-> smp_call_function_single(ksmd task)
pmdp_clear_flush
->flush_tlb_mm_range
->native_flush_tlb_others-> smp_call_function_many
So is this two separate smp_call_function instances, crossing each other, and none makes any progress, indefinitely - as if the two IPIs got lost?
The traces Rafael he linked to show a simpler scenario with two CPUs apparently locked up, doing this:
CPU0:
#5 [ffffffff81c03e88] native_safe_halt at ffffffff81059386 #6 [ffffffff81c03e90] default_idle at ffffffff8101eaee #7 [ffffffff81c03eb0] arch_cpu_idle at ffffffff8101f46f #8 [ffffffff81c03ec0] cpu_startup_entry at ffffffff810b6563 #9 [ffffffff81c03f30] rest_init at ffffffff817a6067
#10 [ffffffff81c03f40] start_kernel at ffffffff81d4cfce #11 [ffffffff81c03f80] x86_64_start_reservations at ffffffff81d4c4d7 #12 [ffffffff81c03f90] x86_64_start_kernel at ffffffff81d4c61c
This CPU is idle.
CPU1:
#10 [ffff88081993fa70] smp_call_function_single at ffffffff810f4d69 #11 [ffff88081993fb10] native_flush_tlb_others at ffffffff810671ae #12 [ffff88081993fb40] flush_tlb_mm_range at ffffffff810672d4 #13 [ffff88081993fb80] pmdp_splitting_flush at ffffffff81065e0d #14 [ffff88081993fba0] split_huge_page_to_list at ffffffff811ddd39 #15 [ffff88081993fc30] __split_huge_page_pmd at ffffffff811dec65 #16 [ffff88081993fcc0] unmap_single_vma at ffffffff811a4f03 #17 [ffff88081993fdc0] zap_page_range at ffffffff811a5d08 #18 [ffff88081993fe80] sys_madvise at ffffffff811b9775 #19 [ffff88081993ff80] system_call_fastpath at ffffffff817b8bad
This CPU is busy-waiting for the TLB flush IPI to finish.
There's no unexpected pattern here (other than it not finishing) AFAICS, the smp_call_function_single() is just the usual way we invoke the TLB flushing methods AFAICS.
So one possibility would be that an 'IPI was sent but lost'.
We could try the following trick: poll for completion for a couple of seconds (since an IPI is not held up by anything but irqs-off sections, it should arrive within microseconds typically - seconds of polling should be more than enough), and if the IPI does not arrive, print a warning message and re-send the IPI.
If the IPI was lost due to some race and there's no other failure mode that we don't understand, then this would work around the bug and would make the tests pass indefinitely - with occasional hickups and a handful of messages produced along the way whenever it would have locked up with a previous kernel.
If testing indeed confirms that kind of behavior we could drill down more closely to figure out why the IPI did not get to its destination.
Or if the behavior is different, we'd have some new behavior to look at. (for example the IPI sending mechanism might be wedged indefinitely for some reason, so that even a resend won't work.)
Agreed?
Thanks,
Ingo
Quoted 2 lines · Ingo Molnar
So one possibility would be that an 'IPI was sent but lost'.
Yes, the "sent but lost" thing would certainly explain the lockups.
At the same time, that sounds like a huge hardware bug, and that's somewhat surprising/unlikely.
That said.
Quoted 5 lines
We could try the following trick: poll for completion for a couple of seconds (since an IPI is not held up by anything but irqs-off sections, it should arrive within microseconds typically - seconds of polling should be more than enough), and if the IPI does not arrive, print a warning message and re-send the IPI.
Sounds like a reasonable approach. At worst it doesn't fix anything, and we never see any messages, and that tells us something too.
Linus
Quoted 21 lines · Ingo Molnar
Quoted 10 lines · Chris J Arges
Whenever we look through the crashdump we see
csd_lock_waitwaiting forCSD_FLAG_LOCKbit to be cleared. Usually the signature leading up to that looks like the following (in the openstack tempest on openstack and nested VM stress case)(qemu-system-x86 task)
kvm_sched_in
->kvm_arch_vcpu_load
->vmx_vcpu_load
->loaded_vmcs_clearQuoted 7 lines
-> smp_call_function_single(ksmd task)
pmdp_clear_flush
->flush_tlb_mm_range
->native_flush_tlb_others-> smp_call_function_many
Quoted 4 lines
So is this two separate
smp_call_functioninstances, crossing each other, and none makes any progress, indefinitely - as if the two IPIs got lost?
This is two different crash signatures. Sorry for the confusion.
Quoted 56 lines
The traces Rafael he linked to show a simpler scenario with two CPUs apparently locked up, doing this:
CPU0:
#5 [
ffffffff81c03e88]native_safe_haltatffffffff81059386#6 [ffffffff81c03e90]default_idleatffffffff8101eaee#7 [ffffffff81c03eb0]arch_cpu_idleatffffffff8101f46f#8 [ffffffff81c03ec0]cpu_startup_entryatffffffff810b6563#9 [ffffffff81c03f30]rest_initatffffffff817a6067
#10 [ffffffff81c03f40]start_kernelatffffffff81d4cfce#11 [ffffffff81c03f80]x86_64_start_reservationsatffffffff81d4c4d7#12 [ffffffff81c03f90]x86_64_start_kernelatffffffff81d4c61cThis CPU is idle.
CPU1:
#10 [
ffff88081993fa70]smp_call_function_singleatffffffff810f4d69#11 [ffff88081993fb10]native_flush_tlb_othersatffffffff810671ae#12 [ffff88081993fb40]flush_tlb_mm_rangeatffffffff810672d4#13 [ffff88081993fb80]pmdp_splitting_flushatffffffff81065e0d#14 [ffff88081993fba0]split_huge_page_to_listatffffffff811ddd39#15 [ffff88081993fc30]__split_huge_page_pmdatffffffff811dec65#16 [ffff88081993fcc0]unmap_single_vmaatffffffff811a4f03#17 [ffff88081993fdc0]zap_page_rangeatffffffff811a5d08#18 [ffff88081993fe80]sys_madviseatffffffff811b9775#19 [ffff88081993ff80]system_call_fastpathatffffffff817b8badThis CPU is busy-waiting for the TLB flush IPI to finish.
There's no unexpected pattern here (other than it not finishing) AFAICS, the
smp_call_function_single()is just the usual way we invoke the TLB flushing methods AFAICS.So one possibility would be that an 'IPI was sent but lost'.
We could try the following trick: poll for completion for a couple of seconds (since an IPI is not held up by anything but irqs-off sections, it should arrive within microseconds typically - seconds of polling should be more than enough), and if the IPI does not arrive, print a warning message and re-send the IPI.
If the IPI was lost due to some race and there's no other failure mode that we don't understand, then this would work around the bug and would make the tests pass indefinitely - with occasional hickups and a handful of messages produced along the way whenever it would have locked up with a previous kernel.
If testing indeed confirms that kind of behavior we could drill down more closely to figure out why the IPI did not get to its destination.
Or if the behavior is different, we'd have some new behavior to look at. (for example the IPI sending mechanism might be wedged indefinitely for some reason, so that even a resend won't work.)
Quoted 6 lines
Agreed?
Thanks,
Ingo
Ingo,
I think tracking IPI calls from 'generic_exec_single' would make a lot of sense. When you say poll for completion do you mean a loop after 'arch_send_call_function_single_ipi' in kernel/smp.c? My main concern would be to not alter the timings too much so we can still reproduce the original problem.
Another approach:
If we want to check for non-ACKed IPIs a possibility would be to add a timestamp field to 'struct call_single_data' and just record jiffies when the IPI gets called. Then have a per-cpu kthread check the 'call_single_queue' percpu list periodically if (jiffies - timestamp) > THRESHOLD. When we reach that condition print the stale entry in call_single_queue, backtrace, then re-send the IPI.
Let me know what makes the most sense to hack on.
Thanks,
--chris
PATCH 1/1 smp/call: Detect stuck CSD locks
Quoted 16 lines · Chris J Arges
Ingo,
I think tracking IPI calls from '
generic_exec_single' would make a lot of sense. When you say poll for completion do you mean a loop after 'arch_send_call_function_single_ipi' inkernel/smp.c? My main concern would be to not alter the timings too much so we can still reproduce the original problem.Another approach:
If we want to check for non-ACKed IPIs a possibility would be to add a timestamp field to 'structcall_single_data' and just record jiffies when the IPI gets called. Then have a per-cpu kthread check the 'call_single_queue' percpu list periodically if (jiffies - timestamp) > THRESHOLD. When we reach that condition print the stale entry incall_single_queue, backtrace, then re-send the IPI.
Quoted 1 line
Let me know what makes the most sense to hack on.
Well, the thing is, putting this polling into an async kernel thread loses a lot of data context and right of reference that we might need to re-send an IPI.
And if the context is not lost we might as well send it from the original, still-looping context - which is a lot simpler as well.
( ... and on a deadlocked non-CONFIG_PREEMPT kernel the kernel thread
won't run at all, so it won't be able to detect deadlocks. )
So I'd really suggest instrumenting the already existing CSD polling, which is already a slowpath, so it won't impact timing much.
I'd suggest the following, rather unintrusive approach:
- first just take a jiffies timestamp and generate a warning message if more than 10 seconds elapsed after sending the IPI, without having heard from it.
- then the IPI is resent. This means adding a bit of a control flow to csd_lock_wait().
Something like the patch below, which implements both steps:
- It will detect and print CSD deadlocks both in the single- and multi- function call APIs, and in the pre-IPI CSD lock wait case as well.
- It will resend an IPI if possible
- It generates various messages in the deadlock case that should give us some idea about how the deadlock played out and whether it got resolved.
The timeout is set to 10 seconds, that should be plenty even in a virtualization environment.
Only very lightly tested under a simple lkvm bootup: I verified that the boilerplate message is displayed, and that it doesn't generate false positive messages in light loads - but I haven't checked whether the deadlock detection works at all.
Thanks,
Ingo
---
kernel/smp.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-)
kernel/smp.c +46 -5
@@ -98,22 +98,63 @@ void __init call_function_init(void)register_cpu_notifier (&hotplug_cfd_notifier); } +/* Locking timeout in ms: */ +#define CSD_LOCK_TIMEOUT (10*1000ULL) + +/* Print this ID in every printk line we output, to be able to easily sort them apart: */ +static int csd_bug_count; +/* * csd_lock/csd_unlock used to serialize access to per-cpu csd resources * * For non-synchronous ipi calls the csd can still be in use by the * previous function call. For multi-cpu calls its even more interesting * as we'll have to ensure no other cpu is observing our csd. +* +* ( The overhead of deadlock detection is not a big problem, this is a +* cpu_relax() loop that is actively wasting CPU cycles to poll for +* completion. ) */ -static void csd_lock_wait (struct call_single_data *csd) +static void csd_lock_wait (struct call_single_data *csd,int cpu) { -while (csd->flags &CSD_FLAG_LOCK ) +int bug_id =0 ; +u64 ts0, ts1, ts_delta; + + ts0 =jiffies_to_msecs (jiffies); + +if (unlikely (!csd_bug_count)) { + csd_bug_count++; +printk ("csd: CSD deadlock debugging initiated!\n" ); + } + +while (csd->flags &CSD_FLAG_LOCK ) { + ts1 =jiffies_to_msecs (jiffies); + + ts_delta = ts1-ts0; +if (unlikely (ts_delta >=CSD_LOCK_TIMEOUT )) {/* Uh oh, it took too long. Why? */ + + bug_id = csd_bug_count; + csd_bug_count++; + + ts0 = ts1;/* Re-start the timeout detection */ + +printk ("csd: Detected non-responsive CSD lock (#%d) on CPU#%02d, waiting %Ld.%03Ld secs for CPU#%02d\n" , + bug_id,raw_smp_processor_id (), ts_delta/1000ULL , ts_delta %1000ULL , cpu); +if (cpu >=0 ) { +printk ("csd: Re-sending CSD lock (#%d) IPI from CPU#%02d to CPU#%02d\n" , bug_id,raw_smp_processor_id (), cpu); +arch_send_call_function_single_ipi (cpu); + } +dump_stack (); + }cpu_relax (); + } +if (unlikely (bug_id)) +printk ("csd: CSD lock (#%d) got unstuck on CPU#%02d, CPU#%02d released the lock after all. Phew!\n" , bug_id,raw_smp_processor_id (), cpu); }static void csd_lock (struct call_single_data *csd) { -csd_lock_wait (csd); +csd_lock_wait (csd,-1 ); csd->flags |=CSD_FLAG_LOCK ;/*
@@ -191,7 +232,7 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,arch_send_call_function_single_ipi (cpu);if (wait) -csd_lock_wait (csd); +csd_lock_wait (csd, cpu);return 0 ; }
@@ -446,7 +487,7 @@ void smp_call_function_many(const struct cpumask *mask,struct call_single_data *csd; csd =per_cpu_ptr (cfd->csd, cpu); -csd_lock_wait (csd); +csd_lock_wait (csd, cpu); } } }
Re: [PATCH] smp/call: Detect stuck CSD locks
kernel/smp.c void __init call_function_init(void) · line 123
Quoted 7 lines · Ingo Molnar
kernel/smp.c +5
-1+static void csd_lock_wait (struct call_single_data *csd,int cpu) { -while (csd->flags &CSD_FLAG_LOCK ) +int bug_id =0 ; +u64 ts0, ts1, ts_delta; + + ts0 =jiffies_to_msecs (jiffies);
Note that while 'jiffies' is a global variable, it's read-mostly accessed, so it is a pretty cheap way to acquire a timestamp in such a simple polling context that has irqs enabled.
Thanks,
Ingo
Re: [PATCH] smp/call: Detect stuck CSD locks
In reply to Ingo MolnarQuoted 104 lines · Ingo Molnar
Quoted 16 lines · Chris J Arges
Ingo,
I think tracking IPI calls from '
generic_exec_single' would make a lot of sense. When you say poll for completion do you mean a loop after 'arch_send_call_function_single_ipi' inkernel/smp.c? My main concern would be to not alter the timings too much so we can still reproduce the original problem.Another approach:
If we want to check for non-ACKed IPIs a possibility would be to add a timestamp field to 'structcall_single_data' and just record jiffies when the IPI gets called. Then have a per-cpu kthread check the 'call_single_queue' percpu list periodically if (jiffies - timestamp) > THRESHOLD. When we reach that condition print the stale entry incall_single_queue, backtrace, then re-send the IPI.Quoted 1 line
Let me know what makes the most sense to hack on.
Well, the thing is, putting this polling into an async kernel thread loses a lot of data context and right of reference that we might need to re-send an IPI.
And if the context is not lost we might as well send it from the original, still-looping context - which is a lot simpler as well.
( ... and on a deadlocked non-CONFIG_PREEMPT kernel the kernel thread
won't run at all, so it won't be able to detect deadlocks. )So I'd really suggest instrumenting the already existing CSD polling, which is already a slowpath, so it won't impact timing much.
I'd suggest the following, rather unintrusive approach:
- first just take a jiffies timestamp and generate a warning message if more than 10 seconds elapsed after sending the IPI, without having heard from it.
- then the IPI is resent. This means adding a bit of a control flow to
csd_lock_wait().Something like the patch below, which implements both steps:
- It will detect and print CSD deadlocks both in the single- and multi- function call APIs, and in the pre-IPI CSD lock wait case as well.
- It will resend an IPI if possible
- It generates various messages in the deadlock case that should give us some idea about how the deadlock played out and whether it got resolved.
The timeout is set to 10 seconds, that should be plenty even in a virtualization environment.
Only very lightly tested under a simple lkvm bootup: I verified that the boilerplate message is displayed, and that it doesn't generate false positive messages in light loads - but I haven't checked whether the deadlock detection works at all.
Thanks,
Ingo
---kernel/smp.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-)kernel/smp.c +15
-2@@ -98,22 +98,63 @@ void __init call_function_init(void)register_cpu_notifier (&hotplug_cfd_notifier); } +/* Locking timeout in ms: */ +#define CSD_LOCK_TIMEOUT (10*1000ULL) + +/* Print this ID in every printk line we output, to be able to easily sort them apart: */ +static int csd_bug_count; +/* * csd_lock/csd_unlock used to serialize access to per-cpu csd resources * * For non-synchronous ipi calls the csd can still be in use by the * previous function call. For multi-cpu calls its even more interesting * as we'll have to ensure no other cpu is observing our csd. +* +* ( The overhead of deadlock detection is not a big problem, this is a +* cpu_relax() loop that is actively wasting CPU cycles to poll for +* completion. ) */ -static void csd_lock_wait (struct call_single_data *csd) +static void csd_lock_wait (struct call_single_data *csd,int cpu) { -while (csd->flags &CSD_FLAG_LOCK ) +int bug_id =0 ; +u64 ts0, ts1, ts_delta; + + ts0 =jiffies_to_msecs (jiffies);
kernel/smp.c void __init call_function_init(void) · line 133
Quoted 10 lines
kernel/smp.c +10
-0+ +if (unlikely (!csd_bug_count)) { + csd_bug_count++; +printk ("csd: CSD deadlock debugging initiated!\n" ); + } + +while (csd->flags &CSD_FLAG_LOCK ) { + ts1 =jiffies_to_msecs (jiffies); + + ts_delta = ts1-ts0;
Ingo,
I noticed that with this patch it never reached 'csd: Detected non-responsive CSD lock...' because it seems that ts_delta never reached CSD_LOCK_TIMEOUT. I tried adjusting the TIMEOUT value and still got a hang without reaching this statement. I made the ts0,ts1 values global and put a counter into the while loop and found that the loop iterated about 670 million times before the softlockup was detected. In addition ts0 and ts1 both had the same values upon soft lockup, and thus would never trip the CSD_LOCK_TIMEOUT check.
--chris
Quoted 47 lines
kernel/smp.c +21
-3+if (unlikely (ts_delta >=CSD_LOCK_TIMEOUT )) {/* Uh oh, it took too long. Why? */ + + bug_id = csd_bug_count; + csd_bug_count++; + + ts0 = ts1;/* Re-start the timeout detection */ + +printk ("csd: Detected non-responsive CSD lock (#%d) on CPU#%02d, waiting %Ld.%03Ld secs for CPU#%02d\n" , + bug_id,raw_smp_processor_id (), ts_delta/1000ULL , ts_delta %1000ULL , cpu); +if (cpu >=0 ) { +printk ("csd: Re-sending CSD lock (#%d) IPI from CPU#%02d to CPU#%02d\n" , bug_id,raw_smp_processor_id (), cpu); +arch_send_call_function_single_ipi (cpu); + } +dump_stack (); + }cpu_relax (); + } +if (unlikely (bug_id)) +printk ("csd: CSD lock (#%d) got unstuck on CPU#%02d, CPU#%02d released the lock after all. Phew!\n" , bug_id,raw_smp_processor_id (), cpu); }static void csd_lock (struct call_single_data *csd) { -csd_lock_wait (csd); +csd_lock_wait (csd,-1 ); csd->flags |=CSD_FLAG_LOCK ;/* @@ -191,7 +232,7 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,arch_send_call_function_single_ipi (cpu);if (wait) -csd_lock_wait (csd); +csd_lock_wait (csd, cpu);return 0 ; }@@ -446,7 +487,7 @@ void smp_call_function_many(const struct cpumask *mask,struct call_single_data *csd; csd =per_cpu_ptr (cfd->csd, cpu); -csd_lock_wait (csd); +csd_lock_wait (csd, cpu); } } }
Re: [PATCH] smp/call: Detect stuck CSD locks
Quoted 9 lines · Chris J Arges
I noticed that with this patch it never reached 'csd: Detected non-responsive CSD lock...' because it seems that
ts_deltanever reachedCSD_LOCK_TIMEOUT. I tried adjusting the TIMEOUT value and still got a hang without reaching this statement. I made the ts0,ts1 values global and put a counter into the while loop and found that the loop iterated about 670 million times before the softlockup was detected. In addition ts0 and ts1 both had the same values upon soft lockup, and thus would never trip theCSD_LOCK_TIMEOUTcheck.
Sounds like jiffies stops updating. Which doesn't sound unreasonable for when there is some IPI problem.
How about just changing the debug patch to count iterations, and print out a warning when it reaches ten million or so.
No, that's not the right thing to do in general, but for debugging this particular issue it's a quick hack that might just work. It's not like re-sending the IPI is "wrong" anyway.
Linus
Re: [PATCH] smp/call: Detect stuck CSD locks
Quoted 12 lines · Linus Torvalds
Quoted 9 lines · Chris J Arges
I noticed that with this patch it never reached 'csd: Detected non-responsive CSD lock...' because it seems that
ts_deltanever reachedCSD_LOCK_TIMEOUT. I tried adjusting the TIMEOUT value and still got a hang without reaching this statement. I made the ts0,ts1 values global and put a counter into the while loop and found that the loop iterated about 670 million times before the softlockup was detected. In addition ts0 and ts1 both had the same values upon soft lockup, and thus would never trip theCSD_LOCK_TIMEOUTcheck.
Quoted 2 lines
Sounds like jiffies stops updating. Which doesn't sound unreasonable for when there is some IPI problem.
Yeah - although it weakens the 'IPI lost spuriously' hypothesis: we ought to have irqs enabled here which normally doesn't stop jiffies from updating, and the timer interrupt stopping suggests a much deeper problem than just some lost IPI ...
Quoted 3 lines
How about just changing the debug patch to count iterations, and print out a warning when it reaches ten million or so.
Yeah, or replace jiffies_to_ms() with:
sched_clock()/1000000
sched_clock() should be safe to call in these codepaths.
Like the attached patch. (Totally untested.)
Thanks,
Ingo
---
kernel/smp.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-)
kernel/smp.c +46 -5
@@ -98,22 +98,63 @@ void __init call_function_init(void)register_cpu_notifier (&hotplug_cfd_notifier); } +/* Locking timeout in ms: */ +#define CSD_LOCK_TIMEOUT (10*1000ULL) + +/* Print this ID in every printk line we output, to be able to easily sort them apart: */ +static int csd_bug_count; +/* * csd_lock/csd_unlock used to serialize access to per-cpu csd resources * * For non-synchronous ipi calls the csd can still be in use by the * previous function call. For multi-cpu calls its even more interesting * as we'll have to ensure no other cpu is observing our csd. +* +* ( The overhead of deadlock detection is not a big problem, this is a +* cpu_relax() loop that is actively wasting CPU cycles to poll for +* completion. ) */ -static void csd_lock_wait (struct call_single_data *csd) +static void csd_lock_wait (struct call_single_data *csd,int cpu) { -while (csd->flags &CSD_FLAG_LOCK ) +int bug_id =0 ; +u64 ts0, ts1, ts_delta; + + ts0 =sched_clock ()/1000000 ; + +if (unlikely (!csd_bug_count)) { + csd_bug_count++; +printk ("csd: CSD deadlock debugging initiated!\n" ); + } + +while (csd->flags &CSD_FLAG_LOCK ) { + ts1 =sched_clock ()/1000000 ; + + ts_delta = ts1-ts0; +if (unlikely (ts_delta >=CSD_LOCK_TIMEOUT )) {/* Uh oh, it took too long. Why? */ + + bug_id = csd_bug_count; + csd_bug_count++; + + ts0 = ts1;/* Re-start the timeout detection */ + +printk ("csd: Detected non-responsive CSD lock (#%d) on CPU#%02d, waiting %Ld.%03Ld secs for CPU#%02d\n" , + bug_id,raw_smp_processor_id (), ts_delta/1000ULL , ts_delta %1000ULL , cpu); +if (cpu >=0 ) { +printk ("csd: Re-sending CSD lock (#%d) IPI from CPU#%02d to CPU#%02d\n" , bug_id,raw_smp_processor_id (), cpu); +arch_send_call_function_single_ipi (cpu); + } +dump_stack (); + }cpu_relax (); + } +if (unlikely (bug_id)) +printk ("csd: CSD lock (#%d) got unstuck on CPU#%02d, CPU#%02d released the lock after all. Phew!\n" , bug_id,raw_smp_processor_id (), cpu); }static void csd_lock (struct call_single_data *csd) { -csd_lock_wait (csd); +csd_lock_wait (csd,-1 ); csd->flags |=CSD_FLAG_LOCK ;/*
@@ -191,7 +232,7 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,arch_send_call_function_single_ipi (cpu);if (wait) -csd_lock_wait (csd); +csd_lock_wait (csd, cpu);return 0 ; }
@@ -446,7 +487,7 @@ void smp_call_function_many(const struct cpumask *mask,struct call_single_data *csd; csd =per_cpu_ptr (cfd->csd, cpu); -csd_lock_wait (csd); +csd_lock_wait (csd, cpu); } } }
Re: [PATCH] smp/call: Detect stuck CSD locks
Quoted 27 lines · Ingo Molnar
Quoted 12 lines · Linus Torvalds
Quoted 9 lines · Chris J Arges
I noticed that with this patch it never reached 'csd: Detected non-responsive CSD lock...' because it seems that
ts_deltanever reachedCSD_LOCK_TIMEOUT. I tried adjusting the TIMEOUT value and still got a hang without reaching this statement. I made the ts0,ts1 values global and put a counter into the while loop and found that the loop iterated about 670 million times before the softlockup was detected. In addition ts0 and ts1 both had the same values upon soft lockup, and thus would never trip theCSD_LOCK_TIMEOUTcheck.Quoted 2 lines
Sounds like jiffies stops updating. Which doesn't sound unreasonable for when there is some IPI problem.
Yeah - although it weakens the 'IPI lost spuriously' hypothesis: we ought to have irqs enabled here which normally doesn't stop jiffies from updating, and the timer interrupt stopping suggests a much deeper problem than just some lost IPI ...
Quoted 3 lines
How about just changing the debug patch to count iterations, and print out a warning when it reaches ten million or so.
Quoted 8 lines
Yeah, or replace
jiffies_to_ms()with:sched_clock()/1000000
sched_clock()should be safe to call in these codepaths.Like the attached patch. (Totally untested.)
Ingo,
Looks like sched_lock() works in this case.
Adding the dump_stack() line caused various issues such as the VM oopsing on boot or the softlockup never being detected properly (and thus not crashing). So the below is running with your patch and 'dump_stack()' commented out.
Here is the log leading up to the soft lockup (I adjusted CSD_LOCK_TIMEOUT to 5s):
[ 22.669630] kvm [1523]: vcpu0 disabled perfctr wrmsr: 0xc1 data 0xffff [ 38.712710] csd: Detected non-responsive CSD lock (#1) on CPU#00, waiting 5.000 secs for CPU#01 [ 38.712715] csd: Re-sending CSD lock (#1) IPI from CPU#00 to CPU#01 [ 43.712709] csd: Detected non-responsive CSD lock (#2) on CPU#00, waiting 5.000 secs for CPU#01 [ 43.712713] csd: Re-sending CSD lock (#2) IPI from CPU#00 to CPU#01 [ 48.712708] csd: Detected non-responsive CSD lock (#3) on CPU#00, waiting 5.000 secs for CPU#01 [ 48.712732] csd: Re-sending CSD lock (#3) IPI from CPU#00 to CPU#01 [ 53.712708] csd: Detected non-responsive CSD lock (#4) on CPU#00, waiting 5.000 secs for CPU#01 [ 53.712712] csd: Re-sending CSD lock (#4) IPI from CPU#00 to CPU#01 [ 58.712707] csd: Detected non-responsive CSD lock (#5) on CPU#00, waiting 5.000 secs for CPU#01 [ 58.712712] csd: Re-sending CSD lock (#5) IPI from CPU#00 to CPU#01 [ 60.080005] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [ksmd:26]
Still we never seem to release the lock, even when resending the IPI.
Looking at the call_single_queue I see the following (I crashed during the soft lockup):
crash> p call_single_queue
PER-CPU DATA TYPE:
struct llist_head call_single_queue;
PER-CPU ADDRESSES:
[0]: ffff88013fc16580
[1]: ffff88013fd16580
crash> list -s call_single_data ffff88013fc16580ffff88013fc16580
struct call_single_data {
llist = {
next = 0x0 },
func = 0x0,
info = 0x0,
flags = 0
}
crash> list -s call_single_data ffff88013fd16580ffff88013fd16580
struct call_single_data {
llist = {
next = 0xffff88013a517c08 },
func = 0x0,
info = 0x0,
flags = 0
}ffff88013a517c08
struct call_single_data {
llist = {
next = 0x0 },
func = 0xffffffff81067f30 <flush_tlb_func>,
info = 0xffff88013a517d00,
flags = 3
}
This seems consistent with previous crash dumps.
As I mentioned here: https://lkml.org/lkml/2015/4/6/186
I'm able to reproduce this easily on certain hardware w/ b6b8a1451fc40412c57d10c94b62e22acab28f94 applied and not 9242b5b60df8b13b469bc6b7be08ff6ebb551ad3 on the L0 kernel. I think it makes sense to get as clear of a picture with this more trivial reproducer, then re-run this on a L0 w/ v4.0-rcX. Most likely the later case will take many days to reproduce.
Thanks,
--chris
Re: [PATCH] smp/call: Detect stuck CSD locks
Quoted 14 lines · Chris J Arges
Here is the log leading up to the soft lockup (I adjusted
CSD_LOCK_TIMEOUTto 5s):[ 22.669630] kvm [1523]: vcpu0 disabled perfctr wrmsr: 0xc1 data 0xffff [ 38.712710] csd: Detected non-responsive CSD lock (#1) on CPU#00, waiting 5.000 secs for CPU#01 [ 38.712715] csd: Re-sending CSD lock (#1) IPI from CPU#00 to CPU#01 [ 43.712709] csd: Detected non-responsive CSD lock (#2) on CPU#00, waiting 5.000 secs for CPU#01 [ 43.712713] csd: Re-sending CSD lock (#2) IPI from CPU#00 to CPU#01 [ 48.712708] csd: Detected non-responsive CSD lock (#3) on CPU#00, waiting 5.000 secs for CPU#01 [ 48.712732] csd: Re-sending CSD lock (#3) IPI from CPU#00 to CPU#01 [ 53.712708] csd: Detected non-responsive CSD lock (#4) on CPU#00, waiting 5.000 secs for CPU#01 [ 53.712712] csd: Re-sending CSD lock (#4) IPI from CPU#00 to CPU#01 [ 58.712707] csd: Detected non-responsive CSD lock (#5) on CPU#00, waiting 5.000 secs for CPU#01 [ 58.712712] csd: Re-sending CSD lock (#5) IPI from CPU#00 to CPU#01 [ 60.080005] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [ksmd:26]
Ok, so it's not the IPI just "getting lost". I'm not hugely surprised.
But it does look like CPU1 never actually reacts to the IPI, even when re-sent:
Quoted 32 lines
Looking at the
call_single_queueI see the following (I crashed during the soft lockup):crash> p
call_single_queue
PER-CPU DATA TYPE:
structllist_headcall_single_queue;
PER-CPU ADDRESSES:
[0]:ffff88013fc16580
[1]:ffff88013fd16580
crash> list -scall_single_dataffff88013fc16580ffff88013fc16580
structcall_single_data{llist = { next = 0x0},
func =0x0,
info =0x0,
flags = 0
}
crash> list -scall_single_dataffff88013fd16580ffff88013fd16580
structcall_single_data{llist = { next = 0xffff88013a517c08},
func =0x0,
info =0x0,
flags = 0
}ffff88013a517c08
structcall_single_data{llist = { next = 0x0
Quoted 7 lines
},
func =0xffffffff81067f30<flush_tlb_func>,
info =0xffff88013a517d00,
flags = 3
}This seems consistent with previous crash dumps.
The above seems to show that CPU1 has never picked up the CSD. Which is consistent with CPU0 waiting forever for it.
It really looks like CPU1 is simply not reacting to the IPI even when resent. It's possibly masked at the APIC level, or it's somehow stuck.
Quoted 7 lines
As I mentioned here: https://lkml.org/lkml/2015/4/6/186
I'm able to reproduce this easily on certain hardware w/b6b8a1451fc40412c57d10c94b62e22acab28f94applied and not9242b5b60df8b13b469bc6b7be08ff6ebb551ad3on the L0 kernel. I think it makes sense to get as clear of a picture with this more trivial reproducer, then re-run this on a L0 w/ v4.0-rcX. Most likely the later case will take many days to reproduce.
Well, those commits imply that it's a kvm virtualization problem, but at least DaveJ's problems was while running on raw hardware with no virtualization.
Ho humm.
Linus
Re: [PATCH] smp/call: Detect stuck CSD locks
In reply to Chris J ArgesQuoted 23 lines · Chris J Arges
Ingo,
Looks like
sched_clock()works in this case.Adding the
dump_stack()line caused various issues such as the VM oopsing on boot or the softlockup never being detected properly (and thus not crashing). So the below is running with your patch and 'dump_stack()' commented out.Here is the log leading up to the soft lockup (I adjusted
CSD_LOCK_TIMEOUTto 5s):[ 22.669630] kvm [1523]: vcpu0 disabled perfctr wrmsr: 0xc1 data 0xffff [ 38.712710] csd: Detected non-responsive CSD lock (#1) on CPU#00, waiting 5.000 secs for CPU#01 [ 38.712715] csd: Re-sending CSD lock (#1) IPI from CPU#00 to CPU#01 [ 43.712709] csd: Detected non-responsive CSD lock (#2) on CPU#00, waiting 5.000 secs for CPU#01 [ 43.712713] csd: Re-sending CSD lock (#2) IPI from CPU#00 to CPU#01 [ 48.712708] csd: Detected non-responsive CSD lock (#3) on CPU#00, waiting 5.000 secs for CPU#01 [ 48.712732] csd: Re-sending CSD lock (#3) IPI from CPU#00 to CPU#01 [ 53.712708] csd: Detected non-responsive CSD lock (#4) on CPU#00, waiting 5.000 secs for CPU#01 [ 53.712712] csd: Re-sending CSD lock (#4) IPI from CPU#00 to CPU#01 [ 58.712707] csd: Detected non-responsive CSD lock (#5) on CPU#00, waiting 5.000 secs for CPU#01 [ 58.712712] csd: Re-sending CSD lock (#5) IPI from CPU#00 to CPU#01 [ 60.080005] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [ksmd:26]
Quoted 1 line
Still we never seem to release the lock, even when resending the IPI.
So it would be really important to see the stack dump of CPU#0 at this point, and also do an APIC state dump of it.
Because from previous dumps it appeared that the 'stuck' CPU was just in its idle loop - which is 'impossible' as the idle loop should still allow APIC irqs arriving.
This behavior can only happen if:
- CPU#0 has irqs disabled perpetually. A dump of CPU#0 should tell us where it's executing. This has actually a fair chance to be the case as it actually happened in a fair number of bugs in the past, but I thought from past dumps you guys provided that this possibility was excluded ... but it merits re-examination with the debug patches applied.
- the APIC on CPU#0 is unacked and has queued up so many IPIs that it starts rejecting them. I'm not sure that's even possible on KVM though. I'm not sure that's even possible on KVM, unless part of the hardware virtualizes the APIC. One other thing that talks against this scenario is that NMIs appear to be reaching through to CPU#0: the crash dumps and dump-on-all-cpus NMI callbacks worked fine.
- the APIC on CPU#0 is in some weird state well outside of its Linux programming model (TPR set wrong, etc. etc.). There's literally a myriad of ways an APIC can be configured to not receive IPIs: but I've never actually seen this happen under Linux, as it needs complicated writes to specialized APIC registers, and we don't actually reconfigure the APIC in any serious fashion aside bootup. Low likelihood but not impossible. Again, NMIs reaching through make this situation less likely.
- CPU#0 having a bad IDT and essentially ignoring certain IPIs. This presumes some serious but very targeted memory corruption. Lowest likelihood.
- ... other failure modes that elude me. Neither of the scenarios above strike me as particularly plausible - but something must be causing the lockup, so ...
In any case, something got seriously messed up on CPU#0, and stays messed up during the lockup, and it would help a lot figuring out exactly what, by further examining its state.
Note, it might also be useful to dump KVM's state of the APIC of CPU#0, to see why _it_ isn't sending (and injecting) the lapic IRQ into CPU#0. By all means it should. [Maybe take a look at CPU#1 as well, to make sure the IPI was actually generated.]
It should be much easier to figure this out on the KVM side than on the native hardware side, which emulates the lapic to a large degree, so we can see 'hardware state' directly. If we are lucky then the KVM problem mirrors the native hardware problem.
Btw., it might also be helpful to try to turn off hardware assisted APIC virtualization on the KVM side, to make the APIC purely software emulated. If this makes the bug go away magically then this raises the likelihood that the bug is really hardware APIC related.
I don't know what the magic incantation is to make 'pure software APIC' happen on KVM and Qemu though.
Thanks,
Ingo
Re: [PATCH] smp/call: Detect stuck CSD locks
<snip>
Quoted 61 lines
So it would be really important to see the stack dump of CPU#0 at this point, and also do an APIC state dump of it.
Because from previous dumps it appeared that the 'stuck' CPU was just in its idle loop - which is 'impossible' as the idle loop should still allow APIC irqs arriving.
This behavior can only happen if:
- CPU#0 has irqs disabled perpetually. A dump of CPU#0 should tell us where it's executing. This has actually a fair chance to be the case as it actually happened in a fair number of bugs in the past, but I thought from past dumps you guys provided that this possibility was excluded ... but it merits re-examination with the debug patches applied.
- the APIC on CPU#0 is unacked and has queued up so many IPIs that it starts rejecting them. I'm not sure that's even possible on KVM though. I'm not sure that's even possible on KVM, unless part of the hardware virtualizes the APIC. One other thing that talks against this scenario is that NMIs appear to be reaching through to CPU#0: the crash dumps and dump-on-all-cpus NMI callbacks worked fine.
- the APIC on CPU#0 is in some weird state well outside of its Linux programming model (TPR set wrong, etc. etc.). There's literally a myriad of ways an APIC can be configured to not receive IPIs: but I've never actually seen this happen under Linux, as it needs complicated writes to specialized APIC registers, and we don't actually reconfigure the APIC in any serious fashion aside bootup. Low likelihood but not impossible. Again, NMIs reaching through make this situation less likely.
- CPU#0 having a bad IDT and essentially ignoring certain IPIs. This presumes some serious but very targeted memory corruption. Lowest likelihood.
- ... other failure modes that elude me. Neither of the scenarios above strike me as particularly plausible - but something must be causing the lockup, so ...
In any case, something got seriously messed up on CPU#0, and stays messed up during the lockup, and it would help a lot figuring out exactly what, by further examining its state.
Note, it might also be useful to dump KVM's state of the APIC of CPU#0, to see why _it_ isn't sending (and injecting) the lapic IRQ into CPU#0. By all means it should. [Maybe take a look at CPU#1 as well, to make sure the IPI was actually generated.]
It should be much easier to figure this out on the KVM side than on the native hardware side, which emulates the lapic to a large degree, so we can see 'hardware state' directly. If we are lucky then the KVM problem mirrors the native hardware problem.
Btw., it might also be helpful to try to turn off hardware assisted APIC virtualization on the KVM side, to make the APIC purely software emulated. If this makes the bug go away magically then this raises the likelihood that the bug is really hardware APIC related.
Quoted 7 lines
I don't know what the magic incantation is to make 'pure software APIC' happen on KVM and Qemu though.
Thanks,
Ingo
Ingo,
/sys/module/kvm_intel/parameters/enable_apicv on the affected hardware is not enabled, and unfortunately my hardware doesn't have the necessary features to enable it. So we are dealing with KVM's lapic implementation only.
FYI, I'm working on getting better data at the moment and here is my approach:
* For the L0 kernel:
- In arch/x86/kvm/lapic.c, I enabled 'apic_debug' to get more output (and print the addresses of various useful structures)
- Setup crash to live dump kvm_lapic structures and associated registers for both vCPUs
* For the L1 kernel:
- Dump a stacktrace when we detect a lockup.
- Detect a lockup and try to not alter the state.
- Have a reliable signal such that the L0 hypervisor can dump the lapic structures and registers when csd_lock_wait detects a softlockup.
Hopefully I can make progress and present meaningful results in my next update.
Thanks,
--chris j arges
Re: [PATCH] smp/call: Detect stuck CSD locks
Quoted 4 lines · Chris J Arges
/sys/module/kvm_intel/parameters/enable_apicvon the affected hardware is not enabled, and unfortunately my hardware doesn't have the necessary features to enable it. So we are dealing with KVM's lapic implementation only.
That's actually pretty fortunate, as we don't have to worry about hardware state nearly as much!
Quoted 6 lines
FYI, I'm working on getting better data at the moment and here is my approach:
* For the L0 kernel:
- Inarch/x86/kvm/lapic.c, I enabled 'apic_debug' to get more output (and print the addresses of various useful structures)
- Setup crash to live dumpkvm_lapicstructures and associated registers for both vCPUs
It would also be nice to double check the stuck vCPU's normal CPU
state: is it truly able to receive interrupts? (IRQ flags are on, or is it sitting in the idle loop, etc.?)
If the IRQ flag (in EFLAGS) is off then the vCPU is not able to receive interrupts, regardless of local APIC state.
Quoted 5 lines
* For the L1 kernel:
- Dump a stacktrace when we detect a lockup.
- Detect a lockup and try to not alter the state.
- Have a reliable signal such that the L0 hypervisor can dump the lapic structures and registers whencsd_lock_waitdetects a softlockup.
I'd also suggest adding a printk() to IPI receipt, to make sure it's not the CSD code that is not getting called into after the IPI resend attempt. To make sure you only get messages after the CPU got stuck, add a 'locked_up' flag that signals this, and only print the messages if the lockup scenario is happening.
I'd do it by adding something like this to kernel/smp.c::generic_smp_call_function_single_interrupt():
if (csd_locked_up)
printk("CSD: Function call IPI callback on CPU#%d\n", raw_smp_processor_id());Having this message in place would ensure that the IPI indeed did not get generated on the stuck vCPU. (Because we'd not get this message.)
Thanks,
Ingo
Re: [PATCH] smp/call: Detect stuck CSD locks
On Mon, Apr 13, 2015 at 08:14:51AM +0200, Ingo Molnar wrote:
<snip>
Quoted 32 lines
Quoted 6 lines
FYI, I'm working on getting better data at the moment and here is my approach:
* For the L0 kernel:
- Inarch/x86/kvm/lapic.c, I enabled 'apic_debug' to get more output (and print the addresses of various useful structures)
- Setup crash to live dumpkvm_lapicstructures and associated registers for both vCPUsIt would also be nice to double check the stuck vCPU's normal CPU
state: is it truly able to receive interrupts? (IRQ flags are on, or is it sitting in the idle loop, etc.?)If the IRQ flag (in EFLAGS) is off then the vCPU is not able to receive interrupts, regardless of local APIC state.
Quoted 5 lines
* For the L1 kernel:
- Dump a stacktrace when we detect a lockup.
- Detect a lockup and try to not alter the state.
- Have a reliable signal such that the L0 hypervisor can dump the lapic structures and registers whencsd_lock_waitdetects a softlockup.I'd also suggest adding a
printk()to IPI receipt, to make sure it's not the CSD code that is not getting called into after the IPI resend attempt. To make sure you only get messages after the CPU got stuck, add a 'locked_up' flag that signals this, and only print the messages if the lockup scenario is happening.I'd do it by adding something like this to kernel/smp.c::generic_smp_call_function_single_interrupt():
if (csd_locked_up) printk("CSD: Function call IPI callback on CPU#%d\n", raw_smp_processor_id());
Quoted 6 lines
Having this message in place would ensure that the IPI indeed did not get generated on the stuck vCPU. (Because we'd not get this message.)
Thanks,
Ingo
Ingo,
Below are the patches and data I've gathered from the reproducer. My methodology was as described previously; however I used gdb on the qemu process in order to breakpoint L1 once we've detected the hang. This made dumping the kvm_lapic structures on L0 more reliable.
Thanks,
--chris j arges
--
* L0 patch (against Ubuntu-3.13.x w/ b6b8a1451fc40412c57d1):
arch/x86/kvm/lapic.c +3 -7
@@ -54,8 +54,7 @@#define APIC_BUS_CYCLE_NS 1 -/* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */ -#define apic_debug(fmt, arg...) +#define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg)#define APIC_LVT_NUM 6/* 14 is the version for Xeon and Pentium 8.4.8*/
@@ -539,9 +538,6 @@ static void apic_update_ppr(struct kvm_lapic *apic)else ppr = isrv &0xf0 ; -apic_debug ("vlapic %p, ppr 0x%x, isr 0x%x, isrv 0x%x" , - apic, ppr, isr, isrv); -if (old_ppr != ppr) {apic_set_reg (apic,APIC_PROCPRI , ppr);if (ppr < old_ppr)
@@ -865,10 +861,10 @@ static void apic_send_ipi(struct kvm_lapic *apic)trace_kvm_apic_ipi (icr_low, irq.dest_id); -apic_debug ("icr_high 0x%x, icr_low 0x%x, " +apic_debug ("apic_send_ipi-> kvm 0x%x vcpu 0x%x apic 0x%x icr_high 0x%x, icr_low 0x%x, " "short_hand 0x%x, dest 0x%x, trig_mode 0x%x, level 0x%x, " "dest_mode 0x%x, delivery_mode 0x%x, vector 0x%x\n" , - icr_high, icr_low, irq.shorthand, irq.dest_id, + apic->vcpu->kvm, apic->vcpu, apic, icr_high, icr_low, irq.shorthand, irq.dest_id, irq.trig_mode, irq.level, irq.dest_mode, irq.delivery_mode, irq.vector);
* L1 patch (against latest v4.0):
kernel/smp.c +53 -5
95 lines not on this page · raw message
* L1 Kernel Log leading up to crash, I set the timeout for 2s.
[ 177.324317] kvm [1671]: vcpu0 disabled perfctr wrmsr: 0xc1 data 0xffff [ 227.645275] csd: Detected non-responsive CSD lock (#1) on CPU#00, waiting 2.000 secs for CPU#01 [ 227.687193] Kernel panic - not syncing: csd_lock_wait
Note: the L0 log mostly was available just to let me know which address the kvm_lapic structures had. I wasn't able to grab this log in this run.
* Crash dump backtrace from L1:
crash> bt -a
PID: 26 TASK: ffff88013a4f1400 CPU: 0 COMMAND: "ksmd"
#0 [ffff88013a5039f0] machine_kexec at ffffffff8109d3ec #1 [ffff88013a503a50] crash_kexec at ffffffff8114a763
#2 [ffff88013a503b20] panic at ffffffff818068e0
#3 [ffff88013a503ba0] csd_lock_wait at ffffffff8113f1e4 #4 [ffff88013a503bf0] generic_exec_single at ffffffff8113f2d0 #5 [ffff88013a503c60] smp_call_function_single at ffffffff8113f417 #6 [ffff88013a503c90] smp_call_function_many at ffffffff8113f7a4 #7 [ffff88013a503d20] flush_tlb_page at ffffffff810b3bf9 #8 [ffff88013a503d50] ptep_clear_flush at ffffffff81205e5e #9 [ffff88013a503d80] try_to_merge_with_ksm_page at ffffffff8121a445
#10 [ffff88013a503e00] ksm_scan_thread at ffffffff8121ac0e #11 [ffff88013a503ec0] kthread at ffffffff810df0fb
#12 [ffff88013a503f50] ret_from_fork at ffffffff8180fc98
PID: 1674 TASK: ffff8800ba4a9e00 CPU: 1 COMMAND: "qemu-system-x86"
#0 [ffff88013fd05e20] crash_nmi_callback at ffffffff81091521 #1 [ffff88013fd05e30] nmi_handle at ffffffff81062560 #2 [ffff88013fd05ea0] default_do_nmi at ffffffff81062b0a #3 [ffff88013fd05ed0] do_nmi at ffffffff81062c88 #4 [ffff88013fd05ef0] end_repeat_nmi at ffffffff81812241
[exception RIP: vmx_vcpu_run+992]
RIP: ffffffff8104cef0 RSP: ffff88013940bcb8 RFLAGS: 00000082
RAX: 0000000080000202 RBX: ffff880139b30000 RCX: ffff880139b30000
RDX: 0000000000000200 RSI: ffff880139b30000 RDI: ffff880139b30000
RBP: ffff88013940bd28 R8: 00007fe192b71110 R9: 00007fe192b71140
R10: 00007fff66407d00 R11: 00007fe1927f0060 R12: 0000000000000000
R13: 0000000000000001 R14: 0000000000000001 R15: 0000000000000000
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018--- <NMI exception stack> ---
#5 [ffff88013940bcb8] vmx_vcpu_run at ffffffff8104cef0 #6 [ffff88013940bcf8] vmx_handle_external_intr at ffffffff81040c18 #7 [ffff88013940bd30] kvm_arch_vcpu_ioctl_run at ffffffff8101b5ad #8 [ffff88013940be00] kvm_vcpu_ioctl at ffffffff81007894 #9 [ffff88013940beb0] do_vfs_ioctl at ffffffff81253190
#10 [ffff88013940bf30] sys_ioctl at ffffffff81253411
#11 [ffff88013940bf80] system_call_fastpath at ffffffff8180fd4d
RIP: 00007ff6f80f5337 RSP: 00007ff6ed833bd8 RFLAGS: 00000246
RAX: ffffffffffffffda RBX: ffffffff8180fd4d RCX: 00007ff6f80f5337
RDX: 0000000000000000 RSI: 000000000000ae80 RDI: 0000000000000010
RBP: 00007ff6ffa7c430 R8: 0000000000000000 R9: 00000000ffffffff
R10: 00000000000fed00 R11: 0000000000000246 R12: 00007ff6fe195240
R13: 0000000000000000 R14: 0000000000000001 R15: 0000000000000000
ORIG_RAX: 0000000000000010 CS: 0033 SS: 002b* Looking at call_single_queue, CPU[1] has <flush_tlb_func>:
crash> p call_single_queue
PER-CPU DATA TYPE:
struct llist_head call_single_queue;
PER-CPU ADDRESSES:
[0]: ffff88013fc16540
[1]: ffff88013fd16540
crash> list -s call_single_data 0xffff88013fc16540 ffff88013fc16540
struct call_single_data {
llist = {
next = 0x0 },
func = 0x0,
info = 0x0,
flags = 0
}
crash> list -s call_single_data 0xffff88013fd16540 ffff88013fd16540
struct call_single_data {
llist = {
next = 0xffff88013a503c08 },
func = 0x0,
info = 0x0,
flags = 0
}ffff88013a503c08
struct call_single_data {
llist = {
next = 0x0 },
func = 0xffffffff810b37d0 <flush_tlb_func>,
info = 0xffff88013a503d00,
flags = 3
}
* Using a script as follows once I find out the addresses of the kvm_lapic structures:
mod -S /usr/lib/debug/lib/modules > /dev/null
p *(struct kvm_lapic *)${apic0}
rd ${regs0} 512 | grep -v '0000000000000000 0000000000000000' p *(struct kvm_lapic *)${apic1}
rd ${regs1} 512 | grep -v '0000000000000000 0000000000000000'
* Normal dump of kvm_lapic structure and registers for each vCPU on L1 (before the hang):
$1 = {
base_address = 4276092928,
dev = {
ops = 0xffffffffa01dc890 <apic_mmio_ops>
},
lapic_timer = {
timer = {
node = {
node = {
__rb_parent_color = 18446612183461255480,
rb_right = 0x0,
rb_left = 0x0
},
expires = {
tv64 = 170867881314366
}
},
_softexpires = {
tv64 = 170867881314366
},
function = 0xffffffffa01c5f80 <apic_timer_fn>,
base = 0xffff880bff20d1a0,
state = 1,
start_pid = 13304,
start_site = 0xffffffff8108edd8 <hrtimer_start+24>,
start_comm = "qemu-system-x86"
},
period = 199816048,
timer_mode_mask = 131072,
tscdeadline = 0,
pending = {
counter = 0
}
},
divide_count = 16,
vcpu = 0xffff880be7443f00,
irr_pending = false,
isr_count = 0,
highest_isr_cache = -1,
regs = 0xffff880be91e6000,
vapic_addr = 0,
vapic_cache = {
generation = 0,
gpa = 0,
hva = 0,
len = 0,
memslot = 0x0 },
pending_events = 0,
sipi_vector = 0
}
ffff880be91e6030: 0000000001050014 0000000000000000 ................ ffff880be91e60d0: 0000000000000001 0000000000000000 ................ ffff880be91e60e0: 00000000ffffffff 0000000000000000 ................ ffff880be91e60f0: 00000000000001ff 0000000000000000 ................ ffff880be91e6190: 000000000e200000 0000000000000000 .. ............. ffff880be91e6300: 00000000000000fd 0000000000000000 ................ ffff880be91e6310: 0000000000000001 0000000000000000 ................ ffff880be91e6320: 00000000000000ef 0000000000000000 ................ ffff880be91e6330: 0000000000010000 0000000000000000 ................ ffff880be91e6340: 0000000000010000 0000000000000000 ................ ffff880be91e6350: 0000000000010700 0000000000000000 ................ ffff880be91e6360: 0000000000000400 0000000000000000 ................ ffff880be91e6370: 00000000000000fe 0000000000000000 ................ ffff880be91e6380: 0000000000be8f37 0000000000000000 7............... ffff880be91e63e0: 0000000000000003 0000000000000000 ................
020 Local APIC ID Register = 0x0000000000000000
030 Local APIC Version Register = 0x0000000001050014
0d0 Logical Destination Register = 0x0000000000000001
0e0 Destination Format Register = 0x00000000ffffffff
0f0 Spurious Interrupt Vector Reg = 0x00000000000001ff
190 Trigger Mode Reg (TMR); 63:32 = 0x000000000e200000
300 Interrupt Cmd Reg (ICR); 0-31 = 0x00000000000000fd
310 Interrupt Cmd Reg (ICR); 32-63 = 0x0000000000000001
320 LVT Timer Register = 0x00000000000000ef
330 LVT Thermal Sensor Register = 0x0000000000010000
340 LVT Perf Mon Counter Reg = 0x0000000000010000
350 LVT LINT0 Register = 0x0000000000010700
360 LVT LINT1 Register = 0x0000000000000400
370 LVT Error Register = 0x00000000000000fe
380 Initial Count Reg (for Timer) = 0x0000000000be8f37
3e0 Divide Cfg Reg (for Timer) = 0x0000000000000003
$2 = {
base_address = 4276092928,
dev = {
ops = 0xffffffffa01dc890 <apic_mmio_ops>
},
lapic_timer = {
timer = {
node = {
node = {
__rb_parent_color = 18446612183483367104,
rb_right = 0x0,
rb_left = 0x0
},
expires = {
tv64 = 170868457351683
}
},
_softexpires = {
tv64 = 170868457351683
},
function = 0xffffffffa01c5f80 <apic_timer_fn>,
base = 0xffff880bff26d1a0,
state = 1,
start_pid = 13305,
start_site = 0xffffffff8108edd8 <hrtimer_start+24>,
start_comm = "qemu-system-x86"
},
period = 955895056,
timer_mode_mask = 131072,
tscdeadline = 0,
pending = {
counter = 0
}
},
divide_count = 16,
vcpu = 0xffff880be7440000,
irr_pending = false,
isr_count = 0,
highest_isr_cache = -1,
regs = 0xffff880be78c1000,
vapic_addr = 0,
vapic_cache = {
generation = 0,
gpa = 0,
hva = 0,
len = 0,
memslot = 0x0 },
pending_events = 0,
sipi_vector = 154
}
ffff880be78c1020: 0000000001000000 0000000000000000 ................ ffff880be78c1030: 0000000001050014 0000000000000000 ................ ffff880be78c10d0: 0000000000000002 0000000000000000 ................ ffff880be78c10e0: 00000000ffffffff 0000000000000000 ................ ffff880be78c10f0: 00000000000001ff 0000000000000000 ................ ffff880be78c1300: 00000000000000fd 0000000000000000 ................ ffff880be78c1320: 00000000000000ef 0000000000000000 ................ ffff880be78c1330: 0000000000010000 0000000000000000 ................ ffff880be78c1340: 0000000000010400 0000000000000000 ................ ffff880be78c1350: 0000000000010700 0000000000000000 ................ ffff880be78c1360: 0000000000010400 0000000000000000 ................ ffff880be78c1370: 00000000000000fe 0000000000000000 ................ ffff880be78c1380: 00000000038f9cd1 0000000000000000 ................ ffff880be78c13e0: 0000000000000003 0000000000000000 ................
020 Local APIC ID Register = 0x0000000001000000
030 Local APIC Version Register = 0x0000000001050014
0d0 Logical Destination Register = 0x0000000000000002
0e0 Destination Format Register = 0x00000000ffffffff
0f0 Spurious Interrupt Vector Reg = 0x00000000000001ff
190 Trigger Mode Reg (TMR); 63:32 = 0x0000000000000000
300 Interrupt Cmd Reg (ICR); 0-31 = 0x00000000000000fd
310 Interrupt Cmd Reg (ICR); 32-63 = 0x0000000000000000
320 LVT Timer Register = 0x00000000000000ef
330 LVT Thermal Sensor Register = 0x0000000000010000
340 LVT Perf Mon Counter Reg = 0x0000000000010400
350 LVT LINT0 Register = 0x0000000000010700
360 LVT LINT1 Register = 0x0000000000010400
370 LVT Error Register = 0x00000000000000fe
380 Initial Count Reg (for Timer) = 0x00000000038f9cd1
3e0 Divide Cfg Reg (for Timer) = 0x0000000000000003
* Dump of kvm_lapic structure and registers for each vCPU on L1 when crash is detected.
Note, I used qemu to trap on when we detect the hang in csd_lock_wait. This way we should preserve the registers as they exist when we've detected the lockup.
$1 = {
base_address = 4276092928,
dev = {
ops = 0xffffffffa01dc890 <apic_mmio_ops>
},
lapic_timer = {
timer = {
node = {
node = {
__rb_parent_color = 18446612172786658320,
rb_right = 0xffff880bff24dce0,
rb_left = 0x0
},
expires = {
tv64 = 170996305305003
}
},
_softexpires = {
tv64 = 170996305305003
},
function = 0xffffffffa01c5f80 <apic_timer_fn>,
base = 0xffff880bff24d1a0,
state = 0,
start_pid = 13304,
start_site = 0xffffffff8108edd8 <hrtimer_start+24>,
start_comm = "qemu-system-x86"
},
period = 3995184,
timer_mode_mask = 131072,
tscdeadline = 0,
pending = {
counter = 1
}
},
divide_count = 16,
vcpu = 0xffff880be7443f00,
irr_pending = false,
isr_count = 0,
highest_isr_cache = -1,
regs = 0xffff880be91e6000,
vapic_addr = 0,
vapic_cache = {
generation = 0,
gpa = 0,
hva = 0,
len = 0,
memslot = 0x0 },
pending_events = 0,
sipi_vector = 0
}
ffff880be91e6030: 0000000001050014 0000000000000000 ................ ffff880be91e60d0: 0000000000000001 0000000000000000 ................ ffff880be91e60e0: 00000000ffffffff 0000000000000000 ................ ffff880be91e60f0: 00000000000001ff 0000000000000000 ................ ffff880be91e6190: 000000000e200000 0000000000000000 .. ............. ffff880be91e6300: 00000000000000fb 0000000000000000 ................ ffff880be91e6310: 0000000000000001 0000000000000000 ................ ffff880be91e6320: 00000000000000ef 0000000000000000 ................ ffff880be91e6330: 0000000000010000 0000000000000000 ................ ffff880be91e6340: 0000000000010000 0000000000000000 ................ ffff880be91e6350: 0000000000010700 0000000000000000 ................ ffff880be91e6360: 0000000000000400 0000000000000000 ................ ffff880be91e6370: 00000000000000fe 0000000000000000 ................ ffff880be91e6380: 000000000003cf63 0000000000000000 c............... ffff880be91e63e0: 0000000000000003 0000000000000000 ................
020 Local APIC ID Register = 0x0000000000000000
030 Local APIC Version Register = 0x0000000001050014
0d0 Logical Destination Register = 0x0000000000000001
0e0 Destination Format Register = 0x00000000ffffffff
0f0 Spurious Interrupt Vector Reg = 0x00000000000001ff
190 Trigger Mode Reg (TMR); 63:32 = 0x000000000e200000
300 Interrupt Cmd Reg (ICR); 0-31 = 0x00000000000000fb
310 Interrupt Cmd Reg (ICR); 32-63 = 0x0000000000000001
320 LVT Timer Register = 0x00000000000000ef
330 LVT Thermal Sensor Register = 0x0000000000010000
340 LVT Perf Mon Counter Reg = 0x0000000000010000
350 LVT LINT0 Register = 0x0000000000010700
360 LVT LINT1 Register = 0x0000000000000400
370 LVT Error Register = 0x00000000000000fe
380 Initial Count Reg (for Timer) = 0x000000000003cf63
3e0 Divide Cfg Reg (for Timer) = 0x0000000000000003
$2 = {
base_address = 4276092928,
dev = {
ops = 0xffffffffa01dc890 <apic_mmio_ops>
},
lapic_timer = {
timer = {
node = {
node = {
__rb_parent_color = 18446612172786662160,
rb_right = 0x0,
rb_left = 0x0
},
expires = {
tv64 = 170994304769720
}
},
_softexpires = {
tv64 = 170994304769720
},
function = 0xffffffffa01c5f80 <apic_timer_fn>,
base = 0xffff880bff20d1a0,
state = 0,
start_pid = 13305,
start_site = 0xffffffff8108edd8 <hrtimer_start+24>,
start_comm = "qemu-system-x86"
},
period = 3422832,
timer_mode_mask = 131072,
tscdeadline = 0,
pending = {
counter = 0
}
},
divide_count = 16,
vcpu = 0xffff880be7440000,
irr_pending = true,
isr_count = 1,
highest_isr_cache = 251,
regs = 0xffff880be78c1000,
vapic_addr = 0,
vapic_cache = {
generation = 0,
gpa = 0,
hva = 0,
len = 0,
memslot = 0x0 },
pending_events = 0,
sipi_vector = 154
}
ffff880be78c1020: 0000000001000000 0000000000000000 ................ ffff880be78c1030: 0000000001050014 0000000000000000 ................ ffff880be78c10a0: 00000000000000f0 0000000000000000 ................ ffff880be78c10d0: 0000000000000002 0000000000000000 ................ ffff880be78c10e0: 00000000ffffffff 0000000000000000 ................ ffff880be78c10f0: 00000000000001ff 0000000000000000 ................ ffff880be78c1170: 0000000008000000 0000000000000000 ................ ffff880be78c1250: 0000000000020000 0000000000000000 ................ ffff880be78c1260: 0000000000000002 0000000000000000 ................ ffff880be78c1270: 0000000000008000 0000000000000000 ................ ffff880be78c1300: 00000000000000fd 0000000000000000 ................ ffff880be78c1320: 00000000000000ef 0000000000000000 ................ ffff880be78c1330: 0000000000010000 0000000000000000 ................ ffff880be78c1340: 0000000000010400 0000000000000000 ................ ffff880be78c1350: 0000000000010700 0000000000000000 ................ ffff880be78c1360: 0000000000010400 0000000000000000 ................ ffff880be78c1370: 00000000000000fe 0000000000000000 ................ ffff880be78c1380: 00000000000343a7 0000000000000000 .C.............. ffff880be78c13e0: 0000000000000003 0000000000000000 ................
020 Local APIC ID Register = 0x0000000001000000
030 Local APIC Version Register = 0x0000000001050014
0a0 Processor Priority Reg (PPR) = 0x00000000000000f0 *
0d0 Logical Destination Register = 0x0000000000000002
0e0 Destination Format Register = 0x00000000ffffffff
0f0 Spurious Interrupt Vector Reg = 0x00000000000001ff
170 In-Service Reg (ISR); 255:224 = 0x0000000008000000 *
190 Trigger Mode Reg (TMR); 63:32 = 0x0000000000000000
250 Intr Req Reg (IRR); 191:160 = 0x0000000000020000 *
260 Intr Req Reg (IRR); 223:192 = 0x0000000000000002 *
270 Intr Req Reg (IRR); 255:224 = 0x0000000000008000 *
300 Interrupt Cmd Reg (ICR); 0-31 = 0x00000000000000fd
310 Interrupt Cmd Reg (ICR); 32-63 = 0x0000000000000000
320 LVT Timer Register = 0x00000000000000ef
330 LVT Thermal Sensor Register = 0x0000000000010000
340 LVT Perf Mon Counter Reg = 0x0000000000010400
350 LVT LINT0 Register = 0x0000000000010700
360 LVT LINT1 Register = 0x0000000000010400
370 LVT Error Register = 0x00000000000000fe
380 Initial Count Reg (for Timer) = 0x00000000000343a7
3e0 Divide Cfg Reg (for Timer) = 0x0000000000000003
Re: [PATCH] smp/call: Detect stuck CSD locks
Quoted 6 lines · Chris J Arges
Ingo,
Below are the patches and data I've gathered from the reproducer. My methodology was as described previously; however I used gdb on the qemu process in order to breakpoint L1 once we've detected the hang. This made dumping the
kvm_lapicstructures on L0 more reliable.
Thanks!
So I have trouble interpreting the L1 backtrace, because it shows something entirely new (to me).
First lets clarify the terminology, to make sure I got the workload all right:
- L0 is the host kernel, running native Linux. It's not locking up.
- L1 is the guest kernel, running virtualized Linux. This is the one that is locking up.
- L2 is the nested guest kernel, running whatever test workload you were running - this is obviously locking up together with L1.
Right?
So with that cleared up, the backtrace on L1 looks like this:
Quoted 17 lines
* Crash dump backtrace from L1:
crash> bt -a
PID: 26 TASK:ffff88013a4f1400CPU: 0 COMMAND: "ksmd"
#0 [ffff88013a5039f0]machine_kexecatffffffff8109d3ec#1 [ffff88013a503a50]crash_kexecatffffffff8114a763
#2 [ffff88013a503b20] panic atffffffff818068e0
#3 [ffff88013a503ba0]csd_lock_waitatffffffff8113f1e4#4 [ffff88013a503bf0]generic_exec_singleatffffffff8113f2d0#5 [ffff88013a503c60]smp_call_function_singleatffffffff8113f417#6 [ffff88013a503c90]smp_call_function_manyatffffffff8113f7a4#7 [ffff88013a503d20]flush_tlb_pageatffffffff810b3bf9#8 [ffff88013a503d50]ptep_clear_flushatffffffff81205e5e#9 [ffff88013a503d80]try_to_merge_with_ksm_pageatffffffff8121a445
#10 [ffff88013a503e00]ksm_scan_threadatffffffff8121ac0e#11 [ffff88013a503ec0] kthread atffffffff810df0fb
#12 [ffff88013a503f50]ret_from_forkatffffffff8180fc98
So this one, VCPU0, is trying to send an IPI to VCPU1:
Quoted 14 lines
PID: 1674 TASK:
ffff8800ba4a9e00CPU: 1 COMMAND: "qemu-system-x86"
#0 [ffff88013fd05e20]crash_nmi_callbackatffffffff81091521#1 [ffff88013fd05e30]nmi_handleatffffffff81062560#2 [ffff88013fd05ea0]default_do_nmiatffffffff81062b0a#3 [ffff88013fd05ed0]do_nmiatffffffff81062c88#4 [ffff88013fd05ef0]end_repeat_nmiatffffffff81812241[exception RIP: vmx_vcpu_run+992] RIP: ffffffff8104cef0 RSP: ffff88013940bcb8 RFLAGS: 00000082 RAX: 0000000080000202 RBX: ffff880139b30000 RCX: ffff880139b30000 RDX: 0000000000000200 RSI: ffff880139b30000 RDI: ffff880139b30000 RBP: ffff88013940bd28 R8: 00007fe192b71110 R9: 00007fe192b71140 R10: 00007fff66407d00 R11: 00007fe1927f0060 R12: 0000000000000000 R13: 0000000000000001 R14: 0000000000000001 R15: 0000000000000000 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
Quoted 8 lines
--- <NMI exception stack> ---
#5 [ffff88013940bcb8]vmx_vcpu_runatffffffff8104cef0#6 [ffff88013940bcf8]vmx_handle_external_intratffffffff81040c18#7 [ffff88013940bd30]kvm_arch_vcpu_ioctl_runatffffffff8101b5ad#8 [ffff88013940be00]kvm_vcpu_ioctlatffffffff81007894#9 [ffff88013940beb0]do_vfs_ioctlatffffffff81253190
#10 [ffff88013940bf30]sys_ioctlatffffffff81253411
#11 [ffff88013940bf80]system_call_fastpathatffffffff8180fd4d
So the problem here that I can see is that L1's VCPU1 appears to be looping with interrupts disabled:
Quoted 1 line
RIP: ffffffff8104cef0 RSP: ffff88013940bcb8 RFLAGS: 00000082
Look how RFLAGS doesn't have 0x200 set - so it's executing with interrupts disabled.
That is why the IPI does not get through to it, but kdump's NMI had no problem getting through.
This (assuming all backtraces are exact!):
Quoted 3 lines
#5 [
ffff88013940bcb8]vmx_vcpu_runatffffffff8104cef0#6 [ffff88013940bcf8]vmx_handle_external_intratffffffff81040c18#7 [ffff88013940bd30]kvm_arch_vcpu_ioctl_runatffffffff8101b5ad
suggests that we called vmx_vcpu_run() from vmx_handle_external_intr(), and that we are executing L2 guest code with interrupts disabled.
How is this supposed to work? What mechanism does KVM have against a (untrusted) guest interrupt handler locking up?
I might be misunderstanding how this works at the KVM level, but from the APIC perspective the situation appears to be pretty clear: CPU1's interrupts are turned off, so it cannot receive IPIs, the CSD wait will eventually time out.
Now obviously it appears to be anomalous (assuming my analysis is correct) that the interrupt handler has locked up, but it's
immaterial: a nested kernel must not allow its guest to lock it up.
Thanks,
Ingo
Re: [PATCH] smp/call: Detect stuck CSD locks
Quoted 20 lines · Ingo Molnar
Quoted 6 lines · Chris J Arges
Ingo,
Below are the patches and data I've gathered from the reproducer. My methodology was as described previously; however I used gdb on the qemu process in order to breakpoint L1 once we've detected the hang. This made dumping the
kvm_lapicstructures on L0 more reliable.Thanks!
So I have trouble interpreting the L1 backtrace, because it shows something entirely new (to me).
First lets clarify the terminology, to make sure I got the workload all right:
- L0 is the host kernel, running native Linux. It's not locking up.
Quoted 7 lines
- L1 is the guest kernel, running virtualized Linux. This is the one that is locking up.
- L2 is the nested guest kernel, running whatever test workload you were running - this is obviously locking up together with L1.
Right?
Yup this sums it up nicely.
Quoted 46 lines
So with that cleared up, the backtrace on L1 looks like this:
Quoted 17 lines
* Crash dump backtrace from L1:
crash> bt -a
PID: 26 TASK:ffff88013a4f1400CPU: 0 COMMAND: "ksmd"
#0 [ffff88013a5039f0]machine_kexecatffffffff8109d3ec#1 [ffff88013a503a50]crash_kexecatffffffff8114a763
#2 [ffff88013a503b20] panic atffffffff818068e0
#3 [ffff88013a503ba0]csd_lock_waitatffffffff8113f1e4#4 [ffff88013a503bf0]generic_exec_singleatffffffff8113f2d0#5 [ffff88013a503c60]smp_call_function_singleatffffffff8113f417#6 [ffff88013a503c90]smp_call_function_manyatffffffff8113f7a4#7 [ffff88013a503d20]flush_tlb_pageatffffffff810b3bf9#8 [ffff88013a503d50]ptep_clear_flushatffffffff81205e5e#9 [ffff88013a503d80]try_to_merge_with_ksm_pageatffffffff8121a445
#10 [ffff88013a503e00]ksm_scan_threadatffffffff8121ac0e#11 [ffff88013a503ec0] kthread atffffffff810df0fb
#12 [ffff88013a503f50]ret_from_forkatffffffff8180fc98So this one, VCPU0, is trying to send an IPI to VCPU1:
Quoted 14 lines
PID: 1674 TASK:
ffff8800ba4a9e00CPU: 1 COMMAND: "qemu-system-x86"
#0 [ffff88013fd05e20]crash_nmi_callbackatffffffff81091521#1 [ffff88013fd05e30]nmi_handleatffffffff81062560#2 [ffff88013fd05ea0]default_do_nmiatffffffff81062b0a#3 [ffff88013fd05ed0]do_nmiatffffffff81062c88#4 [ffff88013fd05ef0]end_repeat_nmiatffffffff81812241[exception RIP: vmx_vcpu_run+992] RIP: ffffffff8104cef0 RSP: ffff88013940bcb8 RFLAGS: 00000082 RAX: 0000000080000202 RBX: ffff880139b30000 RCX: ffff880139b30000 RDX: 0000000000000200 RSI: ffff880139b30000 RDI: ffff880139b30000 RBP: ffff88013940bd28 R8: 00007fe192b71110 R9: 00007fe192b71140 R10: 00007fff66407d00 R11: 00007fe1927f0060 R12: 0000000000000000 R13: 0000000000000001 R14: 0000000000000001 R15: 0000000000000000 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018Quoted 8 lines
--- <NMI exception stack> ---
#5 [ffff88013940bcb8]vmx_vcpu_runatffffffff8104cef0#6 [ffff88013940bcf8]vmx_handle_external_intratffffffff81040c18#7 [ffff88013940bd30]kvm_arch_vcpu_ioctl_runatffffffff8101b5ad#8 [ffff88013940be00]kvm_vcpu_ioctlatffffffff81007894#9 [ffff88013940beb0]do_vfs_ioctlatffffffff81253190
#10 [ffff88013940bf30]sys_ioctlatffffffff81253411
#11 [ffff88013940bf80]system_call_fastpathatffffffff8180fd4d
Quoted 8 lines
So the problem here that I can see is that L1's VCPU1 appears to be looping with interrupts disabled:
Quoted 1 line
RIP: ffffffff8104cef0 RSP: ffff88013940bcb8 RFLAGS: 00000082Look how RFLAGS doesn't have
0x200set - so it's executing with interrupts disabled.
I've ran this with L0: 3.13+b6b8a145 L1: 4.0+debug patches and got a similar backtrace with interrupts disabled; however this _may_ be another issue.
I ran L0/L1: 3.13+b6b8a145 and got something like this:
PID: 36 TASK: ffff8801396a9800 CPU: 0 COMMAND: "ksmd"
#0 [ffff88013fc03d18] machine_kexec at ffffffff8104ace2 #1 [ffff88013fc03d68] crash_kexec at ffffffff810e72e3
#2 [ffff88013fc03e30] panic at ffffffff8171a404
#3 [ffff88013fc03ea8] watchdog_timer_fn at ffffffff8110daa5 #4 [ffff88013fc03ed8] __run_hrtimer at ffffffff8108e7a7 #5 [ffff88013fc03f18] hrtimer_interrupt at ffffffff8108ef6f #6 [ffff88013fc03f80] local_apic_timer_interrupt at ffffffff81043617 #7 [ffff88013fc03f98] smp_apic_timer_interrupt at ffffffff8173414f #8 [ffff88013fc03fb0] apic_timer_interrupt at ffffffff81732add
--- <IRQ stack> ---
#9 [ffff880137fd3b08] apic_timer_interrupt at ffffffff81732add
[exception RIP: generic_exec_single+130]
RIP: ffffffff810dbf52 RSP: ffff880137fd3bb0 RFLAGS: 00000202
RAX: 0000000000000002 RBX: ffff880137fd3b80 RCX: 0000000000000002
RDX: ffffffff8180ad80 RSI: 0000000000000000 RDI: 0000000000000282
RBP: ffff880137fd3be0 R8: ffffffff8180ad68 R9: 0000000000000001
R10: 0000000000000000 R11: 0000000000000002 R12: 0000000000000000
R13: 0000000000000002 R14: 0000000000000000 R15: ffff880137fd3bd0
ORIG_RAX: ffffffffffffff10 CS: 0010 SS: 0018 #10 [ffff880137fd3be8] smp_call_function_single at ffffffff810dc065
#11 [ffff880137fd3c60] smp_call_function_many at ffffffff810dc496
#12 [ffff880137fd3cc0] make_all_cpus_request at ffffffffa004e5ef [kvm]
#13 [ffff880137fd3cf8] kvm_flush_remote_tlbs at ffffffffa004e620 [kvm]
#14 [ffff880137fd3d18] kvm_mmu_notifier_invalidate_range_start at ffffffffa004e6a2 [kvm] #15 [ffff880137fd3d58] __mmu_notifier_invalidate_range_start at ffffffff8119b56b #16 [ffff880137fd3d90] try_to_merge_with_ksm_page at ffffffff8119d296
#17 [ffff880137fd3e00] ksm_do_scan at ffffffff8119d749
#18 [ffff880137fd3e78] ksm_scan_thread at ffffffff8119e0cf
#19 [ffff880137fd3ed0] kthread at ffffffff8108b592
#20 [ffff880137fd3f50] ret_from_fork at ffffffff81731ccc
PID: 1543 TASK: ffff880137861800 CPU: 1 COMMAND: "qemu-system-x86"
#0 [ffff88013fd05e58] crash_nmi_callback at ffffffff81040082 #1 [ffff88013fd05e68] nmi_handle at ffffffff8172aa38 #2 [ffff88013fd05ec8] do_nmi at ffffffff8172ac00 #3 [ffff88013fd05ef0] end_repeat_nmi at ffffffff81729ea1
[exception RIP: _raw_spin_lock+50]
RIP: ffffffff817292b2 RSP: ffff8800372ab8f8 RFLAGS: 00000202
RAX: 0000000000000010 RBX: 0000000000000010 RCX: 0000000000000202
RDX: ffff8800372ab8f8 RSI: 0000000000000018 RDI: 0000000000000001
RBP: ffffffff817292b2 R8: ffffffff817292b2 R9: 0000000000000018
R10: ffff8800372ab8f8 R11: 0000000000000202 R12: ffffffffffffffff
R13: ffff8800b8f78000 R14: 00000000000070ae R15: 00000000000070ae
ORIG_RAX: 00000000000070ae CS: 0010 SS: 0018 --- <DOUBLEFAULT exception stack> ---
#4 [ffff8800372ab8f8] _raw_spin_lock at ffffffff817292b2
#5 [ffff8800372ab900] kvm_mmu_notifier_invalidate_range_start at ffffffffa004e67e [kvm] #6 [ffff8800372ab940] __mmu_notifier_invalidate_range_start at ffffffff8119b56b #7 [ffff8800372ab978] do_wp_page at ffffffff81177fee
A previous backtrace of a 3.19 series kernel is here and showing interrupts enabled on both CPUs on L1:
https://lkml.org/lkml/2015/2/23/234
http://people.canonical.com/~inaddy/lp1413540/BACKTRACES.txt
Quoted 21 lines
That is why the IPI does not get through to it, but kdump's NMI had no problem getting through.
This (assuming all backtraces are exact!):
Quoted 3 lines
#5 [
ffff88013940bcb8]vmx_vcpu_runatffffffff8104cef0#6 [ffff88013940bcf8]vmx_handle_external_intratffffffff81040c18#7 [ffff88013940bd30]kvm_arch_vcpu_ioctl_runatffffffff8101b5adsuggests that we called
vmx_vcpu_run()fromvmx_handle_external_intr(), and that we are executing L2 guest code with interrupts disabled.How is this supposed to work? What mechanism does KVM have against a (untrusted) guest interrupt handler locking up?
I might be misunderstanding how this works at the KVM level, but from the APIC perspective the situation appears to be pretty clear: CPU1's interrupts are turned off, so it cannot receive IPIs, the CSD wait will eventually time out.
Quoted 8 lines
Now obviously it appears to be anomalous (assuming my analysis is correct) that the interrupt handler has locked up, but it's
immaterial: a nested kernel must not allow its guest to lock it up.Thanks,
Ingo
Yes, I think at this point I'll go through the various backtraces and try to narrow things down. I think overall we're seeing a single effect from multiple code paths.
--chris j arges
Re: [PATCH] smp/call: Detect stuck CSD locks
Quoted 10 lines · Chris J Arges
A previous backtrace of a 3.19 series kernel is here and showing interrupts enabled on both CPUs on L1:
https://lkml.org/lkml/2015/2/23/234
http://people.canonical.com/~inaddy/lp1413540/BACKTRACES.txt[...]
Yes, I think at this point I'll go through the various backtraces and try to narrow things down. I think overall we're seeing a single effect from multiple code paths.
Now what would be nice is to observe it whether the CPU that is not doing the CSD wait is truly locked up.
It might be executing random KVM-ish workloads and the various backtraces we've seen so far are just a random sample of those workloads (from L1's perspective).
Yet the fact that the kdump's NMI gets through is a strong indication that the CPU's APIC is fine: NMIs are essentially IPIs too, they just go to the NMI vector, which punches through irqs-off regions.
So maybe another debug trick would be useful: instead of re-sending the IPI, send a single non-destructive NMI every second or so, creating a backtrace on the other CPU. From that we'll be able to see whether it's locked up permanently in an irqs-off section.
I.e. basically you could try to trigger the 'show NMI backtraces on all CPUs' logic when the lockup triggers, and repeat it every couple of seconds.
The simplest method to do that would be to call:
trigger_all_cpu_backtrace();
every couple of seconds, in the CSD polling loop - after the initial timeout has passed. I'd suggest to collect at least 10 pairs of backtraces that way.
Thanks,
Ingo
Re: [PATCH] smp/call: Detect stuck CSD locks
On Thu, Apr 16, 2015 at 06:31:40PM +0200, Ingo Molnar wrote:
<snip>
Quoted 24 lines
Now what would be nice is to observe it whether the CPU that is not doing the CSD wait is truly locked up.
It might be executing random KVM-ish workloads and the various backtraces we've seen so far are just a random sample of those workloads (from L1's perspective).
Yet the fact that the kdump's NMI gets through is a strong indication that the CPU's APIC is fine: NMIs are essentially IPIs too, they just go to the NMI vector, which punches through irqs-off regions.
So maybe another debug trick would be useful: instead of re-sending the IPI, send a single non-destructive NMI every second or so, creating a backtrace on the other CPU. From that we'll be able to see whether it's locked up permanently in an irqs-off section.
I.e. basically you could try to trigger the 'show NMI backtraces on all CPUs' logic when the lockup triggers, and repeat it every couple of seconds.
The simplest method to do that would be to call:
trigger_all_cpu_backtrace();
Quoted 8 lines
every couple of seconds, in the CSD polling loop - after the initial timeout has passed. I'd suggest to collect at least 10 pairs of backtraces that way.
Thanks,
Ingo
Ingo,
Ok, finally got some good data and some analysis for this issue.
I've uploaded my data here:
http://people.canonical.com/~arges/csd_hang/
Patch I used for these experiments is here:
http://people.canonical.com/~arges/csd_hang/csd-lock-debug.patch
The actual dmesg/bt output are in the timestamped directory.
One thing I tried to do was observe how long it took until we got into an actual softlockup that led into a full system lockup. The maximum time I saw that a kernel thread spent in csd_lock and it not being a full system hang was 0.017s. By detecting the hang earlier I was able to use things like ftrace to actually see the IPI call in action that hangs the machine.
* Experiment 1:
For every lockup detected generate NMIs for all cpus using 'trigger_all_cpu_backtrace()'. I used a csd_lock_timeout value of 1s.
This was perhaps inconclusive. If I added the call when we detect a hang, I never got the watchdog to detect a softlockup. Furthermore the machine became unresponsive when running this experiment. Breakpoint using gdb/qemu showed that the machine was still hitting the csd timeout code over and over again, from there I was able to 'call panic()' and get a crashdump.
In 201504291924, 201504292008 it seems like the backtrace is causing csd_lock_wait to detect a hang and then backtrace again.
* Experiment 2:
A bit more interesting was using ftrace and dumping the output on a detected lockup in csd_lock_wait.
The csd_lock_timeout value was set to 0.018s, and ftrace was dumped on oops. Using this method I collected 10 traces in which most had ftrace output.
In 201504282127 we see a normal flush_tlb_page call followed by the interrupt handler and then calling the requested function 'flush_tlb_func' on the other CPU:
[ 603.248016] 2452.083739 | 0) | ptep_clear_flush() {
[ 603.248016] 2452.083739 | 0) | flush_tlb_page() {
[ 603.248016] 2452.083739 | 0) 0.071 us | leave_mm();
[ 603.248016] 2452.083739 | 0) | native_flush_tlb_others() {
[ 603.248016] 2452.083740 | 0) | smp_call_function_many() {
[ 603.248016] 2452.083740 | 0) | smp_call_function_single() {
[ 603.248016] 2452.083740 | 0) | generic_exec_single() {
[ 603.248016] 2452.083740 | 0) | native_send_call_func_single_ipi() {
[ 603.248016] 2452.083740 | 0) | x2apic_send_IPI_mask() {
[ 603.248016] 2452.083741 | 0) 1.406 us | __x2apic_send_IPI_mask();
[ 603.248016] 2452.083743 | 0) 1.958 us | }
[ 603.248016] 2452.083743 | 0) 2.349 us | }
[ 603.248016] 2452.083743 | 0) 2.823 us | }
[ 603.248016] 2452.083743 | 0) + 13.132 us | csd_lock_wait.isra.4();
[ 603.248016] 2452.083746 | 1) + 25.238 us | }
[ 603.248016] 2452.083747 | 1) 0.987 us | vmx_read_l1_tsc();
[ 603.248016] 2452.083749 | 1) | vmx_handle_external_intr() {
[ 603.248016] 2452.083752 | 1) | smp_call_function_single_interrupt() {
[ 603.248016] 2452.083752 | 1) 0.063 us | kvm_guest_apic_eoi_write();
[ 603.248016] 2452.083753 | 1) | irq_enter() {
[ 603.248016] 2452.083753 | 1) 0.077 us | rcu_irq_enter();
[ 603.248016] 2452.083754 | 1) 0.751 us | }
[ 603.248016] 2452.083754 | 1) | generic_smp_call_function_single_interrupt() {
[ 603.248016] 2452.083754 | 1) | flush_smp_call_function_queue() {
[ 603.248016] 2452.083755 | 1) 0.459 us | flush_tlb_func();
[ 603.248016] 2452.083756 | 1) 0.089 us | csd_unlock();
[ 603.248016] 2452.083757 | 1) 2.180 us | }
[ 603.248016] 2452.083757 | 0) + 16.726 us | }
[ 603.248016] 2452.083757 | 1) 2.826 us | }
[ 603.248016] 2452.083757 | 0) + 17.236 us | }
[ 603.248016] 2452.083757 | 0) + 17.722 us | }Later in the trace we see the same call followed by vmx_handle_external_intr() ignoring the call:
[ 603.248016] 2452.083823 | 0) | ptep_clear_flush() {
[ 603.248016] 2452.083824 | 0) | flush_tlb_page() {
[ 603.248016] 2452.083824 | 0) 0.109 us | leave_mm();
[ 603.248016] 2452.083824 | 0) | native_flush_tlb_others() {
[ 603.248016] 2452.083824 | 0) | smp_call_function_many() {
[ 603.248016] 2452.083825 | 0) | smp_call_function_single() {
[ 603.248016] 2452.083825 | 0) | generic_exec_single() {
[ 603.248016] 2452.083825 | 0) | native_send_call_func_single_ipi() {
[ 603.248016] 2452.083825 | 0) | x2apic_send_IPI_mask() {
[ 603.248016] 2452.083826 | 0) 1.625 us | __x2apic_send_IPI_mask();
[ 603.248016] 2452.083828 | 0) 2.173 us | }
[ 603.248016] 2452.083828 | 0) 2.588 us | }
[ 603.248016] 2452.083828 | 0) 3.082 us | }
[ 603.248016] 2452.083828 | 0) | csd_lock_wait.isra.4() {
[ 603.248016] 2452.083848 | 1) + 44.033 us | }
[ 603.248016] 2452.083849 | 1) 0.975 us | vmx_read_l1_tsc();
[ 603.248016] 2452.083851 | 1) 1.031 us | vmx_handle_external_intr();
[ 603.248016] 2452.083852 | 1) 0.234 us | __srcu_read_lock();
[ 603.248016] 2452.083853 | 1) | vmx_handle_exit() {
[ 603.248016] 2452.083854 | 1) | handle_ept_violation() {
[ 603.248016] 2452.083856 | 1) | kvm_mmu_page_fault() {
[ 603.248016] 2452.083856 | 1) | tdp_page_fault() {
[ 603.248016] 2452.083856 | 1) 0.092 us | mmu_topup_memory_caches();
[ 603.248016] 2452.083857 | 1) | gfn_to_memslot_dirty_bitmap.isra.84() {
[ 603.248016] 2452.083857 | 1) 0.231 us | gfn_to_memslot();
[ 603.248016] 2452.083858 | 1) 0.774 us | }So potentially, CPU0 generated an interrupt that caused vcpu_enter_guest to be called on CPU1. However, when vmx_handle_external_intr was called, it didn't progress any further.
Another experiment here would be to dump vmcs_read32(VM_EXIT_INTR_INFO); to see why we don't handle the interrupt.
In 201504282155/dmesg.* we see a similar pattern:
[ 1578.184041] 4152.856104 | 1) | flush_tlb_page() {
[ 1578.184041] 4152.856105 | 1) 0.122 us | leave_mm();
[ 1578.184041] 4152.856105 | 1) | native_flush_tlb_others() {
[ 1578.184041] 4152.856106 | 1) | smp_call_function_many() {
[ 1578.184041] 4152.856106 | 1) | smp_call_function_single() {
[ 1578.184041] 4152.856107 | 1) | generic_exec_single() {
[ 1578.184041] 4152.856107 | 1) | native_send_call_func_single_ipi() {
[ 1578.184041] 4152.856107 | 1) | x2apic_send_IPI_mask() {
[ 1578.184041] 4152.856108 | 1) 2.770 us | __x2apic_send_IPI_mask();
[ 1578.184041] 4152.856111 | 1) 3.725 us | }
[ 1578.184041] 4152.856112 | 1) 4.383 us | }
[ 1578.184041] 4152.856112 | 1) 5.220 us | }
[ 1578.184041] 4152.856112 | 1) | csd_lock_wait.isra.4() {
[ 1578.184041] 4152.856149 | 0) + 57.757 us | }
[ 1578.184041] 4152.856150 | 0) 1.613 us | vmx_read_l1_tsc();
[ 1578.184041] 4152.856153 | 0) 1.566 us | vmx_handle_external_intr();
[ 1578.184041] 4152.856156 | 0) 0.360 us | __srcu_read_lock();
[ 1578.184041] 4152.856157 | 0) | vmx_handle_exit() {
[ 1578.184041] 4152.856158 | 0) | handle_wrmsr() {
[ 1578.184041] 4152.856158 | 0) | kvm_set_msr() {201504282251 and 201504290305 didn't seem to ftrace properly.
201504290015 shows the same thing, but we get another interrupt through afterwards that does work. The original call is what hangs the machine.
[ 4906.553939] 12500.903369 | 0) 1.736 us | __x2apic_send_IPI_mask();
[ 4906.556244] 12500.903371 | 0) 2.361 us | }
[ 4906.558222] 12500.903371 | 0) 2.785 us | }
[ 4906.560198] 12500.903371 | 0) 3.374 us | }
[ 4906.562131] 12500.903372 | 0) | csd_lock_wait.isra.4() {
[ 4906.564334] 12500.903391 | 1) + 50.198 us | }
[ 4906.566201] 12500.903392 | 1) 0.991 us | vmx_read_l1_tsc();
[ 4906.568284] 12500.903394 | 1) 0.977 us | vmx_handle_external_intr();
[ 4906.570436] 12500.903395 | 1) 0.260 us | __srcu_read_lock();
[ 4906.572727] 12500.903396 | 1) | vmx_handle_exit() {
[ 4906.574810] 12500.903397 | 1) | handle_wrmsr() {
[ 4906.576888] 12500.903397 | 1) | kvm_set_msr() {
[ 4906.578965] 12500.903397 | 1) | vmx_set_msr() {<snip>
[ 4918.994035] 12500.913985 | 1) | native_send_call_func_single_ipi() {
[ 4918.996510] 12500.913986 | 1) | x2apic_send_IPI_mask() {
[ 4918.998809] 12500.913986 | 1) 2.050 us | __x2apic_send_IPI_mask();
[ 4919.001153] 12500.913989 | 1) 2.820 us | }
[ 4919.003186] 12500.913989 | 1) 3.444 us | }
[ 4919.005215] 12500.913989 | 1) 4.145 us | }
[ 4919.007180] 12500.913989 | 0) | smp_call_function_single_interrupt() {
[ 4919.009516] 12500.913989 | 1) 4.474 us | csd_lock_wait.isra.4();
[ 4919.011745] 12500.913990 | 0) 0.116 us | kvm_guest_apic_eoi_write();
[ 4919.013994] 12500.913990 | 0) | irq_enter() {
[ 4919.016092] 12500.913991 | 0) 0.115 us | rcu_irq_enter();
[ 4919.018210] 12500.913991 | 0) 0.607 us | }
[ 4919.020165] 12500.913991 | 0) | generic_smp_call_function_single_interrupt() {
[ 4919.022645] 12500.913992 | 0) | flush_smp_call_function_queue() {
[ 4919.025005] 12500.913992 | 0) | flush_tlb_func() {
[ 4919.027223] 12500.913993 | 0) 0.348 us | leave_mm();201504290245 and 201504290342 aren't very clear, we send the interrupt, then CPU1 gets a timer interrupt right away. CPU0 shows lost events, so perhaps we missed what actually happened in the ftrace output.
[ 9504.605612] 22133.181730 | 1) 3.307 us | __x2apic_send_IPI_mask();
[ 9504.605616] 22133.181734 | 1) 4.081 us | }
[ 9504.605619] 22133.181735 | 1) 4.735 us | }
[ 9504.605622] 22133.181735 | 1) 5.744 us | }
[ 9504.605626] 22133.181735 | 1) | csd_lock_wait.isra.4() {
[ 9504.605632] 22133.185489 | 1) ==========> |.22133.185489 | 1) | smp_apic_timer_interrupt() {
[ 9504.605637] 22133.185489 | 1) 0.088 us | kvm_guest_apic_eoi_write();
[ 9504.605641] 22133.185490 | 1) | irq_enter() {
[ 9504.605646] 22133.185490 | 1) 0.130 us | rcu_irq_enter();
<snip>
[ 9504.606348] CPU:0 [LOST 902542527 EVENTS].22133.188647 | 0) 0.096 us | } /* inc_zone_page_state */
[ 9504.606354] 22133.188647 | 0) 0.088 us | mem_cgroup_end_page_stat();201504290305 shows the call, and it doesn't even seem like CPU1 ever responds to it.
[ 643.522880] 22837.075483 | 0) | flush_tlb_page() {
[ 643.522885] 22837.075484 | 1) 0.160 us | _raw_spin_unlock_irqrestore();
[ 643.522890] 22837.075485 | 0) | native_flush_tlb_others() {
[ 643.522895] 22837.075485 | 1) 0.083 us | _raw_spin_unlock_irqrestore();
[ 643.522899] 22837.075486 | 0) | smp_call_function_many() {
[ 643.522904] 22837.075486 | 1) 0.145 us | mem_cgroup_update_page_stat();
[ 643.522908] 22837.075487 | 0) | smp_call_function_single() {
[ 643.522913] 22837.075487 | 1) 0.255 us | dec_zone_page_state();
[ 643.522918] 22837.075487 | 0) 0.288 us | generic_exec_single();
[ 643.522923] 22837.075488 | 1) 0.336 us | inc_zone_page_state();
[ 643.522927] 22837.075489 | 0) | csd_lock_wait.isra.4() {
[ 643.522931] 22837.075490 | 1) 0.115 us | mem_cgroup_end_page_stat();
[ 643.522935] 22837.075491 | 1) + 14.409 us | }
[ 643.522940] 22837.075491 | 1) 0.113 us | __wake_up_bit();
[ 643.522943] 22837.075492 | 1) + 16.781 us | }
[ 643.522948] 22837.075493 | 1) | end_page_writeback() {
[ 643.522952] 22837.075494 | 1) | test_clear_page_writeback() {
[ 643.522957] 22837.075494 | 1) 0.110 us | page_mapping();
[ 643.522962] 22837.075495 | 1) 0.135 us | mem_cgroup_begin_page_stat();
[ 643.522967] 22837.075496 | 1) | inode_to_bdi() {
[ 643.522972] 22837.075497 | 1) 0.115 us | sb_is_blkdev_sb();Thanks,
--chris j arges
Re: [PATCH] smp/call: Detect stuck CSD locks
Quoted 30 lines · Chris J Arges
Later in the trace we see the same call followed by
vmx_handle_external_intr()ignoring the call:[ 603.248016] 2452.083823 | 0) | ptep_clear_flush() { [ 603.248016] 2452.083824 | 0) | flush_tlb_page() { [ 603.248016] 2452.083824 | 0) 0.109 us | leave_mm(); [ 603.248016] 2452.083824 | 0) | native_flush_tlb_others() { [ 603.248016] 2452.083824 | 0) | smp_call_function_many() { [ 603.248016] 2452.083825 | 0) | smp_call_function_single() { [ 603.248016] 2452.083825 | 0) | generic_exec_single() { [ 603.248016] 2452.083825 | 0) | native_send_call_func_single_ipi() { [ 603.248016] 2452.083825 | 0) | x2apic_send_IPI_mask() { [ 603.248016] 2452.083826 | 0) 1.625 us | __x2apic_send_IPI_mask(); [ 603.248016] 2452.083828 | 0) 2.173 us | } [ 603.248016] 2452.083828 | 0) 2.588 us | } [ 603.248016] 2452.083828 | 0) 3.082 us | } [ 603.248016] 2452.083828 | 0) | csd_lock_wait.isra.4() { [ 603.248016] 2452.083848 | 1) + 44.033 us | } [ 603.248016] 2452.083849 | 1) 0.975 us | vmx_read_l1_tsc(); [ 603.248016] 2452.083851 | 1) 1.031 us | vmx_handle_external_intr(); [ 603.248016] 2452.083852 | 1) 0.234 us | __srcu_read_lock(); [ 603.248016] 2452.083853 | 1) | vmx_handle_exit() { [ 603.248016] 2452.083854 | 1) | handle_ept_violation() { [ 603.248016] 2452.083856 | 1) | kvm_mmu_page_fault() { [ 603.248016] 2452.083856 | 1) | tdp_page_fault() { [ 603.248016] 2452.083856 | 1) 0.092 us | mmu_topup_memory_caches(); [ 603.248016] 2452.083857 | 1) | gfn_to_memslot_dirty_bitmap.isra.84() { [ 603.248016] 2452.083857 | 1) 0.231 us | gfn_to_memslot(); [ 603.248016] 2452.083858 | 1) 0.774 us | }
Quoted 3 lines
So potentially, CPU0 generated an interrupt that caused
vcpu_enter_guestto be called on CPU1. However, whenvmx_handle_external_intrwas called, it didn't progress any further.
So the IPI does look like to be lost in the KVM code?
So why did vmx_handle_external_intr() skip the irq injection - were IRQs disabled in the guest perhaps?
Quoted 3 lines
Another experiment here would be to dump
vmcs_read32(VM_EXIT_INTR_INFO); to see why we don't handle the interrupt.
Possibly, but also to instrument the KVM IRQ injection code to see when it skips an IPI and why.
Thanks,
Ingo
Re: [PATCH] smp/call: Detect stuck CSD locks
Quoted 13 lines · Ingo Molnar
Quoted 3 lines
So potentially, CPU0 generated an interrupt that caused
vcpu_enter_guestto be called on CPU1. However, whenvmx_handle_external_intrwas called, it didn't progress any further.So the IPI does look like to be lost in the KVM code?
So why did
vmx_handle_external_intr()skip the irq injection - were IRQs disabled in the guest perhaps?Quoted 3 lines
Another experiment here would be to dump
vmcs_read32(VM_EXIT_INTR_INFO); to see why we don't handle the interrupt.
Quoted 7 lines
Possibly, but also to instrument the KVM IRQ injection code to see when it skips an IPI and why.
Thanks,
Ingo
Ingo,
I no longer have access to the reproducer machine unfortunately. I'll try to locate additional kit that has the same situation, but it may take some time. Thanks,
--chris
Quoted 24 lines · Chris J Arges
Quoted 21 lines · Ingo Molnar
Quoted 17 lines · Chris J Arges
Whenever we look through the crashdump we see
csd_lock_waitwaiting forCSD_FLAG_LOCKbit to be cleared. Usually the signature leading up to that looks like the following (in the openstack tempest on openstack and nested VM stress case)(qemu-system-x86 task)
kvm_sched_in
->kvm_arch_vcpu_load
->vmx_vcpu_load
->loaded_vmcs_clear-> smp_call_function_single(ksmd task)
pmdp_clear_flush
->flush_tlb_mm_range
->native_flush_tlb_others-> smp_call_function_many
Quoted 6 lines
Quoted 4 lines
So is this two separate
smp_call_functioninstances, crossing each other, and none makes any progress, indefinitely - as if the two IPIs got lost?This is two different crash signatures. Sorry for the confusion.
So just in case, both crash signatures ought to be detected by the patch I just sent.
Thanks,
Ingo
Quoted 16 lines · Linus Torvalds
Quoted 4 lines · Chris J Arges
It is worthwhile to do a 'bisect' to see where on average it takes longer to reproduce? Perhaps it will point to a relevant change, or it may be completely useless.
It's likely to be an exercise in futility. "git bisect" is realyl bad at "gray area" things, and when it's a question of "it takes hours or days to reproduce", it's almost certainly not worth it. Not unless there is some really clear cut-off that we can believably say "this causes it to get much slower". And in this case, I don't think it's that clear-cut. Judging by DaveJ's attempts at bisecting things, the timing just changes. And the differences might be due to entirely unrelated changes like cacheline alignment etc.
Quoted 6 lines
So unless we find a real clear signature of the bug (I was hoping that the ISR bit would be that sign), I don't think trying to bisect it based on how quickly you can reproduce things is worthwhile.
Linus
Linus, Ingo,
I did some testing and found that at the following patch level, the issue was much, much more likely to reproduce within < 15m.
commit b6b8a1451fc40412c57d10c94b62e22acab28f94
Author: Jan Kiszka <[email protected]> Date: Fri Mar 7 20:03:12 2014 +0100
KVM: nVMX: Rework interception of IRQs and NMIs
Move the check for leaving L2 on pending and intercepted IRQs or NMIs from the *_allowed handler into a dedicated callback. Invoke this callback at the relevant points before KVM checks if IRQs/NMIs can be injected. The callback has the task to switch from L2 to L1 if needed and inject the proper vmexit events.
The rework fixes L2 wakeups from HLT and provides the foundation for preemption timer emulation.
However, when the following patch was applied the average time to reproduction goes down greatly (the stress reproducer ran for hours without issue):
commit 9242b5b60df8b13b469bc6b7be08ff6ebb551ad3
Author: Bandan Das <[email protected]> Date: Tue Jul 8 00:30:23 2014 -0400
KVM: x86: Check for nested events if there is an injectable interrupt
With commit b6b8a1451fc40412c57d1 that introduced vmx_check_nested_events, checks for injectable interrupts happen at different points in time for L1 and L2 that could potentially cause a race. The regression occurs because KVM_REQ_EVENT is always set when nested_run_pending is set even if there's no pending interrupt. Consequently, there could be a small window when check_nested_events returns without exiting to L1, but an interrupt comes through soon after and it incorrectly, gets injected to L2 by inject_pending_event Fix this by adding a call to check for nested events too when a check for injectable interrupt returns true
However we reproduced with v3.19 (containing these two patches) which did eventually softlockup with a similar backtrace.
So far, this agrees with the current understanding that we may be not ACK'ing certain interrupts (IPIs from the L1 guest) causing csd_lock_wait to spin and causing the soft lockup.
Hopefully this helps shed more light on this issue.
Thanks,
--chris j arges
Quoted 12 lines · Linus Torvalds
Quoted 10 lines · Linus Torvalds
Quoted 2 lines · Linus Torvalds
Are there known errata for the x2apic?
.. and in particular, do we still have to worry about the traditional local apic "if there are more than two pending interrupts per priority level, things get lost" problem?
Quoted 7 lines
Quoted 2 lines
I forget the exact details. Hopefully somebody
remembers.I can't find it in the docs. I find the "two-entries per vector", but not anything that is per priority level (group of 16 vectors). Maybe that was the IO-APIC, in which case it's immaterial for IPI's.
So if my memory serves me right, I think it was for local APICs, and even there mostly it was a performance issue: if an IO-APIC sent more than 2 IRQs per 'level' to a local APIC then the IO-APIC might be forced to resend those IRQs, leading to excessive message traffic on the relevant hardware bus.
( I think the 'resend' was automatic in this case, i.e. a
hardware fallback for a CPU side resource shortage, and it could not result in actually lost IRQs. I never saw this documented properly, so people inside Intel or AMD would be in a better position to comment on this ... I might be mis-remembering this or confusing different bugs. )
Quoted 23 lines
However, having now mostly re-acquainted myself with the APIC details, it strikes me that we do have some oddities here.
In particular, a few interrupt types are very special:
NMI, SMI, INIT, ExtINT, or SIPI are handled early in the interrupt acceptance logic, and are sent directly to the CPU core, without going through the usual intermediate IRR/ISR dance.And why might this matter? It's important because it means that those kinds of interrupts must *not* do the apic EOI that
ack_APIC_irq()does.And we correctly don't do
ack_APIC_irq()for NMI etc, but it strikes me that ExtINT is odd and special.I think we still use ExtINT for some odd cases. We used to have some magic with the legacy timer interrupt, for example. And I think they all go through the normal "
do_IRQ()" logic regardless of whether they are ExtINT or not.
Quoted 6 lines
Now, what happens if we send an EOI for an ExtINT interrupt? It basically ends up being a spurious IPI. And I *think* that what normally happens is absolutely nothing at all. But if in addition to the ExtINT, there was a pending IPI (or other pending ISR bit set), maybe we lose interrupts..
1)
I think you got it right.
So the principle of EOI acknowledgement from the OS to the local APIC is specific to the IRQ that raised the interrupt and caused the vector to be executed, so it's not possible to ack the 'wrong' IRQ.
But technically the EOI is state-less, i.e. (as you know) we write a constant value to a local APIC register without indicating which vector or external IRQ we meant. The OS wants to ack 'the IRQ that we are executing currently', but this leaves the situation a bit confused in cases where for example an IRQ handler enables IRQs, another IRQ comes in and stays unacked.
So I _think_ it's not possible to accidentally acknowledge a pending IRQ that has not been issued to the CPU yet (unless we have hardirqs enabled), just by writing stray EOIs to the local APIC. So in that sense the ExtInt irq0 case should be mostly harmless.
But I could be wrong :-/
2)
So my suggestion for this bug would be:
The 'does a stray EOI matter' question could also be tested by deliberately writing two EOIs instead of just one - does this trigger the bug faster?
Then perhaps try to make sure that no hardirqs get ever enabled in an irq handler, and figure out whether any of the IRQs in question are edge triggered - but AFAICS it could be 'any' IRQ handler or flow causing the problem, right?
3)
I also fully share your frustration about the level of obfuscation the various APIC drivers display today.
The lack of a simple single-IPI implementation is annoying as well - when that injury was first inflicted with clustered APICs I tried to resist, but AFAICR there were some good hardware arguments why it cannot be kept and I gave up.
If you agree then I can declare a feature stop for new hardware support (that isn't a stop-ship issue for users) until it's all cleaned up for real, and Thomas started some of that work already.
Quoted 4 lines
.. and it's entirely possible that I'm just completely full of shit. Who is the poor bastard who has worked most with things like ExtINT, and can educate me? I'm adding Ingo, hpa and Jiang Liu as primary contacts..
So the buck stops at my desk, but any help is welcome!
Thanks,
Ingo
Quoted 7 lines · Ingo Molnar
So if my memory serves me right, I think it was for local APICs, and even there mostly it was a performance issue: if an IO-APIC sent more than 2 IRQs per 'level' to a local APIC then the IO-APIC might be forced to resend those IRQs, leading to excessive message traffic on the relevant hardware bus.
Hmm. I have a distinct memory of interrupts actually being lost, but I really can't find anything to support that memory, so it's probably some drug-induced confusion of mine. I don't find *anything* about interrupt "levels" any more in modern Intel documentation on the APIC, but maybe I missed something. But it might all have been an IO-APIC thing.
Quoted 6 lines
I think you got it right.
So the principle of EOI acknowledgement from the OS to the local APIC is specific to the IRQ that raised the interrupt and caused the vector to be executed, so it's not possible to ack the 'wrong' IRQ.
I agree - but only for cases where we actualyl should ACK in the first place. The LAPIC knows what its own priorities were, so it always just clears the highest-priority ISR bit.
Quoted 5 lines
So I _think_ it's not possible to accidentally acknowledge a pending IRQ that has not been issued to the CPU yet (unless we have hardirqs enabled), just by writing stray EOIs to the local APIC. So in that sense the ExtInt irq0 case should be mostly harmless.
It must clearly be mostly harmless even if I'm right, since we've always done the ACK for it, as far as I can tell. So you're probably right, and it doesn't matter.
In particular, it would depend on exactly when the ISR bit actually gets set in the APIC. If it gets set only after the CPU has actually *accepted* the interrupt, then it should not be possible for a spurious EOI write to screw things up, because it's still happening in the context of the previously executing interrupt, so a new ISR bit hasn't been set yet, and any old ISR bits must be lower-priority than the currently executing interrupt routine (that were interrupted by a higher-priority one).
That sounds like the likely scenario. It just worries me. And my test patch did actually trigger, even if it only seemed to trigger during device probing (when the probing itself probably caused and then cleared an interrupt).
Quoted 9 lines
I also fully share your frustration about the level of obfuscation the various APIC drivers display today.
The lack of a simple single-IPI implementation is annoying as well - when that injury was first inflicted with clustered APICs I tried to resist, but AFAICR there were some good hardware arguments why it cannot be kept and I gave up.
Quoted 4 lines
If you agree then I can declare a feature stop for new hardware support (that isn't a stop-ship issue for users) until it's all cleaned up for real, and Thomas started some of that work already.
Well, the attached patch for that seems pretty trivial. And seems to work for me (my machine also defaults to x2apic clustered mode), and allows the APIC code to start doing a "send to specific cpu" thing one by one, since it falls back to the send_IPI_mask() function if no individual CPU IPI function exists.
NOTE! There's a few cases in arch/x86/kernel/apic/vector.c that also do that "apic->send_IPI_mask(cpumask_of(i), .." thing, but they aren't that important, so I didn't bother with them.
NOTE2! I've tested this, and it seems to work, but maybe there is something seriously wrong. I skipped the "disable interrupts" part when doing the "send_IPI", for example, because I think it's entirely unnecessary for that case. But this has certainly *not* gotten any real stress-testing.
But /proc/interrupts shows thousands of rescheduling IPI's, so this should all have triggered.
Linus
arch/x86/include/asm/apic.h | 1 + arch/x86/kernel/apic/x2apic_cluster.c | 9 +++++++++ arch/x86/kernel/smp.c | 16 ++++++++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-)
arch/x86/include/asm/apic.h +1 -0
@@ -296,6 +296,7 @@ struct apic { unsigned int *apicid);/* ipi */ +void (*send_IPI)(int cpu,int vector);void (*send_IPI_mask)(const struct cpumask *mask,int vector);void (*send_IPI_mask_allbutself)(const struct cpumask *mask,int vector);
arch/x86/kernel/apic/x2apic_cluster.c +9 -0
@@ -23,6 +23,14 @@ static inline u32 x2apic_cluster(int cpu)return per_cpu (x86_cpu_to_logical_apicid, cpu) >>16 ; } +static void x2apic_send_IPI (int cpu,int vector) +{ +u32 dest =per_cpu (x86_cpu_to_logical_apicid, cpu); + +x2apic_wrmsr_fence (); +__x2apic_send_IPI_dest (dest, vector,APIC_DEST_LOGICAL ); +} +static void __x2apic_send_IPI_mask (const struct cpumask *mask,int vector,int apic_dest) {
@@ -266,6 +274,7 @@ static struct apic apic_x2apic_cluster = { .cpu_mask_to_apicid_and = x2apic_cpu_mask_to_apicid_and, + .send_IPI = x2apic_send_IPI, .send_IPI_mask = x2apic_send_IPI_mask, .send_IPI_mask_allbutself = x2apic_send_IPI_mask_allbutself, .send_IPI_allbutself = x2apic_send_IPI_allbutself,
arch/x86/kernel/smp.c +14 -2
@@ -114,6 +114,18 @@ static atomic_t stopping_cpu = ATOMIC_INIT(-1);static bool smp_no_nmi_ipi = false;/* +* Helper wrapper: not all apic definitions support sending to +* a single CPU, so we fall back to sending to a mask. +*/ +static void send_IPI_cpu (int cpu,int vector) +{ +if (apic->send_IPI) + apic->send_IPI (cpu, vector); +else + apic->send_IPI_mask (cpumask_of (cpu), vector); +} + +/* * this function sends a 'reschedule' IPI to another CPU. * it goes straight through and wastes no time serializing * anything. Worst case is that we lose a reschedule ...
@@ -124,12 +136,12 @@ static void native_smp_send_reschedule(int cpu)WARN_ON (1 );return ; } - apic->send_IPI_mask (cpumask_of (cpu),RESCHEDULE_VECTOR ); +send_IPI_cpu (cpu,RESCHEDULE_VECTOR ); }void native_send_call_func_single_ipi (int cpu) { - apic->send_IPI_mask (cpumask_of (cpu),CALL_FUNCTION_SINGLE_VECTOR ); +send_IPI_cpu (cpu,CALL_FUNCTION_SINGLE_VECTOR ); }void native_send_call_func_ipi (const struct cpumask *mask)
Quoted 9 lines · Linus Torvalds
Quoted 7 lines · Ingo Molnar
So if my memory serves me right, I think it was for local APICs, and even there mostly it was a performance
issue: if an IO-APIC sent more than 2 IRQs per 'level' to a local APIC then the IO-APIC might be forced to resend those IRQs, leading to excessive message traffic on the relevant hardware bus.
Quoted 7 lines
Hmm. I have a distinct memory of interrupts actually being lost, but I really can't find anything to support that memory, so it's probably some drug-induced confusion of mine. I don't find *anything* about interrupt "levels" any more in modern Intel documentation on the APIC, but maybe I missed something. But it might all have been an IO-APIC thing.
So I just found an older discussion of it:
http://www.gossamer-threads.com/lists/linux/kernel/1554815?do=post_view_threaded#1554815
while it's not a comprehensive description, it matches what I remember from it: with 3 vectors within a level of 16 vectors we'd get excessive "retries" sent by the IO-APIC through the (then rather slow) APIC bus.
( It was possible for the same phenomenon to occur with
IPIs as well, when a CPU sent an APIC message to another CPU, if the affected vectors were equal modulo 16 - but this was rare IIRC because most systems were dual CPU so only two IPIs could have occured. )
Quoted 12 lines
Well, the attached patch for that seems pretty trivial. And seems to work for me (my machine also defaults to x2apic clustered mode), and allows the APIC code to start doing a "send to specific cpu" thing one by one, since it falls back to the
send_IPI_mask()function if no individual CPU IPI function exists.NOTE! There's a few cases in
arch/x86/kernel/apic/vector.cthat also do that "apic->send_IPI_mask(cpumask_of(i), .." thing, but they aren't that important, so I didn't bother with them.
Quoted 6 lines
NOTE2! I've tested this, and it seems to work, but maybe there is something seriously wrong. I skipped the "disable interrupts" part when doing the "
send_IPI", for example, because I think it's entirely unnecessary for that case. But this has certainly *not* gotten any real stress-testing.
I'm not so sure about that aspect: I think disabling IRQs might be necessary with some APICs (if lower levels don't disable IRQs), to make sure the 'local APIC busy' bit isn't set:
we typically do a wait_icr_idle() call before sending an IPI - and if IRQs are not off then the idleness of the APIC might be gone. (Because a hardirq that arrives after a wait_icr_idle() but before the actual IPI sending sent out an IPI and the queue is full.)
So the IPI sending should be atomic in that sense.
Thanks,
Ingo
Quoted 5 lines · Ingo Molnar
I'm not so sure about that aspect: I think disabling IRQs might be necessary with some APICs (if lower levels don't disable IRQs), to make sure the 'local APIC busy' bit isn't set:
Right. But afaik not for the x2apic case, which this is. The x2apic doesn't even have a busy bit, and sending the ipi is a single write,
I agree that when doing other apic implementations, we may need to guarantee atomicity for things like "wait for apic idle, then send the ipi".
Linus
Quoted 10 lines · Linus Torvalds
Quoted 5 lines · Ingo Molnar
I'm not so sure about that aspect: I think disabling IRQs might be necessary with some APICs (if lower levels don't disable IRQs), to make sure the 'local APIC busy' bit isn't set:
Right. But afaik not for the x2apic case, which this is. The x2apic doesn't even have a busy bit, and sending the ipi is a single write,
Ah, ok! Then the patch looks good to me.
( Originally we didn't wait for the ICR bit either, but
then it was added due to later erratas and was eventually made an architectural requirement. )
Quoted 3 lines
I agree that when doing other apic implementations, we may need to guarantee atomicity for things like "wait for apic idle, then send the ipi".
Yeah.
Thanks,
Ingo
Quoted 6 lines · Linus Torvalds
Ok, this is a more involved patch than I'd like, but making the *caller* do all the CSD maintenance actually cleans things up.
And this is still completely untested, and may be entirely buggy. What do you guys think?
Linus, any plans for this patch? I think it does solve a fair few issues the current code has.
do you want me to route it through tip (and write a changelog while I'm at it) or will you be taking it yourself?
Quoted 3 lines · Peter Zijlstra
Linus, any plans for this patch? I think it does solve a fair few issues the current code has.
So I didn't really have any plans. I think it's a good patch, and it might even fix a bug and improve code generation, but it didn't fix the lockup problem, so..
Quoted 2 lines
do you want me to route it through tip (and write a changelog while I'm at it) or will you be taking it yourself?
If you think it's worth committing, then go ahead. Add my signed-off, although I have to note that I didn't do a lot of testing of that patch (I think it was compile-tested when I sent it out, and then I ended up running it for a while, and obviously it got *some* testing by the person who saw the lockup that just showed that it didn't fix the problem ;(
Linus
Quoted 12 lines · Linus Torvalds
Quoted 3 lines · Peter Zijlstra
Linus, any plans for this patch? I think it does solve a fair few issues the current code has.
So I didn't really have any plans. I think it's a good patch, and it might even fix a bug and improve code generation, but it didn't fix the lockup problem, so..
Quoted 2 lines
do you want me to route it through tip (and write a changelog while I'm at it) or will you be taking it yourself?
Quoted 6 lines
If you think it's worth committing, then go ahead. Add my signed-off, although I have to note that I didn't do a lot of testing of that patch (I think it was compile-tested when I sent it out, and then I ended up running it for a while, and obviously it got *some* testing by the person who saw the lockup that just showed that it didn't fix the problem ;(
I carried it for a while on boxen big and small, so it got some burn-in.
-Mike
Quoted 141 lines · Linus Torvalds
[ Added Frederic to the cc, since he's touched this file/area most ]
Quoted 13 lines · Linus Torvalds
So the caller has a really hard time guaranteeing that
CSD_LOCKisn't set. And if the call is done in interrupt context, for all we know it is interrupting the code that is going to clearCSD_LOCK, soCSD_LOCKwill never be cleared at all, andcsd_lock()will wait forever.So I actually think that for the async case, we really *should* unlock before doing the callback (which is what Thomas' old patch did).
And we migth well be better off doing something like
WARN_ON_ONCE(csd->flags & CSD_LOCK);Quoted 7 lines
in
smp_call_function_single_async(), because that really is a hard requirement.And it strikes me that
hrtick_csdis one of these cases that do this with interrupts disabled, and use the callback for serialization. So I really wonder if this is part of the problem..Thomas? Am I missing something?
Ok, this is a more involved patch than I'd like, but making the *caller* do all the CSD maintenance actually cleans things up.
And this is still completely untested, and may be entirely buggy. What do you guys think?
Linus
kernel/smp.c | 78 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 31 deletions(-)kernel/smp.c +13
-29@@ -19,7 +19,7 @@enum {CSD_FLAG_LOCK =0x01 , -CSD_FLAG_WAIT =0x02 , +CSD_FLAG_SYNCHRONOUS =0x02 , };struct call_function_data {@@ -107,7 +107,7 @@ void __init call_function_init(void)*/ static void csd_lock_wait (struct call_single_data *csd) { -while (csd->flags &CSD_FLAG_LOCK ) +while (smp_load_acquire (&csd->flags) &CSD_FLAG_LOCK )cpu_relax (); }@@ -121,19 +121,17 @@ static void csd_lock(struct call_single_data *csd)* to ->flags with any subsequent assignments to other * fields of the specified call_single_data structure: */ -smp_mb (); +smp_wmb (); }static void csd_unlock (struct call_single_data *csd) { -WARN_ON ((csd->flags &CSD_FLAG_WAIT ) && !(csd->flags &CSD_FLAG_LOCK )); +WARN_ON (!(csd->flags &CSD_FLAG_LOCK ));/* * ensure we're all done before releasing data: */ -smp_mb (); - - csd->flags &= ~CSD_FLAG_LOCK ; +smp_store_release (&csd->flags,0 ); } static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_data, csd_data);@@ -144,13 +142,16 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_data, csd_data);* ->func, ->info, and ->flags set. */ static int generic_exec_single (int cpu,struct call_single_data *csd, -smp_call_func_t func,void *info,int wait) +smp_call_func_t func,void *info) { -struct call_single_data csd_stack = { .flags =0 }; -unsigned long flags; - -if (cpu ==smp_processor_id ()) { +unsigned long flags; + +/* +* We can unlock early even for the synchronous on-stack case, +* since we're doing this from the same CPU.. +*/ +csd_unlock (csd);local_irq_save (flags);func (info);local_irq_restore (flags);@@ -161,21 +162,9 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,if ((unsigned )cpu >= nr_cpu_ids || !cpu_online (cpu))return -ENXIO ; - -if (!csd) { - csd = &csd_stack; -if (!wait) - csd =this_cpu_ptr (&csd_data); - } - -csd_lock (csd); - csd->func = func; csd->info = info; -if (wait) - csd->flags |=CSD_FLAG_WAIT ; -/* * The list addition should be visible before sending the IPI * handler locks the list to pull the entry off it because of @@ -190,9 +179,6 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,if (llist_add (&csd->llist, &per_cpu (call_single_queue, cpu)))arch_send_call_function_single_ipi (cpu); -if (wait) -csd_lock_wait (csd); -return 0 ; }@@ -250,8 +236,17 @@ static void flush_smp_call_function_queue(bool warn_cpu_offline) }llist_for_each_entry_safe (csd, csd_next, entry, llist) { - csd->func (csd->info); -csd_unlock (csd);
kernel/smp.c static void flush_smp_call_function_queue(bool warn_cpu_offline) · line 248
Quoted 10 lines
kernel/smp.c +10
-0+smp_call_func_t func = csd->func; +void *info = csd->info; + +/* Do we wait until *after* callback? */ +if (csd->flags &CSD_FLAG_SYNCHRONOUS ) { +func (info); +csd_unlock (csd); + }else { +csd_unlock (csd); +func (info);
Just to clarify things, the expected kind of lockup it is expected to fix is the case where the IPI is resent from the IPI itself, right?
Thanks.
tip-bot for Linus Torvalds
merge bot[tip:locking/urgent] smp: Fix smp_call_function_single_async() locking
In reply to Linus Torvaldssmp: Fix smp_call_function_single_async() locking
Commit-ID: 8053871d0f7f67c7efb7f226ef031f78877d6625 Gitweb: http://git.kernel.org/tip/8053871d0f7f67c7efb7f226ef031f78877d6625 Author: Linus Torvalds <[email protected]> AuthorDate: Wed, 11 Feb 2015 12:42:10 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 17 Apr 2015 09:57:52 +0200
smp: Fix smp_call_function_single_async() locking
The current smp_function_call code suffers a number of problems, most notably smp_call_function_single_async() is broken.
The problem is that flush_smp_call_function_queue() does csd_unlock() _after_ calling csd->func(). This means that a caller cannot properly synchronize the csd usage as it has to.
Change the code to release the csd before calling ->func() for the async case, and put a WARN_ON_ONCE(csd->flags & CSD_FLAG_LOCK) in smp_call_function_single_async() to warn us of improper serialization, because any waiting there can results in deadlocks when called with IRQs disabled.
Rename the (currently) unused WAIT flag to SYNCHRONOUS and (re)use it such that we know what to do in flush_smp_call_function_queue().
Rework csd_{,un}lock() to use smp_load_acquire() / smp_store_release() to avoid some full barriers while more clearly providing lock semantics.
Finally move the csd maintenance out of generic_exec_single() into its callers for clearer code.
--- kernel/smp.c | 78 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 31 deletions(-)
kernel/smp.c +47 -31
@@ -19,7 +19,7 @@enum {CSD_FLAG_LOCK =0x01 , -CSD_FLAG_WAIT =0x02 , +CSD_FLAG_SYNCHRONOUS =0x02 , };struct call_function_data {
@@ -107,7 +107,7 @@ void __init call_function_init(void)*/ static void csd_lock_wait (struct call_single_data *csd) { -while (csd->flags &CSD_FLAG_LOCK ) +while (smp_load_acquire (&csd->flags) &CSD_FLAG_LOCK )cpu_relax (); }
@@ -121,19 +121,17 @@ static void csd_lock(struct call_single_data *csd)* to ->flags with any subsequent assignments to other * fields of the specified call_single_data structure: */ -smp_mb (); +smp_wmb (); }static void csd_unlock (struct call_single_data *csd) { -WARN_ON ((csd->flags &CSD_FLAG_WAIT ) && !(csd->flags &CSD_FLAG_LOCK )); +WARN_ON (!(csd->flags &CSD_FLAG_LOCK ));/* * ensure we're all done before releasing data: */ -smp_mb (); - - csd->flags &= ~CSD_FLAG_LOCK ; +smp_store_release (&csd->flags,0 ); } static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_data, csd_data);
@@ -144,13 +142,16 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_data, csd_data);* ->func, ->info, and ->flags set. */ static int generic_exec_single (int cpu,struct call_single_data *csd, -smp_call_func_t func,void *info,int wait) +smp_call_func_t func,void *info) { -struct call_single_data csd_stack = { .flags =0 }; -unsigned long flags; - -if (cpu ==smp_processor_id ()) { +unsigned long flags; + +/* +* We can unlock early even for the synchronous on-stack case, +* since we're doing this from the same CPU.. +*/ +csd_unlock (csd);local_irq_save (flags);func (info);local_irq_restore (flags);
@@ -161,21 +162,9 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,if ((unsigned )cpu >= nr_cpu_ids || !cpu_online (cpu))return -ENXIO ; - -if (!csd) { - csd = &csd_stack; -if (!wait) - csd =this_cpu_ptr (&csd_data); - } - -csd_lock (csd); - csd->func = func; csd->info = info; -if (wait) - csd->flags |=CSD_FLAG_WAIT ; -/* * The list addition should be visible before sending the IPI * handler locks the list to pull the entry off it because of
@@ -190,9 +179,6 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,if (llist_add (&csd->llist, &per_cpu (call_single_queue, cpu)))arch_send_call_function_single_ipi (cpu); -if (wait) -csd_lock_wait (csd); -return 0 ; }
@@ -250,8 +236,17 @@ static void flush_smp_call_function_queue(bool warn_cpu_offline) }llist_for_each_entry_safe (csd, csd_next, entry, llist) { - csd->func (csd->info); -csd_unlock (csd); +smp_call_func_t func = csd->func; +void *info = csd->info; + +/* Do we wait until *after* callback? */ +if (csd->flags &CSD_FLAG_SYNCHRONOUS ) { +func (info); +csd_unlock (csd); + }else { +csd_unlock (csd); +func (info); + } }/*
@@ -274,6 +269,8 @@ static void flush_smp_call_function_queue(bool warn_cpu_offline)int smp_call_function_single (int cpu,smp_call_func_t func,void *info,int wait) { +struct call_single_data *csd; +struct call_single_data csd_stack = { .flags =CSD_FLAG_LOCK |CSD_FLAG_SYNCHRONOUS };int this_cpu;int err;
@@ -292,7 +289,16 @@ int smp_call_function_single(int cpu, smp_call_func_t func, void *info,WARN_ON_ONCE (cpu_online (this_cpu) &&irqs_disabled () && !oops_in_progress); - err =generic_exec_single (cpu,NULL , func, info, wait); + csd = &csd_stack; +if (!wait) { + csd =this_cpu_ptr (&csd_data); +csd_lock (csd); + } + + err =generic_exec_single (cpu, csd, func, info); + +if (wait) +csd_lock_wait (csd);put_cpu ();
@@ -321,7 +327,15 @@ int smp_call_function_single_async(int cpu, struct call_single_data *csd)int err =0 ;preempt_disable (); - err =generic_exec_single (cpu, csd, csd->func, csd->info,0 ); + +/* We could deadlock if we have to wait here with interrupts disabled! */ +if (WARN_ON_ONCE (csd->flags &CSD_FLAG_LOCK )) +csd_lock_wait (csd); + + csd->flags =CSD_FLAG_LOCK ; +smp_wmb (); + + err =generic_exec_single (cpu, csd, csd->func, csd->info);preempt_enable ();return err;
@@ -433,6 +447,8 @@ void smp_call_function_many(const struct cpumask *mask,struct call_single_data *csd =per_cpu_ptr (cfd->csd, cpu);csd_lock (csd); +if (wait) + csd->flags |=CSD_FLAG_SYNCHRONOUS ; csd->func = func; csd->info = info;llist_add (&csd->llist, &per_cpu (call_single_queue, cpu));