KVM: SVM: Add manipulation functions for misc intercepts
This patch wraps changes to the misc intercepts of SVM into seperate functions to abstract nested-svm better and prepare the implementation of the vmcb-clean-bits feature. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
parent
18c918c5f5
commit
8a05a1b869
@ -277,6 +277,24 @@ static inline void clr_exception_intercept(struct vcpu_svm *svm, int bit)
|
||||
recalc_intercepts(svm);
|
||||
}
|
||||
|
||||
static inline void set_intercept(struct vcpu_svm *svm, int bit)
|
||||
{
|
||||
struct vmcb *vmcb = get_host_vmcb(svm);
|
||||
|
||||
vmcb->control.intercept |= (1ULL << bit);
|
||||
|
||||
recalc_intercepts(svm);
|
||||
}
|
||||
|
||||
static inline void clr_intercept(struct vcpu_svm *svm, int bit)
|
||||
{
|
||||
struct vmcb *vmcb = get_host_vmcb(svm);
|
||||
|
||||
vmcb->control.intercept &= ~(1ULL << bit);
|
||||
|
||||
recalc_intercepts(svm);
|
||||
}
|
||||
|
||||
static inline void enable_gif(struct vcpu_svm *svm)
|
||||
{
|
||||
svm->vcpu.arch.hflags |= HF_GIF_MASK;
|
||||
@ -863,29 +881,29 @@ static void init_vmcb(struct vcpu_svm *svm)
|
||||
set_exception_intercept(svm, UD_VECTOR);
|
||||
set_exception_intercept(svm, MC_VECTOR);
|
||||
|
||||
control->intercept = (1ULL << INTERCEPT_INTR) |
|
||||
(1ULL << INTERCEPT_NMI) |
|
||||
(1ULL << INTERCEPT_SMI) |
|
||||
(1ULL << INTERCEPT_SELECTIVE_CR0) |
|
||||
(1ULL << INTERCEPT_CPUID) |
|
||||
(1ULL << INTERCEPT_INVD) |
|
||||
(1ULL << INTERCEPT_HLT) |
|
||||
(1ULL << INTERCEPT_INVLPG) |
|
||||
(1ULL << INTERCEPT_INVLPGA) |
|
||||
(1ULL << INTERCEPT_IOIO_PROT) |
|
||||
(1ULL << INTERCEPT_MSR_PROT) |
|
||||
(1ULL << INTERCEPT_TASK_SWITCH) |
|
||||
(1ULL << INTERCEPT_SHUTDOWN) |
|
||||
(1ULL << INTERCEPT_VMRUN) |
|
||||
(1ULL << INTERCEPT_VMMCALL) |
|
||||
(1ULL << INTERCEPT_VMLOAD) |
|
||||
(1ULL << INTERCEPT_VMSAVE) |
|
||||
(1ULL << INTERCEPT_STGI) |
|
||||
(1ULL << INTERCEPT_CLGI) |
|
||||
(1ULL << INTERCEPT_SKINIT) |
|
||||
(1ULL << INTERCEPT_WBINVD) |
|
||||
(1ULL << INTERCEPT_MONITOR) |
|
||||
(1ULL << INTERCEPT_MWAIT);
|
||||
set_intercept(svm, INTERCEPT_INTR);
|
||||
set_intercept(svm, INTERCEPT_NMI);
|
||||
set_intercept(svm, INTERCEPT_SMI);
|
||||
set_intercept(svm, INTERCEPT_SELECTIVE_CR0);
|
||||
set_intercept(svm, INTERCEPT_CPUID);
|
||||
set_intercept(svm, INTERCEPT_INVD);
|
||||
set_intercept(svm, INTERCEPT_HLT);
|
||||
set_intercept(svm, INTERCEPT_INVLPG);
|
||||
set_intercept(svm, INTERCEPT_INVLPGA);
|
||||
set_intercept(svm, INTERCEPT_IOIO_PROT);
|
||||
set_intercept(svm, INTERCEPT_MSR_PROT);
|
||||
set_intercept(svm, INTERCEPT_TASK_SWITCH);
|
||||
set_intercept(svm, INTERCEPT_SHUTDOWN);
|
||||
set_intercept(svm, INTERCEPT_VMRUN);
|
||||
set_intercept(svm, INTERCEPT_VMMCALL);
|
||||
set_intercept(svm, INTERCEPT_VMLOAD);
|
||||
set_intercept(svm, INTERCEPT_VMSAVE);
|
||||
set_intercept(svm, INTERCEPT_STGI);
|
||||
set_intercept(svm, INTERCEPT_CLGI);
|
||||
set_intercept(svm, INTERCEPT_SKINIT);
|
||||
set_intercept(svm, INTERCEPT_WBINVD);
|
||||
set_intercept(svm, INTERCEPT_MONITOR);
|
||||
set_intercept(svm, INTERCEPT_MWAIT);
|
||||
|
||||
control->iopm_base_pa = iopm_base;
|
||||
control->msrpm_base_pa = __pa(svm->msrpm);
|
||||
@ -936,8 +954,8 @@ static void init_vmcb(struct vcpu_svm *svm)
|
||||
if (npt_enabled) {
|
||||
/* Setup VMCB for Nested Paging */
|
||||
control->nested_ctl = 1;
|
||||
control->intercept &= ~((1ULL << INTERCEPT_TASK_SWITCH) |
|
||||
(1ULL << INTERCEPT_INVLPG));
|
||||
clr_intercept(svm, INTERCEPT_TASK_SWITCH);
|
||||
clr_intercept(svm, INTERCEPT_INVLPG);
|
||||
clr_exception_intercept(svm, PF_VECTOR);
|
||||
clr_cr_intercept(svm, INTERCEPT_CR3_READ);
|
||||
clr_cr_intercept(svm, INTERCEPT_CR3_WRITE);
|
||||
@ -952,7 +970,7 @@ static void init_vmcb(struct vcpu_svm *svm)
|
||||
|
||||
if (boot_cpu_has(X86_FEATURE_PAUSEFILTER)) {
|
||||
control->pause_filter_count = 3000;
|
||||
control->intercept |= (1ULL << INTERCEPT_PAUSE);
|
||||
set_intercept(svm, INTERCEPT_PAUSE);
|
||||
}
|
||||
|
||||
enable_gif(svm);
|
||||
@ -1126,12 +1144,12 @@ static void svm_cache_reg(struct kvm_vcpu *vcpu, enum kvm_reg reg)
|
||||
|
||||
static void svm_set_vintr(struct vcpu_svm *svm)
|
||||
{
|
||||
svm->vmcb->control.intercept |= 1ULL << INTERCEPT_VINTR;
|
||||
set_intercept(svm, INTERCEPT_VINTR);
|
||||
}
|
||||
|
||||
static void svm_clear_vintr(struct vcpu_svm *svm)
|
||||
{
|
||||
svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_VINTR);
|
||||
clr_intercept(svm, INTERCEPT_VINTR);
|
||||
}
|
||||
|
||||
static struct vmcb_seg *svm_seg(struct kvm_vcpu *vcpu, int seg)
|
||||
@ -2309,7 +2327,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
|
||||
}
|
||||
|
||||
/* We don't want to see VMMCALLs from a nested guest */
|
||||
svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_VMMCALL);
|
||||
clr_intercept(svm, INTERCEPT_VMMCALL);
|
||||
|
||||
svm->vmcb->control.lbr_ctl = nested_vmcb->control.lbr_ctl;
|
||||
svm->vmcb->control.int_vector = nested_vmcb->control.int_vector;
|
||||
@ -2557,7 +2575,7 @@ static int cpuid_interception(struct vcpu_svm *svm)
|
||||
static int iret_interception(struct vcpu_svm *svm)
|
||||
{
|
||||
++svm->vcpu.stat.nmi_window_exits;
|
||||
svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_IRET);
|
||||
clr_intercept(svm, INTERCEPT_IRET);
|
||||
svm->vcpu.arch.hflags |= HF_IRET_MASK;
|
||||
return 1;
|
||||
}
|
||||
@ -3103,7 +3121,7 @@ static void svm_inject_nmi(struct kvm_vcpu *vcpu)
|
||||
|
||||
svm->vmcb->control.event_inj = SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_NMI;
|
||||
vcpu->arch.hflags |= HF_NMI_MASK;
|
||||
svm->vmcb->control.intercept |= (1ULL << INTERCEPT_IRET);
|
||||
set_intercept(svm, INTERCEPT_IRET);
|
||||
++vcpu->stat.nmi_injections;
|
||||
}
|
||||
|
||||
@ -3170,10 +3188,10 @@ static void svm_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked)
|
||||
|
||||
if (masked) {
|
||||
svm->vcpu.arch.hflags |= HF_NMI_MASK;
|
||||
svm->vmcb->control.intercept |= (1ULL << INTERCEPT_IRET);
|
||||
set_intercept(svm, INTERCEPT_IRET);
|
||||
} else {
|
||||
svm->vcpu.arch.hflags &= ~HF_NMI_MASK;
|
||||
svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_IRET);
|
||||
clr_intercept(svm, INTERCEPT_IRET);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user