On Tue, Apr 23, 2019 at 09:50:59PM -0700, nadav.amit@xxxxxxxxx wrote: > From: Nadav Amit <nadav.amit@xxxxxxxxx> > > According to the discussion in [1], expecting nested NMIs never to be s/nested/multiple pending > collapsed is wrong. It'd also be helpful to quote the SDM or APM, although it's admittedly difficult to find a relevant blurb in the SDM. The only explict statement regarding the number of latched/pending NMIs I could find was for SMM: 34.8 NMI HANDLING WHILE IN SMM NMI interrupts are blocked upon entry to the SMI handler. If an NMI request occurs during the SMI handler, it is latched and serviced after the processor exits SMM. Only one NMI request will be latched during the SMI handler. If an NMI request is pending when the processor executes the RSM instruction, the NMI is serviced before the next instruction of the interrupted code sequence. This assumes that NMIs were not blocked before the SMI occurred. If NMIs were blocked before the SMI occurred, they are blocked after execution of RSM All that being said, removing the test is correct as it's blatantly subject to a race condition between vCPUs. It probably makes sense add a single threaded test that pends an NMI from inside the NMI handler to ensure that KVM pends NMIs correctly. I'll send a patch. > > [1] https://marc.info/?l=kvm&m=145876994031502&w=2 > > Signed-off-by: Nadav Amit <nadav.amit@xxxxxxxxx> > --- > x86/apic.c | 70 ------------------------------------------------------ > 1 file changed, 70 deletions(-) > > diff --git a/x86/apic.c b/x86/apic.c > index 51744cf..d1ed5ea 100644 > --- a/x86/apic.c > +++ b/x86/apic.c > @@ -334,75 +334,6 @@ static volatile int nmi_received; > static volatile int cpu0_nmi_ctr1, cpu1_nmi_ctr1; > static volatile int cpu0_nmi_ctr2, cpu1_nmi_ctr2; > > -static void multiple_nmi_handler(isr_regs_t *regs) > -{ > - ++nmi_received; > -} > - > -static void kick_me_nmi(void *blah) > -{ > - while (!nmi_done) { > - ++cpu1_nmi_ctr1; > - while (cpu1_nmi_ctr1 != cpu0_nmi_ctr1 && !nmi_done) { > - pause(); > - } > - if (nmi_done) { > - return; > - } > - apic_icr_write(APIC_DEST_PHYSICAL | APIC_DM_NMI | APIC_INT_ASSERT, 0); > - /* make sure the NMI has arrived by sending an IPI after it */ > - apic_icr_write(APIC_DEST_PHYSICAL | APIC_DM_FIXED | APIC_INT_ASSERT > - | 0x44, 0); > - ++cpu1_nmi_ctr2; > - while (cpu1_nmi_ctr2 != cpu0_nmi_ctr2 && !nmi_done) { > - pause(); > - } > - } > -} > - > -static void flush_nmi(isr_regs_t *regs) > -{ > - nmi_flushed = true; > - apic_write(APIC_EOI, 0); > -} > - > -static void test_multiple_nmi(void) > -{ > - int i; > - bool ok = true; > - > - if (cpu_count() < 2) { > - return; > - } > - > - sti(); > - handle_irq(2, multiple_nmi_handler); > - handle_irq(0x44, flush_nmi); > - on_cpu_async(1, kick_me_nmi, 0); > - for (i = 0; i < 1000000; ++i) { > - nmi_flushed = false; > - nmi_received = 0; > - ++cpu0_nmi_ctr1; > - while (cpu1_nmi_ctr1 != cpu0_nmi_ctr1) { > - pause(); > - } > - apic_icr_write(APIC_DEST_PHYSICAL | APIC_DM_NMI | APIC_INT_ASSERT, 0); > - while (!nmi_flushed) { > - pause(); > - } > - if (nmi_received != 2) { > - ok = false; > - break; > - } > - ++cpu0_nmi_ctr2; > - while (cpu1_nmi_ctr2 != cpu0_nmi_ctr2) { > - pause(); > - } > - } > - nmi_done = true; > - report("multiple nmi", ok); > -} > - > static volatile int lvtt_counter = 0; > > static void lvtt_handler(isr_regs_t *regs) > @@ -614,7 +545,6 @@ int main(void) > test_pv_ipi(); > > test_sti_nmi(); > - test_multiple_nmi(); > > test_apic_timer_one_shot(); > test_apic_change_mode(); > -- > 2.19.1 >
