From: Yosry Ahmed <yosry.ahmed@linux.dev>
To: Sean Christopherson <seanjc@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Jim Mattson <jmattson@google.com>,
Maxim Levitsky <mlevitsk@redhat.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Yosry Ahmed <yosry.ahmed@linux.dev>,
Matteo Rizzo <matteorizzo@google.com>,
evn@google.com
Subject: [PATCH 1/6] KVM: SVM: Mark VMCB_LBR dirty when MSR_IA32_DEBUGCTLMSR is updated
Date: Sat, 8 Nov 2025 00:45:19 +0000 [thread overview]
Message-ID: <20251108004524.1600006-2-yosry.ahmed@linux.dev> (raw)
In-Reply-To: <20251108004524.1600006-1-yosry.ahmed@linux.dev>
Clear the VMCB_LBR clean bit when MSR_IA32_DEBUGCTLMSR is updated, as
the only valid bit is DEBUGCTLMSR_LBR.
The history is complicated, it was correctly cleared for L1 before
commit 1d5a1b5860ed ("KVM: x86: nSVM: correctly virtualize LBR msrs when
L2 is running"), then the latter relied on svm_update_lbrv() to clear
it, but it only did so for L2. Go back to clearing it directly in
svm_set_msr().
Fixes: 1d5a1b5860ed ("KVM: x86: nSVM: correctly virtualize LBR msrs when L2 is running")
Reported-by: Matteo Rizzo <matteorizzo@google.com>
Reported-by: evn@google.com
Co-developed-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Yosry Ahmed <yosry.ahmed@linux.dev>
---
arch/x86/kvm/svm/svm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 55bd7aa5cd743..d25c56b30b4e2 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -3009,7 +3009,11 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)
if (data & DEBUGCTL_RESERVED_BITS)
return 1;
+ if (svm_get_lbr_vmcb(svm)->save.dbgctl == data)
+ break;
+
svm_get_lbr_vmcb(svm)->save.dbgctl = data;
+ vmcb_mark_dirty(svm->vmcb, VMCB_LBR);
svm_update_lbrv(vcpu);
break;
case MSR_VM_HSAVE_PA:
--
2.51.2.1041.gc1ab5b90ca-goog
next prev parent reply other threads:[~2025-11-08 0:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-08 0:45 [PATCH 0/6] KVM: SVM: LBR virtualization fixes Yosry Ahmed
2025-11-08 0:45 ` Yosry Ahmed [this message]
2025-11-09 7:42 ` [PATCH 1/6] KVM: SVM: Mark VMCB_LBR dirty when MSR_IA32_DEBUGCTLMSR is updated Paolo Bonzini
2025-11-08 0:45 ` [PATCH 2/6] KVM: nSVM: Always recalculate LBR MSR intercepts in svm_update_lbrv() Yosry Ahmed
2025-11-11 3:11 ` Yosry Ahmed
2025-11-11 18:55 ` Yosry Ahmed
2025-11-11 22:30 ` Sean Christopherson
2025-11-08 0:45 ` [PATCH 3/6] KVM: nSVM: Fix and simplify LBR virtualization handling with nested Yosry Ahmed
2025-11-08 0:45 ` [PATCH 4/6] KVM: SVM: Switch svm_copy_lbrs() to a macro Yosry Ahmed
2025-11-09 7:59 ` Paolo Bonzini
2025-11-10 19:23 ` Yosry Ahmed
2025-11-10 19:41 ` Sean Christopherson
2025-11-08 0:45 ` [PATCH 5/6] KVM: SVM: Add missing save/restore handling of LBR MSRs Yosry Ahmed
2025-11-08 9:08 ` Yosry Ahmed
2025-11-08 0:45 ` [PATCH 6/6] KVM: selftests: Add a test for LBR save/restore (ft. nested) Yosry Ahmed
2025-11-09 7:57 ` [PATCH 0/6] KVM: SVM: LBR virtualization fixes Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251108004524.1600006-2-yosry.ahmed@linux.dev \
--to=yosry.ahmed@linux.dev \
--cc=evn@google.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matteorizzo@google.com \
--cc=mlevitsk@redhat.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox