From patchwork Mon Feb 26 20:44:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13572956 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D3AB5C48BF6 for ; Mon, 26 Feb 2024 21:44:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WkP7Dn2Y6T9duQ5T0Ck+kpXkcWHgkpH1OBgEFuJvOIA=; b=tTjDo6xsKCV83J +OremBuhN+HVzYGIkFU81BRuzjFwzUNtAeQFGn5k/14s3SjOVO9VPMechGr7q34Zn6Ckmiyo5+nLc wQKU99xmVwLYV5W4AmRIMvmWSSOgJfe+a5SwD17XFwAhXIxWk9UbkJ1G5y4EAQwnUshU2qg7qddPY s7kO4yrRXaO2pvCoKEAzGIRqyc01gnQ1g8EMDeZ7r7OtIq5dwkgENsnjl25OFc8ynhS01P7TRx7Kt 0sgJVIz1gQsvlmJKBG+BkZKsnuLh7vOMg8MaLXOpXujuYtLozsY+kOgGnCKSRUvngeSJSwjA++iju PxwM+QRbPx3yx0elsFKg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1reilZ-00000002kXN-1UxX; Mon, 26 Feb 2024 21:44:06 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1reilK-00000002kRX-2czu for linux-arm-kernel@lists.infradead.org; Mon, 26 Feb 2024 21:43:53 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 0CEBDCE1AA2; Mon, 26 Feb 2024 21:43:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D536C433A6; Mon, 26 Feb 2024 21:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708983828; bh=Jec+4jSEe3TE9NlPCIYI3vp1JTkd6IOOCraufqfC27M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=a+aG+x78P7NW2Nj1FmO3D/uRGKdQFzq8iwfBek8oRL0YSFz6bCfihGgQs7vB0zy3R su1UhucYcu9jFXaU/cGebwZtVpsLwiwgU3PoM2t9dh44oxOMNu+9vFeg6r4iCYDmml 9wbYxo8oEjh+1tFMnIn1W31g20cjucYC9i+LljVuAkOv4IiS6d+AbvAdgec57E1pdQ Hnl7hmfqj6t1/1/knncZ22/cOksnCoJvAWKHFIHxGF+urxclZ6kdfqCvYzLqEQB81h oSpNhmlGlfMABanjmTHhULGsMtoH24U+3gphcev8NZQ/i7C/lpgiOUfsOJuXfENKia 20uNWKcQSGsvA== From: Mark Brown Date: Mon, 26 Feb 2024 20:44:10 +0000 Subject: [PATCH 1/2] KVM: arm64: Rename variable for tracking ownership of FP state MIME-Version: 1.0 Message-Id: <20240226-kvm-arm64-group-fp-data-v1-1-07d13759517e@kernel.org> References: <20240226-kvm-arm64-group-fp-data-v1-0-07d13759517e@kernel.org> In-Reply-To: <20240226-kvm-arm64-group-fp-data-v1-0-07d13759517e@kernel.org> To: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-a684c X-Developer-Signature: v=1; a=openpgp-sha256; l=8388; i=broonie@kernel.org; h=from:subject:message-id; bh=Jec+4jSEe3TE9NlPCIYI3vp1JTkd6IOOCraufqfC27M=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBl3QYOoqwHcuZulALfPHG3XnAMl4YDy7lOglcCoS6I K5Ee6KGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZd0GDgAKCRAk1otyXVSH0CnbB/ 4xC5iAHrUF08i9DPh17+BqLgs/3GTTiDZdE70rolU+sX+TNMsSXUvJJ9eYab9s4LUkQdvBJADrk031 t8CraKfPviP72eefkre5W8zyl++GKWldV0Tjmu3GNvRbLNDqzOKhbVC7oaWVEVsjz1r+UX7/jL8qJw IwD0bQRtWQ/PtVq8Ct7MGml34O9PLmxXgPG5lFmP1tVQPI9StGjRxEKuWxI76SdT2Ew8rjnjTlK4rB TIHPBtb2qQcliwvuGYFd8Q+9yYG9NB/cAi6FN3CgE28YVG+maj6wQWv0hFgX4cqoZIW4vVIfU/ICiH FqZFZB9BehOp8PJANwnCw7SAmIcFmE X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240226_134351_897271_5B5B6BD4 X-CRM114-Status: GOOD ( 23.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In preparation for refactoring how we store the actual FP state into a single struct let's free up the name 'fp_state' which we currently use for the variable where we track the ownership of the FP registers to something a bit more specific to it's usage. While we're at it also move the enum definition next to the rest of the FP state. No functional changes. Signed-off-by: Mark Brown --- arch/arm64/include/asm/kvm_emulate.h | 4 ++-- arch/arm64/include/asm/kvm_host.h | 14 +++++++------- arch/arm64/kvm/arm.c | 2 +- arch/arm64/kvm/fpsimd.c | 10 +++++----- arch/arm64/kvm/hyp/include/hyp/switch.h | 6 +++--- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 4 ++-- arch/arm64/kvm/hyp/nvhe/switch.c | 2 +- arch/arm64/kvm/hyp/vhe/switch.c | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index b804fe832184..1211d93aa712 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -593,7 +593,7 @@ static __always_inline u64 kvm_get_reset_cptr_el2(struct kvm_vcpu *vcpu) val = (CPACR_EL1_FPEN_EL0EN | CPACR_EL1_FPEN_EL1EN); if (!vcpu_has_sve(vcpu) || - (vcpu->arch.fp_state != FP_STATE_GUEST_OWNED)) + (vcpu->arch.fp_owner != FP_STATE_GUEST_OWNED)) val |= CPACR_EL1_ZEN_EL1EN | CPACR_EL1_ZEN_EL0EN; if (cpus_have_final_cap(ARM64_SME)) val |= CPACR_EL1_SMEN_EL1EN | CPACR_EL1_SMEN_EL0EN; @@ -601,7 +601,7 @@ static __always_inline u64 kvm_get_reset_cptr_el2(struct kvm_vcpu *vcpu) val = CPTR_NVHE_EL2_RES1; if (vcpu_has_sve(vcpu) && - (vcpu->arch.fp_state == FP_STATE_GUEST_OWNED)) + (vcpu->arch.fp_owner == FP_STATE_GUEST_OWNED)) val |= CPTR_EL2_TZ; if (cpus_have_final_cap(ARM64_SME)) val &= ~CPTR_EL2_TSM; diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 21c57b812569..e0fbba52f1d3 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -544,6 +544,13 @@ struct kvm_vcpu_arch { unsigned int sve_max_vl; u64 svcr; + /* Ownership of the FP regs */ + enum { + FP_STATE_FREE, + FP_STATE_HOST_OWNED, + FP_STATE_GUEST_OWNED, + } fp_owner; + /* Stage 2 paging state used by the hardware on next switch */ struct kvm_s2_mmu *hw_mmu; @@ -558,13 +565,6 @@ struct kvm_vcpu_arch { /* Exception Information */ struct kvm_vcpu_fault_info fault; - /* Ownership of the FP regs */ - enum { - FP_STATE_FREE, - FP_STATE_HOST_OWNED, - FP_STATE_GUEST_OWNED, - } fp_state; - /* Configuration flags, set once and for all before the vcpu can run */ u8 cflags; diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index a25265aca432..a2cba18effb2 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -377,7 +377,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) * Default value for the FP state, will be overloaded at load * time if we support FP (pretty likely) */ - vcpu->arch.fp_state = FP_STATE_FREE; + vcpu->arch.fp_owner = FP_STATE_FREE; /* Set up the timer */ kvm_timer_vcpu_init(vcpu); diff --git a/arch/arm64/kvm/fpsimd.c b/arch/arm64/kvm/fpsimd.c index 8c1d0d4853df..8dbd62d1e677 100644 --- a/arch/arm64/kvm/fpsimd.c +++ b/arch/arm64/kvm/fpsimd.c @@ -86,7 +86,7 @@ void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu) * guest in kvm_arch_vcpu_ctxflush_fp() and override this to * FP_STATE_FREE if the flag set. */ - vcpu->arch.fp_state = FP_STATE_HOST_OWNED; + vcpu->arch.fp_owner = FP_STATE_HOST_OWNED; vcpu_clear_flag(vcpu, HOST_SVE_ENABLED); if (read_sysreg(cpacr_el1) & CPACR_EL1_ZEN_EL0EN) @@ -110,7 +110,7 @@ void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu) * been saved, this is very unlikely to happen. */ if (read_sysreg_s(SYS_SVCR) & (SVCR_SM_MASK | SVCR_ZA_MASK)) { - vcpu->arch.fp_state = FP_STATE_FREE; + vcpu->arch.fp_owner = FP_STATE_FREE; fpsimd_save_and_flush_cpu_state(); } } @@ -126,7 +126,7 @@ void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_ctxflush_fp(struct kvm_vcpu *vcpu) { if (test_thread_flag(TIF_FOREIGN_FPSTATE)) - vcpu->arch.fp_state = FP_STATE_FREE; + vcpu->arch.fp_owner = FP_STATE_FREE; } /* @@ -142,7 +142,7 @@ void kvm_arch_vcpu_ctxsync_fp(struct kvm_vcpu *vcpu) WARN_ON_ONCE(!irqs_disabled()); - if (vcpu->arch.fp_state == FP_STATE_GUEST_OWNED) { + if (vcpu->arch.fp_owner == FP_STATE_GUEST_OWNED) { /* * Currently we do not support SME guests so SVCR is @@ -195,7 +195,7 @@ void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) isb(); } - if (vcpu->arch.fp_state == FP_STATE_GUEST_OWNED) { + if (vcpu->arch.fp_owner == FP_STATE_GUEST_OWNED) { if (vcpu_has_sve(vcpu)) { __vcpu_sys_reg(vcpu, ZCR_EL1) = read_sysreg_el1(SYS_ZCR); diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h index a038320cdb08..575c39847d40 100644 --- a/arch/arm64/kvm/hyp/include/hyp/switch.h +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h @@ -42,7 +42,7 @@ extern struct kvm_exception_table_entry __stop___kvm_ex_table; /* Check whether the FP regs are owned by the guest */ static inline bool guest_owns_fp_regs(struct kvm_vcpu *vcpu) { - return vcpu->arch.fp_state == FP_STATE_GUEST_OWNED; + return vcpu->arch.fp_owner == FP_STATE_GUEST_OWNED; } /* Save the 32-bit only FPSIMD system register state */ @@ -370,7 +370,7 @@ static bool kvm_hyp_handle_fpsimd(struct kvm_vcpu *vcpu, u64 *exit_code) isb(); /* Write out the host state if it's in the registers */ - if (vcpu->arch.fp_state == FP_STATE_HOST_OWNED) + if (vcpu->arch.fp_owner == FP_STATE_HOST_OWNED) __fpsimd_save_state(vcpu->arch.host_fpsimd_state); /* Restore the guest state */ @@ -383,7 +383,7 @@ static bool kvm_hyp_handle_fpsimd(struct kvm_vcpu *vcpu, u64 *exit_code) if (!(read_sysreg(hcr_el2) & HCR_RW)) write_sysreg(__vcpu_sys_reg(vcpu, FPEXC32_EL2), fpexc32_el2); - vcpu->arch.fp_state = FP_STATE_GUEST_OWNED; + vcpu->arch.fp_owner = FP_STATE_GUEST_OWNED; return true; } diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 2385fd03ed87..85ea18227d33 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -39,7 +39,7 @@ static void flush_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) hyp_vcpu->vcpu.arch.cptr_el2 = host_vcpu->arch.cptr_el2; hyp_vcpu->vcpu.arch.iflags = host_vcpu->arch.iflags; - hyp_vcpu->vcpu.arch.fp_state = host_vcpu->arch.fp_state; + hyp_vcpu->vcpu.arch.fp_owner = host_vcpu->arch.fp_owner; hyp_vcpu->vcpu.arch.debug_ptr = kern_hyp_va(host_vcpu->arch.debug_ptr); hyp_vcpu->vcpu.arch.host_fpsimd_state = host_vcpu->arch.host_fpsimd_state; @@ -64,7 +64,7 @@ static void sync_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) host_vcpu->arch.fault = hyp_vcpu->vcpu.arch.fault; host_vcpu->arch.iflags = hyp_vcpu->vcpu.arch.iflags; - host_vcpu->arch.fp_state = hyp_vcpu->vcpu.arch.fp_state; + host_vcpu->arch.fp_owner = hyp_vcpu->vcpu.arch.fp_owner; host_cpu_if->vgic_hcr = hyp_cpu_if->vgic_hcr; for (i = 0; i < hyp_cpu_if->used_lrs; ++i) diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c index c50f8459e4fc..9f9404c9bbae 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -337,7 +337,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) __sysreg_restore_state_nvhe(host_ctxt); - if (vcpu->arch.fp_state == FP_STATE_GUEST_OWNED) + if (vcpu->arch.fp_owner == FP_STATE_GUEST_OWNED) __fpsimd_save_fpexc32(vcpu); __debug_switch_to_host(vcpu); diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c index 1581df6aec87..17596586806c 100644 --- a/arch/arm64/kvm/hyp/vhe/switch.c +++ b/arch/arm64/kvm/hyp/vhe/switch.c @@ -258,7 +258,7 @@ static int __kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) sysreg_restore_host_state_vhe(host_ctxt); - if (vcpu->arch.fp_state == FP_STATE_GUEST_OWNED) + if (vcpu->arch.fp_owner == FP_STATE_GUEST_OWNED) __fpsimd_save_fpexc32(vcpu); __debug_switch_to_host(vcpu); From patchwork Mon Feb 26 20:44:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13572957 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55E59C48BF6 for ; Mon, 26 Feb 2024 21:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zs7votM7XDAsJ8RA9duHrb0UkZObwTxLKQNpjVTUBGg=; b=gOGy/y1dlievKo MUalcG3lH7BNzLEmt20nU7418halFONhocbhphtpyUatLYeeMsE1JsVkji2ggWMEW3IOh/umG6qB8 w225QIzEAmXtI9N2EoLWs/3tDxqhrB5T6w17AOxCtWBAAPhi7aMMoHccOo9/TArMLlLWyQb1dKsBD WV2MoK8A4DvfVS5au6gpOE4Q0p5y/wDBHYotWtnFdxZ3lB7TRK8DDViNYxwnQMqHuHcD61sJ+LokT tnwJoZq4LvRH4IfZmXKyeYamLs0a3HB/j5jHYl5Us+3HkYgHkdHDiWWbUeHwcYymLywtTTWaDn3ML 50VbFMwwOL4cEYP2haHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1reilb-00000002kY7-0ljt; Mon, 26 Feb 2024 21:44:09 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1reilM-00000002kRn-3ytp for linux-arm-kernel@lists.infradead.org; Mon, 26 Feb 2024 21:43:54 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 4D655CE18F1; Mon, 26 Feb 2024 21:43:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFC71C433F1; Mon, 26 Feb 2024 21:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708983830; bh=hZC4T/H/3uUmFlacUDnTpnQhs8dVMlojfX4EFThzU3w=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ucfx8m/WSnG3ryl67f/6qZ33c9UDhhiB6FG4p89uvDnIXO2XRujJN7xEkDcO3Ua+R oWcKpt4TrCZjAjh7go5ASFx6dgbEVVUNb9LbLR9cR1oDmhpLQhNi+ZWQX3tqh0Pj74 wL3VzVYnY3NBDwRl/gxRylYwkemOfMtt6O+GzPlgwoc45w3Q/rkj9x65M5Gbe6phT5 zzxJGy1bZcFctXPm48Bv4LvdEmupykRxptso60dS67v6kmLT/6Qo11biWg9YzWxuOy 5ZE1wKVA4dee8f4+zhTkCCfJXySPPlkPL96nCSuToM0/P7WH8KrL7D5jXqateq9Fiz A4y92zu0uGiqQ== From: Mark Brown Date: Mon, 26 Feb 2024 20:44:11 +0000 Subject: [PATCH 2/2] KVM: arm64: Reuse struct cpu_fp_state to track the guest FP state MIME-Version: 1.0 Message-Id: <20240226-kvm-arm64-group-fp-data-v1-2-07d13759517e@kernel.org> References: <20240226-kvm-arm64-group-fp-data-v1-0-07d13759517e@kernel.org> In-Reply-To: <20240226-kvm-arm64-group-fp-data-v1-0-07d13759517e@kernel.org> To: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-a684c X-Developer-Signature: v=1; a=openpgp-sha256; l=9781; i=broonie@kernel.org; h=from:subject:message-id; bh=hZC4T/H/3uUmFlacUDnTpnQhs8dVMlojfX4EFThzU3w=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBl3QYO1hLJUK/NFohF305xR7YZG+uWE5iTVcjdg/ad FId0XKyJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZd0GDgAKCRAk1otyXVSH0EW1B/ 9kX5YFCqVWrk+J//TPYLj/tDy6p0p8l7vgAXYMiGU1FxvyX/CvEZRU0XmgV0eqEJ9N4zMiMOXxHsYm Fk2O8rvrMjvb2tPgQYfb44vy+48CiqKAKx0MMgqKrVq1rIgx+MNkDVFQgi36olK5nxETECoL0WABXf rMpUO96lvMY2p7Ue+mUDorCqpRdhlEGN335EOqE2u/0ctQGJ/+UquV+9si/0xBZIr2RIZ9QeLWKdNw zQuX8TyM4JbAze6G5Z6s5fOUlX/Gmm6pqShjV47j5dh4HYqg3z9kzu/ktR9Z9b93jcvvhTx6gtNbKQ /nbde1qaUzNxwAyo5AwjCILn8uh4Ax X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240226_134353_389966_268F0F5F X-CRM114-Status: GOOD ( 23.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org At present we store the various bits of floating point state individually in struct kvm_vpcu_arch and construct a struct cpu_fp_state to share with the host each time we exit the guest. Let's simplify this a little by having a struct cpu_fp_state in the struct kvm_vcpu_arch and initialising this while initialising the guest. As part of this remove the separate variables used for the SVE register storage and vector length information, just using the variables in the struct cpu_fp_state directly. Since cpu_fp_state stores pointers to variables to be updated as part of saving we do still need some variables stored directly in the struct for the FPSIMD registers, SVCR and the type of FP state saved. Due to the embedding of the FPSIMD registers into ucontext which is stored directly in the host's data and the future need to support KVM's system register view of SVCR and FPMR unpicking these indirections would be more involved. No functional changes. Signed-off-by: Mark Brown --- arch/arm64/include/asm/kvm_host.h | 11 +++++------ arch/arm64/kvm/arm.c | 12 ++++++++++++ arch/arm64/kvm/fpsimd.c | 19 +------------------ arch/arm64/kvm/guest.c | 21 ++++++++++++++------- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 5 +++-- arch/arm64/kvm/reset.c | 14 ++++++++------ 6 files changed, 43 insertions(+), 39 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index e0fbba52f1d3..47bd769a26ff 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -539,9 +539,8 @@ struct kvm_vcpu_arch { * floating point code saves the register state of a task it * records which view it saved in fp_type. */ - void *sve_state; + struct cpu_fp_state fp_state; enum fp_type fp_type; - unsigned int sve_max_vl; u64 svcr; /* Ownership of the FP regs */ @@ -799,16 +798,16 @@ struct kvm_vcpu_arch { /* Pointer to the vcpu's SVE FFR for sve_{save,load}_state() */ -#define vcpu_sve_pffr(vcpu) (kern_hyp_va((vcpu)->arch.sve_state) + \ - sve_ffr_offset((vcpu)->arch.sve_max_vl)) +#define vcpu_sve_pffr(vcpu) (kern_hyp_va((vcpu)->arch.fp_state.sve_state) + \ + sve_ffr_offset((vcpu)->arch.fp_state.sve_vl)) -#define vcpu_sve_max_vq(vcpu) sve_vq_from_vl((vcpu)->arch.sve_max_vl) +#define vcpu_sve_max_vq(vcpu) sve_vq_from_vl((vcpu)->arch.fp_state.sve_vl) #define vcpu_sve_state_size(vcpu) ({ \ size_t __size_ret; \ unsigned int __vcpu_vq; \ \ - if (WARN_ON(!sve_vl_valid((vcpu)->arch.sve_max_vl))) { \ + if (WARN_ON(!sve_vl_valid((vcpu)->arch.fp_state.sve_vl))) { \ __size_ret = 0; \ } else { \ __vcpu_vq = vcpu_sve_max_vq(vcpu); \ diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index a2cba18effb2..84cc0dbd9b14 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -379,6 +379,18 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) */ vcpu->arch.fp_owner = FP_STATE_FREE; + /* + * Initial setup for FP state for sharing with host, if SVE is + * enabled additional configuration will be done. + * + * Currently we do not support SME guests so SVCR is always 0 + * and we just need a variable to point to. + */ + vcpu->arch.fp_state.st = &vcpu->arch.ctxt.fp_regs; + vcpu->arch.fp_state.fp_type = &vcpu->arch.fp_type; + vcpu->arch.fp_state.svcr = &vcpu->arch.svcr; + vcpu->arch.fp_state.to_save = FP_STATE_FPSIMD; + /* Set up the timer */ kvm_timer_vcpu_init(vcpu); diff --git a/arch/arm64/kvm/fpsimd.c b/arch/arm64/kvm/fpsimd.c index 8dbd62d1e677..45fe4a942992 100644 --- a/arch/arm64/kvm/fpsimd.c +++ b/arch/arm64/kvm/fpsimd.c @@ -143,24 +143,7 @@ void kvm_arch_vcpu_ctxsync_fp(struct kvm_vcpu *vcpu) WARN_ON_ONCE(!irqs_disabled()); if (vcpu->arch.fp_owner == FP_STATE_GUEST_OWNED) { - - /* - * Currently we do not support SME guests so SVCR is - * always 0 and we just need a variable to point to. - */ - fp_state.st = &vcpu->arch.ctxt.fp_regs; - fp_state.sve_state = vcpu->arch.sve_state; - fp_state.sve_vl = vcpu->arch.sve_max_vl; - fp_state.sme_state = NULL; - fp_state.svcr = &vcpu->arch.svcr; - fp_state.fp_type = &vcpu->arch.fp_type; - - if (vcpu_has_sve(vcpu)) - fp_state.to_save = FP_STATE_SVE; - else - fp_state.to_save = FP_STATE_FPSIMD; - - fpsimd_bind_state_to_cpu(&fp_state); + fpsimd_bind_state_to_cpu(&vcpu->arch.fp_state); clear_thread_flag(TIF_FOREIGN_FPSTATE); } diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index aaf1d4939739..54e9d3b648f0 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -317,7 +317,7 @@ static int get_sve_vls(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) if (!vcpu_has_sve(vcpu)) return -ENOENT; - if (WARN_ON(!sve_vl_valid(vcpu->arch.sve_max_vl))) + if (WARN_ON(!sve_vl_valid(vcpu->arch.fp_state.sve_vl))) return -EINVAL; memset(vqs, 0, sizeof(vqs)); @@ -344,7 +344,7 @@ static int set_sve_vls(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) if (kvm_arm_vcpu_sve_finalized(vcpu)) return -EPERM; /* too late! */ - if (WARN_ON(vcpu->arch.sve_state)) + if (WARN_ON(vcpu->arch.fp_state.sve_state)) return -EINVAL; if (copy_from_user(vqs, (const void __user *)reg->addr, sizeof(vqs))) @@ -373,8 +373,11 @@ static int set_sve_vls(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) if (max_vq < SVE_VQ_MIN) return -EINVAL; - /* vcpu->arch.sve_state will be alloc'd by kvm_vcpu_finalize_sve() */ - vcpu->arch.sve_max_vl = sve_vl_from_vq(max_vq); + /* + * vcpu->arch.fp_state.sve_state will be alloc'd by + * kvm_vcpu_finalize_sve(). + */ + vcpu->arch.fp_state.sve_vl = sve_vl_from_vq(max_vq); return 0; } @@ -403,7 +406,10 @@ static int set_sve_vls(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) */ #define vcpu_sve_slices(vcpu) 1 -/* Bounds of a single SVE register slice within vcpu->arch.sve_state */ +/* + * Bounds of a single SVE register slice within + * vcpu->arch.fp_state.sve_state + */ struct sve_state_reg_region { unsigned int koffset; /* offset into sve_state in kernel memory */ unsigned int klen; /* length in kernel memory */ @@ -499,7 +505,7 @@ static int get_sve_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) if (!kvm_arm_vcpu_sve_finalized(vcpu)) return -EPERM; - if (copy_to_user(uptr, vcpu->arch.sve_state + region.koffset, + if (copy_to_user(uptr, vcpu->arch.fp_state.sve_state + region.koffset, region.klen) || clear_user(uptr + region.klen, region.upad)) return -EFAULT; @@ -525,7 +531,8 @@ static int set_sve_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) if (!kvm_arm_vcpu_sve_finalized(vcpu)) return -EPERM; - if (copy_from_user(vcpu->arch.sve_state + region.koffset, uptr, + if (copy_from_user(vcpu->arch.fp_state.sve_state + region.koffset, + uptr, region.klen)) return -EFAULT; diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 85ea18227d33..63971b801cf3 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -29,8 +29,9 @@ static void flush_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) hyp_vcpu->vcpu.arch.ctxt = host_vcpu->arch.ctxt; - hyp_vcpu->vcpu.arch.sve_state = kern_hyp_va(host_vcpu->arch.sve_state); - hyp_vcpu->vcpu.arch.sve_max_vl = host_vcpu->arch.sve_max_vl; + hyp_vcpu->vcpu.arch.fp_state.sve_state + = kern_hyp_va(host_vcpu->arch.fp_state.sve_state); + hyp_vcpu->vcpu.arch.fp_state.sve_vl = host_vcpu->arch.fp_state.sve_vl; hyp_vcpu->vcpu.arch.hw_mmu = host_vcpu->arch.hw_mmu; diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index 68d1d05672bd..675b8925242f 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -75,7 +75,7 @@ int __init kvm_arm_init_sve(void) static void kvm_vcpu_enable_sve(struct kvm_vcpu *vcpu) { - vcpu->arch.sve_max_vl = kvm_sve_max_vl; + vcpu->arch.fp_state.sve_vl = kvm_sve_max_vl; /* * Userspace can still customize the vector lengths by writing @@ -87,7 +87,7 @@ static void kvm_vcpu_enable_sve(struct kvm_vcpu *vcpu) /* * Finalize vcpu's maximum SVE vector length, allocating - * vcpu->arch.sve_state as necessary. + * vcpu->arch.fp_state.sve_state as necessary. */ static int kvm_vcpu_finalize_sve(struct kvm_vcpu *vcpu) { @@ -96,7 +96,7 @@ static int kvm_vcpu_finalize_sve(struct kvm_vcpu *vcpu) size_t reg_sz; int ret; - vl = vcpu->arch.sve_max_vl; + vl = vcpu->arch.fp_state.sve_vl; /* * Responsibility for these properties is shared between @@ -118,7 +118,8 @@ static int kvm_vcpu_finalize_sve(struct kvm_vcpu *vcpu) return ret; } - vcpu->arch.sve_state = buf; + vcpu->arch.fp_state.sve_state = buf; + vcpu->arch.fp_state.to_save = FP_STATE_SVE; vcpu_set_flag(vcpu, VCPU_SVE_FINALIZED); return 0; } @@ -149,7 +150,7 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu) void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu) { - void *sve_state = vcpu->arch.sve_state; + void *sve_state = vcpu->arch.fp_state.sve_state; kvm_vcpu_unshare_task_fp(vcpu); kvm_unshare_hyp(vcpu, vcpu + 1); @@ -162,7 +163,8 @@ void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu) static void kvm_vcpu_reset_sve(struct kvm_vcpu *vcpu) { if (vcpu_has_sve(vcpu)) - memset(vcpu->arch.sve_state, 0, vcpu_sve_state_size(vcpu)); + memset(vcpu->arch.fp_state.sve_state, 0, + vcpu_sve_state_size(vcpu)); } static void kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu)