From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, HK_RANDOM_FROM,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0C3DC2BA83 for ; Thu, 13 Feb 2020 14:25:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EAC120873 for ; Thu, 13 Feb 2020 14:25:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727558AbgBMOZx (ORCPT ); Thu, 13 Feb 2020 09:25:53 -0500 Received: from mga01.intel.com ([192.55.52.88]:62473 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725781AbgBMOZx (ORCPT ); Thu, 13 Feb 2020 09:25:53 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Feb 2020 06:25:52 -0800 X-IronPort-AV: E=Sophos;i="5.70,437,1574150400"; d="scan'208";a="227245768" Received: from xiaoyaol-mobl.ccr.corp.intel.com (HELO [10.255.30.123]) ([10.255.30.123]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Feb 2020 06:25:50 -0800 Subject: Re: [PATCH 21/61] KVM: x86: Use supported_xcr0 to detect MPX support To: Sean Christopherson , Paolo Bonzini Cc: Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20200201185218.24473-1-sean.j.christopherson@intel.com> <20200201185218.24473-22-sean.j.christopherson@intel.com> From: Xiaoyao Li Message-ID: <10a4c4bb-82a7-4a1e-d979-dea5f4076d41@intel.com> Date: Thu, 13 Feb 2020 22:25:49 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.4.2 MIME-Version: 1.0 In-Reply-To: <20200201185218.24473-22-sean.j.christopherson@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/2/2020 2:51 AM, Sean Christopherson wrote: > Query supported_xcr0 when checking for MPX support instead of invoking > ->mpx_supported() and drop ->mpx_supported() as kvm_mpx_supported() was > its last user. Rename vmx_mpx_supported() to cpu_has_vmx_mpx() to > better align with VMX/VMCS nomenclature. > > Modify VMX's adjustment of xcr0 to call cpus_has_vmx_mpx() (renamed from > vmx_mpx_supported()) directly to avoid reading supported_xcr0 before > it's fully configured. > > No functional change intended. > Reviewed-by: Xiaoyao Li > Signed-off-by: Sean Christopherson > --- > arch/x86/include/asm/kvm_host.h | 2 +- > arch/x86/kvm/cpuid.c | 3 +-- > arch/x86/kvm/svm.c | 6 ------ > arch/x86/kvm/vmx/capabilities.h | 2 +- > arch/x86/kvm/vmx/vmx.c | 3 +-- > 5 files changed, 4 insertions(+), 12 deletions(-) > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index 77d206a93658..85f0d96cfeb2 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -1163,7 +1163,7 @@ struct kvm_x86_ops { > enum x86_intercept_stage stage); > void (*handle_exit_irqoff)(struct kvm_vcpu *vcpu, > enum exit_fastpath_completion *exit_fastpath); > - bool (*mpx_supported)(void); > + > bool (*xsaves_supported)(void); > bool (*umip_emulated)(void); > bool (*pt_supported)(void); > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > index b9763eb711cb..84006cc4007c 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -47,8 +47,7 @@ static u32 xstate_required_size(u64 xstate_bv, bool compacted) > > bool kvm_mpx_supported(void) > { > - return ((host_xcr0 & (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR)) > - && kvm_x86_ops->mpx_supported()); > + return supported_xcr0 & (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR); > } > EXPORT_SYMBOL_GPL(kvm_mpx_supported); > > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c > index af096c4f9c5f..3c7ddaff405d 100644 > --- a/arch/x86/kvm/svm.c > +++ b/arch/x86/kvm/svm.c > @@ -6082,11 +6082,6 @@ static bool svm_invpcid_supported(void) > return false; > } > > -static bool svm_mpx_supported(void) > -{ > - return false; > -} > - > static bool svm_xsaves_supported(void) > { > return boot_cpu_has(X86_FEATURE_XSAVES); > @@ -7468,7 +7463,6 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = { > > .rdtscp_supported = svm_rdtscp_supported, > .invpcid_supported = svm_invpcid_supported, > - .mpx_supported = svm_mpx_supported, > .xsaves_supported = svm_xsaves_supported, > .umip_emulated = svm_umip_emulated, > .pt_supported = svm_pt_supported, > diff --git a/arch/x86/kvm/vmx/capabilities.h b/arch/x86/kvm/vmx/capabilities.h > index 1a6a99382e94..0a0b1494a934 100644 > --- a/arch/x86/kvm/vmx/capabilities.h > +++ b/arch/x86/kvm/vmx/capabilities.h > @@ -100,7 +100,7 @@ static inline bool cpu_has_load_perf_global_ctrl(void) > (vmcs_config.vmexit_ctrl & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL); > } > > -static inline bool vmx_mpx_supported(void) > +static inline bool cpu_has_vmx_mpx(void) > { > return (vmcs_config.vmexit_ctrl & VM_EXIT_CLEAR_BNDCFGS) && > (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_BNDCFGS); > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index 32a84ec15064..98fd651f7f7e 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -7590,7 +7590,7 @@ static __init int hardware_setup(void) > WARN_ONCE(host_bndcfgs, "KVM: BNDCFGS in host will be lost"); > } > > - if (!kvm_mpx_supported()) > + if (!cpu_has_vmx_mpx()) > supported_xcr0 &= ~(XFEATURE_MASK_BNDREGS | > XFEATURE_MASK_BNDCSR); > > @@ -7857,7 +7857,6 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = { > > .check_intercept = vmx_check_intercept, > .handle_exit_irqoff = vmx_handle_exit_irqoff, > - .mpx_supported = vmx_mpx_supported, > .xsaves_supported = vmx_xsaves_supported, > .umip_emulated = vmx_umip_emulated, > .pt_supported = vmx_pt_supported, >