From patchwork Wed Jun 7 20:35:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 104724 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp498980vqr; Wed, 7 Jun 2023 14:43:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4se6sNvuwm534dzDdVSX+LChKXeDGEZ2cdg54pB7CqCq0Uwt32L6wLkudHSlLEXKNUd0VP X-Received: by 2002:a05:6a20:244f:b0:117:6b17:106f with SMTP id t15-20020a056a20244f00b001176b17106fmr2547170pzc.11.1686174181729; Wed, 07 Jun 2023 14:43:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686174181; cv=none; d=google.com; s=arc-20160816; b=qf76V/+rcjQEu5x74lzWJkDnxAbQxs8fKS/KJtDDunKF+TaLomdG4K3fYH+kHZ1Bp9 sLaTOurOKIpbvjVPQ6KGo8cgrgzPtMlXARNJxGhkz2stFpGF1PMc3JXsruihoxacijEC +dtliS4Fsyk5mZgw7m7VFfUwoqkGE6CAsA+8VTCA25XNcVkKS6Fee9KOzAO7avc5VIU0 WjdeKc/CJIv85YOlPfJotpgDSLdJcK7n58OOYUR6ezzpzIpSKDJRRumTtoN2VK/47cDy kIp3rvS1WjGY6TvYnOWfmYJ4j/ql+jk+4JK4vkPc+nF/pWCIvl+uKzPcHXapJAXqRFCo cADg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=DquDErYwSPFQFhe20Zbr/7qCAnoddW9Z0B+S6Q5Fhio=; b=iHLHI6PH7YQy+2ZWwzV850O2rF+iLV7sSdsoVoX8PUtG76HTbj2ANTfENgz36Sv/m1 NnM7r1Uk7MfocU40zoAfsmdpN9Ul5B1apHYbvhJHDKjwtMkCzzZtguhmh7eQ2uSSxkRv W99NBzCbQIicrCesmnXWW7X61WybpO1N47LXqLo7/2bXvf3xJY0JXFCrFVWhf+txKrjl iZuLww1W0eCmS04WM3Y/HGNdOkKf27pT4q2x4bbOymD+Yn8Ay17j8UnQC6b//xOydlV3 WR+nA5cB9jy/LqQv8pwUAzWwX3rgJ3RFqxMMeimsNA7zZVF0d1ohP6/w+3CweYCZfzj0 +hpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=FWGwOMWt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h17-20020a056a00001100b00659145ce601si6157382pfk.401.2023.06.07.14.42.47; Wed, 07 Jun 2023 14:43:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=FWGwOMWt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234209AbjFGUgD (ORCPT + 99 others); Wed, 7 Jun 2023 16:36:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234051AbjFGUfk (ORCPT ); Wed, 7 Jun 2023 16:35:40 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85C8C2703 for ; Wed, 7 Jun 2023 13:35:26 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-2564b3494baso2840929a91.1 for ; Wed, 07 Jun 2023 13:35:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686170126; x=1688762126; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=DquDErYwSPFQFhe20Zbr/7qCAnoddW9Z0B+S6Q5Fhio=; b=FWGwOMWthgPc7UaDciIlmjesryq0AK5GA+YXJcOdu9psUB2gPqYflrXJurDw3MfrmF xp0Z49eUO7QsMN3rNY0J1alAZYZVNzeP+Mu3QTZzSGz5fInRhB2bRA5IN7ibxTkvMdRO 0/Nxq+wibrs8faMQnqw7EmBrIRJSQDsulrVe1AkJ4Ceo58bipREb9vDr8AEuGoNE45y+ z01xOaiLmbXcd/KkH+qG8k2EmLGEo2cwH08QFZhwMckgO8uuNQbWIhSRFvTMcursA1IB 9d0mbPQsrJLjrc3trMUHYnTwkmGUaAwMlkrnfd7O147NByHy+8b4Fn89fdgNSE2izsDZ Edbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686170126; x=1688762126; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DquDErYwSPFQFhe20Zbr/7qCAnoddW9Z0B+S6Q5Fhio=; b=FMvQzp9h4vmy6Sjt2ebspU2TGyNVrr3yULyBsScDotDZ0Xc9nbrktG9BpUgy4T/lov zy6dgixowR4/G2uKtZFtf1MHdZkcc6iBm0cMPqDv6vM4C0JawJpO5AFsXqUDvGtMUHH1 3allGtIxvpmWpxD1oRxVJIyyasOOlGRa+Xx5BM9OKmN4VOFQiCJWxs8Pa7Qbz5G/K52G xkDhpylKHymtNo9oUO/WKc+s4XVq/MizzYAekgbFYXeTVEhtWcakjceAi3UD+5s2xIJl q7QEwyCMOXw3am2rE0hHcTa4F3grGrC4tP98SKkTid1DaywWupotKf0wlYrJaOYMbOwA LCoA== X-Gm-Message-State: AC+VfDzp1OQFvIJIdY5m2QkCKlCDoLa5JWZCKwThrRsj6SUoMiKrFSAN i6oFA5SDKM2knBclBRC1G6MtGNT+B6E= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:907:b0:253:56ee:2172 with SMTP id bo7-20020a17090b090700b0025356ee2172mr1643711pjb.6.1686170125989; Wed, 07 Jun 2023 13:35:25 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 7 Jun 2023 13:35:18 -0700 In-Reply-To: <20230607203519.1570167-1-seanjc@google.com> Mime-Version: 1.0 References: <20230607203519.1570167-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Message-ID: <20230607203519.1570167-3-seanjc@google.com> Subject: [PATCH 2/3] KVM: SVM: Clean up handling of LBR virtualization enabled From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Luczaj , Yuan Yao X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768081778566835278?= X-GMAIL-MSGID: =?utf-8?q?1768081778566835278?= Clean up the enable_lbrv computation in svm_update_lbrv() to consolidate the logic for computing enable_lbrv into a single statement, and to remove the coding style violations (lack of curly braces on nested if). No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/svm.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index b7d145571f75..db97eca6c1ae 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -961,15 +961,10 @@ static struct vmcb *svm_get_lbr_vmcb(struct vcpu_svm *svm) void svm_update_lbrv(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm = to_svm(vcpu); - - bool enable_lbrv = svm_get_lbr_vmcb(svm)->save.dbgctl & DEBUGCTLMSR_LBR; - - bool current_enable_lbrv = !!(svm->vmcb->control.virt_ext & - LBR_CTL_ENABLE_MASK); - - if (unlikely(is_guest_mode(vcpu) && svm->lbrv_enabled)) - if (unlikely(svm->nested.ctl.virt_ext & LBR_CTL_ENABLE_MASK)) - enable_lbrv = true; + bool current_enable_lbrv = svm->vmcb->control.virt_ext & LBR_CTL_ENABLE_MASK; + bool enable_lbrv = (svm_get_lbr_vmcb(svm)->save.dbgctl & DEBUGCTLMSR_LBR) || + (is_guest_mode(vcpu) && svm->lbrv_enabled && + (svm->nested.ctl.virt_ext & LBR_CTL_ENABLE_MASK)); if (enable_lbrv == current_enable_lbrv) return;