From: Xing Li <lixing@loongson.cn>
To: Ralf Baechle <ralf@linux-mips.org>, Paul Burton <paulburton@kernel.org>
Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] KVM: MIPS: Fixup VPN2_MASK definition over 32bits virtual address
Date: Fri, 10 Jan 2020 17:08:39 +0800 [thread overview]
Message-ID: <1578647320-14391-2-git-send-email-lixing@loongson.cn> (raw)
In-Reply-To: <1578647320-14391-1-git-send-email-lixing@loongson.cn>
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.cn>
---
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
+#endif
#define KVM_ENTRYHI_ASID cpu_asid_mask(¤t_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)
--
2.1.0
next prev parent reply other threads:[~2020-01-10 9:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 9:08 [PATCH 1/3] KVM: MIPS: Change KVM_ENTRYHI_ASID to cpu_asid_mask(¤t_cpu_data) Xing Li
2020-01-10 9:08 ` Xing Li [this message]
2020-01-13 1:47 ` [PATCH 2/3] KVM: MIPS: Fixup VPN2_MASK definition over 32bits virtual address Jiaxun Yang
2020-01-10 9:08 ` [PATCH 3/3] KVM: MIPS: Support kvm modules autoprobed when startup system Xing Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1578647320-14391-2-git-send-email-lixing@loongson.cn \
--to=lixing@loongson.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=paulburton@kernel.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.