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=-11.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,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 E76B6C433F5 for ; Fri, 17 Sep 2021 16:16:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D02E361108 for ; Fri, 17 Sep 2021 16:16:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243832AbhIQQRZ (ORCPT ); Fri, 17 Sep 2021 12:17:25 -0400 Received: from mga02.intel.com ([134.134.136.20]:26386 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242090AbhIQQRU (ORCPT ); Fri, 17 Sep 2021 12:17:20 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10110"; a="210059600" X-IronPort-AV: E=Sophos;i="5.85,301,1624345200"; d="scan'208";a="210059600" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2021 09:15:57 -0700 X-IronPort-AV: E=Sophos;i="5.85,301,1624345200"; d="scan'208";a="546478915" Received: from zengguan-mobl.ccr.corp.intel.com (HELO [10.254.208.219]) ([10.254.208.219]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2021 09:15:52 -0700 Subject: Re: [PATCH v4 3/6] KVM: VMX: Detect Tertiary VM-Execution control when setup VMCS config To: Sean Christopherson Cc: Paolo Bonzini , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , "kvm@vger.kernel.org" , Dave Hansen , "Luck, Tony" , Kan Liang , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Kim Phillips , Jarkko Sakkinen , Jethro Beekman , "Huang, Kai" , "x86@kernel.org" , "linux-kernel@vger.kernel.org" , "Hu, Robert" , "Gao, Chao" , Robert Hoo References: <20210809032925.3548-1-guang.zeng@intel.com> <20210809032925.3548-4-guang.zeng@intel.com> From: Zeng Guang Message-ID: <60d6f343-058a-5fbe-5265-ccb38689bb93@intel.com> Date: Sat, 18 Sep 2021 00:15:50 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 9/11/2021 5:35 AM, Sean Christopherson wrote: > On Mon, Aug 09, 2021, Zeng Guang wrote: >> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c >> index 927a552393b9..ee8c5664dc95 100644 >> --- a/arch/x86/kvm/vmx/vmx.c >> +++ b/arch/x86/kvm/vmx/vmx.c >> @@ -2391,6 +2391,23 @@ static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt, >> return 0; >> } >> >> +static __init int adjust_vmx_controls_64(u64 ctl_min, u64 ctl_opt, >> + u32 msr, u64 *result) >> +{ >> + u64 vmx_msr; >> + u64 ctl = ctl_min | ctl_opt; >> + >> + rdmsrl(msr, vmx_msr); >> + ctl &= vmx_msr; /* bit == 1 means it can be set */ >> + >> + /* Ensure minimum (required) set of control bits are supported. */ >> + if (ctl_min & ~ctl) >> + return -EIO; >> + >> + *result = ctl; >> + return 0; >> +} > More succinctly, since we don't need to force-set bits in the final value: > > u64 allowed1; > > rdmsrl(msr, allowed1); > > /* Ensure minimum (required) set of control bits are supported. */ > if (ctl_min & ~allowed1) > return -EIO; > > *result = (ctl_min | ctl_opt) & allowed1; > return 0; Yes, it becomes more concise. I will change it . Thanks. >> static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, >> struct vmx_capability *vmx_cap) >> {