From nobody Sun Oct 5 09:07:59 2025 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4ADC91B4231; Wed, 6 Aug 2025 09:00:49 +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=1754470854; cv=none; b=Dr1gyVAEwpW3igXa1Jg1y3eI8X0izI/HkUo58tBZz8huA61ffUaymeCKnivXqi+xBaYDoBQ8kRsv3oT4k2XtTMUv8VxAJdbRdEAuJ72KBoB/PIHSmUg+L1azB4beUgNkGafjLCaM2XZ/0Lua+01JHJ+CWRqthj+zHPDRI2tEEvg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754470854; c=relaxed/simple; bh=zR1tyOdyYA/M4ELpX0KfN8UVCXAxrOu08vQc349M9i4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SyvXdTpmQ+JP+R1WXYXXdWLrQhNHMaZM+8osi2IAQZ+OjhNrs93R59F2BBvqiSBxCz+niK09mvfoh4Hw5KdMhuVbK10x7WyBAxiyu1ZRZEIVc1IJTeTcWBsQPVp3rMly2Xo8ft0AmSQz8wGghGHKqNebem4pxBo83COQHzB5MJc= 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 _____8DxDeO_GZNohZs5AQ--.12540S3; Wed, 06 Aug 2025 17:00:47 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJBxzsG+GZNoe6k4AA--.54411S3; Wed, 06 Aug 2025 17:00:47 +0800 (CST) From: Bibo Mao To: Tianrui Zhao , Huacai Chen , Xianglai Li Cc: kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] LoongArch: KVM: Access mailbox directly in mail_send() Date: Wed, 6 Aug 2025 17:00:44 +0800 Message-Id: <20250806090046.2028785-2-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250806090046.2028785-1-maobibo@loongson.cn> References: <20250806090046.2028785-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: qMiowJBxzsG+GZNoe6k4AA--.54411S3 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" With function mail_send(), it is to write mailbox of other VCPUs. Existing simple APIs read_mailbox/write_mailbox can be used directly rather than send command on IOCSR address. Signed-off-by: Bibo Mao --- arch/loongarch/kvm/intc/ipi.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kvm/intc/ipi.c b/arch/loongarch/kvm/intc/ipi.c index e658d5b37c04..6bbbf5df3957 100644 --- a/arch/loongarch/kvm/intc/ipi.c +++ b/arch/loongarch/kvm/intc/ipi.c @@ -134,7 +134,8 @@ static int send_ipi_data(struct kvm_vcpu *vcpu, gpa_t a= ddr, uint64_t data) =20 static int mail_send(struct kvm *kvm, uint64_t data) { - int cpu, mailbox, offset; + int i, cpu, mailbox, offset; + uint32_t val =3D 0, mask =3D 0; struct kvm_vcpu *vcpu; =20 cpu =3D ((data & 0xffffffff) >> 16) & 0x3ff; @@ -144,9 +145,18 @@ static int mail_send(struct kvm *kvm, uint64_t data) return -EINVAL; } mailbox =3D ((data & 0xffffffff) >> 2) & 0x7; - offset =3D IOCSR_IPI_BASE + IOCSR_IPI_BUF_20 + mailbox * 4; + offset =3D IOCSR_IPI_BUF_20 + mailbox * 4; + if ((data >> 27) & 0xf) { + val =3D read_mailbox(vcpu, offset, 4); + for (i =3D 0; i < 4; i++) + if (data & (BIT(27 + i))) + mask |=3D (0xff << (i * 8)); + val &=3D mask; + } =20 - return send_ipi_data(vcpu, offset, data); + val |=3D ((uint32_t)(data >> 32) & ~mask); + write_mailbox(vcpu, offset, val, 4); + return 0; } =20 static int any_send(struct kvm *kvm, uint64_t data) --=20 2.39.3 From nobody Sun Oct 5 09:07:59 2025 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 65D44289371; Wed, 6 Aug 2025 09:00:50 +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=1754470853; cv=none; b=RQTeyDhaHOQKcdEK/hXfD/oJH3Mf/tUgfzUjbZPGijTdbVLicQ632aDpUJGIp/QxC/UMWsI9shbscz1Zm5+9SKz1XcBx/rNuIsJG4PKVALXFRQFPiT/OZZ5ywWm9GEAwo71tkBMuLFKsBD4t2Yzhxdm4F7peUHMxTQNjCgZZJzk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754470853; c=relaxed/simple; bh=KIcw3ORhJZhhiF5OhW7almcs41TmKKIO/mtjrFKeYxU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jjdeahNK4vZy6VdVtQhdYeSUTOozs7wvR5ja4n5EcPxYpG5qPs7mnRQvaly5QCxtej2xnfQ9dAS9M03KZHldRirOwRZtF9gO/8UwGo9r/E1U1FvHg3JFrgBJevp4MwDD352N3ed/ezAB25IDBDxfDI1uaJYUbrHavpxq10chmJo= 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 _____8DxQK_BGZNoiJs5AQ--.13182S3; Wed, 06 Aug 2025 17:00:49 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJBxzsG+GZNoe6k4AA--.54411S4; Wed, 06 Aug 2025 17:00:47 +0800 (CST) From: Bibo Mao To: Tianrui Zhao , Huacai Chen , Xianglai Li Cc: kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] LoongArch: KVM: Add implementation with IOCSR_IPI_SET Date: Wed, 6 Aug 2025 17:00:45 +0800 Message-Id: <20250806090046.2028785-3-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250806090046.2028785-1-maobibo@loongson.cn> References: <20250806090046.2028785-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: qMiowJBxzsG+GZNoe6k4AA--.54411S4 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" IPI IOCSR register IOCSR_IPI_SET can send ipi interrupt to other vCPUs, also it can send interrupt to vCPU itself. Instead there is such operation on Linux such as arch_irq_work_raise(), it will send ipi message to vCPU itself. Here add implementation of write operation with IOCSR_IPI_SET register. Signed-off-by: Bibo Mao --- arch/loongarch/kvm/intc/ipi.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/arch/loongarch/kvm/intc/ipi.c b/arch/loongarch/kvm/intc/ipi.c index 6bbbf5df3957..d0457a198847 100644 --- a/arch/loongarch/kvm/intc/ipi.c +++ b/arch/loongarch/kvm/intc/ipi.c @@ -7,13 +7,26 @@ #include #include =20 -static void ipi_send(struct kvm *kvm, uint64_t data) +static void ipi_set(struct kvm_vcpu *vcpu, uint32_t data) { - int cpu, action; uint32_t status; - struct kvm_vcpu *vcpu; struct kvm_interrupt irq; =20 + spin_lock(&vcpu->arch.ipi_state.lock); + status =3D vcpu->arch.ipi_state.status; + vcpu->arch.ipi_state.status |=3D data; + spin_unlock(&vcpu->arch.ipi_state.lock); + if ((status =3D=3D 0) && data) { + irq.irq =3D LARCH_INT_IPI; + kvm_vcpu_ioctl_interrupt(vcpu, &irq); + } +} + +static void ipi_send(struct kvm *kvm, uint64_t data) +{ + int cpu; + struct kvm_vcpu *vcpu; + cpu =3D ((data & 0xffffffff) >> 16) & 0x3ff; vcpu =3D kvm_get_vcpu_by_cpuid(kvm, cpu); if (unlikely(vcpu =3D=3D NULL)) { @@ -21,15 +34,7 @@ static void ipi_send(struct kvm *kvm, uint64_t data) return; } =20 - action =3D BIT(data & 0x1f); - spin_lock(&vcpu->arch.ipi_state.lock); - status =3D vcpu->arch.ipi_state.status; - vcpu->arch.ipi_state.status |=3D action; - spin_unlock(&vcpu->arch.ipi_state.lock); - if (status =3D=3D 0) { - irq.irq =3D LARCH_INT_IPI; - kvm_vcpu_ioctl_interrupt(vcpu, &irq); - } + ipi_set(vcpu, BIT(data & 0x1f)); } =20 static void ipi_clear(struct kvm_vcpu *vcpu, uint64_t data) @@ -241,7 +246,7 @@ static int loongarch_ipi_writel(struct kvm_vcpu *vcpu, = gpa_t addr, int len, cons spin_unlock(&vcpu->arch.ipi_state.lock); break; case IOCSR_IPI_SET: - ret =3D -EINVAL; + ipi_set(vcpu, data); break; case IOCSR_IPI_CLEAR: /* Just clear the status of the current vcpu */ @@ -260,10 +265,10 @@ static int loongarch_ipi_writel(struct kvm_vcpu *vcpu= , gpa_t addr, int len, cons ipi_send(vcpu->kvm, data); break; case IOCSR_MAIL_SEND: - ret =3D mail_send(vcpu->kvm, *(uint64_t *)val); + ret =3D mail_send(vcpu->kvm, data); break; case IOCSR_ANY_SEND: - ret =3D any_send(vcpu->kvm, *(uint64_t *)val); + ret =3D any_send(vcpu->kvm, data); break; default: kvm_err("%s: unknown addr: %llx\n", __func__, addr); --=20 2.39.3 From nobody Sun Oct 5 09:07:59 2025 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 151D928852E; Wed, 6 Aug 2025 09:00:52 +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=1754470855; cv=none; b=sbnQJ0kbC7rwoFKb+sACfVPRa2jyTc1kPrU6Luz31lqgBsQz7IuwUCxq5UQvzn6gLyNh5m6BUSGVBPA/6S8bPEI+VHr3qvsfC44ZMeBZGtdHznJvBDv2CgVrjnkyDA//LsNvQCn81U9p3zIDgeoqKlH2E+SOGXBLEYv0J65UHB4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754470855; c=relaxed/simple; bh=PesLW11khJRpGmSVJfT+LbNggq4Xf0R0wDY67UVzXGI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ujKnji4Z40v4ihbK7rtNu+XvPw1WFR4MeB/yuSBtcuuCO3YCPK+LCtJin8kIGLvJra/AgpFSQayc3AOIIxeiv130Uiy9miqSl4/iE/IQR4XqY7fzO5HWMAT0SFOCF23DsOERq+r/fpPNdPBF7xNSIovATUj6ePkG6TEP8Zlp6Vc= 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 _____8AxmnHDGZNoj5s5AQ--.47823S3; Wed, 06 Aug 2025 17:00:51 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJBxzsG+GZNoe6k4AA--.54411S5; Wed, 06 Aug 2025 17:00:49 +0800 (CST) From: Bibo Mao To: Tianrui Zhao , Huacai Chen , Xianglai Li Cc: kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] LoongArch: KVM: Make function kvm_own_lbt() robust Date: Wed, 6 Aug 2025 17:00:46 +0800 Message-Id: <20250806090046.2028785-4-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250806090046.2028785-1-maobibo@loongson.cn> References: <20250806090046.2028785-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: qMiowJBxzsG+GZNoe6k4AA--.54411S5 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" Add flag KVM_LARCH_LBT checking in function kvm_own_lbt(), so that it can be called safely rather than duplicated enabling again. Signed-off-by: Bibo Mao --- arch/loongarch/kvm/vcpu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index d1b8c50941ca..ce478151466c 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -1283,9 +1283,11 @@ int kvm_own_lbt(struct kvm_vcpu *vcpu) return -EINVAL; =20 preempt_disable(); - set_csr_euen(CSR_EUEN_LBTEN); - _restore_lbt(&vcpu->arch.lbt); - vcpu->arch.aux_inuse |=3D KVM_LARCH_LBT; + if (!(vcpu->arch.aux_inuse & KVM_LARCH_LBT)) { + set_csr_euen(CSR_EUEN_LBTEN); + _restore_lbt(&vcpu->arch.lbt); + vcpu->arch.aux_inuse |=3D KVM_LARCH_LBT; + } preempt_enable(); =20 return 0; --=20 2.39.3