Skip to content

Commit 41dfb5f

Browse files
committed
KVM: SVM: Clean up handling of LBR virtualization enabled
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. Link: https://lore.kernel.org/r/20230607203519.1570167-3-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent d518f8c commit 41dfb5f

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

arch/x86/kvm/svm/svm.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -994,15 +994,10 @@ static struct vmcb *svm_get_lbr_vmcb(struct vcpu_svm *svm)
994994
void svm_update_lbrv(struct kvm_vcpu *vcpu)
995995
{
996996
struct vcpu_svm *svm = to_svm(vcpu);
997-
998-
bool enable_lbrv = svm_get_lbr_vmcb(svm)->save.dbgctl & DEBUGCTLMSR_LBR;
999-
1000-
bool current_enable_lbrv = !!(svm->vmcb->control.virt_ext &
1001-
LBR_CTL_ENABLE_MASK);
1002-
1003-
if (unlikely(is_guest_mode(vcpu) && svm->lbrv_enabled))
1004-
if (unlikely(svm->nested.ctl.virt_ext & LBR_CTL_ENABLE_MASK))
1005-
enable_lbrv = true;
997+
bool current_enable_lbrv = svm->vmcb->control.virt_ext & LBR_CTL_ENABLE_MASK;
998+
bool enable_lbrv = (svm_get_lbr_vmcb(svm)->save.dbgctl & DEBUGCTLMSR_LBR) ||
999+
(is_guest_mode(vcpu) && svm->lbrv_enabled &&
1000+
(svm->nested.ctl.virt_ext & LBR_CTL_ENABLE_MASK));
10061001

10071002
if (enable_lbrv == current_enable_lbrv)
10081003
return;

0 commit comments

Comments
 (0)