xen/x86: implement NMI continuation
v3 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
Juergen Gross (3):
xen/x86: add nmi continuation framework
xen/oprofile: use set_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/oprofile/nmi_int.c | 9 ++++- xen/arch/x86/traps.c | 61 +++++++++++++++++++++++++++++---- xen/include/asm-x86/nmi.h | 13 ++++++- xen/include/asm-x86/softirq.h | 5 ++- 5 files changed, 87 insertions(+), 14 deletions(-)
Signature · 1 line
2.26.2
PATCH v3 1/3 xen/x86: add nmi continuation framework
Actions in NMI context are rather limited as e.g. locking is rather fragile.
Add a generic 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.
---
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/traps.c | 52 +++++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/nmi.h | 13 +++++++++- 3 files changed, 74 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/traps.c +52 -0
64 lines not on this page · raw message
xen/include/asm-x86/nmi.h +12 -1
@@ -33,5 +33,16 @@ nmi_callback_t *set_nmi_callback(nmi_callback_t *callback);void unset_nmi_callback (void ); DECLARE_PER_CPU(unsigned int, nmi_count); - + +typedef void nmi_contfunc_t (void *arg); + +/** +* set_nmi_continuation +* +* Schedule a function to be started in interrupt context after NMI handling. +*/ +int set_nmi_continuation (nmi_contfunc_t *func,void *arg); + +/* Check for NMI continuation pending. */ +bool nmi_check_continuation (void );#endif /* ASM_NMI_H */
Signature · 1 line
2.26.2
Re: [PATCH v3 1/3] xen/x86: add nmi continuation framework
Quoted 9 lines · Juergen Gross
Actions in NMI context are rather limited as e.g. locking is rather fragile.
Add a generic 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.
I'm concerned by there being just a single handler allowed, when the series already introduces two uses. A single NMI instance may signal multiple things in one go. At the very least we then need a priority, such that SERR could override oprofile.
Quoted 8 lines
xen/arch/x86/traps.c +4
-0@@ -1799,6 +1800,57 @@ void unset_nmi_callback(void) nmi_callback = dummy_nmi_callback; } +static DEFINE_PER_CPU(nmi_contfunc_t *, nmi_cont_func); +static DEFINE_PER_CPU(void *, nmi_cont_arg); +static DEFINE_PER_CPU(bool, nmi_cont_busy); +
xen/arch/x86/traps.c void unset_nmi_callback(void) · line 1816
Quoted 10 lines
xen/arch/x86/traps.c +10
-0+bool nmi_check_continuation (void ) +{ +unsigned int cpu =smp_processor_id (); +nmi_contfunc_t *func =per_cpu (nmi_cont_func, cpu); +void *arg =per_cpu (nmi_cont_arg, cpu); + +if (per_cpu (nmi_cont_busy, cpu) ) + { +per_cpu (nmi_cont_busy, cpu) = false; +printk ("Trying to set NMI continuation while still one active!\n" );
I guess the bool would better be a const void *, written with __builtin_return_address(0) and logged accordingly here (also including the CPU number).
Also (nit) maybe "... while one still active"?
xen/arch/x86/traps.c void unset_nmi_callback(void) · line 1822
Quoted 6 lines
xen/arch/x86/traps.c +6
-0+ } + +/* Reads must be done before following write (local cpu ordering only). */ +barrier (); + +per_cpu (nmi_cont_func, cpu) =NULL ;
I think this still is too lax, and you really need to use xchg() to make sure you won't lose any case of "busy" (which may become set between the if() above and the write here).
Jan
Re: [PATCH v3 1/3] xen/x86: add nmi continuation framework
Quoted 7 lines · Jan Beulich
Quoted 6 lines · Juergen Gross
Actions in NMI context are rather limited as e.g. locking is rather fragile.
Add a generic framework to continue processing in normal interrupt context after leaving NMI processing.
Quoted 8 lines
Quoted 3 lines
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.
I'm concerned by there being just a single handler allowed, when the series already introduces two uses. A single NMI instance may signal multiple things in one go. At the very least we then need a priority, such that SERR could override oprofile.
A different approach could be not to introduce a generic interface, but to explicitly call the continuation handlers in the interrupt handler.
Instead of a function pointer, a parameter pointer and a busy indicator (probably another function pointer) per cpu, we'd need for now only a parameter value per cpu (for the oprofile case) and a global flag (for the SERR case).
The downside would be having to add additional fields for other use cases, but for now I think this could be the better way, especially as this would remove the theoretical case of multiple issues overwriting one another.
Thoughts?
Juergen
Re: [PATCH v3 1/3] xen/x86: add nmi continuation framework
Quoted 26 lines · Jürgen Groß
Quoted 7 lines · Jan Beulich
Quoted 6 lines · Juergen Gross
Actions in NMI context are rather limited as e.g. locking is rather fragile.
Add a generic framework to continue processing in normal interrupt context after leaving NMI processing.
Quoted 8 lines
Quoted 3 lines
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.
I'm concerned by there being just a single handler allowed, when the series already introduces two uses. A single NMI instance may signal multiple things in one go. At the very least we then need a priority, such that SERR could override oprofile.
A different approach could be not to introduce a generic interface, but to explicitly call the continuation handlers in the interrupt handler.
Instead of a function pointer, a parameter pointer and a busy indicator (probably another function pointer) per cpu, we'd need for now only a parameter value per cpu (for the oprofile case) and a global flag (for the SERR case).
Quoted 4 lines
The downside would be having to add additional fields for other use cases, but for now I think this could be the better way, especially as this would remove the theoretical case of multiple issues overwriting one another.
Yes, perhaps less abstraction is the better approach here, for now at least. Perhaps give Andrew and Roger a little bit of time to object before going down that route.
Jan
PATCH v3 2/3 xen/oprofile: use set_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.
--- xen/arch/x86/oprofile/nmi_int.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
xen/arch/x86/oprofile/nmi_int.c +8 -1
@@ -83,6 +83,13 @@ void passive_domain_destroy(struct vcpu *v) model->free_msr (v); } +static void nmi_oprofile_send_virq (void *arg) +{ +struct vcpu *v = arg; + +send_guest_vcpu_virq (v,VIRQ_XENOPROF ); +} +static int nmi_callback (const struct cpu_user_regs *regs,int cpu) {int xen_mode, ovf;
@@ -90,7 +97,7 @@ static int nmi_callback(const struct cpu_user_regs *regs, int cpu) 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 ); +set_nmi_continuation (nmi_oprofile_send_virq, current);if ( ovf ==2 ) current->arch.nmi_pending = true;
Signature · 1 line
2.26.2
PATCH v3 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.
--- xen/arch/x86/traps.c | 9 +++------ xen/include/asm-x86/softirq.h | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-)
xen/arch/x86/traps.c +3 -6
@@ -1659,7 +1659,7 @@ 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 void pci_serr_nmicont (void *arg) {printk ("\n\nNMI - PCI system error (SERR)\n" );outb (inb (0x61 ) &0x0b ,0x61 );/* re-enable the PCI SERR error line. */
@@ -1687,9 +1687,8 @@ 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. */ +set_nmi_continuation (pci_serr_nmicont,NULL );break ;default :/* 'fatal' */ console_force_unlock ();
@@ -2183,8 +2182,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