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 824C8C43334 for ; Fri, 24 Jun 2022 00:09:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230016AbiFXAJo (ORCPT ); Thu, 23 Jun 2022 20:09:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229624AbiFXAJn (ORCPT ); Thu, 23 Jun 2022 20:09:43 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22F8556FB6 for ; Thu, 23 Jun 2022 17:09:41 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id 184so868553pga.12 for ; Thu, 23 Jun 2022 17:09:41 -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=kmIOcSZ0XyvR8utlTv5b37APzufzmKu6KXV604cAkks=; b=PFe18VaFhnS2ZT5vucNtUjtMrbL5fT+p1wHxfF79shjK8OTNjP53aakMa2b+zVXkuc CmA8KDew4qpMkvB6Yk5ZQ4WTjrLuHnFR6dyH+m8BPa6dHem6Em6vDpPKN/etuMv+GIPX jNlPai9N3MGMUF97DkaQORnNzm1lA7ZI7U2mny/9lnqMi4EZ99EHlf3CNPiiBeBypOVE Yapf26UfzsiC40UcMcnUwh4BOqyrrHAi/tg1RBSN7ThyTMI2f6qokY8M3DIs9fBGQ6YR vCu2CgQcMubPd4aHpb/Plffwgn5V7kQAPWkC38EyQoe/PfanOtJxDvYcHeyFV5t5dcvO ScjA== 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=kmIOcSZ0XyvR8utlTv5b37APzufzmKu6KXV604cAkks=; b=7QjRA2xVzh+aUlLK+0DQWjYEKWaJP2eplUUBodYktlqRQIX4F6D/I2wN7PByICzLjs v5/FNoipvYQI52Kp2g1WS/ZPfs4fgC9QU0chQBF7dapRI4ephgvkxeJB07sF+sTeTJQK mnI69MUTVdx5B0lyJhRIfCf4pBgXMvMlfqrCW3jsPZJmutbZV3DlxdD3UiR/weLXBH4q O1lAjdHnatsb+RpxSS8TnpWSQv6/C4VZBUTpK2zo13Y+UEqCsR9ED24OHDiDwoZWTB0T WucGg1fe5Kq1CY8SZpS6S6VRjFDJqHDKNlAKVX6NoyOuRUYfGofGfbw1501V7GEAPNl6 QBtg== X-Gm-Message-State: AJIora+52D7z8SBYl/cXk6WnMkTrTA5bvQ1EtHMBxgLJiCLzjmNEouln lZZJuT7h0GLKP051IXf5oMrpVqDXEoEalw== X-Google-Smtp-Source: AGRyM1vOU2JOxzyPmhn3SCTphsf1lpqO4zI/+wpXbPVC8mkQutvYrMGQoOaRm82CH9BNGfIrgKqQHg== X-Received: by 2002:a63:371e:0:b0:40c:f411:6768 with SMTP id e30-20020a63371e000000b0040cf4116768mr9519656pga.471.1656029380480; Thu, 23 Jun 2022 17:09:40 -0700 (PDT) Received: from google.com (123.65.230.35.bc.googleusercontent.com. [35.230.65.123]) by smtp.gmail.com with ESMTPSA id z11-20020aa7888b000000b0052516db7123sm229410pfe.35.2022.06.23.17.09.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 17:09:39 -0700 (PDT) Date: Fri, 24 Jun 2022 00:09:36 +0000 From: Sean Christopherson To: Vitaly Kuznetsov Cc: kvm@vger.kernel.org, Paolo Bonzini , Anirudh Rayabharam , Wanpeng Li , Jim Mattson , Maxim Levitsky , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH RFC v1 01/10] KVM: VMX: Move CPU_BASED_CR8_{LOAD,STORE}_EXITING filtering out of setup_vmcs_config() Message-ID: References: <20220622164432.194640-1-vkuznets@redhat.com> <20220622164432.194640-2-vkuznets@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220622164432.194640-2-vkuznets@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-hyperv@vger.kernel.org On Wed, Jun 22, 2022, Vitaly Kuznetsov wrote: > Signed-off-by: Vitaly Kuznetsov > --- > arch/x86/kvm/vmx/vmx.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index 5e14e4c40007..24da9e93bdab 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -2490,11 +2490,6 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, > if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS, > &_cpu_based_exec_control) < 0) > return -EIO; > -#ifdef CONFIG_X86_64 > - if (_cpu_based_exec_control & CPU_BASED_TPR_SHADOW) > - _cpu_based_exec_control &= ~CPU_BASED_CR8_LOAD_EXITING & > - ~CPU_BASED_CR8_STORE_EXITING; Eww, who does a double "~" with an "&"? > -#endif > if (_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS) { > min2 = 0; > opt2 = SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES | > @@ -4285,6 +4280,12 @@ static u32 vmx_exec_control(struct vcpu_vmx *vmx) > { > u32 exec_control = vmcs_config.cpu_based_exec_ctrl; > > +#ifdef CONFIG_X86_64 > + if (exec_control & CPU_BASED_TPR_SHADOW) > + exec_control &= ~CPU_BASED_CR8_LOAD_EXITING & > + ~CPU_BASED_CR8_STORE_EXITING; If you shove this done a few lines, then you can have a single set of #ifdefs, and avoid restoring the controls a few lines later if it turns out KVM isn't enabling the TPR shadow, e.g. (with fixup to use the more canonical ~(x | y) pattern). if (!cpu_need_tpr_shadow(&vmx->vcpu)) exec_control &= ~CPU_BASED_TPR_SHADOW; #ifdef CONFIG_X86_64 if (exec_control & CPU_BASED_TPR_SHADOW) exec_control &= ~(CPU_BASED_CR8_LOAD_EXITING | CPU_BASED_CR8_STORE_EXITING); else exec_control |= CPU_BASED_CR8_STORE_EXITING | CPU_BASED_CR8_LOAD_EXITING; #endif