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 F3DD9C369C2 for ; Tue, 22 Apr 2025 07:17:36 +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=ZJG9JpuQyeGoC6AIwajPzbS/oP70rc42YADTMHiIgRo=; b=L4TEK4tML/X5Md9Pj43/lF2XR4 buNWGvD58yKU9TlMxzIaMGvFbkD/MSxe9d09SSwvtJXfT3hsE5itzHMjyEWcgFYuSOW4sU8cyptZt rRQwuft7HLuAKL0zIGjqywWnymWZ7fGNr7y9KIb9ICqw/FKa5VsUn74pNQJm14/nRt5r+NbNj56fS 5Br4sSmRGQf6/fhSyQOC2l4AbT4dEdxYQoQuzbeIA4bHnsvt0mpkQa5iIZEq6vpIACmlxT7ElS0B/ QfqJ4iRh4mK0QhK06WPt7PAeR2k0Mt+emjORI6aEYok6zz4Y2Mm9it0KBeHpLB3wVe06gRnP/1zso wZ6a+o9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u77sl-000000065ic-1qHd; Tue, 22 Apr 2025 07:17:27 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u77Ns-000000061Rb-3GkQ for linux-arm-kernel@lists.infradead.org; Tue, 22 Apr 2025 06:45:34 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id D91C3A4BD61; Tue, 22 Apr 2025 06:40:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 517D7C4CEE9; Tue, 22 Apr 2025 06:45:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745304331; bh=rTIa+zMbXm9kYbtC0ScARaT0bQ2CWgqWX3ZBnug8uZA=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=0SGy7aYFA2QA9EsdHb2ZtTLqT9y0ax7btOzYWdp85fzo7cKGWiyMZSB5DRUNXiezH 3CATa8szvxbt1qkWiqUl67c80jzS75jWuok1VJhEhNI7jsLNHynEdcqy0WkKoCNPNZ YeAQ/Q/NLHSZ7LvdyocM4mScGivc/nrb54d0mIZU= Subject: Patch "KVM: arm64: Calculate cptr_el2 traps on activating traps" has been added to the 5.15-stable tree To: broonie@kernel.org,catalin.marinas@arm.com,gregkh@linuxfoundation.org,james.clark@linaro.org,james.morse@arm.com,kvmarm@lists.cs.columbia.edu,linux-arm-kernel@lists.infradead.org,maz@kernel.org,oleg@redhat.com,oliver.upton@linux.dev,suzuki.poulose@arm.com,tabba@google.com,will@kernel.org Cc: From: Date: Tue, 22 Apr 2025 08:45:13 +0200 In-Reply-To: <20250408-stable-sve-5-15-v3-10-ca9a6b850f55@kernel.org> Message-ID: <2025042213-threefold-untangled-267a@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_234532_958220_9568C783 X-CRM114-Status: GOOD ( 19.31 ) 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: Calculate cptr_el2 traps on activating traps 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-calculate-cptr_el2-traps-on-activating-traps.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:50 2025 From: Mark Brown Date: Tue, 08 Apr 2025 19:10:05 +0100 Subject: KVM: arm64: Calculate cptr_el2 traps on activating traps 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 , Fuad Tabba , James Clark Message-ID: <20250408-stable-sve-5-15-v3-10-ca9a6b850f55@kernel.org> From: Fuad Tabba [ Upstream commit 2fd5b4b0e7b440602455b79977bfa64dea101e6c ] Similar to VHE, calculate the value of cptr_el2 from scratch on activate traps. This removes the need to store cptr_el2 in every vcpu structure. Moreover, some traps, such as whether the guest owns the fp registers, need to be set on every vcpu run. Reported-by: James Clark Fixes: 5294afdbf45a ("KVM: arm64: Exclude FP ownership from kvm_vcpu_arch") Signed-off-by: Fuad Tabba Link: https://lore.kernel.org/r/20241216105057.579031-13-tabba@google.com Signed-off-by: Marc Zyngier Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/kvm_host.h | 1 - arch/arm64/kvm/arm.c | 1 - arch/arm64/kvm/hyp/nvhe/switch.c | 35 ++++++++++++++++++++++++++--------- 3 files changed, 26 insertions(+), 11 deletions(-) --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -301,7 +301,6 @@ struct kvm_vcpu_arch { /* Values of trap registers for the guest. */ u64 hcr_el2; u64 mdcr_el2; - u64 cptr_el2; /* Values of trap registers for the host before guest entry. */ u64 mdcr_el2_host; --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1138,7 +1138,6 @@ static int kvm_arch_vcpu_ioctl_vcpu_init } vcpu_reset_hcr(vcpu); - vcpu->arch.cptr_el2 = CPTR_EL2_DEFAULT; /* * Handle the "start in power-off" case. --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -34,21 +34,38 @@ DEFINE_PER_CPU(struct kvm_host_data, kvm DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); DEFINE_PER_CPU(unsigned long, kvm_hyp_vector); -static void __activate_traps(struct kvm_vcpu *vcpu) +static bool guest_owns_fp_regs(struct kvm_vcpu *vcpu) { - u64 val; + return vcpu->arch.flags & KVM_ARM64_FP_ENABLED; +} - ___activate_traps(vcpu); - __activate_traps_common(vcpu); +static void __activate_cptr_traps(struct kvm_vcpu *vcpu) +{ + u64 val = CPTR_EL2_TAM; /* Same bit irrespective of E2H */ - val = vcpu->arch.cptr_el2; - val |= CPTR_EL2_TTA | CPTR_EL2_TAM; - if (!update_fp_enabled(vcpu)) { - val |= CPTR_EL2_TFP | CPTR_EL2_TZ; - __activate_traps_fpsimd32(vcpu); + /* !hVHE case upstream */ + if (1) { + val |= CPTR_EL2_TTA | CPTR_NVHE_EL2_RES1; + + if (!vcpu_has_sve(vcpu) || !guest_owns_fp_regs(vcpu)) + val |= CPTR_EL2_TZ; + + if (!guest_owns_fp_regs(vcpu)) + val |= CPTR_EL2_TFP; } + if (!guest_owns_fp_regs(vcpu)) + __activate_traps_fpsimd32(vcpu); + write_sysreg(val, cptr_el2); +} + +static void __activate_traps(struct kvm_vcpu *vcpu) +{ + ___activate_traps(vcpu); + __activate_traps_common(vcpu); + __activate_cptr_traps(vcpu); + write_sysreg(__this_cpu_read(kvm_hyp_vector), vbar_el2); if (cpus_have_final_cap(ARM64_WORKAROUND_SPECULATIVE_AT)) { 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