xen/x86: implement NMI continuation
v5 cover xen/x86: implement NMI continuation
Move sending of a virq event for oprofile to the local vcpu from NMI to normal interrupt context.
This has been tested with a small test patch using the continuation framework of patch 1 for all NMIs and doing a print to console in the continuation handler.
Version 1 of this small series was sent to the security list before.
Changes in V3:
- switched to self-IPI instead of softirq
- added patch 3
Changes in V4:
- use less generic approach
Changes in V5:
- addressed comments
Juergen Gross (3):
xen/x86: add nmi continuation framework xen/oprofile: use NMI continuation for sending virq to guest xen/x86: issue pci_serr error message via NMI continuation
xen/arch/x86/apic.c | 13 +++++++--- xen/arch/x86/genapic/x2apic.c | 1 + xen/arch/x86/oprofile/nmi_int.c | 19 ++++++++++++-- xen/arch/x86/smp.c | 1 + xen/arch/x86/traps.c | 46 ++++++++++++++++++++++++++++----- xen/include/asm-x86/nmi.h | 11 +++++++- xen/include/asm-x86/softirq.h | 5 ++-- xen/include/asm-x86/xenoprof.h | 7 +++++ 8 files changed, 88 insertions(+), 15 deletions(-)
Signature · 1 line
2.26.2
PATCH v5 1/3 xen/x86: add nmi continuation framework
Actions in NMI context are rather limited as e.g. locking is rather fragile.
Add a framework to continue processing in normal interrupt context after leaving NMI processing.
This is done by a high priority interrupt vector triggered via a self IPI from NMI context, which will then call the continuation function specified during NMI handling.
---
V5:
- add comment (Jan Beulich)
V4:
- make the framework less generic
V2:
- add prototype for continuation function (Roger Pau Monné)
- switch from softirq to explicit self-IPI (Jan Beulich)
--- xen/arch/x86/apic.c | 13 ++++++++++--- xen/arch/x86/genapic/x2apic.c | 1 + xen/arch/x86/smp.c | 1 + xen/arch/x86/traps.c | 21 +++++++++++++++++++++ xen/include/asm-x86/nmi.h | 11 ++++++++++- 5 files changed, 43 insertions(+), 4 deletions(-)
xen/arch/x86/apic.c +10 -3
@@ -40,6 +40,7 @@#include <irq_vectors.h> #include <xen/kexec.h> #include <asm/guest.h> +#include <asm/nmi.h> #include <asm/time.h> static bool __read_mostly tdt_enabled;
@@ -1376,16 +1377,22 @@ void spurious_interrupt(struct cpu_user_regs *regs) {/* * Check if this is a vectored interrupt (most likely, as this is probably -* a request to dump local CPU state). Vectored interrupts are ACKed; -* spurious interrupts are not. +* a request to dump local CPU state or to continue NMI handling). +* Vectored interrupts are ACKed; spurious interrupts are not. */ if (apic_isr_read (SPURIOUS_APIC_VECTOR )) { +bool is_spurious; +ack_APIC_irq (); + is_spurious = !nmi_check_continuation ();if (this_cpu (state_dump_pending)) {this_cpu (state_dump_pending) = false;dump_execstate (regs); -return ; + is_spurious = false; } + +if ( !is_spurious ) +return ; }/* see sw-dev-man vol 3, chapter 7.4.13.5 */
xen/arch/x86/genapic/x2apic.c +1 -0
@@ -89,6 +89,7 @@ static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t *cpumask)static void send_IPI_self_x2apic (uint8_t vector) { +/* NMI continuation handling relies on using a shorthand here. */ apic_wrmsr (APIC_SELF_IPI , vector); }
xen/arch/x86/smp.c +1 -0
@@ -163,6 +163,7 @@ void send_IPI_self(int vector)void send_IPI_self_legacy (uint8_t vector) { +/* NMI continuation handling relies on using a shorthand here. */ send_IPI_shortcut (APIC_DEST_SELF , vector,APIC_DEST_PHYSICAL ); }
xen/arch/x86/traps.c +21 -0
@@ -79,6 +79,7 @@#include <public/hvm/params.h> #include <asm/cpuid.h> #include <xsm/xsm.h> +#include <asm/mach-default/irq_vectors.h> #include <asm/pv/traps.h> #include <asm/pv/mm.h>
@@ -1800,6 +1801,26 @@ void unset_nmi_callback(void) nmi_callback = dummy_nmi_callback; } +bool nmi_check_continuation (void ) +{ +bool ret = false; + +return ret; +} + +void trigger_nmi_continuation (void ) +{ +/* +* Issue a self-IPI. Handling is done in spurious_interrupt(). +* NMI could have happened in IPI sequence, so wait for ICR being idle +* again before leaving NMI handler. +* This relies on self-IPI using a simple shorthand, thus avoiding any +* use of locking or percpu cpumasks. +*/ +send_IPI_self (SPURIOUS_APIC_VECTOR ); +apic_wait_icr_idle (); +} +void do_device_not_available (struct cpu_user_regs *regs) {#ifdef CONFIG_PV
xen/include/asm-x86/nmi.h +10 -1
@@ -33,5 +33,14 @@ nmi_callback_t *set_nmi_callback(nmi_callback_t *callback);void unset_nmi_callback (void ); DECLARE_PER_CPU(unsigned int, nmi_count); - + +/** +* trigger_nmi_continuation +* +* Schedule continuation to be started in interrupt context after NMI handling. +*/ +void trigger_nmi_continuation (void ); + +/* Check for NMI continuation pending. */ +bool nmi_check_continuation (void );#endif /* ASM_NMI_H */
Signature · 1 line
2.26.2
Re: [PATCH v5 1/3] xen/x86: add nmi continuation framework
xen/arch/x86/genapic/x2apic.c static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t *cpumask) · line 94
Quoted 9 lines · Juergen Gross
xen/arch/x86/genapic/x2apic.c +1
-0@@ -89,6 +89,7 @@ static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t *cpumask)static void send_IPI_self_x2apic (uint8_t vector) { +/* NMI continuation handling relies on using a shorthand here. */ apic_wrmsr (APIC_SELF_IPI , vector); }
I'm inclined to drop this hunk again - I did ask for ...
xen/arch/x86/smp.c void send_IPI_self(int vector) · line 168
Quoted 9 lines
xen/arch/x86/smp.c +1
-0@@ -163,6 +163,7 @@ void send_IPI_self(int vector)void send_IPI_self_legacy (uint8_t vector) { +/* NMI continuation handling relies on using a shorthand here. */ send_IPI_shortcut (APIC_DEST_SELF , vector,APIC_DEST_PHYSICAL ); }
... this one only simply because x2APIC doesn't have the same restriction.
Jan
Re: [PATCH v5 1/3] xen/x86: add nmi continuation framework
Quoted 17 lines · Jan Beulich
xen/arch/x86/genapic/x2apic.c static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t *cpumask) · line 94
Quoted 9 lines · Juergen Gross
xen/arch/x86/genapic/x2apic.c +1
-0@@ -89,6 +89,7 @@ static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t *cpumask)static void send_IPI_self_x2apic (uint8_t vector) { +/* NMI continuation handling relies on using a shorthand here. */ apic_wrmsr (APIC_SELF_IPI , vector); }I'm inclined to drop this hunk again - I did ask for ...
Quoted 4 lines
xen/arch/x86/smp.c +0
-0@@ -163,6 +163,7 @@ void send_IPI_self(int vector)
Quoted 7 lines
xen/arch/x86/smp.c void send_IPI_self(int vector) · line 168
Quoted 5 lines
xen/arch/x86/smp.c +1
-0void send_IPI_self_legacy (uint8_t vector) { +/* NMI continuation handling relies on using a shorthand here. */ send_IPI_shortcut (APIC_DEST_SELF , vector,APIC_DEST_PHYSICAL ); }... this one only simply because x2APIC doesn't have the same restriction.
It would still be bad if the x2APIC variant would e.g. use send_IPI_mask_x2apic_cluster() due to its usage of per_cpu(scratch_mask).
Juergen
PATCH v5 2/3 xen/oprofile: use NMI continuation for sending virq to guest
In reply to Juergen GrossInstead of calling send_guest_vcpu_virq() from NMI context use the NMI continuation framework for that purpose. This avoids taking locks in NMI mode.
---
V5:
- use Linux coding style (Jan Beulich)
- assume races could happen (Jan Beulich)
V4:
- rework to less generic approach
--- xen/arch/x86/oprofile/nmi_int.c | 19 +++++++++++++++++-- xen/arch/x86/traps.c | 4 ++++ xen/include/asm-x86/xenoprof.h | 7 +++++++ 3 files changed, 28 insertions(+), 2 deletions(-)
xen/arch/x86/oprofile/nmi_int.c +17 -2
@@ -38,6 +38,8 @@ static unsigned long saved_lvtpc[NR_CPUS];static char *cpu_type; +static DEFINE_PER_CPU(struct vcpu *, nmi_cont_vcpu); +static int passive_domain_msr_op_checks (unsigned int msr,int *typep,int *indexp) {struct vpmu_struct *vpmu =vcpu_vpmu (current);
@@ -83,14 +85,27 @@ void passive_domain_destroy(struct vcpu *v) model->free_msr (v); } +bool nmi_oprofile_send_virq (void ) +{ +struct vcpu *v =xchg (&this_cpu (nmi_cont_vcpu),NULL ); + +if (v) +send_guest_vcpu_virq (v,VIRQ_XENOPROF ); + +return v; +} +static int nmi_callback (const struct cpu_user_regs *regs,int cpu) {int xen_mode, ovf; ovf = model->check_ctrs (cpu, &cpu_msrs[cpu], regs); xen_mode =ring_0 (regs); -if ( ovf &&is_active (current->domain) && !xen_mode ) -send_guest_vcpu_virq (current,VIRQ_XENOPROF ); +if (ovf &&is_active (current->domain) && !xen_mode && + !this_cpu (nmi_cont_vcpu)) { +this_cpu (nmi_cont_vcpu) = current; +trigger_nmi_continuation (); + }if ( ovf ==2 ) current->arch.nmi_pending = true;
xen/arch/x86/traps.c +4 -0
@@ -65,6 +65,7 @@#include <asm/debugger.h> #include <asm/msr.h> #include <asm/nmi.h> +#include <asm/xenoprof.h> #include <asm/shared.h> #include <asm/x86_emulate.h> #include <asm/traps.h>
@@ -1805,6 +1806,9 @@ bool nmi_check_continuation(void) {bool ret = false; +if (nmi_oprofile_send_virq () ) + ret = true; +return ret; }
xen/include/asm-x86/xenoprof.h +7 -0
@@ -69,6 +69,8 @@ int passive_domain_do_rdmsr(unsigned int msr, uint64_t *msr_content);int passive_domain_do_wrmsr (unsigned int msr,uint64_t msr_content);void passive_domain_destroy (struct vcpu *v); +bool nmi_oprofile_send_virq (void ); +#else static inline int passive_domain_do_rdmsr(unsigned int msr,
@@ -85,6 +87,11 @@ static inline int passive_domain_do_wrmsr(unsigned int msr,static inline void passive_domain_destroy (struct vcpu *v) {} +static inline bool nmi_oprofile_send_virq (void ) +{ +return false; +} +#endif /* CONFIG_XENOPROF */ #endif /* __ASM_X86_XENOPROF_H__ */
Signature · 1 line
2.26.2
Re: [PATCH v5 2/3] xen/oprofile: use NMI continuation for sending virq to guest
Quoted 5 lines · Juergen Gross
Instead of calling
send_guest_vcpu_virq()from NMI context use the NMI continuation framework for that purpose. This avoids taking locks in NMI mode.Signed-off-by Juergen Gross <[email protected]>
PATCH v5 3/3 xen/x86: issue pci_serr error message via NMI continuation
In reply to Juergen GrossInstead of using a softirq pci_serr_error() can use NMI continuation for issuing an error message.
---
V5:
- make PCISERR higher prior than oprofile (Jan Beulich) V4:
- rework to less generic approach
--- xen/arch/x86/traps.c | 21 +++++++++++++++------ xen/include/asm-x86/softirq.h | 5 ++--- 2 files changed, 17 insertions(+), 9 deletions(-)
xen/arch/x86/traps.c +15 -6
@@ -1661,10 +1661,18 @@ void do_general_protection(struct cpu_user_regs *regs)panic ("GENERAL PROTECTION FAULT\n[error_code=%04x]\n" , regs->error_code); } -static void pci_serr_softirq (void ) +static bool pci_serr_cont; + +static bool pci_serr_nmicont (void ) { +if ( !pci_serr_cont ) +return false; + + pci_serr_cont = false;printk ("\n\nNMI - PCI system error (SERR)\n" );outb (inb (0x61 ) &0x0b ,0x61 );/* re-enable the PCI SERR error line. */ + +return true; }static void nmi_hwdom_report (unsigned int reason_idx)
@@ -1689,9 +1697,9 @@ static void pci_serr_error(const struct cpu_user_regs *regs)nmi_hwdom_report (_XEN_NMIREASON_pci_serr);/* fallthrough */ case 'i' :/* 'ignore' */ -/* Would like to print a diagnostic here but can't call printk() -from NMI context -- raise a softirq instead. */ -raise_softirq (PCI_SERR_SOFTIRQ ); +/* Issue error message in NMI continuation. */ + pci_serr_cont = true; +trigger_nmi_continuation ();break ;default :/* 'fatal' */ console_force_unlock ();
@@ -1806,6 +1814,9 @@ bool nmi_check_continuation(void) {bool ret = false; +if (pci_serr_nmicont () ) + ret = true; +if (nmi_oprofile_send_virq () ) ret = true;
@@ -2157,8 +2168,6 @@ void __init trap_init(void)percpu_traps_init ();cpu_init (); - -open_softirq (PCI_SERR_SOFTIRQ , pci_serr_softirq); }void activate_debugregs (const struct vcpu *curr)
xen/include/asm-x86/softirq.h +2 -3
@@ -6,9 +6,8 @@#define VCPU_KICK_SOFTIRQ (NR_COMMON_SOFTIRQS + 2)#define MACHINE_CHECK_SOFTIRQ (NR_COMMON_SOFTIRQS + 3) -#define PCI_SERR_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) -#define HVM_DPCI_SOFTIRQ (NR_COMMON_SOFTIRQS + 5) -#define NR_ARCH_SOFTIRQS 6 +#define HVM_DPCI_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) +#define NR_ARCH_SOFTIRQS 5bool arch_skip_send_event_check (unsigned int cpu);
Signature · 1 line
2.26.2