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=-17.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 27D16C4320A for ; Fri, 6 Aug 2021 07:01:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09E5360560 for ; Fri, 6 Aug 2021 07:01:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243500AbhHFHBf (ORCPT ); Fri, 6 Aug 2021 03:01:35 -0400 Received: from mga05.intel.com ([192.55.52.43]:13959 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243487AbhHFHBd (ORCPT ); Fri, 6 Aug 2021 03:01:33 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10067"; a="299909292" X-IronPort-AV: E=Sophos;i="5.84,299,1620716400"; d="scan'208";a="299909292" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2021 00:01:14 -0700 X-IronPort-AV: E=Sophos;i="5.84,299,1620716400"; d="scan'208";a="481378284" Received: from zengguan-mobl.ccr.corp.intel.com (HELO [10.238.0.133]) ([10.238.0.133]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2021 00:01:09 -0700 Subject: Re: [PATCH v3 2/6] KVM: VMX: Extend BUILD_CONTROLS_SHADOW macro to support 64-bit variation 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: <20210805151317.19054-1-guang.zeng@intel.com> <20210805151317.19054-3-guang.zeng@intel.com> From: Zeng Guang Message-ID: <86b1a46b-10b7-a495-8793-26374ebc9b90@intel.com> Date: Fri, 6 Aug 2021 15:01:00 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.12.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: linux-kernel@vger.kernel.org On 8/6/2021 6:32 AM, Sean Christopherson wrote: > On Thu, Aug 05, 2021, Zeng Guang wrote: >> From: Robert Hoo >> >> The Tertiary VM-Exec Control, different from previous control fields, is 64 >> bit. So extend BUILD_CONTROLS_SHADOW() by adding a 'bit' parameter, to >> support both 32 bit and 64 bit fields' auxiliary functions building. >> Also, define the auxiliary functions for Tertiary control field here, using >> the new BUILD_CONTROLS_SHADOW(). >> >> Suggested-by: Sean Christopherson >> Signed-off-by: Robert Hoo >> --- >> arch/x86/kvm/vmx/vmx.h | 23 ++++++++++++----------- >> 1 file changed, 12 insertions(+), 11 deletions(-) >> >> diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h >> index 3979a947933a..945c6639ce24 100644 >> --- a/arch/x86/kvm/vmx/vmx.h >> +++ b/arch/x86/kvm/vmx/vmx.h >> @@ -413,31 +413,32 @@ static inline u8 vmx_get_rvi(void) >> return vmcs_read16(GUEST_INTR_STATUS) & 0xff; >> } >> >> -#define BUILD_CONTROLS_SHADOW(lname, uname) \ >> -static inline void lname##_controls_set(struct vcpu_vmx *vmx, u32 val) \ >> +#define BUILD_CONTROLS_SHADOW(lname, uname, bits) \ >> +static inline void lname##_controls_set(struct vcpu_vmx *vmx, u##bits val) \ > Align the trailing backslashes (with tabs when possible). It's a lot of unfortunate > churn, but it really does make the code easier to read. An alternative is to split > "static inline" to a separate line. > >> { \ >> if (vmx->loaded_vmcs->controls_shadow.lname != val) { \ >> - vmcs_write32(uname, val); \ >> + vmcs_write##bits(uname, val); \ >> vmx->loaded_vmcs->controls_shadow.lname = val; \ >> } \ >> } \ >> -static inline u32 lname##_controls_get(struct vcpu_vmx *vmx) \ >> +static inline u##bits lname##_controls_get(struct vcpu_vmx *vmx) \ >> { \ >> return vmx->loaded_vmcs->controls_shadow.lname; \ >> } \ >> -static inline void lname##_controls_setbit(struct vcpu_vmx *vmx, u32 val) \ >> +static inline void lname##_controls_setbit(struct vcpu_vmx *vmx, u##bits val) \ >> { \ >> lname##_controls_set(vmx, lname##_controls_get(vmx) | val); \ >> } \ >> -static inline void lname##_controls_clearbit(struct vcpu_vmx *vmx, u32 val) \ >> +static inline void lname##_controls_clearbit(struct vcpu_vmx *vmx, u##bits val) \ >> { \ >> lname##_controls_set(vmx, lname##_controls_get(vmx) & ~val); \ >> } >> -BUILD_CONTROLS_SHADOW(vm_entry, VM_ENTRY_CONTROLS) >> -BUILD_CONTROLS_SHADOW(vm_exit, VM_EXIT_CONTROLS) >> -BUILD_CONTROLS_SHADOW(pin, PIN_BASED_VM_EXEC_CONTROL) >> -BUILD_CONTROLS_SHADOW(exec, CPU_BASED_VM_EXEC_CONTROL) >> -BUILD_CONTROLS_SHADOW(secondary_exec, SECONDARY_VM_EXEC_CONTROL) >> +BUILD_CONTROLS_SHADOW(vm_entry, VM_ENTRY_CONTROLS, 32) >> +BUILD_CONTROLS_SHADOW(vm_exit, VM_EXIT_CONTROLS, 32) >> +BUILD_CONTROLS_SHADOW(pin, PIN_BASED_VM_EXEC_CONTROL, 32) >> +BUILD_CONTROLS_SHADOW(exec, CPU_BASED_VM_EXEC_CONTROL, 32) >> +BUILD_CONTROLS_SHADOW(secondary_exec, SECONDARY_VM_EXEC_CONTROL, 32) >> +BUILD_CONTROLS_SHADOW(tertiary_exec, TERTIARY_VM_EXEC_CONTROL, 64) > This fails to compile because all the TERTIARY collateral is in a later patch. Alternative to derive relative TERTIARY collateral and prepare them in this patch. Ok for that ? > > I think I'd also prefer hiding the 32/64 param via more macros, e.g. > > #define __BUILD_CONTROLS_SHADOW(lname, uname, bits) \ > static inline void lname##_controls_set(struct vcpu_vmx *vmx, u##bits val) \ > { \ > if (vmx->loaded_vmcs->controls_shadow.lname != val) { \ > vmcs_write##bits(uname, val); \ > vmx->loaded_vmcs->controls_shadow.lname = val; \ > } \ > } \ > static inline u##bits lname##_controls_get(struct vcpu_vmx *vmx) \ > { \ > return vmx->loaded_vmcs->controls_shadow.lname; \ > } \ > static inline void lname##_controls_setbit(struct vcpu_vmx *vmx, u##bits val) \ > { \ > lname##_controls_set(vmx, lname##_controls_get(vmx) | val); \ > } \ > static inline void lname##_controls_clearbit(struct vcpu_vmx *vmx, u##bits val) \ > { \ > lname##_controls_set(vmx, lname##_controls_get(vmx) & ~val); \ > } > #define BUILD_CONTROLS_SHADOW(lname, uname) __BUILD_CONTROLS_SHADOW(lname, uname, 32) > #define BUILD_CONTROLS_SHADOW64(lname, uname) __BUILD_CONTROLS_SHADOW(lname, uname, 64)