From mboxrd@z Thu Jan 1 00:00:00 1970 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 682F1225A20 for ; Fri, 21 Mar 2025 17:30:10 +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=1742578210; cv=none; b=tSZGxUhuJ9xaGDS2NBXgYkQ7rsf3PSG4xS1UkUwoTQF7vnhM7diiH6hvSp3nlfWAiBaB311xzvRy4UJkQVKuQYTqpU+ETmW48tXWTd2WioqnSMT4ZgkcaUtodizaCLtWDOZ5l34NdL8+zRPTX6V3ELbZe/TPls1zQ2Ld/QjmS7I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742578210; c=relaxed/simple; bh=dM1mvq8bGxuDuXsI03GrIpDNNkASHUFR2I96QgGGSLA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=VnDeoaX9bDi0NNZsU1GmCan60Skdy+eh/hGz39EJgdUhrTKU7cNa6Lpdd4mE7hZiuepqTNM4X0Agf9N2xEa1hIKiBES8eU+70SImZZMsUCFE98LRVJEqQGAnil1ynmd4Dp2mXvnK8wQyFoa+p6SqV0ssf2zCxN7dXkkmkKq9NSc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cOxiFPF/; 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="cOxiFPF/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0A56C4CEE3; Fri, 21 Mar 2025 17:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742578210; bh=dM1mvq8bGxuDuXsI03GrIpDNNkASHUFR2I96QgGGSLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cOxiFPF/RmwsOPHh3prnT783J8HetjYspGaOk/44HFjnJdy8lH/wlNo4qgrn/pn8C lte6j8b+rEeHQojocJe3Ok39O2bLYQgkwCqETjOhVqggYUawYq5IDuIm/0w5FQXV6i khVDFkTwMg127HoVbXSUT25FT11VeOrBxC4F0v5vpHbV+jJhgfBvJZmXeSukyryRNw +0LBC7vRSdxHxM8x1cZEa3HOnMeP7p1RgaWjrbZ5ui72AURIgZcvTOBDZjgi73Iudj NOtXY5jHsP5dSejXmYxhrT8xrK2UeJOzEsnob6i1RVBXcXFlZqbhFOIh4RelIkzovZ dnHg7ufWD5YlA== From: Sasha Levin To: stable@vger.kernel.org Cc: Mark Brown , Sasha Levin Subject: Re: [PATCH 6.12 v2 5/8] KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN Date: Fri, 21 Mar 2025 13:29:58 -0400 Message-Id: <20250321111412-417dad2a95814802@stable.kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250321-stable-sve-6-12-v2-5-417ca2278d18@kernel.org> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ Sasha's backport helper bot ] Hi, ✅ All tests passed successfully. No issues detected. No action required from the submitter. The upstream commit SHA1 provided is correct: 407a99c4654e8ea65393f412c421a55cac539f5b WARNING: Author mismatch between patch and upstream commit: Backport author: Mark Brown Commit author: Mark Rutland Status in newer kernel trees: 6.13.y | Present (different SHA1: bc7676732238) Note: The patch differs from the upstream commit: --- 1: 407a99c4654e8 ! 1: 1b4d413932773 KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN @@ Metadata ## Commit message ## KVM: arm64: Remove VHE host restore of CPACR_EL1.SMEN + [ Upstream commit 407a99c4654e8ea65393f412c421a55cac539f5b ] + When KVM is in VHE mode, the host kernel tries to save and restore the configuration of CPACR_EL1.SMEN (i.e. CPTR_EL2.SMEN when HCR_EL2.E2H=1) across kvm_arch_vcpu_load_fp() and kvm_arch_vcpu_put_fp(), since the @@ Commit message Reviewed-by: Oliver Upton Link: https://lore.kernel.org/r/20250210195226.1215254-5-mark.rutland@arm.com Signed-off-by: Marc Zyngier + [Update for rework of flags storage -- broonie] + Signed-off-by: Mark Brown ## arch/arm64/include/asm/kvm_host.h ## -@@ arch/arm64/include/asm/kvm_host.h: struct cpu_sve_state { - struct kvm_host_data { - #define KVM_HOST_DATA_FLAG_HAS_SPE 0 - #define KVM_HOST_DATA_FLAG_HAS_TRBE 1 --#define KVM_HOST_DATA_FLAG_HOST_SME_ENABLED 3 - #define KVM_HOST_DATA_FLAG_TRBE_ENABLED 4 - #define KVM_HOST_DATA_FLAG_EL1_TRACING_CONFIGURED 5 - unsigned long flags; +@@ arch/arm64/include/asm/kvm_host.h: struct kvm_vcpu_arch { + /* Save TRBE context if active */ + #define DEBUG_STATE_SAVE_TRBE __vcpu_single_flag(iflags, BIT(6)) + +-/* SME enabled for EL0 */ +-#define HOST_SME_ENABLED __vcpu_single_flag(sflags, BIT(1)) + /* Physical CPU not in supported_cpus */ + #define ON_UNSUPPORTED_CPU __vcpu_single_flag(sflags, BIT(2)) + /* WFIT instruction trapped */ ## arch/arm64/kvm/fpsimd.c ## @@ arch/arm64/kvm/fpsimd.c: void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu) @@ arch/arm64/kvm/fpsimd.c: void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu) *host_data_ptr(fp_owner) = FP_STATE_FREE; - if (system_supports_sme()) { -- host_data_clear_flag(HOST_SME_ENABLED); +- vcpu_clear_flag(vcpu, HOST_SME_ENABLED); - if (read_sysreg(cpacr_el1) & CPACR_EL1_SMEN_EL0EN) -- host_data_set_flag(HOST_SME_ENABLED); +- vcpu_set_flag(vcpu, HOST_SME_ENABLED); - } - /* @@ arch/arm64/kvm/fpsimd.c: void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) - */ - if (has_vhe() && system_supports_sme()) { - /* Also restore EL0 state seen on entry */ -- if (host_data_test_flag(HOST_SME_ENABLED)) -- sysreg_clear_set(CPACR_EL1, 0, CPACR_EL1_SMEN); +- if (vcpu_get_flag(vcpu, HOST_SME_ENABLED)) +- sysreg_clear_set(CPACR_EL1, 0, CPACR_ELx_SMEN); - else - sysreg_clear_set(CPACR_EL1, - CPACR_EL1_SMEN_EL0EN, --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.13.y | Success | Success |