From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73CF6C2BA19 for ; Mon, 13 Apr 2020 11:21:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39B5320732 for ; Mon, 13 Apr 2020 11:21:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=flygoat.com header.i=@flygoat.com header.b="nI9oLpWi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 39B5320732 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=flygoat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNx9A-0000dS-Ec for qemu-devel@archiver.kernel.org; Mon, 13 Apr 2020 07:21:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59401) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNx7n-000077-0c for qemu-devel@nongnu.org; Mon, 13 Apr 2020 07:19:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNx7k-0003sn-C3 for qemu-devel@nongnu.org; Mon, 13 Apr 2020 07:19:33 -0400 Received: from vultr.net.flygoat.com ([2001:19f0:6001:3633:5400:2ff:fe8c:553]:33208) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jNx7k-0003rJ-4k for qemu-devel@nongnu.org; Mon, 13 Apr 2020 07:19:32 -0400 Received: from flygoat-x1e (unknown [IPv6:240e:390:49e:92c0::d68]) by vultr.net.flygoat.com (Postfix) with ESMTPSA id 88A9020CF7; Mon, 13 Apr 2020 11:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=flygoat.com; s=vultr; t=1586776769; bh=UXhLwWCtxUcz+mKOYtgex60WB9mqNaOsxhp6uoAkwDQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=nI9oLpWikjHYtk1zNWU+DAzDzaMZA5aGVQ5Y+oRg9DRD1x6X3g0D3C+3rJeKzCnDY 0LiOvuPyh3RbzyG96fPZrV6B9+gDU6G9gwzcjPtHW2OP9CJCknU8JbxFESB8MPItu4 Tdqs8cdoy0aihdmxQsH6kDVITEUyE7DTdYVP2uSLmWuPIucmzFnSW2/vmg2jkw1cfP 5ycXxy570mDfm9CY0u/GM9PONSQGylnb3PLtSvHp1/k+dx06VG1GoIiZONVyIzWgyh owu3dZOIlrVo5Upn01hkd5VLu09QdGgHOeww2BzGnnOMJZ6XB3alzQrUHS3ob1gd5W pbhH302tpwGBw== Date: Mon, 13 Apr 2020 19:19:09 +0800 From: Jiaxun Yang To: Huacai Chen Subject: Re: [PATCH 13/15] KVM: MIPS: Add CONFIG6 and DIAG registers emulation Message-ID: <20200413191909.4e776272@flygoat-x1e> In-Reply-To: <1586763024-12197-14-git-send-email-chenhc@lemote.com> References: <1586763024-12197-1-git-send-email-chenhc@lemote.com> <1586763024-12197-14-git-send-email-chenhc@lemote.com> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:19f0:6001:3633:5400:2ff:fe8c:553 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Bogendoerfer , kvm@vger.kernel.org, Huacai Chen , qemu-devel@nongnu.org, linux-mips@vger.kernel.org, Fuxin Zhang , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 13 Apr 2020 15:30:22 +0800 Huacai Chen wrote: > Loongson-3 has CONFIG6 and DIAG registers which need to be emulate. > CONFIG6 is mostly used to enable/disable FTLB and SFB, while DIAG is > mostly used to flush BTB, ITLB, DTLB, VTLB and FTLB. > > Signed-off-by: Huacai Chen > Co-developed-by: Jiaxun Yang It should be guarded by CONFIG_CPU_LOONGSON64 as well. Thanks. > --- > arch/mips/include/asm/kvm_host.h | 5 ++++ > arch/mips/include/asm/mipsregs.h | 7 +++++ > arch/mips/kvm/tlb.c | 39 +++++++++++++++++++++++++++ > arch/mips/kvm/vz.c | 58 > +++++++++++++++++++++++++++++++++++++++- 4 files changed, 108 > insertions(+), 1 deletion(-) > > diff --git a/arch/mips/include/asm/kvm_host.h > b/arch/mips/include/asm/kvm_host.h index c291767..3ef6ca8 100644 > --- a/arch/mips/include/asm/kvm_host.h > +++ b/arch/mips/include/asm/kvm_host.h > @@ -68,9 +68,11 @@ > #define KVM_REG_MIPS_CP0_CONFIG3 MIPS_CP0_32(16, 3) > #define KVM_REG_MIPS_CP0_CONFIG4 MIPS_CP0_32(16, 4) > #define KVM_REG_MIPS_CP0_CONFIG5 MIPS_CP0_32(16, 5) > +#define KVM_REG_MIPS_CP0_CONFIG6 MIPS_CP0_32(16, 6) > #define KVM_REG_MIPS_CP0_CONFIG7 MIPS_CP0_32(16, 7) > #define KVM_REG_MIPS_CP0_MAARI MIPS_CP0_64(17, 2) > #define KVM_REG_MIPS_CP0_XCONTEXT MIPS_CP0_64(20, 0) > +#define KVM_REG_MIPS_CP0_DIAG MIPS_CP0_32(22, 0) > #define KVM_REG_MIPS_CP0_ERROREPC MIPS_CP0_64(30, 0) > #define KVM_REG_MIPS_CP0_KSCRATCH1 MIPS_CP0_64(31, 2) > #define KVM_REG_MIPS_CP0_KSCRATCH2 MIPS_CP0_64(31, 3) > @@ -256,6 +258,7 @@ struct mips_coproc { > #define MIPS_CP0_WATCH_LO 18 > #define MIPS_CP0_WATCH_HI 19 > #define MIPS_CP0_TLB_XCONTEXT 20 > +#define MIPS_CP0_DIAG 22 > #define MIPS_CP0_ECC 26 > #define MIPS_CP0_CACHE_ERR 27 > #define MIPS_CP0_TAG_LO 28 > @@ -927,6 +930,8 @@ void kvm_vz_save_guesttlb(struct kvm_mips_tlb > *buf, unsigned int index, unsigned int count); > void kvm_vz_load_guesttlb(const struct kvm_mips_tlb *buf, unsigned > int index, unsigned int count); > +void kvm_loongson_clear_guest_vtlb(void); > +void kvm_loongson_clear_guest_ftlb(void); > #endif > > void kvm_mips_suspend_mm(int cpu); > diff --git a/arch/mips/include/asm/mipsregs.h > b/arch/mips/include/asm/mipsregs.h index 796fe47..ce40fbf 100644 > --- a/arch/mips/include/asm/mipsregs.h > +++ b/arch/mips/include/asm/mipsregs.h > @@ -674,6 +674,9 @@ > #define MIPS_CONF5_CV (_ULCAST_(1) << 29) > #define MIPS_CONF5_K (_ULCAST_(1) << 30) > > +#define MIPS_CONF6_INTIMER (_ULCAST_(1) << 6) > +#define MIPS_CONF6_EXTIMER (_ULCAST_(1) << 7) > +#define MIPS_CONF6_SFBEN (_ULCAST_(1) << 8) > #define MIPS_CONF6_SYND (_ULCAST_(1) << 13) > /* proAptiv FTLB on/off bit */ > #define MIPS_CONF6_FTLBEN (_ULCAST_(1) << 15) > @@ -993,6 +996,8 @@ > /* Disable Branch Return Cache */ > #define R10K_DIAG_D_BRC (_ULCAST_(1) << 22) > > +/* Flush BTB */ > +#define LOONGSON_DIAG_BTB (_ULCAST_(1) << 1) > /* Flush ITLB */ > #define LOONGSON_DIAG_ITLB (_ULCAST_(1) << 2) > /* Flush DTLB */ > @@ -2825,7 +2830,9 @@ __BUILD_SET_C0(status) > __BUILD_SET_C0(cause) > __BUILD_SET_C0(config) > __BUILD_SET_C0(config5) > +__BUILD_SET_C0(config6) > __BUILD_SET_C0(config7) > +__BUILD_SET_C0(diag) > __BUILD_SET_C0(intcontrol) > __BUILD_SET_C0(intctl) > __BUILD_SET_C0(srsmap) > diff --git a/arch/mips/kvm/tlb.c b/arch/mips/kvm/tlb.c > index 7cd9216..1efb9a0 100644 > --- a/arch/mips/kvm/tlb.c > +++ b/arch/mips/kvm/tlb.c > @@ -20,6 +20,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -622,6 +623,44 @@ void kvm_vz_load_guesttlb(const struct > kvm_mips_tlb *buf, unsigned int index, } > EXPORT_SYMBOL_GPL(kvm_vz_load_guesttlb); > > +void kvm_loongson_clear_guest_vtlb(void) > +{ > + int idx = read_gc0_index(); > + > + /* Set root GuestID for root probe and write of guest TLB > entry */ > + set_root_gid_to_guest_gid(); > + > + write_gc0_index(0); > + guest_tlbinvf(); > + write_gc0_index(idx); > + > + clear_root_gid(); > + set_c0_diag(LOONGSON_DIAG_ITLB | LOONGSON_DIAG_DTLB); > +} > +EXPORT_SYMBOL_GPL(kvm_loongson_clear_guest_vtlb); > + > +void kvm_loongson_clear_guest_ftlb(void) > +{ > + int i; > + int idx = read_gc0_index(); > + > + /* Set root GuestID for root probe and write of guest TLB > entry */ > + set_root_gid_to_guest_gid(); > + > + for (i = current_cpu_data.tlbsizevtlb; > + i < (current_cpu_data.tlbsizevtlb + > + current_cpu_data.tlbsizeftlbsets); > + i++) { > + write_gc0_index(i); > + guest_tlbinvf(); > + } > + write_gc0_index(idx); > + > + clear_root_gid(); > + set_c0_diag(LOONGSON_DIAG_ITLB | LOONGSON_DIAG_DTLB); > +} > +EXPORT_SYMBOL_GPL(kvm_loongson_clear_guest_ftlb); > + > #endif > > /** > diff --git a/arch/mips/kvm/vz.c b/arch/mips/kvm/vz.c > index 0772565..2ea1f13 100644 > --- a/arch/mips/kvm/vz.c > +++ b/arch/mips/kvm/vz.c > @@ -127,6 +127,11 @@ static inline unsigned int > kvm_vz_config5_guest_wrmask(struct kvm_vcpu *vcpu) return mask; > } > > +static inline unsigned int kvm_vz_config6_guest_wrmask(struct > kvm_vcpu *vcpu) +{ > + return MIPS_CONF6_INTIMER | MIPS_CONF6_EXTIMER | > MIPS_CONF6_SYND; +} > + > /* > * VZ optionally allows these additional Config bits to be written > by root: > * Config: M, [MT] > @@ -181,6 +186,12 @@ static inline unsigned int > kvm_vz_config5_user_wrmask(struct kvm_vcpu *vcpu) return > kvm_vz_config5_guest_wrmask(vcpu) | MIPS_CONF5_MRP; } > > +static inline unsigned int kvm_vz_config6_user_wrmask(struct > kvm_vcpu *vcpu) +{ > + return kvm_vz_config6_guest_wrmask(vcpu) | > + MIPS_CONF6_SFBEN | MIPS_CONF6_FTLBEN | > MIPS_CONF6_FTLBDIS; +} > + > static gpa_t kvm_vz_gva_to_gpa_cb(gva_t gva) > { > /* VZ guest has already converted gva to gpa */ > @@ -930,7 +941,8 @@ static enum emulation_result > kvm_vz_gpsi_cop0(union mips_instruction inst, (sel == 2 || /* > SRSCtl */ sel == 3)) || /* SRSMap */ > (rd == MIPS_CP0_CONFIG && > - (sel == 7)) || /* Config7 > */ > + (sel == 6 || /* Config6 */ > + sel == 7)) || /* Config7 > */ (rd == MIPS_CP0_LLADDR && > (sel == 2) && /* MAARI */ > cpu_guest_has_maar && > @@ -938,6 +950,9 @@ static enum emulation_result > kvm_vz_gpsi_cop0(union mips_instruction inst, (rd == MIPS_CP0_ERRCTL > && (sel == 0))) { /* ErrCtl */ > val = cop0->reg[rd][sel]; > + } else if (rd == MIPS_CP0_DIAG && > + (sel == 0)) { /* Diag */ > + val = cop0->reg[rd][sel]; > } else { > val = 0; > er = EMULATE_FAIL; > @@ -1000,9 +1015,38 @@ static enum emulation_result > kvm_vz_gpsi_cop0(union mips_instruction inst, cpu_guest_has_maar && > !cpu_guest_has_dyn_maar) { > kvm_write_maari(vcpu, val); > + } else if (rd == MIPS_CP0_CONFIG && > + (sel == 6)) { > + cop0->reg[rd][sel] = (int)val; > } else if (rd == MIPS_CP0_ERRCTL && > (sel == 0)) { /* ErrCtl */ > /* ignore the written value */ > + } else if (rd == MIPS_CP0_DIAG && > + (sel == 0)) { /* Diag */ > + unsigned long flags; > + > + local_irq_save(flags); > + if (val & LOONGSON_DIAG_BTB) { > + /* Flush BTB */ > + > set_c0_diag(LOONGSON_DIAG_BTB); > + } > + if (val & LOONGSON_DIAG_ITLB) { > + /* Flush ITLB */ > + > set_c0_diag(LOONGSON_DIAG_ITLB); > + } > + if (val & LOONGSON_DIAG_DTLB) { > + /* Flush DTLB */ > + > set_c0_diag(LOONGSON_DIAG_DTLB); > + } > + if (val & LOONGSON_DIAG_VTLB) { > + /* Flush VTLB */ > + > kvm_loongson_clear_guest_vtlb(); > + } > + if (val & LOONGSON_DIAG_FTLB) { > + /* Flush FTLB */ > + > kvm_loongson_clear_guest_ftlb(); > + } > + local_irq_restore(flags); > } else { > er = EMULATE_FAIL; > } > @@ -1665,6 +1709,7 @@ static u64 kvm_vz_get_one_regs[] = { > KVM_REG_MIPS_CP0_CONFIG3, > KVM_REG_MIPS_CP0_CONFIG4, > KVM_REG_MIPS_CP0_CONFIG5, > + KVM_REG_MIPS_CP0_CONFIG6, > #ifdef CONFIG_64BIT > KVM_REG_MIPS_CP0_XCONTEXT, > #endif > @@ -1992,6 +2037,9 @@ static int kvm_vz_get_one_reg(struct kvm_vcpu > *vcpu, return -EINVAL; > *v = read_gc0_config5(); > break; > + case KVM_REG_MIPS_CP0_CONFIG6: > + *v = kvm_read_sw_gc0_config6(cop0); > + break; > case KVM_REG_MIPS_CP0_MAAR(0) ... > KVM_REG_MIPS_CP0_MAAR(0x3f): if (!cpu_guest_has_maar || > cpu_guest_has_dyn_maar) return -EINVAL; > @@ -2261,6 +2309,14 @@ static int kvm_vz_set_one_reg(struct kvm_vcpu > *vcpu, write_gc0_config5(v); > } > break; > + case KVM_REG_MIPS_CP0_CONFIG6: > + cur = kvm_read_sw_gc0_config6(cop0); > + change = (cur ^ v) & > kvm_vz_config6_user_wrmask(vcpu); > + if (change) { > + v = cur ^ change; > + kvm_write_sw_gc0_config6(cop0, (int)v); > + } > + break; > case KVM_REG_MIPS_CP0_MAAR(0) ... > KVM_REG_MIPS_CP0_MAAR(0x3f): if (!cpu_guest_has_maar || > cpu_guest_has_dyn_maar) return -EINVAL;