From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 12 Jun 2026 08:47:24 +0000 (+0200)
Subject: Merge branch 'kvm-single-pdptrs' into HEAD
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e6df939687caf878bb493570ff1c583bba86e7c;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'kvm-single-pdptrs' into HEAD

The non-MMU changes/preliminary cleanups from the "split kvm_mmu in
three" series[1].  The final outcome is to have a single copy of the
PDPTRs (in vcpu->arch) instead of two (in root_mmu and nested_mmu).

[1] https://lore.kernel.org/kvm/20260603105814.10236-1-pbonzini@redhat.com/T/#t
---

4e6df939687caf878bb493570ff1c583bba86e7c
diff --cc arch/x86/kvm/x86.h
index acb22167901fa,60ff064de12fd..9de577ef9c974
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@@ -254,9 -290,29 +254,9 @@@ static inline bool x86_exception_has_er
  
  static inline bool mmu_is_nested(struct kvm_vcpu *vcpu)
  {
- 	return vcpu->arch.walk_mmu == &vcpu->arch.nested_mmu;
+ 	return vcpu->arch.mmu == &vcpu->arch.guest_mmu;
  }
  
 -static inline bool is_pae(struct kvm_vcpu *vcpu)
 -{
 -	return kvm_is_cr4_bit_set(vcpu, X86_CR4_PAE);
 -}
 -
 -static inline bool is_pse(struct kvm_vcpu *vcpu)
 -{
 -	return kvm_is_cr4_bit_set(vcpu, X86_CR4_PSE);
 -}
 -
 -static inline bool is_paging(struct kvm_vcpu *vcpu)
 -{
 -	return likely(kvm_is_cr0_bit_set(vcpu, X86_CR0_PG));
 -}
 -
 -static inline bool is_pae_paging(struct kvm_vcpu *vcpu)
 -{
 -	return !is_long_mode(vcpu) && is_pae(vcpu) && is_paging(vcpu);
 -}
 -
  static inline u8 vcpu_virt_addr_bits(struct kvm_vcpu *vcpu)
  {
  	return kvm_is_cr4_bit_set(vcpu, X86_CR4_LA57) ? 57 : 48;