Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1:Update
xen
20059-vmx-nmi-handling.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 20059-vmx-nmi-handling.patch of Package xen
# HG changeset patch # User Keir Fraser <keir.fraser@citrix.com> # Date 1250243912 -3600 # Node ID 76a65bf2aa4d0b27fb55e85cc2d9ce8b9ff1bbf3 # Parent c8beb04afbf0a7a3a4290df212d1b7fe7d288dca VMX: issue an NMI rather than just calling the NMI handler when the VMEXIT code indicates that an NMI has been raised. Otherwise we might hit a real NMI while in the handler. Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com> --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -843,8 +843,6 @@ static void vmx_set_tsc_offset(struct vc vmx_vmcs_exit(v); } -void do_nmi(struct cpu_user_regs *); - static void vmx_init_hypercall_page(struct domain *d, void *hypercall_page) { char *p; @@ -2161,7 +2159,7 @@ asmlinkage void vmx_vmexit_handler(struc (X86_EVENTTYPE_NMI << 8) ) goto exit_and_crash; HVMTRACE_0D(NMI, v); - do_nmi(regs); /* Real NMI, vector 2: normal processing. */ + self_nmi(); /* Real NMI, vector 2: normal processing. */ break; case TRAP_machine_check: HVMTRACE_0D(MCE, v); --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -441,18 +441,22 @@ void nmi_watchdog_tick(struct cpu_user_r * 8-3 and 8-4 in IA32 Reference Manual Volume 3. We send the IPI to * our own APIC ID explicitly which is valid. */ -static void do_nmi_trigger(unsigned char key) +void self_nmi(void) { u32 id = get_apic_id(); - printk("Triggering NMI on APIC ID %x\n", id); - local_irq_disable(); apic_wait_icr_idle(); apic_icr_write(APIC_DM_NMI | APIC_DEST_PHYSICAL, id); local_irq_enable(); } +static void do_nmi_trigger(unsigned char key) +{ + printk("Triggering NMI on APIC ID %x\n", get_apic_id()); + self_nmi(); +} + static void do_nmi_stats(unsigned char key) { int i; --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -196,6 +196,7 @@ extern void setup_secondary_APIC_clock ( extern void setup_apic_nmi_watchdog (void); extern int reserve_lapic_nmi(void); extern void release_lapic_nmi(void); +extern void self_nmi(void); extern void disable_timer_nmi_watchdog(void); extern void enable_timer_nmi_watchdog(void); extern void nmi_watchdog_tick (struct cpu_user_regs *regs);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor