x86: Introduce CPU_INTERRUPT_NMI
PATCH 1/3 x86: Introduce CPU_INTERRUPT_NMI
[ This patch obsoletes
http://permalink.gmane.org/gmane.comp.emulators.qemu/22989. ]
The x86 emulation yet lacks proper NMI support. This patch introduces CPU_INTERRUPT_NMI and the required handling logic so that hardware emulation drivers can simply call
cpu_interrupt(env, CPU_INTERRUPT_NMI);
to raise an NMI on this arch.
---
cpu-all.h | 1 + cpu-exec.c | 6 ++++++ target-i386/cpu.h | 2 ++ target-i386/exec.h | 5 +++-- target-i386/helper.c | 2 ++ 5 files changed, 14 insertions(+), 2 deletions(-)
cpu-all.h +0 -0
@@ -753,6 +753,7 @@ extern int code_copy_enabled;
#define CPU_INTERRUPT_SMI 0x40 /* (x86 only) SMI interrupt pending */ #define CPU_INTERRUPT_DEBUG 0x80 /* Debug event occured. */ #define CPU_INTERRUPT_VIRQ 0x100 /* virtual interrupt pending. */
+#define CPU_INTERRUPT_NMI 0x200 /* NMI pending. */
void cpu_interrupt(CPUState *s, int mask); void cpu_reset_interrupt(CPUState *env, int mask);
cpu-exec.c +6 -0
@@ -444,6 +444,12 @@ int cpu_exec(CPUState *env1) env->interrupt_request &= ~CPU_INTERRUPT_SMI ;do_smm_enter ();BREAK_CHAIN ; + }else if ((interrupt_request &CPU_INTERRUPT_NMI ) && + !(env->hflags &HF_NMI_MASK )) { + env->interrupt_request &= ~CPU_INTERRUPT_NMI ; + env->hflags |=HF_NMI_MASK ; +do_interrupt (EXCP02_NMI ,0 ,0 ,0 ,1 ); +BREAK_CHAIN ; }else if ((interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK || env->hflags &HF_HIF_MASK ) && !(env->hflags &HF_INHIBIT_IRQ_MASK )) {
target-i386/cpu.h +0 -0
@@ -148,6 +148,7 @@
#define HF_SMM_SHIFT 19 /* CPU in SMM mode */ #define HF_GIF_SHIFT 20 /* if set CPU takes interrupts */ #define HF_HIF_SHIFT 21 /* shadow copy of IF_MASK when in SVM */
+#define HF_NMI_SHIFT 22 /* CPU serving NMI */
#define HF_CPL_MASK (3 << HF_CPL_SHIFT)
#define HF_SOFTMMU_MASK (1 << HF_SOFTMMU_SHIFT)
@@ -167,6 +168,7 @@
#define HF_SMM_MASK (1 << HF_SMM_SHIFT) #define HF_GIF_MASK (1 << HF_GIF_SHIFT) #define HF_HIF_MASK (1 << HF_HIF_SHIFT)
+#define HF_NMI_MASK (1 << HF_NMI_SHIFT)
#define CR0_PE_MASK (1 << 0)
#define CR0_MP_MASK (1 << 1)
target-i386/helper.c +1 -0
@@ -2383,6 +2383,7 @@ void helper_iret_real(int shift)if (shift ==0 ) eflags_mask &=0xffff ;load_eflags (new_eflags, eflags_mask); + env->hflags &= ~HF_NMI_MASK ;
}
static inline void validate_seg(int seg_reg, int cpl) @@ -2634,6 +2635,7 @@ void helper_iret_protected(int shift, in
} else {
helper_ret_protected(shift, 1, 0);
}
+ env->hflags &= ~HF_NMI_MASK;
#ifdef USE_KQEMU
if (kqemu_is_ok(env)) {
CC_OP = CC_OP_EFLAGS;target-i386/exec.h +3 -2
@@ -593,8 +593,9 @@ static inline int cpu_halted(CPUState *eif (!(env->hflags &HF_HALTED_MASK ))return 0 ;/* disable halt condition */ -if ((env->interrupt_request &CPU_INTERRUPT_HARD ) && - (env->eflags &IF_MASK )) { +if (((env->interrupt_request &CPU_INTERRUPT_HARD ) && + (env->eflags &IF_MASK )) || + (env->interrupt_request &CPU_INTERRUPT_NMI )) { env->hflags &= ~HF_HALTED_MASK ;return 0 ; }
Quoted 7 lines · Jan Kiszka
[ This patch obsoletes
http://permalink.gmane.org/gmane.comp.emulators.qemu/22989. ]The x86 emulation yet lacks proper NMI support. This patch introduces
CPU_INTERRUPT_NMIand the required handling logic so that hardware emulation drivers can simply call
Quoted 6 lines
cpu_interrupt(env, CPU_INTERRUPT_NMI);to raise an NMI on this arch.
Signed-off-by Jan Kiszka <[email protected]>
Non-broken patch attached. Sorry.
Jan
--- cpu-all.h | 1 + cpu-exec.c | 6 ++++++ target-i386/cpu.h | 2 ++ target-i386/exec.h | 5 +++-- target-i386/helper.c | 2 ++ 5 files changed, 14 insertions(+), 2 deletions(-)
cpu-all.h +1 -0
@@ -753,6 +753,7 @@ extern int code_copy_enabled;#define CPU_INTERRUPT_SMI 0x40/* (x86 only) SMI interrupt pending */ #define CPU_INTERRUPT_DEBUG 0x80/* Debug event occured. */ #define CPU_INTERRUPT_VIRQ 0x100/* virtual interrupt pending. */ +#define CPU_INTERRUPT_NMI 0x200/* NMI pending. */ void cpu_interrupt (CPUState *s,int mask);void cpu_reset_interrupt (CPUState *env,int mask);
cpu-exec.c +6 -0
@@ -444,6 +444,12 @@ int cpu_exec(CPUState *env1) env->interrupt_request &= ~CPU_INTERRUPT_SMI ;do_smm_enter ();BREAK_CHAIN ; + }else if ((interrupt_request &CPU_INTERRUPT_NMI ) && + !(env->hflags &HF_NMI_MASK )) { + env->interrupt_request &= ~CPU_INTERRUPT_NMI ; + env->hflags |=HF_NMI_MASK ; +do_interrupt (EXCP02_NMI ,0 ,0 ,0 ,1 ); +BREAK_CHAIN ; }else if ((interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK || env->hflags &HF_HIF_MASK ) && !(env->hflags &HF_INHIBIT_IRQ_MASK )) {
target-i386/cpu.h +2 -0
@@ -148,6 +148,7 @@#define HF_SMM_SHIFT 19/* CPU in SMM mode */ #define HF_GIF_SHIFT 20/* if set CPU takes interrupts */ #define HF_HIF_SHIFT 21/* shadow copy of IF_MASK when in SVM */ +#define HF_NMI_SHIFT 22/* CPU serving NMI */ #define HF_CPL_MASK (3 << HF_CPL_SHIFT)#define HF_SOFTMMU_MASK (1 << HF_SOFTMMU_SHIFT)
@@ -167,6 +168,7 @@#define HF_SMM_MASK (1 << HF_SMM_SHIFT)#define HF_GIF_MASK (1 << HF_GIF_SHIFT)#define HF_HIF_MASK (1 << HF_HIF_SHIFT) +#define HF_NMI_MASK (1 << HF_NMI_SHIFT)#define CR0_PE_MASK (1 << 0)#define CR0_MP_MASK (1 << 1)
target-i386/helper.c +2 -0
@@ -2383,6 +2383,7 @@ void helper_iret_real(int shift)if (shift ==0 ) eflags_mask &=0xffff ;load_eflags (new_eflags, eflags_mask); + env->hflags &= ~HF_NMI_MASK ; }static inline void validate_seg (int seg_reg,int cpl)
@@ -2634,6 +2635,7 @@ void helper_iret_protected(int shift, in }else {helper_ret_protected (shift,1 ,0 ); } + env->hflags &= ~HF_NMI_MASK ;#ifdef USE_KQEMU if (kqemu_is_ok (env)) {CC_OP =CC_OP_EFLAGS ;
target-i386/exec.h +3 -2
@@ -593,8 +593,9 @@ static inline int cpu_halted(CPUState *eif (!(env->hflags &HF_HALTED_MASK ))return 0 ;/* disable halt condition */ -if ((env->interrupt_request &CPU_INTERRUPT_HARD ) && - (env->eflags &IF_MASK )) { +if (((env->interrupt_request &CPU_INTERRUPT_HARD ) && + (env->eflags &IF_MASK )) || + (env->interrupt_request &CPU_INTERRUPT_NMI )) { env->hflags &= ~HF_HALTED_MASK ;return 0 ; }
Quoted 10 lines · Jan Kiszka
[ This patch obsoletes
http://permalink.gmane.org/gmane.comp.emulators.qemu/22989. ]The x86 emulation yet lacks proper NMI support. This patch introduces
CPU_INTERRUPT_NMIand the required handling logic so that hardware emulation drivers can simply callcpu_interrupt(env, CPU_INTERRUPT_NMI);to raise an NMI on this arch.
Could you please add a monitor command to raise it too? Some OS support triggering debugging code from NMIs and that might be useful inside qemu too.
-Andi
Quoted 9 lines · Andi Kleen
Quoted 7 lines · Jan Kiszka
[ This patch obsoletes
http://permalink.gmane.org/gmane.comp.emulators.qemu/22989. ]The x86 emulation yet lacks proper NMI support. This patch introduces
CPU_INTERRUPT_NMIand the required handling logic so that hardware emulation drivers can simply call
Quoted 7 lines
Quoted 3 lines
cpu_interrupt(env, CPU_INTERRUPT_NMI);to raise an NMI on this arch.
Could you please add a monitor command to raise it too? Some OS support triggering debugging code from NMIs and that might be useful inside qemu too.
Will it be enough just the raise the NMI? Or doesn't you also have to modify some hardware state somewhere? Maybe you could provide an example for what you have in mind (it's trivial to hack such an extension, I'm just curious to understand its background).
Jan
Quoted 6 lines
Quoted 4 lines
Could you please add a monitor command to raise it too? Some OS support triggering debugging code from NMIs and that might be useful inside qemu too.
Will it be enough just the raise the NMI?
Yes that's enough.
Quoted 2 lines
Or doesn't you also have to
modify some hardware state somewhere?
Not needed.
Quoted 3 lines
Maybe you could provide an example
for what you have in mind (it's trivial to hack such an extension, I'm just curious to understand its background).
Basically it would emulate an NMI button which can be found on some systems.
-Andi
Quoted 10 lines · Andi Kleen
Quoted 4 lines
Quoted 3 lines
Could you please add a monitor command to raise it too? Some OS support triggering debugging code from NMIs and that might be useful inside qemu too.
Will it be enough just the raise the NMI?
Yes that's enough.
Quoted 2 lines
Or doesn't you also have to
modify some hardware state somewhere?
Quoted 7 lines
Not needed.
Quoted 3 lines
Maybe you could provide an example
for what you have in mind (it's trivial to hack such an extension, I'm just curious to understand its background).Basically it would emulate an NMI button which can be found on some systems.
I see. Here is the patch. Works as expected for me.
--- monitor.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
monitor.c +17 -0
@@ -1283,6 +1283,19 @@ static void do_wav_capture (const char * }#endif +#if defined(TARGET_I386 ) +static void do_inject_nmi (int cpu_index) +{ +CPUState *env; + +for (env = first_cpu; env !=NULL ; env = env->next_cpu) +if (env->cpu_index == cpu_index) { +cpu_interrupt (env,CPU_INTERRUPT_NMI ); +break ; + } +} +#endif +static term_cmd_t term_cmds[] = { {"help|?" ,"s?" , do_help,"[cmd]" ,"show the help" },
@@ -1356,6 +1369,10 @@ static term_cmd_t term_cmds[] = { "addr size file", "save to disk virtual memory dump starting at 'addr' of size 'size'", }, { "pmemsave", "lis", do_physical_memory_save, "addr size file", "save to disk physical memory dump starting at 'addr' of size 'size'", }, +#if defined(TARGET_I386) + { "nmi", "i", do_inject_nmi, + "cpu", "inject an NMI on the given CPU", }, +#endif { NULL, NULL, }, };