From nobody Mon Jun 15 00:11:18 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 7913B3921C7; Tue, 7 Apr 2026 07:06:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775545603; cv=none; b=q0/93SZP4AsTwBbSPQUTYoZZxiGdDyarDb+DkLEt/Q0RByc3nvb0+4iDDTmDlYXf2tQdQke9f09wODOhSfZGETPFVsouq38hLFENG9C5KEVD3nonDijyb+sUuJUdBFlNv7mUCWlPYvXpX3Pu/3qquu3M6CSMImmVV2Cd5SxL1xM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775545603; c=relaxed/simple; bh=plJP0pd0uSYXAkIuBW9kJurwffV76M4W10VkksmsHcw=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=pqA4ydviCbXWEdh/p4dY3AC6Qk0WDXfpUwGLK33E6Gv+65OXr69cjvoSfOVHtW5b8L8MFN+knc9VzIpI0Qk0uJBYl1J25bU2asOpugfdxNyc5FoQQPTIEtqPoIK7wtqKbWXWdfR4cuejBW1dAXy82TSaV7pRRJm6E0vl8V+sjoo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=xA5cjJH2; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=KSGLOox9; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="xA5cjJH2"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="KSGLOox9" Date: Tue, 07 Apr 2026 07:06:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1775545600; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mJp9MgcRbyICYZBROV9hcFqxL9TPsb0VrFxA7yerFlY=; b=xA5cjJH2iNuix4HarEqlTRbwuN6mbCIvlxKvukSA+nU7h1bE26+W1vhN5BQtqOa42KR5QI iLN6riGNsplc0JFyMJdDHj/n9+WtglZHGaTWdLHilcLS/5uU+BKK8BEBlwJC6Y0kErMmth 4YaA/A4qw/c4/HkkrSLlOo23qJYlujrFTsHRp9XXyOBdfO6M1vR8xx89pHdx8d0xZ1bGqC dt28aJWquJvm1PHXHdfHGxQwg5n+tQ4xQG4ywpchpMzHTnRG+LmgeEKXP/TExVrPhFrH8G M3eKshKJ/6ut36uwH2C8aOXyu0Z5un3pribSkmDnq1/QfCiUyjR3Dj0KP3VI9w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1775545600; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mJp9MgcRbyICYZBROV9hcFqxL9TPsb0VrFxA7yerFlY=; b=KSGLOox98VJTO6BmJlqn3Muo0nQhOKQvhyZ+0sGT99GitClhyeDrLFloypLE7g4ySSkh5t B8agwWWFwo6Fw1DQ== From: "tip-bot2 for Zide Chen" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/urgent] perf/x86/intel/uncore: Fix die ID init and look up bugs Cc: Zide Chen , "Peter Zijlstra (Intel)" , Dapeng Mi , Steve Wahl , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260313174050.171704-4-zide.chen@intel.com> References: <20260313174050.171704-4-zide.chen@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177554559865.226963.16099358041754193394.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the perf/urgent branch of tip: Commit-ID: a16d1ec4dd0cdcf689f324adde6067083bce9099 Gitweb: https://git.kernel.org/tip/a16d1ec4dd0cdcf689f324adde6067083= bce9099 Author: Zide Chen AuthorDate: Fri, 13 Mar 2026 10:40:49 -07:00 Committer: Peter Zijlstra CommitterDate: Tue, 07 Apr 2026 09:05:29 +02:00 perf/x86/intel/uncore: Fix die ID init and look up bugs In snbep_pci2phy_map_init(), in the nr_node_ids > 8 path, uncore_device_to_die() may return -1 when all CPUs associated with the UBOX device are offline. Remove the WARN_ON_ONCE(die_id =3D=3D -1) check for two reasons: - The current code breaks out of the loop. This is incorrect because pci_get_device() does not guarantee iteration in domain or bus order, so additional UBOX devices may be skipped during the scan. - Returning -EINVAL is incorrect, since marking offline buses with die_id =3D=3D -1 is expected and should not be treated as an error. Separately, when NUMA is disabled on a NUMA-capable platform, pcibus_to_node() returns NUMA_NO_NODE, causing uncore_device_to_die() to return -1 for all PCI devices. As a result, spr_update_device_location(), used on Intel SPR and EMR, ignores the corresponding PMON units and does not add them to the RB tree. Fix this by using uncore_pcibus_to_dieid(), which retrieves topology from the UBOX GIDNIDMAP register and works regardless of whether NUMA is enabled in Linux. This requires snbep_pci2phy_map_init() to be added in spr_uncore_pci_init(). Keep uncore_device_to_die() only for the nr_node_ids > 8 case, where NUMA is expected to be enabled. Fixes: 9a7832ce3d92 ("perf/x86/intel/uncore: With > 8 nodes, get pci bus di= e id from NUMA info") Fixes: 65248a9a9ee1 ("perf/x86/uncore: Add a quirk for UPI on SPR") 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-4-zide.chen@intel.com --- arch/x86/events/intel/uncore.c | 1 + arch/x86/events/intel/uncore_snbep.c | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 786bd51..e9cc1ba 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -67,6 +67,7 @@ int uncore_die_to_segment(int die) return bus ? pci_domain_nr(bus) : -EINVAL; } =20 +/* Note: This API can only be used when NUMA information is available. */ int uncore_device_to_die(struct pci_dev *dev) { int node =3D pcibus_to_node(dev->bus); diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/u= ncore_snbep.c index 0a1d081..a4b337b 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -1459,13 +1459,7 @@ static int snbep_pci2phy_map_init(int devid, int nod= eid_loc, int idmap_loc, bool } =20 map->pbus_to_dieid[bus] =3D die_id =3D uncore_device_to_die(ubox_dev); - raw_spin_unlock(&pci2phy_map_lock); - - if (WARN_ON_ONCE(die_id =3D=3D -1)) { - err =3D -EINVAL; - break; - } } } =20 @@ -6420,7 +6414,7 @@ static void spr_update_device_location(int type_id) =20 while ((dev =3D pci_get_device(PCI_VENDOR_ID_INTEL, device, dev)) !=3D NU= LL) { =20 - die =3D uncore_device_to_die(dev); + die =3D uncore_pcibus_to_dieid(dev->bus); if (die < 0) continue; =20 @@ -6444,6 +6438,11 @@ static void spr_update_device_location(int type_id) =20 int spr_uncore_pci_init(void) { + int ret =3D snbep_pci2phy_map_init(0x3250, SKX_CPUNODEID, SKX_GIDNIDMAP, = true); + + if (ret) + return ret; + /* * The discovery table of UPI on some SPR variant is broken, * which impacts the detection of both UPI and M3UPI uncore PMON.