linux-kernel - Re: [PATCH v2 05/13] KVM: x86: Refactor emulated exception injection to take the emul context

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <875zftjrpt.fsf@vitty.brq.redhat.com>
Date:   Wed, 26 Feb 2020 16:25:34 +0100
From:   Vitaly Kuznetsov <vkuznets@...hat.com>
To:     Sean Christopherson <sean.j.christopherson@...el.com>
Cc:     Paolo Bonzini <pbonzini@...hat.com>,
        Wanpeng Li <wanpengli@...cent.com>,
        Jim Mattson <jmattson@...gle.com>,
        Joerg Roedel <joro@...tes.org>, kvm@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 05/13] KVM: x86: Refactor emulated exception injection to take the emul context

Sean Christopherson <sean.j.christopherson@...el.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@...el.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@...hat.com>

-- 
Vitaly