Skip to contentSkip to conversation

KVM: nSVM: Mark VMCB_CET dirty on active VMCB in svm_set_msr()

PATCH In review Jim Mattson 2 participants 2 messages Nov 12

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KVM: nSVM: Mark VMCB_CET dirty on active VMCB in svm_set_msr()

In svm_set_msr(), writes to MSR_IA32_S_CET, MSR_IA32_INT_SSP_TAB, and MSR_KVM_INTERNAL_GUEST_SSP update svm->vmcb->save.{s_cet,isst_addr,ssp} (which resolves to vmcb02->save when in guest mode), but mark VMCB_CET dirty on svm->vmcb01.ptr instead of svm->vmcb.

A stale VMCB_CET clean bit may result in the loss of those MSR updates.

Mark VMCB_CET dirty on svm->vmcb instead of svm->vmcb01.ptr.

Fixes 48b2ec0d540c ("KVM: SVM: Emulate reads and writes to shadow stack MSRs")
---
 arch/x86/kvm/svm/svm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/svm/svm.c +3 -3
index 136069dfcd44..eab11fe50312 100644
@@ -3181,15 +3181,15 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)
 		break;
 	case MSR_IA32_S_CET:
 		svm->vmcb->save.s_cet = data;
-		vmcb_mark_dirty(svm->vmcb01.ptr, VMCB_CET);
+		vmcb_mark_dirty(svm->vmcb, VMCB_CET);
 		break;
 	case MSR_IA32_INT_SSP_TAB:
 		svm->vmcb->save.isst_addr = data;
-		vmcb_mark_dirty(svm->vmcb01.ptr, VMCB_CET);
+		vmcb_mark_dirty(svm->vmcb, VMCB_CET);
 		break;
 	case MSR_KVM_INTERNAL_GUEST_SSP:
 		svm->vmcb->save.ssp = data;
-		vmcb_mark_dirty(svm->vmcb01.ptr, VMCB_CET);
+		vmcb_mark_dirty(svm->vmcb, VMCB_CET);
 		break;
 	case MSR_TSC_AUX:
 		/*
Signature · 1 line
2.56.0.567.gdb80ae8cd5-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Jim Mattson

In svm_set_msr(), writes to MSR_IA32_S_CET, MSR_IA32_INT_SSP_TAB, and MSR_KVM_INTERNAL_GUEST_SSP update svm->vmcb->save.{s_cet,isst_addr,ssp} (which resolves to vmcb02->save when in guest mode), but mark VMCB_CET dirty on svm->vmcb01.ptr instead of svm->vmcb.

Quoted 6 lines

A stale VMCB_CET clean bit may result in the loss of those MSR updates.

Mark VMCB_CET dirty on svm->vmcb instead of svm->vmcb01.ptr.

Fixes 48b2ec0d540c ("KVM: SVM: Emulate reads and writes to shadow stack MSRs")
Quoted 30 lines
---
 arch/x86/kvm/svm/svm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/svm/svm.c +3 -4
index 136069dfcd44..eab11fe50312 100644
@@ -3181,15 +3181,15 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)
                break;
        case MSR_IA32_S_CET:
                svm->vmcb->save.s_cet = data;
-               vmcb_mark_dirty(svm->vmcb01.ptr, VMCB_CET);
+               vmcb_mark_dirty(svm->vmcb, VMCB_CET);
                break;
        case MSR_IA32_INT_SSP_TAB:
                svm->vmcb->save.isst_addr = data;
-               vmcb_mark_dirty(svm->vmcb01.ptr, VMCB_CET);
+               vmcb_mark_dirty(svm->vmcb, VMCB_CET);
                break;
        case MSR_KVM_INTERNAL_GUEST_SSP:
                svm->vmcb->save.ssp = data;
-               vmcb_mark_dirty(svm->vmcb01.ptr, VMCB_CET);
+               vmcb_mark_dirty(svm->vmcb, VMCB_CET);
                break;
        case MSR_TSC_AUX:
                /*
--

2.56.0.567.gdb80ae8cd5-goog