Re: [PATCH v3 19/40] KVM: x86: Swap the include order between x86.h and mmu.h

[Yosry Ahmed]

On Fri, May 29, 2026 at 03:22:02PM -0700, Sean Christopherson wrote:
> Invert the include ordering between x86.h and mmu.h, so that x86.h is the
> "top-level" include for KVM x86.

You're also silently moving mmu_is_nested().

Aside from that, I thought top-level include means that other headers
will include it, and it will include fewer headers. Seems like this is
doing the opposite?

> 
> No functional change intended.
> 
> Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
> ---
>  arch/x86/kvm/mmu.h | 6 +++++-
>  arch/x86/kvm/x86.h | 6 +-----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
> index e1bb663ebbd5..28fca48dcf64 100644
> --- a/arch/x86/kvm/mmu.h
> +++ b/arch/x86/kvm/mmu.h
> @@ -4,7 +4,6 @@
>  
>  #include <linux/kvm_host.h>
>  #include "regs.h"
> -#include "x86.h"
>  #include "cpuid.h"
>  
>  extern bool __read_mostly enable_mmio_caching;
> @@ -300,6 +299,11 @@ static inline void kvm_update_page_stats(struct kvm *kvm, int level, int count)
>  	atomic64_add(count, &kvm->stat.pages[level - 1]);
>  }
>  
> +static inline bool mmu_is_nested(struct kvm_vcpu *vcpu)
> +{
> +	return vcpu->arch.walk_mmu == &vcpu->arch.nested_mmu;
> +}
> +
>  static inline gpa_t kvm_translate_gpa(struct kvm_vcpu *vcpu,
>  				      struct kvm_mmu *mmu,
>  				      gpa_t gpa, u64 access,
> diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
> index b7d3b54cde15..a0e68eaf1f80 100644
> --- a/arch/x86/kvm/x86.h
> +++ b/arch/x86/kvm/x86.h
> @@ -6,6 +6,7 @@
>  #include <asm/fpu/xstate.h>
>  #include <asm/mce.h>
>  #include <asm/pvclock.h>
> +#include "mmu.h"
>  #include "regs.h"
>  #include "kvm_emulate.h"
>  #include "cpuid.h"
> @@ -210,11 +211,6 @@ static inline bool x86_exception_has_error_code(unsigned int vector)
>  	return (1U << vector) & exception_has_error_code;
>  }
>  
> -static inline bool mmu_is_nested(struct kvm_vcpu *vcpu)
> -{
> -	return vcpu->arch.walk_mmu == &vcpu->arch.nested_mmu;
> -}
> -
>  static inline u8 vcpu_virt_addr_bits(struct kvm_vcpu *vcpu)
>  {
>  	return kvm_is_cr4_bit_set(vcpu, X86_CR4_LA57) ? 57 : 48;
> -- 
> 2.54.0.823.g6e5bcc1fc9-goog
>