Re: [PATCH 2/3] KVM: MIPS: Fixup VPN2_MASK definition over 32bits virtual address

[Jiaxun Yang]

ä 2020å1æ10æ GMT+08:00 äå5:08:39, Xing Li <lixing@xxxxxxxxxxx> åå:
>If the cpu support more than 32bits vmbits, VPN2_MASK set to fixed
>0xffffe000 will lead to wrong entryhi for _kvm_mips_host_tlb_inv
>
>Signed-off-by: Xing Li <lixing@xxxxxxxxxxx>
>---
> arch/mips/include/asm/kvm_host.h | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/arch/mips/include/asm/kvm_host.h
>b/arch/mips/include/asm/kvm_host.h
>index 6be70d5..ce9546c 100644
>--- a/arch/mips/include/asm/kvm_host.h
>+++ b/arch/mips/include/asm/kvm_host.h
>@@ -274,7 +274,12 @@ enum emulation_result {
> #define MIPS3_PG_SHIFT		6
> #define MIPS3_PG_FRAME		0x3fffffc0
> 
>+#if defined(CONFIG_64BIT)
>+#define VPN2_MASK		(((1UL << cpu_vmbits) - 1) &	\
>+						   0x3fffffffffffe000UL)
>+#else
> #define VPN2_MASK		0xffffe000

Hi Lixing,
It could be more reasonable to do like:

#define VPN2_MASK GENMASK(vm_bits, 13)

So we can avoid ugly ifdef.

Thanks


>+#endif
> #define KVM_ENTRYHI_ASID	cpu_asid_mask(&current_cpu_data)
> #define TLB_IS_GLOBAL(x)	((x).tlb_lo[0] & (x).tlb_lo[1] & ENTRYLO_G)
> #define TLB_VPN2(x)		((x).tlb_hi & VPN2_MASK)

-- 
Jiaxun Yang