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

KVM x86 misc changes for 6.11

 - Add a global struct to consolidate tracking of host values, e.g. EFER, and
   move "shadow_phys_bits" into the structure as "maxphyaddr".

 - Add KVM_CAP_X86_APIC_BUS_CYCLES_NS to allow configuring the effective APIC
   bus frequency, because TDX.

 - Print the name of the APICv/AVIC inhibits in the relevant tracepoint.

 - Clean up KVM's handling of vendor specific emulation to consistently act on
   "compatible with Intel/AMD", versus checking for a specific vendor.

 - Misc cleanups

diff --cc Documentation/virt/kvm/api.rst
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/include/uapi/asm/kvm.h
Simple merge

diff --cc arch/x86/kvm/lapic.c
Simple merge

diff --cc arch/x86/kvm/lapic.h
Simple merge

diff --cc arch/x86/kvm/mmu.h
Simple merge

diff --cc arch/x86/kvm/mmu/mmu.c
Simple merge

diff --cc arch/x86/kvm/mmu/spte.c
Simple merge

diff --cc arch/x86/kvm/pmu.c
Simple merge

diff --cc arch/x86/kvm/svm/sev.c
Simple merge

diff --cc arch/x86/kvm/svm/svm.c
Simple merge

diff --cc arch/x86/kvm/svm/svm.h
Simple merge

diff --cc arch/x86/kvm/trace.h
Simple merge

diff --cc arch/x86/kvm/vmx/main.c
Simple merge

diff --cc arch/x86/kvm/vmx/nested.c
Simple merge

diff --cc arch/x86/kvm/vmx/vmx.c
Simple merge

diff --cc arch/x86/kvm/vmx/x86_ops.h
index 3cb0be94e77926e04a24ddfa45767ba3cf351b76,d4339525af5443a981838b4275597b16042c79dd..6016883c8533854e2626bbef18574ef5cfe3e7d1
--- 1/arch/x86/kvm/vmx/x86_ops.h
--- 2/arch/x86/kvm/vmx/x86_ops.h
+++ b/arch/x86/kvm/vmx/x86_ops.h
@@@ -111,7 -110,7 +110,6 @@@ u64 vmx_get_l2_tsc_offset(struct kvm_vc
  u64 vmx_get_l2_tsc_multiplier(struct kvm_vcpu *vcpu);
  void vmx_write_tsc_offset(struct kvm_vcpu *vcpu);
  void vmx_write_tsc_multiplier(struct kvm_vcpu *vcpu);
- void vmx_request_immediate_exit(struct kvm_vcpu *vcpu);
 -void vmx_sched_in(struct kvm_vcpu *vcpu, int cpu);
  void vmx_update_cpu_dirty_logging(struct kvm_vcpu *vcpu);
  #ifdef CONFIG_X86_64
  int vmx_set_hv_timer(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc,

diff --cc arch/x86/kvm/x86.c
index e8c34f8e19641402901b290de2de29bca4e0846b,9ef5aaf6ad5c6eb7369bb3499bbe7482a5317b14..e90e1a74564ebfbf29f4016b3c394985dcf8f2d6
--- 1/arch/x86/kvm/x86.c
--- 2/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -4703,11 -4704,12 +4695,15 @@@ int kvm_vm_ioctl_check_extension(struc
        case KVM_CAP_VM_DISABLE_NX_HUGE_PAGES:
        case KVM_CAP_IRQFD_RESAMPLE:
        case KVM_CAP_MEMORY_FAULT_INFO:
+       case KVM_CAP_X86_GUEST_MODE:
                r = 1;
                break;
 +      case KVM_CAP_PRE_FAULT_MEMORY:
 +              r = tdp_enabled;
 +              break;
+       case KVM_CAP_X86_APIC_BUS_CYCLES_NS:
+               r = APIC_BUS_CYCLE_NS_DEFAULT;
+               break;
        case KVM_CAP_EXIT_HYPERCALL:
                r = KVM_EXIT_HYPERCALL_VALID_MASK;
                break;

diff --cc include/uapi/linux/kvm.h
index 1053e7c5eab91731118fbaf683c3a1281ce9dc24,a6ac00ec77adb05e3fcc0f230abdb97d66a8a3bd..637efc05514534ca635671f64f84bfd65a1b8ea1
--- 1/include/uapi/linux/kvm.h
--- 2/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -930,7 -917,8 +930,9 @@@ struct kvm_enable_cap 
  #define KVM_CAP_MEMORY_ATTRIBUTES 233
  #define KVM_CAP_GUEST_MEMFD 234
  #define KVM_CAP_VM_TYPES 235
 -#define KVM_CAP_X86_APIC_BUS_CYCLES_NS 236
 -#define KVM_CAP_X86_GUEST_MODE 237
 +#define KVM_CAP_PRE_FAULT_MEMORY 236
++#define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237
++#define KVM_CAP_X86_GUEST_MODE 238
  
  struct kvm_irq_routing_irqchip {
        __u32 irqchip;

diff --cc tools/testing/selftests/kvm/Makefile
Simple merge

diff --cc tools/testing/selftests/kvm/include/x86_64/processor.h
Simple merge

diff --cc tools/testing/selftests/kvm/lib/x86_64/processor.c
Simple merge