Skip to content

Commit 16ca585

Browse files
yosrym93opsiff
authored andcommitted
KVM: SVM: Mark VMCB_LBR dirty when MSR_IA32_DEBUGCTLMSR is updated
commit dc55b3c upstream. The APM lists the DbgCtlMsr field as being tracked by the VMCB_LBR clean bit. Always clear the bit when MSR_IA32_DEBUGCTLMSR is updated. The history is complicated, it was correctly cleared for L1 before commit 1d5a1b5 ("KVM: x86: nSVM: correctly virtualize LBR msrs when L2 is running"). At that point svm_set_msr() started to rely on svm_update_lbrv() to clear the bit, but when nested virtualization is enabled the latter does not always clear it even if MSR_IA32_DEBUGCTLMSR changed. Go back to clearing it directly in svm_set_msr(). Fixes: 1d5a1b5 ("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> Link: https://patch.msgid.link/20251108004524.1600006-2-yosry.ahmed@linux.dev Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 08c8d23e2ed1d5b008f5069fc939d94351f7789e) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 7b97357 commit 16ca585

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/x86/kvm/svm/svm.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3257,7 +3257,11 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)
32573257
if (data & DEBUGCTL_RESERVED_BITS)
32583258
return 1;
32593259

3260+
if (svm_get_lbr_vmcb(svm)->save.dbgctl == data)
3261+
break;
3262+
32603263
svm_get_lbr_vmcb(svm)->save.dbgctl = data;
3264+
vmcb_mark_dirty(svm->vmcb, VMCB_LBR);
32613265
svm_update_lbrv(vcpu);
32623266
break;
32633267
case MSR_VM_HSAVE_PA:

0 commit comments

Comments
 (0)