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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A176C433F5 for ; Thu, 31 Mar 2022 22:27:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242436AbiCaW3A (ORCPT ); Thu, 31 Mar 2022 18:29:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242406AbiCaW27 (ORCPT ); Thu, 31 Mar 2022 18:28:59 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCCBC234561 for ; Thu, 31 Mar 2022 15:27:11 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id gp15-20020a17090adf0f00b001c7cd11b0b3so3611937pjb.3 for ; Thu, 31 Mar 2022 15:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=UGTTLM5KwdelLI1VtyfoCZNZpzMLIVy+TmklmTZiKBE=; b=OeelOoTlY6TqHjI6jnJEPOZtPmywhHwFU5PYLzUYWNqHpovPkDcc77sd+H/hnXpeGn SgaRg1zjdPbSYYdVCYhkPXxVSZDgNE18Z1UkoF9FuPPipMFJwWqPklkOXHadIF8jEr+t YcBTSQVuV0j+Us+u8rwIIkmBXF6wL6vN4ye+sG90Co+KfcYLeDQ5S118SAvEUwBSrBGn murWArPh51ijI0fwrPFnFf6/32+dfWD8+GrbZN4p4suALijE1Bgv6wa3bE/45rSk8dbV GIOMvgzqZEGgTFRmDNRSmuwbzyhXlNMjhcxFgtuVOwJmRz3OwAxF6Tyfq2/wNf9rxPqT mztA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=UGTTLM5KwdelLI1VtyfoCZNZpzMLIVy+TmklmTZiKBE=; b=cN1PfxwYSd8pXLX80NvQg6/4OuNp5kpLkk7IOB9op52QSMyJicqr+EDleILA9zUHPu XCu7ux9oSDadTzEW8jszVgvkBss4zwuh88dfBggNZqt1Dtl/Ese2lWVpljjtBANg0ylL QJ/XIOrp7CRAPCpNn+6Q1WCAC2x4G1DTnnPgQO5Sui0+TduaNr10X3K4aIMQqhwlDHKP UYAhw30STtED6f29DWU5Tl6jP0atITmqBFB0SJk8CEQlaSvRFniUeouY/WZoH+/ZBHLw j/yiFqNenzdkcDDvViTv9lTNtm/hHlYP2ofwlcThpjlSGwN9R9ZKBYowcNhhuDST2Rx/ 904g== X-Gm-Message-State: AOAM533xHXteKxKEkY/YjtEjHdFPVnIytWO+TaFmbm45dJuxoo33s6hT o/xb7B5CTbY9Mxs30VXTB58NNw== X-Google-Smtp-Source: ABdhPJxzp3+4FNR5zB1aoc75aqa5jCF4E1pX+5cqO1ZHj3iTIM//NVXx6G3jLRz+TtqGlWrUbcWDsw== X-Received: by 2002:a17:902:82c1:b0:155:ecb7:e018 with SMTP id u1-20020a17090282c100b00155ecb7e018mr7492538plz.59.1648765631025; Thu, 31 Mar 2022 15:27:11 -0700 (PDT) Received: from google.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id p10-20020a637f4a000000b00373a2760775sm338009pgn.2.2022.03.31.15.27.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 15:27:10 -0700 (PDT) Date: Thu, 31 Mar 2022 22:27:06 +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 v7 2/8] KVM: VMX: Extend BUILD_CONTROLS_SHADOW macro to support 64-bit variation Message-ID: References: <20220304080725.18135-1-guang.zeng@intel.com> <20220304080725.18135-3-guang.zeng@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220304080725.18135-3-guang.zeng@intel.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Fri, Mar 04, 2022, Zeng Guang wrote: > +#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 loaded_vmcs *vmcs)\ > +{ \ > + return vmcs->controls_shadow.lname; \ > +} \ > +static inline u##bits lname##_controls_get(struct vcpu_vmx *vmx) \ > +{ \ > + return __##lname##_controls_get(vmx->loaded_vmcs); \ > +} \ > +static inline \ Drop the newline, there's no need to split this across two lines. Aligning the backslashes will mean they all poke past the 80 char soft limit, but that's totally ok. The whole point of the line limit is to improve readability, and a trivial runover is much less painful than a split function declaration. As a bonus, all the backslashes are aligned, have leading whitespace, and still land on a tab stop :-) #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 loaded_vmcs *vmcs) \ { \ return vmcs->controls_shadow.lname; \ } \ static inline u##bits lname##_controls_get(struct vcpu_vmx *vmx) \ { \ return __##lname##_controls_get(vmx->loaded_vmcs); \ } \ 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); \ } With that fixed, Reviewed-by: Sean Christopherson > +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); \ > } > -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) > > /* > * VMX_REGS_LAZY_LOAD_SET - The set of registers that will be updated in the > -- > 2.27.0 >