Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 13 Jan 2020 09:47:45 +0800
User-Agent: K-9 Mail for Android
In-Reply-To: <1578647320-14391-2-git-send-email-lixing@loongson.cn>
References: <1578647320-14391-1-git-send-email-lixing@loongson.cn> <1578647320-14391-2-git-send-email-lixing@loongson.cn>
MIME-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [PATCH 2/3] KVM: MIPS: Fixup VPN2_MASK definition over 32bits virtual address
To:     Xing Li <lixing@loongson.cn>, Ralf Baechle <ralf@linux-mips.org>,
        Paul Burton <paulburton@kernel.org>
CC:     linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org
From:   Jiaxun Yang <jiaxun.yang@flygoat.com>
Message-ID: <1E098715-90D3-4732-8F6D-1ED88D06F96C@flygoat.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


=E4=BA=8E 2020=E5=B9=B41=E6=9C=8810=E6=97=A5 GMT+08:00 =E4=B8=8B=E5=8D=885=
:08:39, Xing Li <lixing@loongson=2Ecn> =E5=86=99=E5=88=B0:
>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@loongson=2Ecn>
>---
> arch/mips/include/asm/kvm_host=2Eh | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/arch/mips/include/asm/kvm_host=2Eh
>b/arch/mips/include/asm/kvm_host=2Eh
>index 6be70d5=2E=2Ece9546c 100644
>--- a/arch/mips/include/asm/kvm_host=2Eh
>+++ b/arch/mips/include/asm/kvm_host=2Eh
>@@ -274,7 +274,12 @@ enum emulation_result {
> #define MIPS3_PG_SHIFT		6
> #define MIPS3_PG_FRAME		0x3fffffc0
>=20
>+#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=2E

Thanks


>+#endif
> #define KVM_ENTRYHI_ASID	cpu_asid_mask(&current_cpu_data)
> #define TLB_IS_GLOBAL(x)	((x)=2Etlb_lo[0] & (x)=2Etlb_lo[1] & ENTRYLO_G)
> #define TLB_VPN2(x)		((x)=2Etlb_hi & VPN2_MASK)

--=20
Jiaxun Yang