From nobody Thu Apr 2 06:27:04 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5727E276041; Tue, 3 Mar 2026 00:34:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772498074; cv=none; b=hSreQaAQNht8iP4Oq3yVjqHGjZK10tJvBi6kMQFRAc+SJBbF3lqX1G3xjeZbaTC320dVtaUGdTbCKlh7cqesWZFN22hYGJsFbnP0I051hvA4rf8HwU2rDc9KKszifSj4j7+TmhduEqhRMGsvu3Oc2xfz3VzZ7IDlXEseEPw2yaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772498074; c=relaxed/simple; bh=Ah8N8t+zByEYmWJjcGNmQ4ocwVXaBIsh8l1+kytMLBU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SdFvnOqku1+jCeX0xJdwqUsBnlFZjrQLRlOfBnnNeXXBpeKdAjzG5D0XOuOwpuyMqW3GC7eH71n4Zg0U3KjOZYcQK2qUoeBWI2V0I1LmdRWb40ulAXguub14+mVfhoCXpDJBeB2VcFrYRNNkwcezW01IprwgYdzttAm3ngN9sqs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=N+YGuNHC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="N+YGuNHC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B415AC2BCB0; Tue, 3 Mar 2026 00:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772498074; bh=Ah8N8t+zByEYmWJjcGNmQ4ocwVXaBIsh8l1+kytMLBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N+YGuNHCUuLk7iih8ueuDehBdHzQmeJbNgMqI48x2+kJbNbkEQ38zCU4X4mOoHL5j pXEoZHpsXBQVimIwwC9izoFn9DYb3CnA64l3+6TTcZm8hg50cX7Dn5ErZI20VP+tEe lLVFlq4Nwb+kKQhyLqEYRad6pv/y5MQQrI9H/rdSkB1YgZjbGKHSrGAJTLp4pHauVv cxY9xhIQIOBSUSPLO/MQNHbCbcu2wupLMRysrZj/BasvAPAT3ZW1YFQ3WCgM7EmXJY oQ99uJyxRghswPTrIs68FgY73O7Iqi4CArDeBkhB59yk4qksu6to0I4Y/5EQyT9atr ckv5+2fXzoLrA== From: Yosry Ahmed To: Sean Christopherson Cc: Paolo Bonzini , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed , stable@vger.kernel.org Subject: [PATCH v7 06/26] KVM: nSVM: Refactor checking LBRV enablement in vmcb12 into a helper Date: Tue, 3 Mar 2026 00:34:00 +0000 Message-ID: <20260303003421.2185681-7-yosry@kernel.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260303003421.2185681-1-yosry@kernel.org> References: <20260303003421.2185681-1-yosry@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refactor the vCPU cap and vmcb12 flag checks into a helper. The unlikely() annotation is dropped, it's unlikely (huh) to make a difference and the CPU will probably predict it better on its own. CC: stable@vger.kernel.org Co-developed-by: Sean Christopherson Signed-off-by: Sean Christopherson Signed-off-by: Yosry Ahmed --- arch/x86/kvm/svm/nested.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 25f769a0d9a0d..d84af051f65bc 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -639,6 +639,12 @@ void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm) svm->nested.vmcb02.ptr->save.g_pat =3D svm->vmcb01.ptr->save.g_pat; } =20 +static bool nested_vmcb12_has_lbrv(struct kvm_vcpu *vcpu) +{ + return guest_cpu_cap_has(vcpu, X86_FEATURE_LBRV) && + (to_svm(vcpu)->nested.ctl.virt_ext & LBR_CTL_ENABLE_MASK); +} + static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *= vmcb12) { bool new_vmcb12 =3D false; @@ -703,8 +709,7 @@ static void nested_vmcb02_prepare_save(struct vcpu_svm = *svm, struct vmcb *vmcb12 vmcb_mark_dirty(vmcb02, VMCB_DR); } =20 - if (unlikely(guest_cpu_cap_has(vcpu, X86_FEATURE_LBRV) && - (svm->nested.ctl.virt_ext & LBR_CTL_ENABLE_MASK))) { + if (nested_vmcb12_has_lbrv(vcpu)) { /* * Reserved bits of DEBUGCTL are ignored. Be consistent with * svm_set_msr's definition of reserved bits. @@ -1234,8 +1239,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm) if (!nested_exit_on_intr(svm)) kvm_make_request(KVM_REQ_EVENT, &svm->vcpu); =20 - if (unlikely(guest_cpu_cap_has(vcpu, X86_FEATURE_LBRV) && - (svm->nested.ctl.virt_ext & LBR_CTL_ENABLE_MASK))) { + if (nested_vmcb12_has_lbrv(vcpu)) { svm_copy_lbrs(&vmcb12->save, &vmcb02->save); } else { svm_copy_lbrs(&vmcb01->save, &vmcb02->save); --=20 2.53.0.473.g4a7958ca14-goog