target/i386: V_IRQ masking and V_TPR fixes
cover target/i386: V_IRQ masking and V_TPR fixes
Patch 2 adds VGIF capability to mask virtual interrupts. Patches 3 and 4 fix bugs related to vTPR, while patch 1 refactors int_ctl into the state structure to simplify the fixes in the following patches.
Lara Lazier (4):
target/i386: Moved int_ctl into CPUX86State structure target/i386: Added VGIF V_IRQ masking capability target/i386: Added ignore TPR check in ctl_has_irq target/i386: Added changed priority check for VIRQ
slirp | 2 +- target/i386/cpu.c | 9 ++-- target/i386/cpu.h | 18 ++++++++ target/i386/machine.c | 22 +++++++++- target/i386/tcg/seg_helper.c | 2 +- target/i386/tcg/sysemu/misc_helper.c | 11 ++++- target/i386/tcg/sysemu/svm_helper.c | 62 +++++++++++----------------- 7 files changed, 79 insertions(+), 47 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/4 target/i386: Moved int_ctl into CPUX86State structure
Moved int_ctl into the CPUX86State structure to remove some unnecessary stores and loads.
--- slirp | 2 +- target/i386/cpu.c | 2 +- target/i386/cpu.h | 1 + target/i386/machine.c | 22 ++++++++++++- target/i386/tcg/seg_helper.c | 2 +- target/i386/tcg/sysemu/misc_helper.c | 4 +-- target/i386/tcg/sysemu/svm_helper.c | 48 +++++++++------------------- 7 files changed, 42 insertions(+), 39 deletions(-)
slirp +1 -1
@@ -1 +1 @@ -Subproject commit a88d9ace234a24ce1c17189642ef9104799425e0 +Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece
target/i386/cpu.c +1 -1
@@ -5647,7 +5647,7 @@ static void x86_cpu_reset(DeviceState *dev) env->old_exception =-1 ;/* init to reset state */ - + env->int_ctl =0 ; env->hflags2 |=HF2_GIF_MASK ; env->hflags &= ~HF_GUEST_MASK ;
target/i386/cpu.h +1 -0
@@ -1577,6 +1577,7 @@ typedef struct CPUX86State {uint64_t nested_cr3;uint32_t nested_pg_mode;uint8_t v_tpr; +uint32_t int_ctl;/* KVM states, automatically cleared on reset */ uint8_t nmi_injected;
target/i386/machine.c +21 -1
@@ -203,7 +203,7 @@ static int cpu_pre_save(void *opaque)X86CPU *cpu = opaque;CPUX86State *env = &cpu->env;int i; - + env->v_tpr = env->int_ctl &V_TPR_MASK ;/* FPU */ env->fpus_vmstate = (env->fpus & ~0x3800 ) | (env->fpstt &0x7 ) <<11 ; env->fptag_vmstate =0 ;
@@ -1356,6 +1356,25 @@ static const VMStateDescription vmstate_svm_npt = { } }; +static bool svm_guest_needed (void *opaque) +{ +X86CPU *cpu = opaque; +CPUX86State *env = &cpu->env; + +return !env->int_ctl; +} + +static const VMStateDescription vmstate_svm_guest = { + .name ="cpu/svn_guest" , + .version_id =1 , + .minimum_version_id =1 , + .needed = svm_guest_needed, + .fields = (VMStateField []){ +VMSTATE_UINT32 (env.int_ctl,X86CPU ), +VMSTATE_END_OF_LIST () + } +}; +#ifndef TARGET_X86_64 static bool intel_efer32_needed (void *opaque) {
@@ -1524,6 +1543,7 @@ const VMStateDescription vmstate_x86_cpu = { &vmstate_msr_intel_pt, &vmstate_msr_virt_ssbd, &vmstate_svm_npt, + &vmstate_svm_guest, #ifndef TARGET_X86_64 &vmstate_efer32, #endif
target/i386/tcg/seg_helper.c +1 -1
@@ -1166,7 +1166,6 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request)break ;#if !defined(CONFIG_USER_ONLY )case CPU_INTERRUPT_VIRQ : -/* FIXME: this should respect TPR */ cpu_svm_check_intercept_param (env,SVM_EXIT_VINTR ,0 ,0 ); intno =x86_ldl_phys (cs, env->vm_vmcb + offsetof(struct vmcb, control.int_vector));
@@ -1174,6 +1173,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request) "Servicing virtual hardware INT=0x%02x\n", intno);do_interrupt_x86_hardirq (env, intno,1 ); cs->interrupt_request &= ~CPU_INTERRUPT_VIRQ ; + env->int_ctl &= ~V_IRQ_MASK ;break ;#endif }
target/i386/tcg/sysemu/misc_helper.c +2 -2
@@ -73,7 +73,7 @@ target_ulong helper_read_crN(CPUX86State *env, int reg)if (!(env->hflags2 &HF2_VINTR_MASK )) { val =cpu_get_apic_tpr (env_archcpu (env)->apic_state); }else { - val = env->v_tpr; + val = env->int_ctl &V_TPR_MASK ; }break ; }
@@ -121,7 +121,7 @@ void helper_write_crN(CPUX86State *env, int reg, target_ulong t0)cpu_set_apic_tpr (env_archcpu (env)->apic_state, t0);qemu_mutex_unlock_iothread (); } - env->v_tpr = t0 &0x0f ; + env->int_ctl = (env->int_ctl & ~V_TPR_MASK ) | (t0 &V_TPR_MASK );break ;default : env->cr[reg] = t0;
target/i386/tcg/sysemu/svm_helper.c +15 -33
118 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 2/4 target/i386: Added VGIF V_IRQ masking capability
In reply to Lara LazierVGIF provides masking capability for when virtual interrupts are taken. (APM2)
--- target/i386/cpu.c | 7 +++++-- target/i386/cpu.h | 2 ++ target/i386/tcg/sysemu/svm_helper.c | 12 ++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-)
target/i386/cpu.c +5 -2
@@ -5649,6 +5649,7 @@ static void x86_cpu_reset(DeviceState *dev)/* init to reset state */ env->int_ctl =0 ; env->hflags2 |=HF2_GIF_MASK ; + env->hflags2 |=HF2_VGIF_MASK ; env->hflags &= ~HF_GUEST_MASK ;cpu_x86_update_cr0 (env,0x60000010 );
@@ -6532,10 +6533,12 @@ int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request) !(env->hflags & HF_INHIBIT_IRQ_MASK))))) {return CPU_INTERRUPT_HARD ;#if !defined(CONFIG_USER_ONLY ) - } else if ((interrupt_request & CPU_INTERRUPT_VIRQ) && + } else if (env->hflags2 & HF2_VGIF_MASK) { +if ((interrupt_request &CPU_INTERRUPT_VIRQ ) && (env->eflags &IF_MASK ) && !(env->hflags &HF_INHIBIT_IRQ_MASK )) { -return CPU_INTERRUPT_VIRQ ; +return CPU_INTERRUPT_VIRQ ; + }#endif } }
target/i386/cpu.h +2 -0
@@ -203,6 +203,7 @@ typedef enum X86Seg {#define HF2_MPX_PR_SHIFT 5/* BNDCFGx.BNDPRESERVE */ #define HF2_NPT_SHIFT 6/* Nested Paging enabled */ #define HF2_IGNNE_SHIFT 7/* Ignore CR0.NE=0 */ +#define HF2_VGIF_SHIFT 8/* Can take VIRQ*/ #define HF2_GIF_MASK (1 << HF2_GIF_SHIFT)#define HF2_HIF_MASK (1 << HF2_HIF_SHIFT)
@@ -212,6 +213,7 @@ typedef enum X86Seg {#define HF2_MPX_PR_MASK (1 << HF2_MPX_PR_SHIFT)#define HF2_NPT_MASK (1 << HF2_NPT_SHIFT)#define HF2_IGNNE_MASK (1 << HF2_IGNNE_SHIFT) +#define HF2_VGIF_MASK (1 << HF2_VGIF_SHIFT)#define CR0_PE_SHIFT 0#define CR0_MP_SHIFT 1
target/i386/tcg/sysemu/svm_helper.c +12 -0
@@ -130,6 +130,11 @@ static inline bool virtual_gif_enabled(CPUX86State *env)return false; } +static inline bool virtual_gif_set (CPUX86State *env) +{ +return !virtual_gif_enabled (env) || (env->int_ctl &V_GIF_MASK ); +} +void helper_vmrun (CPUX86State *env,int aflag,int next_eip_addend) {CPUState *cs =env_cpu (env);
@@ -363,6 +368,10 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) cs->interrupt_request |=CPU_INTERRUPT_VIRQ ; } +if (virtual_gif_set (env)) { + env->hflags2 |=HF2_VGIF_MASK ; + } +/* maybe we need to inject an event */ event_inj =x86_ldl_phys (cs, env->vm_vmcb + offsetof(struct vmcb , control.event_inj));
@@ -519,6 +528,7 @@ void helper_stgi(CPUX86State *env)if (virtual_gif_enabled (env)) { env->int_ctl |=V_GIF_MASK ; + env->hflags2 |=HF2_VGIF_MASK ; }else { env->hflags2 |=HF2_GIF_MASK ; }
@@ -530,6 +540,7 @@ void helper_clgi(CPUX86State *env)if (virtual_gif_enabled (env)) { env->int_ctl &= ~V_GIF_MASK ; + env->hflags2 &= ~HF2_VGIF_MASK ; }else { env->hflags2 &= ~HF2_GIF_MASK ; }
@@ -811,6 +822,7 @@ void do_vmexit(CPUX86State *env) env->vm_vmcb + offsetof(struct vmcb, control.event_inj), 0); env->hflags2 &= ~HF2_GIF_MASK ; + env->hflags2 &= ~HF2_VGIF_MASK ;/* FIXME: Resets the current ASID register to zero (host ASID). */ /* Clears the V_IRQ and V_INTR_MASKING bits inside the processor. */
Signature · 1 line
2.25.1
PATCH 3/4 target/i386: Added ignore TPR check in ctl_has_irq
In reply to Lara LazierThe APM2 states that if V_IGN_TPR is nonzero, the current virtual interrupt ignores the (virtual) TPR.
--- target/i386/tcg/sysemu/svm_helper.c | 5 +++++ 1 file changed, 5 insertions(+)
target/i386/tcg/sysemu/svm_helper.c +5 -0
@@ -83,6 +83,11 @@ static inline bool ctl_has_irq(CPUX86State *env) int_prio = (env->int_ctl &V_INTR_PRIO_MASK ) >>V_INTR_PRIO_SHIFT ; tpr = env->int_ctl &V_TPR_MASK ; + +if (env->int_ctl &V_IGN_TPR_MASK ) { +return env->int_ctl &V_IRQ_MASK ; + } +return (env->int_ctl &V_IRQ_MASK ) && (int_prio >= tpr); }
Signature · 1 line
2.25.1
PATCH 4/4 target/i386: Added changed priority check for VIRQ
In reply to Lara LazierWrites to cr8 affect v_tpr. This could set or unset an interrupt request as the priority might have changed.
--- target/i386/cpu.h | 15 +++++++++++++++ target/i386/tcg/sysemu/misc_helper.c | 7 +++++++ target/i386/tcg/sysemu/svm_helper.c | 15 --------------- 3 files changed, 22 insertions(+), 15 deletions(-)
target/i386/cpu.h +15 -0
@@ -2245,6 +2245,21 @@ static inline uint64_t cr4_reserved_bits(CPUX86State *env)return reserved_bits; } +static inline bool ctl_has_irq (CPUX86State *env) +{ +uint32_t int_prio; +uint32_t tpr; + + int_prio = (env->int_ctl &V_INTR_PRIO_MASK ) >>V_INTR_PRIO_SHIFT ; + tpr = env->int_ctl &V_TPR_MASK ; + +if (env->int_ctl &V_IGN_TPR_MASK ) { +return (env->int_ctl &V_IRQ_MASK ); + } + +return (env->int_ctl &V_IRQ_MASK ) && (int_prio >= tpr); +} +#if defined(TARGET_X86_64 ) && \ defined(CONFIG_USER_ONLY ) && \ defined(CONFIG_LINUX )
target/i386/tcg/sysemu/misc_helper.c +7 -0
@@ -122,6 +122,13 @@ void helper_write_crN(CPUX86State *env, int reg, target_ulong t0)qemu_mutex_unlock_iothread (); } env->int_ctl = (env->int_ctl & ~V_TPR_MASK ) | (t0 &V_TPR_MASK ); + +CPUState *cs =env_cpu (env); +if (ctl_has_irq (env)) { +cpu_interrupt (cs,CPU_INTERRUPT_VIRQ ); + }else { +cpu_reset_interrupt (cs,CPU_INTERRUPT_VIRQ ); + }break ;default : env->cr[reg] = t0;
target/i386/tcg/sysemu/svm_helper.c +0 -15
@@ -76,21 +76,6 @@ static inline void svm_load_seg_cache(CPUX86State *env, hwaddr addr, sc->base, sc->limit, sc->flags); } -static inline bool ctl_has_irq (CPUX86State *env) -{ -uint32_t int_prio; -uint32_t tpr; - - int_prio = (env->int_ctl &V_INTR_PRIO_MASK ) >>V_INTR_PRIO_SHIFT ; - tpr = env->int_ctl &V_TPR_MASK ; - -if (env->int_ctl &V_IGN_TPR_MASK ) { -return env->int_ctl &V_IRQ_MASK ; - } - -return (env->int_ctl &V_IRQ_MASK ) && (int_prio >= tpr); -} -static inline bool is_efer_invalid_state (CPUX86State *env) {if (!(env->efer &MSR_EFER_SVME )) {
Signature · 1 line
2.25.1