From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 26 Nov 2025 08:46:45 +0000 (+0100)
Subject: Merge tag 'kvm-x86-svm-6.19' of https://github.com/kvm-x86/linux into HEAD
X-Git-Tag: v6.19-rc1~103^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=679fcce0028bf101146127c730f447396891852d;p=thirdparty%2Flinux.git

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

KVM SVM changes for 6.19:

 - Fix a few missing "VMCB dirty" bugs.

 - Fix the worst of KVM's lack of EFER.LMSLE emulation.

 - Add AVIC support for addressing 4k vCPUs in x2AVIC mode.

 - Fix incorrect handling of selective CR0 writes when checking intercepts
   during emulation of L2 instructions.

 - Fix a currently-benign bug where KVM would clobber SPEC_CTRL[63:32] on
   VMRUN and #VMEXIT.

 - Fix a bug where KVM corrupt the guest code stream when re-injecting a soft
   interrupt if the guest patched the underlying code after the VM-Exit, e.g.
   when Linux patches code with a temporary INT3.

 - Add KVM_X86_SNP_POLICY_BITS to advertise supported SNP policy bits to
   userspace, and extend KVM "support" to all policy bits that don't require
   any actual support from KVM.
---

679fcce0028bf101146127c730f447396891852d
diff --cc arch/x86/include/asm/cpufeatures.h
index fc5698844a0bf,7129eb44adadd..c2f1281b32d8f
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
@@@ -499,11 -500,7 +500,12 @@@
  #define X86_FEATURE_IBPB_EXIT_TO_USER	(21*32+14) /* Use IBPB on exit-to-userspace, see VMSCAPE bug */
  #define X86_FEATURE_ABMC		(21*32+15) /* Assignable Bandwidth Monitoring Counters */
  #define X86_FEATURE_MSR_IMM		(21*32+16) /* MSR immediate form instructions */
 -#define X86_FEATURE_X2AVIC_EXT		(21*32+17) /* AMD SVM x2AVIC support for 4k vCPUs */
 +#define X86_FEATURE_CLEAR_CPU_BUF_VM_MMIO (21*32+17) /*
 +						      * Clear CPU buffers before VM-Enter if the vCPU
 +						      * can access host MMIO (ignored for all intents
 +						      * and purposes if CLEAR_CPU_BUF_VM is set).
 +						      */
++#define X86_FEATURE_X2AVIC_EXT		(21*32+18) /* AMD SVM x2AVIC support for 4k vCPUs */
  
  /*
   * BUG word(s)
diff --cc arch/x86/kvm/svm/svm.h
index dd78e64023450,a9f6c1ece63d4..9e151dbdef25d
--- a/arch/x86/kvm/svm/svm.h
+++ b/arch/x86/kvm/svm/svm.h
@@@ -806,7 -802,8 +803,8 @@@ extern struct kvm_x86_nested_ops svm_ne
  )
  
  bool __init avic_hardware_setup(void);
 -int avic_ga_log_notifier(u32 ga_tag);
 +void avic_hardware_unsetup(void);
+ int avic_alloc_physical_id_table(struct kvm *kvm);
  void avic_vm_destroy(struct kvm *kvm);
  int avic_vm_init(struct kvm *kvm);
  void avic_init_vmcb(struct vcpu_svm *svm, struct vmcb *vmcb);