| Message ID | 20200218232953.5724-6-sean.j.christopherson@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: x86: Allow userspace to disable the emulator | expand |
Sean Christopherson <sean.j.christopherson@intel.com> writes: > Invert the vcpu->context derivation in inject_emulated_exception() in > preparation for dynamically allocating the emulation context. > > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> > --- > arch/x86/kvm/x86.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 772e704e8083..79d1113ad6e7 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -6399,9 +6399,10 @@ static void toggle_interruptibility(struct kvm_vcpu *vcpu, u32 mask) > } > } > > -static bool inject_emulated_exception(struct kvm_vcpu *vcpu) > +static bool inject_emulated_exception(struct x86_emulate_ctxt *ctxt) > { > - struct x86_emulate_ctxt *ctxt = &vcpu->arch.emulate_ctxt; > + struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt); > + > if (ctxt->exception.vector == PF_VECTOR) > return kvm_propagate_fault(vcpu, &ctxt->exception); > > @@ -6806,7 +6807,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, > */ > WARN_ON_ONCE(ctxt->exception.vector == UD_VECTOR || > exception_type(ctxt->exception.vector) == EXCPT_TRAP); > - inject_emulated_exception(vcpu); > + inject_emulated_exception(ctxt); > return 1; > } > return handle_emulation_failure(vcpu, emulation_type); > @@ -6860,7 +6861,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, > > if (ctxt->have_exception) { > r = 1; > - if (inject_emulated_exception(vcpu)) > + if (inject_emulated_exception(ctxt)) > return r; > } else if (vcpu->arch.pio.count) { > if (!vcpu->arch.pio.in) { Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 772e704e8083..79d1113ad6e7 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6399,9 +6399,10 @@ static void toggle_interruptibility(struct kvm_vcpu *vcpu, u32 mask) } } -static bool inject_emulated_exception(struct kvm_vcpu *vcpu) +static bool inject_emulated_exception(struct x86_emulate_ctxt *ctxt) { - struct x86_emulate_ctxt *ctxt = &vcpu->arch.emulate_ctxt; + struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt); + if (ctxt->exception.vector == PF_VECTOR) return kvm_propagate_fault(vcpu, &ctxt->exception); @@ -6806,7 +6807,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, */ WARN_ON_ONCE(ctxt->exception.vector == UD_VECTOR || exception_type(ctxt->exception.vector) == EXCPT_TRAP); - inject_emulated_exception(vcpu); + inject_emulated_exception(ctxt); return 1; } return handle_emulation_failure(vcpu, emulation_type); @@ -6860,7 +6861,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, if (ctxt->have_exception) { r = 1; - if (inject_emulated_exception(vcpu)) + if (inject_emulated_exception(ctxt)) return r; } else if (vcpu->arch.pio.count) { if (!vcpu->arch.pio.in) {
Invert the vcpu->context derivation in inject_emulated_exception() in preparation for dynamically allocating the emulation context. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/kvm/x86.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)