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 03344C7EE23 for ; Wed, 7 Jun 2023 20:36:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234152AbjFGUf6 (ORCPT ); Wed, 7 Jun 2023 16:35:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234053AbjFGUfm (ORCPT ); Wed, 7 Jun 2023 16:35:42 -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 994282704 for ; Wed, 7 Jun 2023 13:35:26 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-258df3797f2so2239113a91.2 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=NXbgwNkg+5obKAqSxlGur4jAZgTDodc4YOLqW9cNvUgRI9dO17BRCmd4N2j+Ipz5Lw fkhQ5QpgC04fHq1djDXvfpxxl609gUBuTi9Pq33c51ckZOanbpkgwSZPh1ytvqdK2QD4 pD85OFT4HQf1sI8i1Km8PuBZuriwMdGQITsJ7WCZ5zWR5n41BIzVPDB0ib0Cb72E3XBq dABU1mWC/veCMreAEs5EY2KGNkUYQdaEzy0wQmtgF0Z14VK7+jsT1A2ABGRDMxzUMo/D im5qTe/meOqFiqEfRZeDCfNBXvV+OdoUUOEfZ1WUztm0/AIb2SEPYAx0+xAegRKQ1wVR 1Jbw== X-Gm-Message-State: AC+VfDyZGQmVsnC8lVETM+u5kg/hdKJ3YrD9gonVDl6xUF11llUQMx9n 5FwdvnKM2SowJldtQ5b1ihO/JT05p6w= X-Google-Smtp-Source: ACHHUZ4Bu6Z4iuKJGZ/XdfxdMPwtpbxA9+mAfD76YKLnzNWMnhs0o+MBIjCmUylppJXZ4F8X9XT+FHSQJDM= 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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; -- 2.41.0.162.gfafddb0af9-goog