KVM: x86: Explicitly pass an exception struct to check_intercept

Explicitly pass an exception struct when checking for intercept from
the emulator, which eliminates the last reference to arch.emulate_ctxt
in vendor specific code.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 316ec6cf532b995f4a0eb3e534f16d40d2dd088f..af42644985546e8a3f9068d265810b90533a8011 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1170,7 +1170,8 @@ struct kvm_x86_ops {
 
        int (*check_intercept)(struct kvm_vcpu *vcpu,
                               struct x86_instruction_info *info,
-                              enum x86_intercept_stage stage);
+                              enum x86_intercept_stage stage,
+                              struct x86_exception *exception);
        void (*handle_exit_irqoff)(struct kvm_vcpu *vcpu,
                enum exit_fastpath_completion *exit_fastpath);
        bool (*mpx_supported)(void);

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 48c9390011d0f4ac388536673080b995541142c7..7f32c407d682aae40d60a378b6ed257296a12c93 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -6175,7 +6175,8 @@ static const struct __x86_intercept {
 
 static int svm_check_intercept(struct kvm_vcpu *vcpu,
                               struct x86_instruction_info *info,
-                              enum x86_intercept_stage stage)
+                              enum x86_intercept_stage stage,
+                              struct x86_exception *exception)
 {
        struct vcpu_svm *svm = to_svm(vcpu);
        int vmexit, ret = X86EMUL_CONTINUE;

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 743b81642ce2fcc49c8039aef6713cb791e644c5..57742ddfd854f24c26a1e6537be52aa12b7cede0 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -7174,10 +7174,10 @@ static int vmx_check_intercept_io(struct kvm_vcpu *vcpu,
 
 static int vmx_check_intercept(struct kvm_vcpu *vcpu,
                               struct x86_instruction_info *info,
-                              enum x86_intercept_stage stage)
+                              enum x86_intercept_stage stage,
+                              struct x86_exception *exception)
 {
        struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
-       struct x86_emulate_ctxt *ctxt = &vcpu->arch.emulate_ctxt;
 
        switch (info->intercept) {
        /*
@@ -7186,8 +7186,8 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu,
         */
        case x86_intercept_rdtscp:
                if (!nested_cpu_has2(vmcs12, SECONDARY_EXEC_RDTSCP)) {
-                       ctxt->exception.vector = UD_VECTOR;
-                       ctxt->exception.error_code_valid = false;
+                       exception->vector = UD_VECTOR;
+                       exception->error_code_valid = false;
                        return X86EMUL_PROPAGATE_FAULT;
                }
                break;

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fbf68c30555607edc70f38981d08c6af5cd75aa4..762a68200b46b9d4cf367aab3f035fb0d6c3de9f 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6212,7 +6212,8 @@ static int emulator_intercept(struct x86_emulate_ctxt *ctxt,
                              struct x86_instruction_info *info,
                              enum x86_intercept_stage stage)
 {
-       return kvm_x86_ops->check_intercept(emul_to_vcpu(ctxt), info, stage);
+       return kvm_x86_ops->check_intercept(emul_to_vcpu(ctxt), info, stage,
+                                           &ctxt->exception);
 }
 
 static bool emulator_get_cpuid(struct x86_emulate_ctxt *ctxt,