From nobody Fri Dec 19 02:50:38 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52F5C1F3FE5; Wed, 12 Mar 2025 23:49:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741823381; cv=none; b=W8ucMWjRBQtRpd+JpBLSGbRZ15YoC1IDJy7JEAiZwtvAdeIb4FMQXneNaTsp61ajc5m3ipASGL6RhHn0kw3fMZ5/MC79YB4bGfebHv9L+zHgaQfmEKiZ2L8dNy2isfUrhn+XBLa9Cyf7ZH2vHqqtuq2o4XfEs6Lm35bIP7ZqKpU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741823381; c=relaxed/simple; bh=E+aOhIZc+2/jDkgAqi9VNAFDe2MB1GBPZXykaIDdI+s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qTpfd9yhobnGZIoQI9HZicsgAu2LTQB4AktxTsKohXg1tAmKFEnhSWDA7HkOW/y0fA2a5zIa1Uj5NsNoq5lTnsKmP88PVHs96e38B+KLWFgPPEP0IkFZFfaQxDlvAIqybWYkTazpzLsKgJdDfi8bpHOTXeVAWA9U4Kw61CFV3Cs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dloNYayT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dloNYayT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40F42C4CEEB; Wed, 12 Mar 2025 23:49:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741823380; bh=E+aOhIZc+2/jDkgAqi9VNAFDe2MB1GBPZXykaIDdI+s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=dloNYayTzK62qxWcAR1OAIxrOxx5Ak3nazf7m6JEr6PklBA/4HgndLHleo/mjcChH Uu/qS30q2i3kKZs2FW09Uhf8U6t+xVYToDfIx7dPvzdMWf/1Zit2J17uR2rmj+QgUH nZYYOTh0foAmaMri7lTwkk0KMEoa6ni7j9R7Kw05dZ/c8QCvjPdiZIOrBlI55wWtZ1 gd5EjdqMU82ytGcQMLQ7InyHTVhBQP0eNQbHXWMN5ws13jVn1bPSUaAPJJsj9ZNqiP N0+bZIIbAe2ACJSnRSMQd+oH1vPGrMAS02TCn9cfXLJEAvTmhjsUhOTns3Cdk3oAaA dusSHYp3Sc+mQ== From: Mark Brown Date: Wed, 12 Mar 2025 23:49:12 +0000 Subject: [PATCH 6.13 4/8] KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250312-stable-sve-6-13-v1-4-c7ba07a6f4f7@kernel.org> References: <20250312-stable-sve-6-13-v1-0-c7ba07a6f4f7@kernel.org> In-Reply-To: <20250312-stable-sve-6-13-v1-0-c7ba07a6f4f7@kernel.org> To: Greg Kroah-Hartman , Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Mark Brown , Mark Rutland , Fuad Tabba X-Mailer: b4 0.15-dev-1b0d6 X-Developer-Signature: v=1; a=openpgp-sha256; l=3661; i=broonie@kernel.org; h=from:subject:message-id; bh=yO17/qmFqJwkGL3jxPrvPZFrNQ9AjVZUoiyN8pPAOE0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBn0h1/7kDEvykZ5MY158i3Qn9rcodBQ//fO5WGdOOg BrFNb4+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZ9IdfwAKCRAk1otyXVSH0C4xB/ 9po6iZQERoaEY6HsrKFxUy2f0XqiBA758gXr3beqeZNpQI4zs3EetjWRbbI7QqoZMQTmLotKVWip2j yL3CzFIU+Tc/gj8Ok6anioJKQHLoCHVV6N1aiPTtbZ3QI/61vS+8GxpctWnlTRBbK1liWa5WOtBBjJ GPjwZUulGj/1vOpGa7CWlUMAlJJyKMpUL2O1y+rDbvPvP93lcDV8UtdoHjZkrhUEfki7RoskSVmFjd M/u0ZQoMqHxKatBFlW3wEJpVOPMnOP6NYAhhH2N1TGXBcLPPPxwkqfRI5jroRaRrlrMQWJptaItyKI G3+iiG8ftFOrzBhmjq6pKF9AluVeOa X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB From: Mark Rutland [ Upstream commit 459f059be702056d91537b99a129994aa6ccdd35 ] When KVM is in VHE mode, the host kernel tries to save and restore the configuration of CPACR_EL1.ZEN (i.e. CPTR_EL2.ZEN when HCR_EL2.E2H=3D1) across kvm_arch_vcpu_load_fp() and kvm_arch_vcpu_put_fp(), since the configuration may be clobbered by hyp when running a vCPU. This logic is currently redundant. The VHE hyp code unconditionally configures CPTR_EL2.ZEN to 0b01 when returning to the host, permitting host kernel usage of SVE. Now that the host eagerly saves and unbinds its own FPSIMD/SVE/SME state, there's no need to save/restore the state of the EL0 SVE trap. The kernel can safely save/restore state without trapping, as described above, and will restore userspace state (including trap controls) before returning to userspace. Remove the redundant logic. Signed-off-by: Mark Rutland Reviewed-by: Mark Brown Tested-by: Mark Brown Acked-by: Will Deacon Cc: Catalin Marinas Cc: Fuad Tabba Cc: Marc Zyngier Cc: Oliver Upton Reviewed-by: Oliver Upton Link: https://lore.kernel.org/r/20250210195226.1215254-4-mark.rutland@arm.c= om Signed-off-by: Marc Zyngier [Rework for refactoring of where the flags are stored -- broonie] Signed-off-by: Mark Brown --- arch/arm64/include/asm/kvm_host.h | 2 -- arch/arm64/kvm/fpsimd.c | 16 ---------------- 2 files changed, 18 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index 0b39888e86d6d40fea56bb6cb8ccdbaf480d0d55..fe25d411d3d8efbe19d5ffba8ea= 23bf98eb06c38 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -902,8 +902,6 @@ struct kvm_vcpu_arch { /* Save TRBE context if active */ #define DEBUG_STATE_SAVE_TRBE __vcpu_single_flag(iflags, BIT(6)) =20 -/* SVE enabled for host EL0 */ -#define HOST_SVE_ENABLED __vcpu_single_flag(sflags, BIT(0)) /* SME enabled for EL0 */ #define HOST_SME_ENABLED __vcpu_single_flag(sflags, BIT(1)) /* Physical CPU not in supported_cpus */ diff --git a/arch/arm64/kvm/fpsimd.c b/arch/arm64/kvm/fpsimd.c index 2ee6bde85235581d6bc9cba7e578c55875b5d5a1..4127abfd319c2c683d2281efa52= a6abe5fac67ee 100644 --- a/arch/arm64/kvm/fpsimd.c +++ b/arch/arm64/kvm/fpsimd.c @@ -65,10 +65,6 @@ void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu) fpsimd_save_and_flush_cpu_state(); *host_data_ptr(fp_owner) =3D FP_STATE_FREE; =20 - vcpu_clear_flag(vcpu, HOST_SVE_ENABLED); - if (read_sysreg(cpacr_el1) & CPACR_EL1_ZEN_EL0EN) - vcpu_set_flag(vcpu, HOST_SVE_ENABLED); - if (system_supports_sme()) { vcpu_clear_flag(vcpu, HOST_SME_ENABLED); if (read_sysreg(cpacr_el1) & CPACR_EL1_SMEN_EL0EN) @@ -202,18 +198,6 @@ void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) * when needed. */ fpsimd_save_and_flush_cpu_state(); - } else if (has_vhe() && system_supports_sve()) { - /* - * The FPSIMD/SVE state in the CPU has not been touched, and we - * have SVE (and VHE): CPACR_EL1 (alias CPTR_EL2) has been - * reset by kvm_reset_cptr_el2() in the Hyp code, disabling SVE - * for EL0. To avoid spurious traps, restore the trap state - * seen by kvm_arch_vcpu_load_fp(): - */ - if (vcpu_get_flag(vcpu, HOST_SVE_ENABLED)) - sysreg_clear_set(CPACR_EL1, 0, CPACR_EL1_ZEN_EL0EN); - else - sysreg_clear_set(CPACR_EL1, CPACR_EL1_ZEN_EL0EN, 0); } =20 local_irq_restore(flags); --=20 2.39.5