Re: [PATCH v19 04/20] KVM: arm64: Avoid including linux/kvm_host.h in kvm_pgtable.h

[Suzuki K Poulose <suzuki.poulose@arm.com>]

On 20/09/2026 22:38, sashiko-bot@kernel.org wrote:
> Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
> - [Low] kvm: missing includes in kvm_pgtable.h for FIELD_GET and others
> --
> 
> commit 0c7ef6102444f8add04f2e7e4854a331850bf438
> Author: Steven Price <steven.price@arm.com>
> 
> KVM: arm64: Avoid including linux/kvm_host.h in kvm_pgtable.h
> 
> This commit drops the linux/kvm_host.h include from kvm_pgtable.h to avoid
> future include cycles. It replaces it with lightweight headers for types
> and a forward declaration for struct kvm_s2_mmu, while making the dependency
> on kvm_host.h explicit in pgtable.c and kvm_pkvm.h.
> 
>> diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h
>> index 41a8687938eb6..c2e4b29e605fc 100644
>> --- a/arch/arm64/include/asm/kvm_pgtable.h
>> +++ b/arch/arm64/include/asm/kvm_pgtable.h
>> @@ -8,9 +8,13 @@
>>   #define __ARM64_KVM_PGTABLE_H__
>>   
>>   #include <linux/bits.h>
>> -#include <linux/kvm_host.h>
>> +#include <linux/kvm_types.h>
>> +#include <linux/rbtree_types.h>
>> +#include <linux/rcupdate.h>
>>   #include <linux/types.h>
> 
> [Severity: Low]
> Does removing linux/kvm_host.h leave some macros used later in this header
> without their explicit includes?
> 
> For example, in kvm_get_parange_max(), the code relies on PAGE_SHIFT:
> 
>      if (kvm_lpa2_is_enabled() ||
>             (IS_ENABLED(CONFIG_ARM64_PA_BITS_52) && PAGE_SHIFT == 16))
> 
> In kvm_pte_to_phys(), the code relies on FIELD_GET:
> 
>      pa |= FIELD_GET(KVM_PTE_ADDR_51_50_LPA2, pte) << 50;
> 
> And in kvm_pte_to_pfn(), it uses __phys_to_pfn:
> 
>      return __phys_to_pfn(kvm_pte_to_phys(pte));
> 
> Should this file explicitly include <linux/bitfield.h>, <asm/page.h>, and
> <asm/memory.h> to prevent build fragilities when it is included in an
> isolated compilation unit?
> 

I have added these changes to the header files and built the kvm 
integration branch. So I will pick these suggestions.

Cheers
Suzuki


> [ ... ]
>