kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Huacai Chen <chenhc@lemote.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
	Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
	Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Cc: kvm@vger.kernel.org, linux-mips@vger.kernel.org,
	Fuxin Zhang <zhangfx@lemote.com>,
	Huacai Chen <chenhuacai@gmail.com>,
	Jiaxun Yang <jiaxun.yang@flygoat.com>,
	Xing Li <lixing@loongson.cn>,
	stable@vger.kernel.org, Huacai Chen <chenhc@lemote.com>
Subject: [PATCH V4 02/14] KVM: MIPS: Fix VPN2_MASK definition for variable cpu_vmbits
Date: Tue, 12 May 2020 18:31:08 +0800	[thread overview]
Message-ID: <1589279480-27722-3-git-send-email-chenhc@lemote.com> (raw)
In-Reply-To: <1589279480-27722-1-git-send-email-chenhc@lemote.com>

From: Xing Li <lixing@loongson.cn>

If a CPU support more than 32bit vmbits (which is true for 64bit CPUs),
VPN2_MASK set to fixed 0xffffe000 will lead to a wrong EntryHi in some
functions such as _kvm_mips_host_tlb_inv().

The cpu_vmbits definition of 32bit CPU in cpu-features.h is 31, so we
still use the old definition.

Cc: stable@vger.kernel.org
Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Signed-off-by: Xing Li <lixing@loongson.cn>
[Huacai: Improve commit messages]
Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
 arch/mips/include/asm/kvm_host.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index a01cee9..caa2b936 100644
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -274,7 +274,11 @@ enum emulation_result {
 #define MIPS3_PG_SHIFT		6
 #define MIPS3_PG_FRAME		0x3fffffc0
 
+#if defined(CONFIG_64BIT)
+#define VPN2_MASK		GENMASK(cpu_vmbits - 1, 13)
+#else
 #define VPN2_MASK		0xffffe000
+#endif
 #define KVM_ENTRYHI_ASID	cpu_asid_mask(&boot_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.7.0


  parent reply	other threads:[~2020-05-12 10:31 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-12 10:31 [PATCH V4 00/14] KVM: MIPS: Add Loongson-3 support (Host Side) Huacai Chen
2020-05-12 10:31 ` [PATCH V4 01/14] KVM: MIPS: Define KVM_ENTRYHI_ASID to cpu_asid_mask(&boot_cpu_data) Huacai Chen
2020-05-19 11:49   ` Sasha Levin
2020-05-12 10:31 ` Huacai Chen [this message]
2020-05-12 10:31 ` [PATCH V4 03/14] KVM: MIPS: Increase KVM_MAX_VCPUS and KVM_USER_MEM_SLOTS to 16 Huacai Chen
2020-05-12 10:31 ` [PATCH V4 04/14] KVM: MIPS: Add EVENTFD support which is needed by VHOST Huacai Chen
2020-05-12 10:31 ` [PATCH V4 05/14] KVM: MIPS: Use lddir/ldpte instructions to lookup gpa_mm.pgd Huacai Chen
2020-05-12 10:31 ` [PATCH V4 06/14] KVM: MIPS: Introduce and use cpu_guest_has_ldpte Huacai Chen
2020-05-12 10:31 ` [PATCH V4 07/14] KVM: MIPS: Use root tlb to control guest's CCA for Loongson-3 Huacai Chen
2020-05-12 10:31 ` [PATCH V4 08/14] KVM: MIPS: Let indexed cacheops cause guest exit on Loongson-3 Huacai Chen
2020-05-12 10:31 ` [PATCH V4 09/14] KVM: MIPS: Add more types of virtual interrupts Huacai Chen
2020-05-12 10:31 ` [PATCH V4 10/14] KVM: MIPS: Add Loongson-3 Virtual IPI interrupt support Huacai Chen
2020-05-12 11:48   ` Aleksandar Markovic
2020-05-12 10:31 ` [PATCH V4 11/14] KVM: MIPS: Add CPUCFG emulation for Loongson-3 Huacai Chen
2020-05-12 12:03   ` Aleksandar Markovic
2020-05-12 10:31 ` [PATCH V4 12/14] KVM: MIPS: Add CONFIG6 and DIAG registers emulation Huacai Chen
2020-05-12 12:08   ` Aleksandar Markovic
2020-05-12 14:17     ` Huacai Chen
2020-05-12 10:31 ` [PATCH V4 13/14] KVM: MIPS: Add more MMIO load/store instructions emulation Huacai Chen
2020-05-12 10:31 ` [PATCH V4 14/14] KVM: MIPS: Enable KVM support for Loongson-3 Huacai Chen

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=1589279480-27722-3-git-send-email-chenhc@lemote.com \
    --to=chenhc@lemote.com \
    --cc=aleksandar.qemu.devel@gmail.com \
    --cc=chenhuacai@gmail.com \
    --cc=jiaxun.yang@flygoat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=lixing@loongson.cn \
    --cc=pbonzini@redhat.com \
    --cc=stable@vger.kernel.org \
    --cc=tsbogend@alpha.franken.de \
    --cc=zhangfx@lemote.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).