From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794048138; b=tOaKewoT8EF1Efu9nfBum4Oi5342IAD/cVkVCPeJt06xHu7W7wmi8RJ+vSTAWhW+7mu2 L74MYaAxLBFgkVyWGUP4g5eh6IgkOtvV6zcy/ekQXGuxtlqf8IXN55eb1wUwhs2qj2ZSQ KDUV53xZNGg36Uz5CDD52SCYJ+ZtuGvAJZw3Dvx7kfljrWKIta0RylZgXoWsx4cALTTqa SzuimoAg8kCNl05heMCWdeXXQOyLfdiD03TND8ayzUpTdXGENko9klCIa3323AAHkGcFE DtZCjaq9GvBW8PxKzJpUo5ybt68M0fA61Qgjsy57jR4e59TGiHFCP3hRXNpX24BJ98w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048138; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=bGciTzQQ3BCupzVbFeGAMtpBw8e5QaDanpqmxqWr6iE=; b=ouAjbYx5lY5KnfSawssjNQYGp4VSlrEGtrQgus7ZuU8ONIc7tX9PTpYDkop6Jc039a7w f/djZdzqseC2c1BG+RfdO45et0Ionl8jsHZH63f62edix5It2WdJaIjfEybYNhSEs6USK TN4IBNeq9h56n1ePRzC+WgITvlyMI4vxqXyo5gv/oA6UGZxAoT+v07NRLSPnV6xmkDl2V LqpaRnCR3ikdJisn+nQedWyjZ5+AgUDJdd4So45ZgkhpU8dxqg6iPpXwRUew14rlOzqxn LJ3/1PMuWtJj5ebmGnehjsFYJjGIG9h1q/IPtOuo9kt+LWkPFSC2HFmBm7Dw/Ld8E7Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=RBER7MkJ; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10A69606A326 for ; Sat, 7 Nov 2026 10:42:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=RBER7MkJ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C5511F0089F; Sat, 7 Nov 2026 10:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048137; bh=bGciTzQQ3BCupzVbFeGAMtpBw8e5QaDanpqmxqWr6iE=; h=From:To:Cc:Subject:Date; b=RBER7MkJJ5D3NVedA92r4ox97qa+J/KR2tGVDkK50FxfiDn7UE+DIQupIv1dxVTUz vhjHDAbKYlOZAZry9QsyO12cU+SfnFE4kJ2vMY9G0hMnaeK6dN6/icyFk2MyYs0mee z/ceZfGKGXqcVAydIg03nmXSnGZMh+2m9SQk1WK9bHUFtZbRNaqsAvYB6gZ5GIQgR+ GK02uzf7HADJvGXuuMP2Az5MvIKEN1WHVLD9IUegUfP9O4WgdZH5lkmEf/9irzoRxs qmdE6K+YNW6qlL+bDTxvaS9f6SiemZbXyAB66/2MZ9YR3GSLvoXtVIUQ0cRnztXgjE FxP6YKiXeropQ== From: Sasha Levin To: christian.loehle@arm.com, sumitg@nvidia.com, rafael.j.wysocki@intel.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] ACPI: CPPC: Propagate errors from cross-CPU FFH calls" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:42:16 -0500 Message-ID: <20261107054216-failed-6.1-36e96b469da2@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 36e96b469da24868f727b4cd168d7cf01cbd163d # git commit -s git send-email --to '' --in-reply-to '20261107054216-failed-6.1-36e96b469da2@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 36e96b469da24868f727b4cd168d7cf01cbd163d Mon Sep 17 00:00:00 2001 From: Christian Loehle Date: Wed, 16 Sep 2026 17:28:02 +0100 Subject: [PATCH] ACPI: CPPC: Propagate errors from cross-CPU FFH calls The arm64 and RISC-V CPPC FFH accessors ignore the return value of smp_call_function_single(). If the target CPU is offline, the call can return -ENXIO without running the callback. The accessors then consume callback output which was never initialized and may report success. CPU offlining leaves the CPU's CPPC sysfs attributes present. On arm64, the AMU feature mask does not exclude an offline CPU, so a paired counter read can expose uninitialized stack values through feedback_ctrs. RISC-V has the same problem in both SBI and CSR reads, and its write paths also inspect an uninitialized callback status after a failed cross-CPU call. Return the SMP call error before using callback output. The arm64 single and paired counter readers already check the helper's return value. For RISC-V, also check the callback status before copying a read value: an unsupported CSR sets the error but does not initialize the value. Fixes: 68c5debcc06d ("arm64: implement CPPC FFH support using AMUs") Fixes: 30f3ffbee86b ("ACPI: RISC-V: Add CPPC driver") Cc: All applicable Signed-off-by: Christian Loehle Tested-by: Sumit Gupta Link: https://patch.msgid.link/20260916162805.1039247-18-christian.loehle@arm.com Signed-off-by: Rafael J. Wysocki --- arch/arm64/kernel/topology.c | 2 +- drivers/acpi/riscv/cppc.c | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 2c030e78d5e45..55bd8fa3e95cf 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -427,7 +427,7 @@ int counters_read_on_cpu(int cpu, smp_call_func_t func, void *val) return -EPERM; func(val); } else { - smp_call_function_single(cpu, func, val, 1); + return smp_call_function_single(cpu, func, val, 1); } return 0; diff --git a/drivers/acpi/riscv/cppc.c b/drivers/acpi/riscv/cppc.c index 42c1a90524707..4ea4ddedd91f1 100644 --- a/drivers/acpi/riscv/cppc.c +++ b/drivers/acpi/riscv/cppc.c @@ -97,6 +97,7 @@ bool cpc_ffh_supported(void) int cpc_read_ffh(int cpu, struct cpc_reg *reg, u64 *val) { struct sbi_cppc_data data; + int ret; if (WARN_ON_ONCE(irqs_disabled())) return -EPERM; @@ -107,19 +108,27 @@ int cpc_read_ffh(int cpu, struct cpc_reg *reg, u64 *val) data.reg = FFH_CPPC_SBI_REG(reg->address); - smp_call_function_single(cpu, sbi_cppc_read, &data, 1); + ret = smp_call_function_single(cpu, sbi_cppc_read, &data, 1); + if (ret) + return ret; + if (data.ret.error) + return sbi_err_map_linux_errno(data.ret.error); *val = data.ret.value; - return (data.ret.error) ? sbi_err_map_linux_errno(data.ret.error) : 0; + return 0; } else if (FFH_CPPC_TYPE(reg->address) == FFH_CPPC_CSR) { data.reg = FFH_CPPC_CSR_NUM(reg->address); - smp_call_function_single(cpu, cppc_ffh_csr_read, &data, 1); + ret = smp_call_function_single(cpu, cppc_ffh_csr_read, &data, 1); + if (ret) + return ret; + if (data.ret.error) + return data.ret.error; *val = data.ret.value; - return data.ret.error; + return 0; } return -EINVAL; @@ -128,6 +137,7 @@ int cpc_read_ffh(int cpu, struct cpc_reg *reg, u64 *val) int cpc_write_ffh(int cpu, struct cpc_reg *reg, u64 val) { struct sbi_cppc_data data; + int ret; if (WARN_ON_ONCE(irqs_disabled())) return -EPERM; @@ -139,14 +149,18 @@ int cpc_write_ffh(int cpu, struct cpc_reg *reg, u64 val) data.reg = FFH_CPPC_SBI_REG(reg->address); data.val = val; - smp_call_function_single(cpu, sbi_cppc_write, &data, 1); + ret = smp_call_function_single(cpu, sbi_cppc_write, &data, 1); + if (ret) + return ret; return (data.ret.error) ? sbi_err_map_linux_errno(data.ret.error) : 0; } else if (FFH_CPPC_TYPE(reg->address) == FFH_CPPC_CSR) { data.reg = FFH_CPPC_CSR_NUM(reg->address); data.val = val; - smp_call_function_single(cpu, cppc_ffh_csr_write, &data, 1); + ret = smp_call_function_single(cpu, cppc_ffh_csr_write, &data, 1); + if (ret) + return ret; return data.ret.error; } -- 2.53.0