Re: [PATCH v3 1/2] KVM: X86: Fix warning caused by stale emulation context

From: Sean Christopherson <seanjc@google.com>
To: Wanpeng Li <kernellwp@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kvm <kvm@vger.kernel.org>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Vitaly Kuznetsov <vkuznets@redhat.com>,
	Wanpeng Li <wanpengli@tencent.com>,
	Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>
Subject: Re: [PATCH v3 1/2] KVM: X86: Fix warning caused by stale emulation context
Date: Thu, 27 May 2021 23:46:56 +0000	[thread overview]
Message-ID: <YLAvcG59BgJ1i0+I@google.com> (raw)
In-Reply-To: <CANRm+CwL-uS3FPZxpW_cB=vdD4WKLRDPTpd4hsn57eWpKZ_CtQ@mail.gmail.com>

On Fri, May 28, 2021, Wanpeng Li wrote:
> How about this?

Yep, perfect!  Sorry about the squash confusion.

> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index bbc4e04..dba8077 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -7226,6 +7226,11 @@ static void init_emulate_ctxt(struct kvm_vcpu *vcpu)
>         BUILD_BUG_ON(HF_SMM_MASK != X86EMUL_SMM_MASK);
>         BUILD_BUG_ON(HF_SMM_INSIDE_NMI_MASK != X86EMUL_SMM_INSIDE_NMI_MASK);
> 
> +       ctxt->interruptibility = 0;
> +       ctxt->have_exception = false;
> +       ctxt->exception.vector = -1;
> +       ctxt->perm_ok = false;
> +
>         init_decode_cache(ctxt);
>         vcpu->arch.emulate_regs_need_sync_from_vcpu = false;
>  }
> @@ -7561,11 +7566,6 @@ int x86_decode_emulated_instruction(struct
> kvm_vcpu *vcpu, int emulation_type,
>             kvm_vcpu_check_breakpoint(vcpu, &r))
>                 return r;
> 
> -       ctxt->interruptibility = 0;
> -       ctxt->have_exception = false;
> -       ctxt->exception.vector = -1;
> -       ctxt->perm_ok = false;
> -
>         ctxt->ud = emulation_type & EMULTYPE_TRAP_UD;
> 
>         r = x86_decode_insn(ctxt, insn, insn_len);