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;
Date:   Mon, 13 May 2019 07:22:32 -0400
User-Agent: K-9 Mail for Android
In-Reply-To: <1557740799-5792-1-git-send-email-wanpengli@tencent.com>
References: <1557740799-5792-1-git-send-email-wanpengli@tencent.com>
MIME-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [PATCH] KVM: X86: Enable IA32_MSIC_ENABLE MONITOR bit when exposing mwait/monitor
To:     Wanpeng Li <kernellwp@gmail.com>, linux-kernel@vger.kernel.org,
        kvm@vger.kernel.org
CC:     Paolo Bonzini <pbonzini@redhat.com>,
        =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>,
        Sean Christopherson <sean.j.christopherson@intel.com>,
        Liran Alon <liran.alon@oracle.com>
From:   Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Message-ID: <0F74F27F-2403-441D-8702-373BDA21E3A7@oracle.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On May 13, 2019 5:46:39 AM EDT, Wanpeng Li <kernellwp@gmail=2Ecom> wrote:
>From: Wanpeng Li <wanpengli@tencent=2Ecom>
>
>MSR IA32_MSIC_ENABLE bit 18, according to SDM:
>

 MSIC? (Also the $subject)


>| When this bit is set to 0, the MONITOR feature flag is not set
>(CPUID=2E01H:ECX[bit 3] =3D 0)=2E=20
> | This indicates that MONITOR/MWAIT are not supported=2E
> |=20
>| Software attempts to execute MONITOR/MWAIT will cause #UD when this
>bit is 0=2E
> |=20
>| When this bit is set to 1 (default), MONITOR/MWAIT are supported
>(CPUID=2E01H:ECX[bit 3] =3D 1)=2E=20
>
>This bit should be set to 1, if BIOS enables MONITOR/MWAIT support on
>host and=20
>we intend to expose mwait/monitor to the guest=2E
>
>Cc: Paolo Bonzini <pbonzini@redhat=2Ecom>
>Cc: Radim Kr=C4=8Dm=C3=A1=C5=99 <rkrcmar@redhat=2Ecom>
>Cc: Sean Christopherson <sean=2Ej=2Echristopherson@intel=2Ecom>
>Cc: Liran Alon <liran=2Ealon@oracle=2Ecom>
>Signed-off-by: Wanpeng Li <wanpengli@tencent=2Ecom>
>---
> arch/x86/kvm/x86=2Ec | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/arch/x86/kvm/x86=2Ec b/arch/x86/kvm/x86=2Ec
>index 1d89cb9=2E=2E664449e 100644
>--- a/arch/x86/kvm/x86=2Ec
>+++ b/arch/x86/kvm/x86=2Ec
>@@ -2723,6 +2723,13 @@ static int get_msr_mce(struct kvm_vcpu *vcpu,
>u32 msr, u64 *pdata, bool host)
> 	return 0;
> }
>=20
>+static inline bool kvm_can_mwait_in_guest(void)
>+{
>+	return boot_cpu_has(X86_FEATURE_MWAIT) &&
>+		!boot_cpu_has_bug(X86_BUG_MONITOR) &&
>+		boot_cpu_has(X86_FEATURE_ARAT);
>+}
>+
>int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data
>*msr_info)
> {
> 	switch (msr_info->index) {
>@@ -2801,6 +2808,8 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu,
>struct msr_data *msr_info)
> 		msr_info->data =3D (u64)vcpu->arch=2Eia32_tsc_adjust_msr;
> 		break;
> 	case MSR_IA32_MISC_ENABLE:
>+		if (kvm_can_mwait_in_guest() && kvm_mwait_in_guest(vcpu->kvm))
>+			vcpu->arch=2Eia32_misc_enable_msr |=3D MSR_IA32_MISC_ENABLE_MWAIT;
> 		msr_info->data =3D vcpu->arch=2Eia32_misc_enable_msr;
> 		break;
> 	case MSR_IA32_SMBASE:
>@@ -2984,13 +2993,6 @@ static int msr_io(struct kvm_vcpu *vcpu, struct
>kvm_msrs __user *user_msrs,
> 	return r;
> }
>=20
>-static inline bool kvm_can_mwait_in_guest(void)
>-{
>-	return boot_cpu_has(X86_FEATURE_MWAIT) &&
>-		!boot_cpu_has_bug(X86_BUG_MONITOR) &&
>-		boot_cpu_has(X86_FEATURE_ARAT);
>-}
>-
> int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
> {
> 	int r =3D 0;