From nobody Sun Feb 8 22:08:13 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8AB5A2628D; Tue, 3 Feb 2026 03:31:37 +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=1770089502; cv=none; b=A1M2zfvFyeLD3Y7X7jet1IqRaB+fLhGrikA/u7sXuBgXwdG9wwUcR3aAbWTzf1hsTS/JHdAK55wB2RnaHn662Y9vdjJLz7RZgQjN6RtVExKEZb0F48IzypK4lkWDM1V1oZ8bo9WIRH9n7HGu2wg+y/SQgGYEo5a0hDTFtdZ+4Ww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770089502; c=relaxed/simple; bh=soXzKnhsQjPTTL1KYho9t5jG3TgZArfa21WuREO0/D0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JoSihj29aGgj9kxiHQsp8fEr96AJsb5GxwE35vIM+NymD/DhEKzvITYmZNPD5SETguKQR16b7gggxr6QiNRH+uSerTLVnOXBqrUI3Uk6VKlqBGp0l2AMxrvAlFJQNvH3Bhh8uLvvrpQlmAuwfle/6QJ6fn1dfSf1k9/NbzkYtOM= 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 _____8DxAfEWbIFp3zwPAA--.49702S3; Tue, 03 Feb 2026 11:31:34 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJAxGMEVbIFpbtk+AA--.37628S3; Tue, 03 Feb 2026 11:31:34 +0800 (CST) From: Bibo Mao To: Huacai Chen , WANG Xuerui , Tianrui Zhao Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v3 1/4] LoongArch: KVM: Move LSX capability check in LSX exception handler Date: Tue, 3 Feb 2026 11:31:28 +0800 Message-Id: <20260203033131.3372834-2-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20260203033131.3372834-1-maobibo@loongson.cn> References: <20260203033131.3372834-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: qMiowJAxGMEVbIFpbtk+AA--.37628S3 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" Like FPU exception handler, check LSX capability in LSX exception handler rather than kvm_own_lsx(). LSX capability in function kvm_guest_has_lsx() implies FPU capability in kvm_guest_has_fpu(), only check kvm_guest_has_lsx() is ok here. Signed-off-by: Bibo Mao --- arch/loongarch/kvm/exit.c | 4 +++- arch/loongarch/kvm/vcpu.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/loongarch/kvm/exit.c b/arch/loongarch/kvm/exit.c index cb493980d874..76eec3f24953 100644 --- a/arch/loongarch/kvm/exit.c +++ b/arch/loongarch/kvm/exit.c @@ -792,8 +792,10 @@ static long kvm_save_notify(struct kvm_vcpu *vcpu) */ static int kvm_handle_lsx_disabled(struct kvm_vcpu *vcpu, int ecode) { - if (kvm_own_lsx(vcpu)) + if (!kvm_guest_has_lsx(&vcpu->arch)) kvm_queue_exception(vcpu, EXCCODE_INE, 0); + else + kvm_own_lsx(vcpu); =20 return RESUME_GUEST; } diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 656b954c1134..aff295aa6b0b 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -1358,9 +1358,6 @@ void kvm_own_fpu(struct kvm_vcpu *vcpu) /* Enable LSX and restore context */ int kvm_own_lsx(struct kvm_vcpu *vcpu) { - if (!kvm_guest_has_fpu(&vcpu->arch) || !kvm_guest_has_lsx(&vcpu->arch)) - return -EINVAL; - preempt_disable(); =20 /* Enable LSX for guest */ --=20 2.39.3 From nobody Sun Feb 8 22:08:13 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8B7EC3254A0; Tue, 3 Feb 2026 03:31:44 +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=1770089506; cv=none; b=A6E6Nq50S4+O3V0+PpOa11gitMavQ5+lGfyeLcTe8zxqmMnGvj1pIUIKZjA67dCi3fitcfq6CkpXcNy8Y6Z/6MJXa6RWvxLRnKaEH1pZ34vz8tUG6toqYp9PC4YFJkiM4MRMBSdT3edzn3ZQLTAqniI+Aj3JqelT5i+U8/Tvlvk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770089506; c=relaxed/simple; bh=IdLW44VGZExsGvqUufz+gqPKgso8L+J5SayaiaaCZhY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mGkh06+NRhlSRJyMPXElzRxaLIWmgXkKtTuVVC8IBlevX6atGGE8NnxA/ULbZiSiSQA7ETGo2OzoMIZfCp1JmvOfygnegHgXRy2jeOg/U//QuhnVhE2DrBKYTG6H/9bQy+d7lqcGA4VRfOStklyFWuodvbat0+Tb2MuMmmXyhqE= 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 _____8CxacIXbIFp4zwPAA--.49020S3; Tue, 03 Feb 2026 11:31:35 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJAxGMEVbIFpbtk+AA--.37628S4; Tue, 03 Feb 2026 11:31:35 +0800 (CST) From: Bibo Mao To: Huacai Chen , WANG Xuerui , Tianrui Zhao Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v3 2/4] LoongArch: KVM: Move LASX capability check in LASX exception handler Date: Tue, 3 Feb 2026 11:31:29 +0800 Message-Id: <20260203033131.3372834-3-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20260203033131.3372834-1-maobibo@loongson.cn> References: <20260203033131.3372834-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: qMiowJAxGMEVbIFpbtk+AA--.37628S4 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" Like FPU exception handler, check LASX capability in LASX exception handler rather than function kvm_own_lasx(). LASX capability in function kvm_guest_has_lasx() implies FPU and LSX capability, only checking kvm_guest_has_lasx() is ok here. Signed-off-by: Bibo Mao --- arch/loongarch/kvm/exit.c | 4 +++- arch/loongarch/kvm/vcpu.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/loongarch/kvm/exit.c b/arch/loongarch/kvm/exit.c index 76eec3f24953..74b427287e96 100644 --- a/arch/loongarch/kvm/exit.c +++ b/arch/loongarch/kvm/exit.c @@ -810,8 +810,10 @@ static int kvm_handle_lsx_disabled(struct kvm_vcpu *vc= pu, int ecode) */ static int kvm_handle_lasx_disabled(struct kvm_vcpu *vcpu, int ecode) { - if (kvm_own_lasx(vcpu)) + if (!kvm_guest_has_lasx(&vcpu->arch)) kvm_queue_exception(vcpu, EXCCODE_INE, 0); + else + kvm_own_lasx(vcpu); =20 return RESUME_GUEST; } diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index aff295aa6b0b..d91a1160a309 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -1391,9 +1391,6 @@ int kvm_own_lsx(struct kvm_vcpu *vcpu) /* Enable LASX and restore context */ int kvm_own_lasx(struct kvm_vcpu *vcpu) { - if (!kvm_guest_has_fpu(&vcpu->arch) || !kvm_guest_has_lsx(&vcpu->arch) ||= !kvm_guest_has_lasx(&vcpu->arch)) - return -EINVAL; - preempt_disable(); =20 kvm_check_fcsr(vcpu, vcpu->arch.fpu.fcsr); --=20 2.39.3 From nobody Sun Feb 8 22:08:13 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C1A2E31D387; Tue, 3 Feb 2026 03:31:38 +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=1770089501; cv=none; b=Q2S/GNltmvZCssMCsXfbAHzhDSkpFCDDRPmJ44HYaQOi9AvMGZps1e5LI4kKnu0i5AWkQgrXhGwI0l2izh1B1C33CHpwcVBXrV+crULjSli7Ek8Y610hT2Fd+Mvl+TfT7NnoEKN4aoVy3nSc2gI6r8w1M+J9AOuyTCoBTVSw5nE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770089501; c=relaxed/simple; bh=/52FdCO+2MJf5DIczIzycLBU53I2LCS2snJAb73d9h4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QuMo5AODH0TDzJUczVufSP/nXdtirjS08j0LRTu2so0XJU/cPvGETbD6O23Gcbp70aA+a5SctGf3lf8YGeNx7LbX1hOsoUNIDHHfyMbyNA/XIniZswVVv41/ebbi18UYGJWxU6PCzLV314g4fGBzQIBvuWMpFsJaXe27+TSBHL0= 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 _____8Axy8IXbIFp5zwPAA--.49026S3; Tue, 03 Feb 2026 11:31:35 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJAxGMEVbIFpbtk+AA--.37628S5; Tue, 03 Feb 2026 11:31:35 +0800 (CST) From: Bibo Mao To: Huacai Chen , WANG Xuerui , Tianrui Zhao Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v3 3/4] LoongArch: KVM: Move LBT capability checking in LBT exception handler Date: Tue, 3 Feb 2026 11:31:30 +0800 Message-Id: <20260203033131.3372834-4-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20260203033131.3372834-1-maobibo@loongson.cn> References: <20260203033131.3372834-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: qMiowJAxGMEVbIFpbtk+AA--.37628S5 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" Like FPU exception handler, check LBT capability in LBT exception handler rather than function kvm_own_lbt(). Signed-off-by: Bibo Mao --- arch/loongarch/kvm/exit.c | 4 +++- arch/loongarch/kvm/vcpu.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/loongarch/kvm/exit.c b/arch/loongarch/kvm/exit.c index 74b427287e96..65ec10a7245a 100644 --- a/arch/loongarch/kvm/exit.c +++ b/arch/loongarch/kvm/exit.c @@ -820,8 +820,10 @@ static int kvm_handle_lasx_disabled(struct kvm_vcpu *v= cpu, int ecode) =20 static int kvm_handle_lbt_disabled(struct kvm_vcpu *vcpu, int ecode) { - if (kvm_own_lbt(vcpu)) + if (!kvm_guest_has_lbt(&vcpu->arch)) kvm_queue_exception(vcpu, EXCCODE_INE, 0); + else + kvm_own_lbt(vcpu); =20 return RESUME_GUEST; } diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index d91a1160a309..995461d724b5 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -1286,9 +1286,6 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu= , struct kvm_fpu *fpu) #ifdef CONFIG_CPU_HAS_LBT int kvm_own_lbt(struct kvm_vcpu *vcpu) { - if (!kvm_guest_has_lbt(&vcpu->arch)) - return -EINVAL; - preempt_disable(); if (!(vcpu->arch.aux_inuse & KVM_LARCH_LBT)) { set_csr_euen(CSR_EUEN_LBTEN); --=20 2.39.3 From nobody Sun Feb 8 22:08:13 2026 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 75F8532142F; Tue, 3 Feb 2026 03:31:40 +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=1770089502; cv=none; b=SQmRNlJHzbCPe3JEUNlkLNj1+FmzW1VK3dEuBs17cGUsiH5u10aAmc3BBdxFH/+hewSMI0+1nUvbfObP864v7w64svZYIanuih8yMpuUCzHzvWBXkuQsvn9eVU8SSaLduKI1jy7iz97j9amydkAOrLUX26d2fc/7Ago1ivM63bY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770089502; c=relaxed/simple; bh=31he4kFXzR0lNTSEFBIYR7Vkdne0EhzfzekN8B+ukOU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rkKmJ9/gP1V3btTi+bbjYz/3GfDAU1UcB28SWmhttrNYExMfN2N36KJPVsstf/EZ3jbqPIxNpmFo++4MaO3AH7I+OCddSKpujryAiYRk3OOlHNJTAKP7REGtr3vqSM2GTZgSG9AgfTsnPMmPk4bcVdh9MDuGaG/Lx8mmEfZkgO4= 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 _____8DxOMIabIFp7TwPAA--.49922S3; Tue, 03 Feb 2026 11:31:38 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJDxzsIZbIFpdNk+AA--.51291S2; Tue, 03 Feb 2026 11:31:37 +0800 (CST) From: Bibo Mao To: Huacai Chen , WANG Xuerui , Tianrui Zhao Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v3 4/4] LoongArch: KVM: Add FPU delay load support Date: Tue, 3 Feb 2026 11:31:31 +0800 Message-Id: <20260203033131.3372834-5-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20260203033131.3372834-1-maobibo@loongson.cn> References: <20260203033131.3372834-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: qMiowJDxzsIZbIFpdNk+AA--.51291S2 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Content-Type: text/plain; charset="utf-8" FPU is lazy enabled with KVM hypervisor. After FPU is enabled and loaded, vCPU can be preempted and FPU will be lost again, there will be unnecessary FPU exception, load and store process. Here FPU is delay load until guest enter entry. Signed-off-by: Bibo Mao --- arch/loongarch/include/asm/kvm_host.h | 2 ++ arch/loongarch/kvm/exit.c | 21 ++++++++++----- arch/loongarch/kvm/vcpu.c | 37 ++++++++++++++++++--------- 3 files changed, 41 insertions(+), 19 deletions(-) diff --git a/arch/loongarch/include/asm/kvm_host.h b/arch/loongarch/include= /asm/kvm_host.h index e4fe5b8e8149..902ff7bc0e35 100644 --- a/arch/loongarch/include/asm/kvm_host.h +++ b/arch/loongarch/include/asm/kvm_host.h @@ -37,6 +37,7 @@ #define KVM_REQ_TLB_FLUSH_GPA KVM_ARCH_REQ(0) #define KVM_REQ_STEAL_UPDATE KVM_ARCH_REQ(1) #define KVM_REQ_PMU KVM_ARCH_REQ(2) +#define KVM_REQ_FPU_LOAD KVM_ARCH_REQ(3) =20 #define KVM_GUESTDBG_SW_BP_MASK \ (KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_USE_SW_BP) @@ -234,6 +235,7 @@ struct kvm_vcpu_arch { u64 vpid; gpa_t flush_gpa; =20 + int fpu_load_type; /* Frequency of stable timer in Hz */ u64 timer_mhz; ktime_t expire; diff --git a/arch/loongarch/kvm/exit.c b/arch/loongarch/kvm/exit.c index 65ec10a7245a..62403c7c6f9a 100644 --- a/arch/loongarch/kvm/exit.c +++ b/arch/loongarch/kvm/exit.c @@ -754,7 +754,8 @@ static int kvm_handle_fpu_disabled(struct kvm_vcpu *vcp= u, int ecode) return RESUME_HOST; } =20 - kvm_own_fpu(vcpu); + vcpu->arch.fpu_load_type =3D KVM_LARCH_FPU; + kvm_make_request(KVM_REQ_FPU_LOAD, vcpu); =20 return RESUME_GUEST; } @@ -794,8 +795,10 @@ static int kvm_handle_lsx_disabled(struct kvm_vcpu *vc= pu, int ecode) { if (!kvm_guest_has_lsx(&vcpu->arch)) kvm_queue_exception(vcpu, EXCCODE_INE, 0); - else - kvm_own_lsx(vcpu); + else { + vcpu->arch.fpu_load_type =3D KVM_LARCH_LSX; + kvm_make_request(KVM_REQ_FPU_LOAD, vcpu); + } =20 return RESUME_GUEST; } @@ -812,8 +815,10 @@ static int kvm_handle_lasx_disabled(struct kvm_vcpu *v= cpu, int ecode) { if (!kvm_guest_has_lasx(&vcpu->arch)) kvm_queue_exception(vcpu, EXCCODE_INE, 0); - else - kvm_own_lasx(vcpu); + else { + vcpu->arch.fpu_load_type =3D KVM_LARCH_LASX; + kvm_make_request(KVM_REQ_FPU_LOAD, vcpu); + } =20 return RESUME_GUEST; } @@ -822,8 +827,10 @@ static int kvm_handle_lbt_disabled(struct kvm_vcpu *vc= pu, int ecode) { if (!kvm_guest_has_lbt(&vcpu->arch)) kvm_queue_exception(vcpu, EXCCODE_INE, 0); - else - kvm_own_lbt(vcpu); + else { + vcpu->arch.fpu_load_type =3D KVM_LARCH_LBT; + kvm_make_request(KVM_REQ_FPU_LOAD, vcpu); + } =20 return RESUME_GUEST; } diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c index 995461d724b5..d05fe6c8f456 100644 --- a/arch/loongarch/kvm/vcpu.c +++ b/arch/loongarch/kvm/vcpu.c @@ -232,6 +232,31 @@ static void kvm_late_check_requests(struct kvm_vcpu *v= cpu) kvm_flush_tlb_gpa(vcpu, vcpu->arch.flush_gpa); vcpu->arch.flush_gpa =3D INVALID_GPA; } + + if (kvm_check_request(KVM_REQ_FPU_LOAD, vcpu)) { + switch (vcpu->arch.fpu_load_type) { + case KVM_LARCH_FPU: + kvm_own_fpu(vcpu); + break; + + case KVM_LARCH_LSX: + kvm_own_lsx(vcpu); + break; + + case KVM_LARCH_LASX: + kvm_own_lasx(vcpu); + break; + + case KVM_LARCH_LBT: + kvm_own_lbt(vcpu); + break; + + default: + break; + } + + vcpu->arch.fpu_load_type =3D 0; + } } =20 /* @@ -1286,13 +1311,11 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vc= pu, struct kvm_fpu *fpu) #ifdef CONFIG_CPU_HAS_LBT int kvm_own_lbt(struct kvm_vcpu *vcpu) { - preempt_disable(); 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; } @@ -1335,8 +1358,6 @@ static inline void kvm_check_fcsr_alive(struct kvm_vc= pu *vcpu) { } /* Enable FPU and restore context */ void kvm_own_fpu(struct kvm_vcpu *vcpu) { - preempt_disable(); - /* * Enable FPU for guest * Set FR and FRE according to guest context @@ -1347,16 +1368,12 @@ void kvm_own_fpu(struct kvm_vcpu *vcpu) kvm_restore_fpu(&vcpu->arch.fpu); vcpu->arch.aux_inuse |=3D KVM_LARCH_FPU; trace_kvm_aux(vcpu, KVM_TRACE_AUX_RESTORE, KVM_TRACE_AUX_FPU); - - preempt_enable(); } =20 #ifdef CONFIG_CPU_HAS_LSX /* Enable LSX and restore context */ int kvm_own_lsx(struct kvm_vcpu *vcpu) { - preempt_disable(); - /* Enable LSX for guest */ kvm_check_fcsr(vcpu, vcpu->arch.fpu.fcsr); set_csr_euen(CSR_EUEN_LSXEN | CSR_EUEN_FPEN); @@ -1378,7 +1395,6 @@ int kvm_own_lsx(struct kvm_vcpu *vcpu) =20 trace_kvm_aux(vcpu, KVM_TRACE_AUX_RESTORE, KVM_TRACE_AUX_LSX); vcpu->arch.aux_inuse |=3D KVM_LARCH_LSX | KVM_LARCH_FPU; - preempt_enable(); =20 return 0; } @@ -1388,8 +1404,6 @@ int kvm_own_lsx(struct kvm_vcpu *vcpu) /* Enable LASX and restore context */ int kvm_own_lasx(struct kvm_vcpu *vcpu) { - preempt_disable(); - kvm_check_fcsr(vcpu, vcpu->arch.fpu.fcsr); set_csr_euen(CSR_EUEN_FPEN | CSR_EUEN_LSXEN | CSR_EUEN_LASXEN); switch (vcpu->arch.aux_inuse & (KVM_LARCH_FPU | KVM_LARCH_LSX)) { @@ -1411,7 +1425,6 @@ int kvm_own_lasx(struct kvm_vcpu *vcpu) =20 trace_kvm_aux(vcpu, KVM_TRACE_AUX_RESTORE, KVM_TRACE_AUX_LASX); vcpu->arch.aux_inuse |=3D KVM_LARCH_LASX | KVM_LARCH_LSX | KVM_LARCH_FPU; - preempt_enable(); =20 return 0; } --=20 2.39.3