KVM: SVM: Mark VMCB_PERM_MAP as dirty on nested VMRUN

commit 93c9e107386dbe1243287a5b14ceca894de372b9 upstream.

Mark the VMCB_PERM_MAP bit as dirty in nested_vmcb02_prepare_control()
on every nested VMRUN.

If L1 changes MSR interception (INTERCEPT_MSR_PROT) between two VMRUN
instructions on the same L1 vCPU, the msrpm_base_pa in the associated
vmcb02 will change, and the VMCB_PERM_MAP clean bit should be cleared.

Fixes: 4bb170a5430b ("KVM: nSVM: do not mark all VMCB02 fields dirty on nested vmexit")
Reported-by: Matteo Rizzo <matteorizzo@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jim Mattson <jmattson@google.com>
Link: https://lore.kernel.org/r/20250922162935.621409-2-jmattson@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
index 6ae021b3630bdf80df1a5815bd297096832821b8..2df6ec74d6ee60d385be968700cf7d80c967fda0 100644 (file)
--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@ -752,6 +752,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm,
        vmcb02->control.nested_ctl = vmcb01->control.nested_ctl;
        vmcb02->control.iopm_base_pa = vmcb01->control.iopm_base_pa;
        vmcb02->control.msrpm_base_pa = vmcb01->control.msrpm_base_pa;
+       vmcb_mark_dirty(vmcb02, VMCB_PERM_MAP);
 
        /*
         * Stash vmcb02's counter if the guest hasn't moved past the guilty