Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
Message-ID: <9f084c44-d394-473f-906d-f11036dc48d9@default>
Date:   Tue, 27 Mar 2018 00:43:27 -0700 (PDT)
From:   Liran Alon <liran.alon@oracle.com>
To:     <kernellwp@gmail.com>
Cc:     <rkrcmar@redhat.com>, <pbonzini@redhat.com>,
        <linux-kernel@vger.kernel.org>, <andrew.cooper3@citrix.com>,
        <kvm@vger.kernel.org>
Subject: Re: [PATCH 1/2] KVM: VMX: Introduce handle_ud()
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


----- kernellwp@gmail.com wrote:

> From: Wanpeng Li <wanpengli@tencent.com>
>=20
> Introduce handle_ud() to handle invalid opcode, this function will be
>=20
> used by later patches.
>=20
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Radim Kr=C4=8Dm=C3=A1=C5=99 <rkrcmar@redhat.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> ---
>  arch/x86/kvm/vmx.c | 22 ++++++++++++++--------
>  1 file changed, 14 insertions(+), 8 deletions(-)
>=20
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 9bc05f5..0f99833 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -6215,6 +6215,18 @@ static int handle_machine_check(struct kvm_vcpu
> *vcpu)
>  =09return 1;
>  }
> =20
> +static int handle_ud(struct kvm_vcpu *vcpu)
> +{
> +=09enum emulation_result er;
> +
> +=09er =3D emulate_instruction(vcpu, EMULTYPE_TRAP_UD);
> +=09if (er =3D=3D EMULATE_USER_EXIT)
> +=09=09return 0;
> +=09if (er !=3D EMULATE_DONE)
> +=09=09kvm_queue_exception(vcpu, UD_VECTOR);
> +=09return 1;
> +}
> +
>  static int handle_exception(struct kvm_vcpu *vcpu)
>  {
>  =09struct vcpu_vmx *vmx =3D to_vmx(vcpu);
> @@ -6233,14 +6245,8 @@ static int handle_exception(struct kvm_vcpu
> *vcpu)
>  =09if (is_nmi(intr_info))
>  =09=09return 1;  /* already handled by vmx_vcpu_run() */
> =20
> -=09if (is_invalid_opcode(intr_info)) {
> -=09=09er =3D emulate_instruction(vcpu, EMULTYPE_TRAP_UD);
> -=09=09if (er =3D=3D EMULATE_USER_EXIT)
> -=09=09=09return 0;
> -=09=09if (er !=3D EMULATE_DONE)
> -=09=09=09kvm_queue_exception(vcpu, UD_VECTOR);
> -=09=09return 1;
> -=09}
> +=09if (is_invalid_opcode(intr_info))
> +=09=09return handle_ud(vcpu);
> =20
>  =09error_code =3D 0;
>  =09if (intr_info & INTR_INFO_DELIVER_CODE_MASK)
> --=20
> 2.7.4

Reviewed-By: Liran Alon <liran.alon@oracle.com>