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 E60181F7580; Mon, 23 Jun 2025 22:09:04 +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=1750716545; cv=none; b=SoscdxeJFf3Ov32je3pfqo07B6Eh4JaNN5IYtvm2/Eexse6SBlziD1BSGfW4Qr05jdr89u4IqnZlPRWbjGm6haAQcVRnI7DZ70b+hNOyW29aqyX/V305DdwprEGcTwiTwO+NFl8RGmqdNOl2FmkFdMnrtQ8lD6A3kb8Lc/Fy0E0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716545; c=relaxed/simple; bh=hssEem2guCdLqEmgpj0YDRQHeHQ9WAqfmL4NzcpUdmI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dcg4gSCJ0uArH3Jswz0rECHGTQv34x7FWTdhmpMJJlsqB/OhQa2m4BfMX962LiQw/oWnnYF7ZJ3TtGhyZTvglKXin8HSRUbvUBJ40bOeGi1m1GpQqpx++hfMUll1r9uY36VE6sVSi7Y2GWIHGOIoDqST4HFEG++m7Nw41AQhxCE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RZhI9v1f; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RZhI9v1f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21609C4CEEA; Mon, 23 Jun 2025 22:09:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750716544; bh=hssEem2guCdLqEmgpj0YDRQHeHQ9WAqfmL4NzcpUdmI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RZhI9v1fnEb8zCAJ7T2879ctFPMSYfyiLKpvyprCLWgcD/0kPW6tDCbphQ6yfbuuw TDfV0znOJI6nKvl3mdALXv6ej4kFpNrjcGHKrVX68wEgsmDNUHxPqNyp6aLNrE8Fa2 OhV0AY44ceEqc7e7erkxyKdQyYcJ2hl8ASiFMbKE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vince Weaver , Kan Liang , "Peter Zijlstra (Intel)" , Ingo Molnar Subject: [PATCH 6.15 560/592] perf/x86/intel: Fix crash in icl_update_topdown_event() Date: Mon, 23 Jun 2025 15:08:38 +0200 Message-ID: <20250623130713.762462406@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130700.210182694@linuxfoundation.org> References: <20250623130700.210182694@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kan Liang commit b0823d5fbacb1c551d793cbfe7af24e0d1fa45ed upstream. The perf_fuzzer found a hard-lockup crash on a RaptorLake machine: Oops: general protection fault, maybe for address 0xffff89aeceab400: 0000 CPU: 23 UID: 0 PID: 0 Comm: swapper/23 Tainted: [W]=WARN Hardware name: Dell Inc. Precision 9660/0VJ762 RIP: 0010:native_read_pmc+0x7/0x40 Code: cc e8 8d a9 01 00 48 89 03 5b cd cc cc cc cc 0f 1f ... RSP: 000:fffb03100273de8 EFLAGS: 00010046 .... Call Trace: icl_update_topdown_event+0x165/0x190 ? ktime_get+0x38/0xd0 intel_pmu_read_event+0xf9/0x210 __perf_event_read+0xf9/0x210 CPUs 16-23 are E-core CPUs that don't support the perf metrics feature. The icl_update_topdown_event() should not be invoked on these CPUs. It's a regression of commit: f9bdf1f95339 ("perf/x86/intel: Avoid disable PMU if !cpuc->enabled in sample read") The bug introduced by that commit is that the is_topdown_event() function is mistakenly used to replace the is_topdown_count() call to check if the topdown functions for the perf metrics feature should be invoked. Fix it. Fixes: f9bdf1f95339 ("perf/x86/intel: Avoid disable PMU if !cpuc->enabled in sample read") Closes: https://lore.kernel.org/lkml/352f0709-f026-cd45-e60c-60dfd97f73f3@maine.edu/ Reported-by: Vince Weaver Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Tested-by: Vince Weaver Cc: stable@vger.kernel.org # v6.15+ Link: https://lore.kernel.org/r/20250612143818.2889040-1-kan.liang@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -2810,7 +2810,7 @@ static void intel_pmu_read_event(struct * If the PEBS counters snapshotting is enabled, * the topdown event is available in PEBS records. */ - if (is_topdown_event(event) && !is_pebs_counter_event_group(event)) + if (is_topdown_count(event) && !is_pebs_counter_event_group(event)) static_call(intel_pmu_update_topdown_event)(event, NULL); else intel_pmu_drain_pebs_buffer();