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 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 E1B97C369C2 for ; Tue, 22 Apr 2025 07:29:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:From:Cc:To:Subject: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:References:List-Owner; bh=96YRPtZIpNyUdMvwMue+6nJtENlPC85UPB4Q+FgUBzY=; b=PZ4EGa+oj4Mkn/yBMI6J6WEn00 d+6qOxIh4pYgBSxJtKcntx/7HCTSVPrHBqj8Y/sH10HR/aunCsWOD3Q3g3BHALbZB35vjH7j7BxFX T6x8cegMcTx9jW8iAGS+zh9iz6WJJasl8WZ6eCBAhS6skcJN0H5GEUcNiriw8gZ8SBTNATHIYZuoe fl1kSA3pLutuxtaLeeEedxiPQrdQDZV72EZknu48tuAYBtFtWbqLlRmVLm4LMXMzxsPz7N4TKnirQ Ri6glKcfrmCUu0VKybik6Q+yRKwvPS+R9+/K+hYX1Q2VGGjxAKtSsjFx+PZBwteVpWdvAfiZg7+8t If6sTriw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u783o-000000067KN-2jgx; Tue, 22 Apr 2025 07:28:52 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u77O8-000000061XN-1vyK for linux-arm-kernel@lists.infradead.org; Tue, 22 Apr 2025 06:45:49 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id A68C64A4E7; Tue, 22 Apr 2025 06:45:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8048C4CEE9; Tue, 22 Apr 2025 06:45:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745304348; bh=aABkJok/MpbxVCb3gsQTzh7nbuFUHpojMLd1MAxhRHU=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=kpsrMD7adSPAa4KjouhIuoT8l7XUyY8/ThyEsSMQ09q5PrFUPhWwUvbC6QcAYeow0 5cEkm6zq5XBbU9Sktnk9uDzMR9JbH4RrOy/syiPixpG002MaNnttpLSQ9sTOhWEeHA pOKP/QY1/4EaHcKEknH4DA5gj1a+63daB1orsDWY= Subject: Patch "KVM: arm64: Discard any SVE state when entering KVM guests" has been added to the 5.15-stable tree To: broonie@kernel.org,catalin.marinas@arm.com,gregkh@linuxfoundation.org,james.morse@arm.com,kvmarm@lists.cs.columbia.edu,linux-arm-kernel@lists.infradead.org,mark.rutland@arm.com,maz@kernel.org,oleg@redhat.com,oliver.upton@linux.dev,suzuki.poulose@arm.com,will@kernel.org Cc: From: Date: Tue, 22 Apr 2025 08:45:14 +0200 In-Reply-To: <20250408-stable-sve-5-15-v3-3-ca9a6b850f55@kernel.org> Message-ID: <2025042214-laundry-landed-75f7@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250421_234548_545163_F5A37172 X-CRM114-Status: GOOD ( 21.51 ) 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 This is a note to let you know that I've just added the patch titled KVM: arm64: Discard any SVE state when entering KVM guests to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: kvm-arm64-discard-any-sve-state-when-entering-kvm-guests.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From broonie@kernel.org Tue Apr 8 20:22:27 2025 From: Mark Brown Date: Tue, 08 Apr 2025 19:09:58 +0100 Subject: KVM: arm64: Discard any SVE state when entering KVM guests To: Greg Kroah-Hartman , Marc Zyngier , James Morse , Suzuki K Poulose , Catalin Marinas , Will Deacon , Oleg Nesterov , Oliver Upton Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Mark Brown , Mark Rutland Message-ID: <20250408-stable-sve-5-15-v3-3-ca9a6b850f55@kernel.org> From: Mark Brown [ Upstream commit 93ae6b01bafee8fa385aa25ee7ebdb40057f6abe ] Since 8383741ab2e773a99 (KVM: arm64: Get rid of host SVE tracking/saving) KVM has not tracked the host SVE state, relying on the fact that we currently disable SVE whenever we perform a syscall. This may not be true in future since performance optimisation may result in us keeping SVE enabled in order to avoid needing to take access traps to reenable it. Handle this by clearing TIF_SVE and converting the stored task state to FPSIMD format when preparing to run the guest. This is done with a new call fpsimd_kvm_prepare() to keep the direct state manipulation functions internal to fpsimd.c. Signed-off-by: Mark Brown Reviewed-by: Catalin Marinas Reviewed-by: Marc Zyngier Link: https://lore.kernel.org/r/20221115094640.112848-2-broonie@kernel.org Signed-off-by: Will Deacon [ Mark: trivial backport to v6.1 ] Signed-off-by: Mark Rutland Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/fpsimd.h | 1 + arch/arm64/kernel/fpsimd.c | 23 +++++++++++++++++++++++ arch/arm64/kvm/fpsimd.c | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) --- a/arch/arm64/include/asm/fpsimd.h +++ b/arch/arm64/include/asm/fpsimd.h @@ -44,6 +44,7 @@ extern void fpsimd_signal_preserve_curre extern void fpsimd_preserve_current_state(void); extern void fpsimd_restore_current_state(void); extern void fpsimd_update_current_state(struct user_fpsimd_state const *state); +extern void fpsimd_kvm_prepare(void); extern void fpsimd_bind_state_to_cpu(struct user_fpsimd_state *state, void *sve_state, unsigned int sve_vl); --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -1109,6 +1109,29 @@ void fpsimd_signal_preserve_current_stat } /* + * Called by KVM when entering the guest. + */ +void fpsimd_kvm_prepare(void) +{ + if (!system_supports_sve()) + return; + + /* + * KVM does not save host SVE state since we can only enter + * the guest from a syscall so the ABI means that only the + * non-saved SVE state needs to be saved. If we have left + * SVE enabled for performance reasons then update the task + * state to be FPSIMD only. + */ + get_cpu_fpsimd_context(); + + if (test_and_clear_thread_flag(TIF_SVE)) + sve_to_fpsimd(current); + + put_cpu_fpsimd_context(); +} + +/* * Associate current's FPSIMD context with this cpu * The caller must have ownership of the cpu FPSIMD context before calling * this function. --- a/arch/arm64/kvm/fpsimd.c +++ b/arch/arm64/kvm/fpsimd.c @@ -70,12 +70,14 @@ error: void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu) { BUG_ON(!current->mm); - BUG_ON(test_thread_flag(TIF_SVE)); vcpu->arch.flags &= ~KVM_ARM64_FP_ENABLED; vcpu->arch.flags |= KVM_ARM64_FP_HOST; + fpsimd_kvm_prepare(); + vcpu->arch.flags &= ~KVM_ARM64_HOST_SVE_ENABLED; + if (read_sysreg(cpacr_el1) & CPACR_EL1_ZEN_EL0EN) vcpu->arch.flags |= KVM_ARM64_HOST_SVE_ENABLED; } Patches currently in stable-queue which might be from broonie@kernel.org are queue-5.15/kvm-arm64-remove-host-fpsimd-saving-for-non-protected-kvm.patch queue-5.15/spi-cadence-qspi-fix-probe-on-am62a-lp-sk.patch queue-5.15/asoc-qdsp6-q6asm-dai-fix-q6asm_dai_compr_set_params-error-path.patch queue-5.15/kvm-arm64-eagerly-switch-zcr_el-1-2.patch queue-5.15/kvm-arm64-unconditionally-save-flush-host-fpsimd-sve-sme-state.patch queue-5.15/kvm-arm64-always-start-with-clearing-sve-flag-on-load.patch queue-5.15/asoc-codecs-lpass-wsa-macro-fix-vi-feedback-rate.patch queue-5.15/arm64-fpsimd-track-the-saved-fpsimd-state-type-separately-to-tif_sve.patch queue-5.15/kvm-arm64-get-rid-of-host-sve-tracking-saving.patch queue-5.15/kvm-arm64-remove-vhe-host-restore-of-cpacr_el1.zen.patch queue-5.15/asoc-fsl_audmix-register-card-device-depends-on-dais.patch queue-5.15/arm64-fpsimd-have-kvm-explicitly-say-which-fp-registers-to-save.patch queue-5.15/kvm-arm64-discard-any-sve-state-when-entering-kvm-guests.patch queue-5.15/arm64-fpsimd-stop-using-tif_sve-to-manage-register-saving-in-kvm.patch queue-5.15/asoc-codecs-lpass-wsa-macro-fix-logic-of-enabling-vi-channels.patch queue-5.15/kvm-arm64-calculate-cptr_el2-traps-on-activating-traps.patch