Re: [PATCH v2 09/17] kvm: arm64: Make stage2 page table layout dynamic

[Suzuki K Poulose]

On 25/04/18 17:35, Julien Grall wrote:
> Hi Suzuki,
>
> On 27/03/18 14:15, Suzuki K Poulose wrote:
> > So far we had a static stage2 page table handling code, based on a
> > fixed IPA of 40bits. As we prepare for a configurable IPA size per
> > VM, make the our stage2 page table code dynamic to do the right thing
> > for a given VM.
> >
> > Support for the IPA size configuration needs other changes in the way
> > we configure the EL2 registers (VTTBR and VTCR). So, the IPA is still
> > fixed to 40bits. The patch also moves the kvm_page_empty() in asm/kvm_mmu.h
> > to the top, before including the asm/stage2_pgtable.h to avoid a forward
> > declaration.
> >
> > Cc: Marc Zyngier <marc.zyngier@xxxxxxx>
> > Cc: Christoffer Dall <cdall@xxxxxxxxxx>
> > Signed-off-by: Suzuki K Poulose <suzuki.poulose@xxxxxxx>
> > ---
> > Â arch/arm64/include/asm/kvm_mmu.hÂÂÂÂÂÂÂÂÂÂÂÂÂ |Â 16 +-
> > Â arch/arm64/include/asm/stage2_pgtable-nopmd.h |Â 42 ------
> > Â arch/arm64/include/asm/stage2_pgtable-nopud.h |Â 39 -----
> > Â arch/arm64/include/asm/stage2_pgtable.hÂÂÂÂÂÂ | 203 +++++++++++++++++---------
> > Â 4 files changed, 145 insertions(+), 155 deletions(-)
> > Â delete mode 100644 arch/arm64/include/asm/stage2_pgtable-nopmd.h
> > Â delete mode 100644 arch/arm64/include/asm/stage2_pgtable-nopud.h
> >
> > diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
> > index 594c4e6..bc133ce 100644
> > --- a/arch/arm64/include/asm/kvm_mmu.h
> > +++ b/arch/arm64/include/asm/kvm_mmu.h
> > @@ -18,9 +18,10 @@
> > Â #ifndef __ARM64_KVM_MMU_H__
> > Â #define __ARM64_KVM_MMU_H__
> > +#include <asm/cpufeature.h>
> > Â #include <asm/page.h>
> > Â #include <asm/memory.h>
> > -#include <asm/cpufeature.h>
>
> OOI, why was the include of cpufeature.h moved earlier?

I think it was a minor cleanup to keep the includes in order. I will either
mention it or drop it from the hunk altogether.

Cheers
Suzuki