From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 9 Feb 2026 17:51:37 +0000 (+0100)
Subject: Merge tag 'kvm-x86-svm-6.20' of https://github.com/kvm-x86/linux into HEAD
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4215ee0d7bb5358882375c84d3cd0488bb5813b2;p=thirdparty%2Flinux.git

Merge tag 'kvm-x86-svm-6.20' of https://github.com/kvm-x86/linux into HEAD

KVM SVM changes for 6.20

 - Drop a user-triggerable WARN on nested_svm_load_cr3() failure.

 - Add support for virtualizing ERAPS.  Note, correct virtualization of ERAPS
   relies on an upcoming, publicly announced change in the APM to reduce the
   set of conditions where hardware (i.e. KVM) *must* flush the RAP.

 - Ignore nSVM intercepts for instructions that are not supported according to
   L1's virtual CPU model.

 - Add support for expedited writes to the fast MMIO bus, a la VMX's fastpath
   for EPT Misconfig.

 - Don't set GIF when clearing EFER.SVME, as GIF exists independently of SVM,
   and allow userspace to restore nested state with GIF=0.

 - Treat exit_code as an unsigned 64-bit value through all of KVM.

 - Add support for fetching SNP certificates from userspace.

 - Fix a bug where KVM would use vmcb02 instead of vmcb01 when emulating VMLOAD
   or VMSAVE on behalf of L2.

 - Misc fixes and cleanups.
---

4215ee0d7bb5358882375c84d3cd0488bb5813b2
diff --cc include/uapi/linux/kvm.h
index 88cca0e22ecea,8cd107cdcf0b3..958d1c20f9275
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -180,7 -186,7 +186,8 @@@ struct kvm_exit_snp_req_certs 
  #define KVM_EXIT_MEMORY_FAULT     39
  #define KVM_EXIT_TDX              40
  #define KVM_EXIT_ARM_SEA          41
 -#define KVM_EXIT_SNP_REQ_CERTS    42
 +#define KVM_EXIT_ARM_LDST64B      42
++#define KVM_EXIT_SNP_REQ_CERTS    43
  
  /* For KVM_EXIT_INTERNAL_ERROR */
  /* Emulate instruction failed. */
diff --cc tools/testing/selftests/kvm/Makefile.kvm
index 192694c97356f,4ddece4ee3654..c3c464513b4e4
--- a/tools/testing/selftests/kvm/Makefile.kvm
+++ b/tools/testing/selftests/kvm/Makefile.kvm
@@@ -93,9 -92,9 +93,10 @@@ TEST_GEN_PROGS_x86 += x86/nested_dirty_
  TEST_GEN_PROGS_x86 += x86/nested_emulation_test
  TEST_GEN_PROGS_x86 += x86/nested_exceptions_test
  TEST_GEN_PROGS_x86 += x86/nested_invalid_cr3_test
+ TEST_GEN_PROGS_x86 += x86/nested_set_state_test
  TEST_GEN_PROGS_x86 += x86/nested_tsc_adjust_test
  TEST_GEN_PROGS_x86 += x86/nested_tsc_scaling_test
 +TEST_GEN_PROGS_x86 += x86/nested_vmsave_vmload_test
  TEST_GEN_PROGS_x86 += x86/platform_info_test
  TEST_GEN_PROGS_x86 += x86/pmu_counters_test
  TEST_GEN_PROGS_x86 += x86/pmu_event_filter_test