From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 28 Jul 2025 15:14:40 +0000 (-0400)
Subject: Merge tag 'kvm-x86-mmu-6.17' of https://github.com/kvm-x86/linux into HEAD
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7f4aac280ccbc8a9d1a1905da2fae860bdad491;p=thirdparty%2Fkernel%2Flinux.git

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

KVM x86 MMU changes for 6.17

 - Exempt nested EPT from the the !USER + CR0.WP logic, as EPT doesn't interact
   with CR0.WP.

 - Move the TDX hardware setup code to tdx.c to better co-locate TDX code
   and eliminate a few global symbols.

 - Dynamically allocation the shadow MMU's hashed page list, and defer
   allocating the hashed list until it's actually needed (the TDP MMU doesn't
   use the list).
---

d7f4aac280ccbc8a9d1a1905da2fae860bdad491
diff --cc arch/x86/kvm/vmx/x86_ops.h
index ffd72f036213f,87e855276a884..2b3424f638dbb
--- a/arch/x86/kvm/vmx/x86_ops.h
+++ b/arch/x86/kvm/vmx/x86_ops.h
@@@ -133,10 -133,9 +133,9 @@@ void tdx_vcpu_reset(struct kvm_vcpu *vc
  void tdx_vcpu_free(struct kvm_vcpu *vcpu);
  void tdx_vcpu_load(struct kvm_vcpu *vcpu, int cpu);
  int tdx_vcpu_pre_run(struct kvm_vcpu *vcpu);
 -fastpath_t tdx_vcpu_run(struct kvm_vcpu *vcpu, bool force_immediate_exit);
 +fastpath_t tdx_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags);
  void tdx_prepare_switch_to_guest(struct kvm_vcpu *vcpu);
  void tdx_vcpu_put(struct kvm_vcpu *vcpu);
- bool tdx_protected_apic_has_interrupt(struct kvm_vcpu *vcpu);
  int tdx_handle_exit(struct kvm_vcpu *vcpu,
  		enum exit_fastpath_completion fastpath);