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.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FSL_HELO_FAKE, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_IN_DEF_DKIM_WL 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 910A8C4320A for ; Thu, 5 Aug 2021 22:33:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7119161108 for ; Thu, 5 Aug 2021 22:33:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240012AbhHEWdU (ORCPT ); Thu, 5 Aug 2021 18:33:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231679AbhHEWdQ (ORCPT ); Thu, 5 Aug 2021 18:33:16 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79331C061798 for ; Thu, 5 Aug 2021 15:33:01 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id ca5so12468559pjb.5 for ; Thu, 05 Aug 2021 15:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=dhXk37eFC15pZKelOTmIoz91X3bzOOO01NaZQtp+pC0=; b=ajPRBLJkLHrlBjvvz7qW4niZDr0o3O4uy8cuF/Qa0I69yg6wp1RTWapwcaDOuVqv1A XSrw6E1Fd/rWKvnNwUY1gVxa7oExBRB45ozwUBE9YyCb9GoSwGEiKPz86155Or4mAMUi IB8yDX+WCefwKsxMXsEAF6T+s+wg3nQsEO4TVznBUEUxRPbsXhsLD88QzzK8ris5TPAR dRptKgrdBaYLdWXuNXhKZ2w+vHtA2B3pWlinOzxeOpUBB9n9ffNHozuT04krg8rOJxJS 57EdyBwidZYhCiw2GhjG0DAZxS2B+sTyPdH6GB83CcKxWRBY8/yJYNuof2IUbiRx1Af0 m5FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=dhXk37eFC15pZKelOTmIoz91X3bzOOO01NaZQtp+pC0=; b=nr6Km3VSeISA8wPiC2thkiqSGc3OrTTsANo2x73SjFdUchC+zSmM/WIxZ9310NFrcr yQwKhRfVfDBelOMq6oat40woOfFrKzcXtrIXgy/GljXfnhUxm1FIk1HpR8aZS/xhRt0G jZnndapXRAcDSjMMCtsBRFCl0JXCzXjgg8KXXbS4Q8CIs3q8u0rwogH2FTGk6VpCbIxl I20H+uY23bvuzSxQU0FJThhvYUbWySBofYlxPloYCECFwRm1mTR3btCXzKmN0g6gNqvY 7DqnR7ghGgr97otq8BnWnbYrBiK2sZk+2adgEIunhPKXNNjLkHyA7hzIc1Fb6TKxYqvk IbAw== X-Gm-Message-State: AOAM532H7rVfzreaD+BadQdBRb2eH/e6TqPB3AZ8OEP0SiD8HQcGGIYh Fv6TtNxn7V0a1jAv4fdkZa8dcg== X-Google-Smtp-Source: ABdhPJzFiCwBTBptI/4xg1FauXtCo55lGOg5JCiA28mQCJsWk8h1ajuQt+NG6YmnQFKlgsV4Js2KxQ== X-Received: by 2002:a17:90a:d985:: with SMTP id d5mr6879897pjv.12.1628202780753; Thu, 05 Aug 2021 15:33:00 -0700 (PDT) Received: from google.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id u16sm9284456pgh.53.2021.08.05.15.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 15:33:00 -0700 (PDT) Date: Thu, 5 Aug 2021 22:32:56 +0000 From: Sean Christopherson To: Zeng Guang Cc: Paolo Bonzini , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, Dave Hansen , Tony Luck , Kan Liang , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Kim Phillips , Jarkko Sakkinen , Jethro Beekman , Kai Huang , x86@kernel.org, linux-kernel@vger.kernel.org, Robert Hu , Gao Chao , Robert Hoo Subject: Re: [PATCH v3 2/6] KVM: VMX: Extend BUILD_CONTROLS_SHADOW macro to support 64-bit variation Message-ID: References: <20210805151317.19054-1-guang.zeng@intel.com> <20210805151317.19054-3-guang.zeng@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210805151317.19054-3-guang.zeng@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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)