]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'kvm-x86-svm-6.16' of https://github.com/kvm-x86/linux into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 27 May 2025 16:15:49 +0000 (12:15 -0400)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 27 May 2025 16:15:49 +0000 (12:15 -0400)
KVM SVM changes for 6.16:

 - Wait for target vCPU to acknowledge KVM_REQ_UPDATE_PROTECTED_GUEST_STATE to
   fix a race between AP destroy and VMRUN.

 - Decrypt and dump the VMSA in dump_vmcb() if debugging enabled for the VM.

 - Add support for ALLOWED_SEV_FEATURES.

 - Add #VMGEXIT to the set of handlers special cased for CONFIG_RETPOLINE=y.

 - Treat DEBUGCTL[5:2] as reserved to pave the way for virtualizing features
   that utilize those bits.

 - Don't account temporary allocations in sev_send_update_data().

 - Add support for KVM_CAP_X86_BUS_LOCK_EXIT on SVM, via Bus Lock Threshold.

1  2 
Documentation/virt/kvm/api.rst
arch/x86/include/asm/cpufeatures.h
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/svm/nested.c
arch/x86/kvm/svm/sev.c
arch/x86/kvm/svm/svm.c
arch/x86/kvm/svm/svm.h
arch/x86/kvm/x86.c
tools/testing/selftests/kvm/Makefile.kvm
virt/kvm/kvm_main.c

Simple merge
Simple merge
Simple merge
index 6cd2cf7f6f68dc39b95f19a4732cf4d7816f00bc,6221a341f500fc4aac57daafae0f85689351063b..8427a48b8b7adb23eb3e5acc2c7fd262d082c13c
@@@ -1039,10 -1066,15 +1066,17 @@@ int nested_svm_vmexit(struct vcpu_svm *
  
        }
  
+       /*
+        * Invalidate bus_lock_rip unless KVM is still waiting for the guest
+        * to make forward progress before re-enabling bus lock detection.
+        */
+       if (!vmcb02->control.bus_lock_counter)
+               svm->nested.ctl.bus_lock_rip = INVALID_GPA;
        nested_svm_copy_common_state(svm->nested.vmcb02.ptr, svm->vmcb01.ptr);
  
 +      kvm_nested_vmexit_handle_ibrs(vcpu);
 +
        svm_switch_vmcb(svm, &svm->vmcb01);
  
        /*
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge