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=1795052053; b=ZWCEjSHmo4TrQuDFzORgQo4H+HmGib6X8QIygwkv5eJNlbFYdz+nCvSMvaCRItmkxVGq g+s7+/K5yK/yNRVflIayi+rOJNkHUp69vZFuYJGkXs/2EVUvepDpIyOvqbfGMF8PVV5Ws 7l/jA7GxTU2vMHXpWk271HmTcGEBjJq8SBIQ6vOuFGcMEu0SpmqLxzevDHZJst666OWmQ dNcgRateMK4gLNuEIHUwGgkmGvAeAfSXXYQbf0GubMkebEc4ZrqWYnvjsjFfzT5rEi1m1 Ze3RrV3bz79vVC2TIyfHptfqD0lzgo2UUVwLwmKygZ9ZXaCKfgi/eJxLRm8ABNM02Kg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795052053; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Gf+O6iS2PqB17/7hTB43YPiLzNET6GCw5UfxiQn5WSk=; b=puYEwARQQVsfvAkdL2/NdfmwQBF+ep4Q/EWIVBPCrJyj37oBdH3UECrVPD0fV50UkTA6 9A2teq+dSioAsamHDepieXShB+3d72DonRH8CcxS4bunmLpUV0a0Zwwycgxm2fItiV5X4 VIQWoMel2Zyda4apv7tVDFR8UpNrWVdQfGDVVO49lUa3S9k5h/nerki3BF9RzTFswM9eZ sPA7eMsloxXsT6N8e2x0ArCDbKrrkfyPfFFtrQ/Cnq3YepX40qtnS6+OeOzPrRwm4Uf9t 9I0T8XBkUZym9H2LMI5XLYgzl6+reJE3UqPhakRzOqD4dFKrIKd25aX6uSCsMqYXmAw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=hlFOUZCC; 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 1534A606A31C; Thu, 19 Nov 2026 01:34:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=hlFOUZCC Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A7D11F000C4; Thu, 19 Nov 2026 01:34:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795052052; bh=Gf+O6iS2PqB17/7hTB43YPiLzNET6GCw5UfxiQn5WSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hlFOUZCCKldlIQ99F3WfNQ3IdJg60TFGthxaf6ho8LSOFR172I/8HrbmhNX727CWZ 5X5MfSDI3HHyY6aYG8LlkZ69dnI2Q2DrWRcSuGwn3vqhT+GrqTY9RX02gesqPmiDqE DjYsjrn8gCnprR0nivBCy09MxSa/GWVqikh43pi0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christian Borntraeger , Sumanth Korikkar , Heiko Carstens , Sasha Levin Subject: [PATCH 5.15 0428/2214] s390/cpum_cf: Check session mask before cpu offline Date: Wed, 18 Nov 2026 15:35:04 +0100 Message-ID: <20261118150028.008580788@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sumanth Korikkar [ Upstream commit 99a95985dfc85eecad97f0991a2401d2fcef294c ] cfset_offline_cpu() stops counter sets for every active session without checking whether the outgoing cpu belongs to the session mask. For example, run an hwctr session on cpu0 and a cpu bound perf event on cpu1: lshwc -l 9999 -i 5 0:b perf stat -C 1 -e cpum_cf/CPU_CYCLES/ sleep 120 chcpu -d 1 chcpu -e 1 Although the hwctr session does not include cpu1, cfset_offline_cpu() decrements its counter set reference count. The subsequent perf teardown decrements it again, causing it to underflow. The perf event keeps the percpu state alive across hotplug. When cpu1 comes online, the hwctr session is started there and the reference count moves from -1 to 0. Stopping the hwctr session then decrements it to -1 again, so the zero triggered counter set disable path is skipped. Check the session mask before stopping counter sets on the outgoing cpu. This prevents the unmatched decrement and the resulting reference count underflow. Fixes: a029a4eab39e ("s390/cpumf: Allow concurrent access for CPU Measurement Counter Facility") Reported-by: Christian Borntraeger Cc: stable@vger.kernel.org # v5.14+ Signed-off-by: Sumanth Korikkar Reviewed-by: Heiko Carstens Signed-off-by: Heiko Carstens [ sashal: adapted the per-session CPU-mask check to the existing if condition for the single global cfset_request. ] Signed-off-by: Sasha Levin --- arch/s390/kernel/perf_cpum_cf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c index d2a2a18b55808..f7b270d2404cc 100644 --- a/arch/s390/kernel/perf_cpum_cf.c +++ b/arch/s390/kernel/perf_cpum_cf.c @@ -1223,7 +1223,8 @@ int cfset_offline_cpu(unsigned int cpu) struct cfset_call_on_cpu_parm p; mutex_lock(&cfset_ctrset_mutex); - if (cfset_request.ctrset) { + if (cfset_request.ctrset && + cpumask_test_cpu(cpu, &cfset_request.mask)) { p.sets = cfset_request.ctrset; cfset_ioctl_off(&p); cpumask_clear_cpu(cpu, &cfset_request.mask); -- 2.53.0