From nobody Mon Feb 9 09:00:25 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9EBF61CEE90; Thu, 24 Apr 2025 06:46:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745477197; cv=none; b=mfapRi7PujoQoHb/2MpYberHBHbBHevM3saoX/73KAWbDyXvLq7e3UIV7LhWzsrZo6omsyZhCUq3zrrLN53/KJcsV+JCcwJp0YVSyKestn198mPDXQMChgMk6CJrwJUcAgHmDTm1slTwsjTyJ9ZlxqYWwyxMQ+6ZA8cKMQBXwkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745477197; c=relaxed/simple; bh=7Gan8JsZYAiRm1KenBbeoVXccD4iViTclcEidxrBTQE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lJ3Zisov4MZGQVR1JCARne8ATGCHIKTYSlzAoZlZSpOZ98AftjLZEW9S+RypaoNHCaDJOd3NmFMJrNePQZlwIC5c6FYJd2wktkFJIrqKyfNjt9bwEVXdKtZYjrpxluuuawudDAnf2fWU6SBCqordUzh0DL5YlI50hA7T03LumUA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8CxaWpI3glojx_FAA--.984S3; Thu, 24 Apr 2025 14:46:32 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMBxXsVB3gloABqTAA--.39186S3; Thu, 24 Apr 2025 14:46:26 +0800 (CST) From: Bibo Mao To: Tianrui Zhao , Huacai Chen Cc: WANG Xuerui , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] LoongArch: KVM: Add parameter exception code with exception handler Date: Thu, 24 Apr 2025 14:46:24 +0800 Message-Id: <20250424064625.3928278-2-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250424064625.3928278-1-maobibo@loongson.cn> References: <20250424064625.3928278-1-maobibo@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowMBxXsVB3gloABqTAA--.39186S3 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" With some KVM exception types, they share the same exception function handler. To show the difference, exception code is added as new parameter in exception handler. Signed-off-by: Bibo Mao --- arch/loongarch/include/asm/kvm_vcpu.h | 2 +- arch/loongarch/kvm/exit.c | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/arch/loongarch/include/asm/kvm_vcpu.h b/arch/loongarch/include= /asm/kvm_vcpu.h index 2c349f961bfb..b0a6cac07ed8 100644 --- a/arch/loongarch/include/asm/kvm_vcpu.h +++ b/arch/loongarch/include/asm/kvm_vcpu.h @@ -37,7 +37,7 @@ #define KVM_LOONGSON_IRQ_NUM_MASK 0xffff =20 typedef union loongarch_instruction larch_inst; -typedef int (*exit_handle_fn)(struct kvm_vcpu *); +typedef int (*exit_handle_fn)(struct kvm_vcpu *, int ecode); =20 int kvm_emu_mmio_read(struct kvm_vcpu *vcpu, larch_inst inst); int kvm_emu_mmio_write(struct kvm_vcpu *vcpu, larch_inst inst); diff --git a/arch/loongarch/kvm/exit.c b/arch/loongarch/kvm/exit.c index ea321403644a..31b9d5f67e8f 100644 --- a/arch/loongarch/kvm/exit.c +++ b/arch/loongarch/kvm/exit.c @@ -341,7 +341,7 @@ static int kvm_trap_handle_gspr(struct kvm_vcpu *vcpu) * 2) Execute CACOP/IDLE instructions; * 3) Access to unimplemented CSRs/IOCSRs. */ -static int kvm_handle_gspr(struct kvm_vcpu *vcpu) +static int kvm_handle_gspr(struct kvm_vcpu *vcpu, int ecode) { int ret =3D RESUME_GUEST; enum emulation_result er =3D EMULATE_DONE; @@ -705,12 +705,12 @@ static int kvm_handle_rdwr_fault(struct kvm_vcpu *vcp= u, bool write) return ret; } =20 -static int kvm_handle_read_fault(struct kvm_vcpu *vcpu) +static int kvm_handle_read_fault(struct kvm_vcpu *vcpu, int ecode) { return kvm_handle_rdwr_fault(vcpu, false); } =20 -static int kvm_handle_write_fault(struct kvm_vcpu *vcpu) +static int kvm_handle_write_fault(struct kvm_vcpu *vcpu, int ecode) { return kvm_handle_rdwr_fault(vcpu, true); } @@ -730,7 +730,7 @@ int kvm_complete_user_service(struct kvm_vcpu *vcpu, st= ruct kvm_run *run) * Handle when the guest attempts to use fpu which hasn't been allowed * by the root context. */ -static int kvm_handle_fpu_disabled(struct kvm_vcpu *vcpu) +static int kvm_handle_fpu_disabled(struct kvm_vcpu *vcpu, int ecode) { struct kvm_run *run =3D vcpu->run; =20 @@ -787,7 +787,7 @@ static long kvm_save_notify(struct kvm_vcpu *vcpu) * Handle when the guest attempts to use LSX when it is disabled in the ro= ot * context. */ -static int kvm_handle_lsx_disabled(struct kvm_vcpu *vcpu) +static int kvm_handle_lsx_disabled(struct kvm_vcpu *vcpu, int ecode) { if (kvm_own_lsx(vcpu)) kvm_queue_exception(vcpu, EXCCODE_INE, 0); @@ -802,7 +802,7 @@ static int kvm_handle_lsx_disabled(struct kvm_vcpu *vcp= u) * Handle when the guest attempts to use LASX when it is disabled in the r= oot * context. */ -static int kvm_handle_lasx_disabled(struct kvm_vcpu *vcpu) +static int kvm_handle_lasx_disabled(struct kvm_vcpu *vcpu, int ecode) { if (kvm_own_lasx(vcpu)) kvm_queue_exception(vcpu, EXCCODE_INE, 0); @@ -810,7 +810,7 @@ static int kvm_handle_lasx_disabled(struct kvm_vcpu *vc= pu) return RESUME_GUEST; } =20 -static int kvm_handle_lbt_disabled(struct kvm_vcpu *vcpu) +static int kvm_handle_lbt_disabled(struct kvm_vcpu *vcpu, int ecode) { if (kvm_own_lbt(vcpu)) kvm_queue_exception(vcpu, EXCCODE_INE, 0); @@ -872,7 +872,7 @@ static void kvm_handle_service(struct kvm_vcpu *vcpu) kvm_write_reg(vcpu, LOONGARCH_GPR_A0, ret); } =20 -static int kvm_handle_hypercall(struct kvm_vcpu *vcpu) +static int kvm_handle_hypercall(struct kvm_vcpu *vcpu, int ecode) { int ret; larch_inst inst; @@ -932,16 +932,14 @@ static int kvm_handle_hypercall(struct kvm_vcpu *vcpu) /* * LoongArch KVM callback handling for unimplemented guest exiting */ -static int kvm_fault_ni(struct kvm_vcpu *vcpu) +static int kvm_fault_ni(struct kvm_vcpu *vcpu, int ecode) { - unsigned int ecode, inst; - unsigned long estat, badv; + unsigned int inst; + unsigned long badv; =20 /* Fetch the instruction */ inst =3D vcpu->arch.badi; badv =3D vcpu->arch.badv; - estat =3D vcpu->arch.host_estat; - ecode =3D (estat & CSR_ESTAT_EXC) >> CSR_ESTAT_EXC_SHIFT; kvm_err("ECode: %d PC=3D%#lx Inst=3D0x%08x BadVaddr=3D%#lx ESTAT=3D%#lx\n= ", ecode, vcpu->arch.pc, inst, badv, read_gcsr_estat()); kvm_arch_vcpu_dump_regs(vcpu); @@ -966,5 +964,5 @@ static exit_handle_fn kvm_fault_tables[EXCCODE_INT_STAR= T] =3D { =20 int kvm_handle_fault(struct kvm_vcpu *vcpu, int fault) { - return kvm_fault_tables[fault](vcpu); + return kvm_fault_tables[fault](vcpu, fault); } --=20 2.39.3 From nobody Mon Feb 9 09:00:25 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 81E691D5166; Thu, 24 Apr 2025 06:46:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745477198; cv=none; b=GhhBnv5/i/7Aukh0/12U8+zWKU06gqb5UFBSrI0KxQpwaIekKmc2lP1Kmx3kP/CFkWQxudas/ULv8e5ZMAupVpl3aOlOIuQX8zB5rH9aY7cGr8Cg5c+wxy/+MoGmlodesEcKrzaZnUz+jA29Jfxq65b1i3kxSbrUQsNrcYh5hYw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745477198; c=relaxed/simple; bh=I5oSLeaECgBESSQPJTrXap4PDHv/Zm++hpeYpGm02Dc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oBwdsWMQ+sGpWFsqikxqO4bC76y1hERgnaZvmFZhkpWe/Y7gH7SYEMNVNvrKf0AEJgk47GWfwQj8LvTe05SLoadxURDKJzaTcoq1mgn07tKXz/W3h9q79iXVHJdu8UYA7gErsQHhaYxo+mKWU8fG2EsiSkSYQa+YDQ0LrS4kEys= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn; spf=pass smtp.mailfrom=loongson.cn; arc=none smtp.client-ip=114.242.206.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8AxWXFK3glokx_FAA--.64928S3; Thu, 24 Apr 2025 14:46:34 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMBxXsVB3gloABqTAA--.39186S4; Thu, 24 Apr 2025 14:46:32 +0800 (CST) From: Bibo Mao To: Tianrui Zhao , Huacai Chen Cc: WANG Xuerui , kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] LoongArch: KVM: Do not flush tlb if HW PTW supported Date: Thu, 24 Apr 2025 14:46:25 +0800 Message-Id: <20250424064625.3928278-3-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250424064625.3928278-1-maobibo@loongson.cn> References: <20250424064625.3928278-1-maobibo@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowMBxXsVB3gloABqTAA--.39186S4 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" With HW PTW supported, TLB is not added if page fault happens. With EXCCODE_TLBM exception, TLB may exist because last read access, tlb flush operation is necessary with EXCCODE_TLBM exception, and not necessary with other memory page fault exception. With SW PTW supported, invalid TLB is added in TLB refill exception. tlb flush operation is necessary with all page fault exceptions. Signed-off-by: Bibo Mao --- arch/loongarch/include/asm/kvm_host.h | 2 +- arch/loongarch/kvm/exit.c | 8 ++++---- arch/loongarch/kvm/mmu.c | 17 +++++++++++++---- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/arch/loongarch/include/asm/kvm_host.h b/arch/loongarch/include= /asm/kvm_host.h index f457c2662e2f..a3c4cc46c892 100644 --- a/arch/loongarch/include/asm/kvm_host.h +++ b/arch/loongarch/include/asm/kvm_host.h @@ -301,7 +301,7 @@ int kvm_arch_vcpu_dump_regs(struct kvm_vcpu *vcpu); /* MMU handling */ void kvm_flush_tlb_all(void); void kvm_flush_tlb_gpa(struct kvm_vcpu *vcpu, unsigned long gpa); -int kvm_handle_mm_fault(struct kvm_vcpu *vcpu, unsigned long badv, bool wr= ite); +int kvm_handle_mm_fault(struct kvm_vcpu *vcpu, unsigned long badv, bool wr= ite, int ecode); =20 int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned lon= g end, bool blockable); int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end); diff --git a/arch/loongarch/kvm/exit.c b/arch/loongarch/kvm/exit.c index 31b9d5f67e8f..e6ad251debb1 100644 --- a/arch/loongarch/kvm/exit.c +++ b/arch/loongarch/kvm/exit.c @@ -661,7 +661,7 @@ int kvm_emu_mmio_write(struct kvm_vcpu *vcpu, larch_ins= t inst) return ret; } =20 -static int kvm_handle_rdwr_fault(struct kvm_vcpu *vcpu, bool write) +static int kvm_handle_rdwr_fault(struct kvm_vcpu *vcpu, bool write, int ec= ode) { int ret; larch_inst inst; @@ -675,7 +675,7 @@ static int kvm_handle_rdwr_fault(struct kvm_vcpu *vcpu,= bool write) return RESUME_GUEST; } =20 - ret =3D kvm_handle_mm_fault(vcpu, badv, write); + ret =3D kvm_handle_mm_fault(vcpu, badv, write, ecode); if (ret) { /* Treat as MMIO */ inst.word =3D vcpu->arch.badi; @@ -707,12 +707,12 @@ static int kvm_handle_rdwr_fault(struct kvm_vcpu *vcp= u, bool write) =20 static int kvm_handle_read_fault(struct kvm_vcpu *vcpu, int ecode) { - return kvm_handle_rdwr_fault(vcpu, false); + return kvm_handle_rdwr_fault(vcpu, false, ecode); } =20 static int kvm_handle_write_fault(struct kvm_vcpu *vcpu, int ecode) { - return kvm_handle_rdwr_fault(vcpu, true); + return kvm_handle_rdwr_fault(vcpu, true, ecode); } =20 int kvm_complete_user_service(struct kvm_vcpu *vcpu, struct kvm_run *run) diff --git a/arch/loongarch/kvm/mmu.c b/arch/loongarch/kvm/mmu.c index 4d203294767c..0f0d4be9cba2 100644 --- a/arch/loongarch/kvm/mmu.c +++ b/arch/loongarch/kvm/mmu.c @@ -912,7 +912,7 @@ static int kvm_map_page(struct kvm_vcpu *vcpu, unsigned= long gpa, bool write) return err; } =20 -int kvm_handle_mm_fault(struct kvm_vcpu *vcpu, unsigned long gpa, bool wri= te) +int kvm_handle_mm_fault(struct kvm_vcpu *vcpu, unsigned long gpa, bool wri= te, int ecode) { int ret; =20 @@ -920,9 +920,18 @@ int kvm_handle_mm_fault(struct kvm_vcpu *vcpu, unsigne= d long gpa, bool write) if (ret) return ret; =20 - /* Invalidate this entry in the TLB */ - vcpu->arch.flush_gpa =3D gpa; - kvm_make_request(KVM_REQ_TLB_FLUSH_GPA, vcpu); + if (!cpu_has_ptw || (ecode =3D=3D EXCCODE_TLBM)) { + /* + * With HW ptw supported, TLB will not update for any page fault + * For EXCCODE_TLBM exception, TLB may exist because last read access + * + * With SW ptw, invalid TLB is added in TLB refill exception + * + * Invalidate this entry in the TLB + */ + vcpu->arch.flush_gpa =3D gpa; + kvm_make_request(KVM_REQ_TLB_FLUSH_GPA, vcpu); + } =20 return 0; } --=20 2.39.3