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 V6 01/15] KVM: MIPS: Define KVM_ENTRYHI_ASID to cpu_asid_mask(&boot_cpu_data)
Date: Sun, 17 May 2020 12:05:58 +0800 [thread overview]
Message-ID: <1589688372-3098-2-git-send-email-chenhc@lemote.com> (raw)
In-Reply-To: <1589688372-3098-1-git-send-email-chenhc@lemote.com>
From: Xing Li <lixing@loongson.cn>
The code in decode_config4() of arch/mips/kernel/cpu-probe.c
asid_mask = MIPS_ENTRYHI_ASID;
if (config4 & MIPS_CONF4_AE)
asid_mask |= MIPS_ENTRYHI_ASIDX;
set_cpu_asid_mask(c, asid_mask);
set asid_mask to cpuinfo->asid_mask.
So in order to support variable ASID_MASK, KVM_ENTRYHI_ASID should also
be changed to cpu_asid_mask(&boot_cpu_data).
Cc: stable@vger.kernel.org
Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Signed-off-by: Xing Li <lixing@loongson.cn>
[Huacai: Change current_cpu_data to boot_cpu_data for optimization]
Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
arch/mips/include/asm/kvm_host.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index 2c343c3..a01cee9 100644
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -275,7 +275,7 @@ enum emulation_result {
#define MIPS3_PG_FRAME 0x3fffffc0
#define VPN2_MASK 0xffffe000
-#define KVM_ENTRYHI_ASID MIPS_ENTRYHI_ASID
+#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)
#define TLB_ASID(x) ((x).tlb_hi & KVM_ENTRYHI_ASID)
--
2.7.0
next prev parent reply other threads:[~2020-05-17 4:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-17 4:05 [PATCH V6 00/15] KVM: MIPS: Add Loongson-3 support (Host Side) Huacai Chen
2020-05-17 4:05 ` Huacai Chen [this message]
2020-05-19 11:49 ` [PATCH V6 01/15] KVM: MIPS: Define KVM_ENTRYHI_ASID to cpu_asid_mask(&boot_cpu_data) Sasha Levin
2020-05-17 4:05 ` [PATCH V6 02/15] KVM: MIPS: Fix VPN2_MASK definition for variable cpu_vmbits Huacai Chen
2020-05-17 4:06 ` [PATCH V6 03/15] KVM: MIPS: Increase KVM_MAX_VCPUS and KVM_USER_MEM_SLOTS to 16 Huacai Chen
2020-05-17 4:06 ` [PATCH V6 04/15] KVM: MIPS: Add EVENTFD support which is needed by VHOST Huacai Chen
2020-05-17 4:06 ` [PATCH V6 05/15] KVM: MIPS: Use lddir/ldpte instructions to lookup gpa_mm.pgd Huacai Chen
2020-05-17 4:06 ` [PATCH V6 06/15] KVM: MIPS: Introduce and use cpu_guest_has_ldpte Huacai Chen
2020-05-17 4:06 ` [PATCH V6 07/15] KVM: MIPS: Use root tlb to control guest's CCA for Loongson-3 Huacai Chen
2020-05-17 4:06 ` [PATCH V6 08/15] KVM: MIPS: Let indexed cacheops cause guest exit on Loongson-3 Huacai Chen
2020-05-17 4:06 ` [PATCH V6 09/15] KVM: MIPS: Add more types of virtual interrupts Huacai Chen
2020-05-17 4:06 ` [PATCH V6 10/15] KVM: MIPS: Add Loongson-3 Virtual IPI interrupt support Huacai Chen
2020-05-17 4:06 ` [PATCH V6 11/15] KVM: MIPS: Add CPUCFG emulation for Loongson-3 Huacai Chen
2020-05-17 4:06 ` [PATCH V6 12/15] KVM: MIPS: Add CONFIG6 and DIAG registers emulation Huacai Chen
2020-05-17 4:06 ` [PATCH V6 13/15] KVM: MIPS: Add more MMIO load/store instructions emulation Huacai Chen
2020-05-17 4:06 ` [PATCH V6 14/15] KVM: MIPS: Enable KVM support for Loongson-3 Huacai Chen
2020-05-17 4:06 ` [PATCH V6 15/15] MAINTAINERS: Update KVM/MIPS maintainers Huacai Chen
2020-05-17 8:22 ` Thomas Bogendoerfer
2020-05-18 8:23 ` Aleksandar Markovic
2020-05-21 9:22 ` Aleksandar Markovic
2020-05-21 9:45 ` Huacai Chen
2020-05-21 11:04 ` Aleksandar Markovic
2020-05-21 14:04 ` Paolo Bonzini
2020-05-22 5:34 ` Huacai Chen
2020-05-22 7:24 ` Paolo Bonzini
2020-05-22 12:16 ` 毛碧波
2020-05-23 2:35 ` 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=1589688372-3098-2-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).