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 B5F343D6CC7; Fri, 24 Apr 2026 13:36: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=1777037764; cv=none; b=aLP+OPWg0Vh8N9o+EtR2XEwa0LP+yAJViO8MWQ+WD3jzz68+J/a4fBw3+1l6ZtlTGrokzLgx+KD1SIb/15M9hH7NSBDFJdK3fhDG8T2rRwe17SJ4wKxr6r/A3nlnhOSL97019Sk1FoNuzJRqGWvlwwoq6+14ddjmuB88jLPnAGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777037764; c=relaxed/simple; bh=LiI6tvSg7e+6mKPok3f7JepdZfLZ5baeoJjm3q8t1uY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i8bVcWHdppMKaiaMAe8jbIjPJUvZ1oZvVxAIgcjV/9M4B3v20VZZ7PrZ7M0E0cIVDMBy/K07oNOojTV2r2az9KMZRWhKoUi/euTOsa6eWYZpATq7ktBjlZJ73rkl4Njy/1/9FI8I/r1hfd7GyPAdovLYsb18Crs7EGGjjU+swAI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=g80mM31z; 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="g80mM31z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D84CC19425; Fri, 24 Apr 2026 13:36:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777037764; bh=LiI6tvSg7e+6mKPok3f7JepdZfLZ5baeoJjm3q8t1uY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g80mM31ztZeaQqCUnB5g0NlFWgY3XZOnRC/y4sH+FIQYLloqjgbippdu3vARB/t0Q h+BbiUkvC/HGSbAHZ3etV1rjWAeEtkONUxgO5yahPDw2LOZkOiMw8x9Pbr3qQRC538 EFZzf/Vbr3IutrAlQnxZi9KpO1/u458VBGF9Pmyw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Steve Wahl , Zide Chen , "Peter Zijlstra (Intel)" , Dapeng Mi , Sasha Levin Subject: [PATCH 6.6 061/166] perf/x86/intel/uncore: Skip discovery table for offline dies Date: Fri, 24 Apr 2026 15:29:35 +0200 Message-ID: <20260424132545.514392925@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260424132532.812258529@linuxfoundation.org> References: <20260424132532.812258529@linuxfoundation.org> User-Agent: quilt/0.69 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zide Chen [ Upstream commit 7b568e9eba2fad89a696f22f0413d44cf4a1f892 ] This warning can be triggered if NUMA is disabled and the system boots with fewer CPUs than the number of CPUs in die 0. WARNING: CPU: 9 PID: 7257 at uncore.c:1157 uncore_pci_pmu_register+0x136/0x160 [intel_uncore] Currently, the discovery table continues to be parsed even if all CPUs in the associated die are offline. This can lead to an array overflow at "pmu->boxes[die] = box" in uncore_pci_pmu_register(), which may trigger the warning above or cause other issues. Fixes: edae1f06c2cd ("perf/x86/intel/uncore: Parse uncore discovery tables") Reported-by: Steve Wahl Signed-off-by: Zide Chen Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Dapeng Mi Tested-by: Steve Wahl Link: https://patch.msgid.link/20260313174050.171704-3-zide.chen@intel.com Signed-off-by: Sasha Levin --- arch/x86/events/intel/uncore_discovery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore_discovery.c b/arch/x86/events/intel/uncore_discovery.c index cb488e41807c7..3f6b20fa14eeb 100644 --- a/arch/x86/events/intel/uncore_discovery.c +++ b/arch/x86/events/intel/uncore_discovery.c @@ -319,7 +319,7 @@ bool intel_uncore_has_discovery_tables(int *ignore) (val & UNCORE_DISCOVERY_DVSEC2_BIR_MASK) * UNCORE_DISCOVERY_BIR_STEP; die = get_device_die_id(dev); - if (die < 0) + if ((die < 0) || (die >= uncore_max_dies())) continue; parse_discovery_table(dev, die, bar_offset, &parsed, ignore); -- 2.53.0