From nobody Tue Apr 7 11:15:48 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (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 CB3ED3D090F; Fri, 13 Mar 2026 17:50:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773424245; cv=none; b=aEraKb2FrPcOF5yzl51Ue6d6ou7QOjDPQnA8LcL1+Xj1gs/2ZCO1vQ67/r1QvMc43SnEeHWqDx3CcvOBWbcbosrowtUVjyOofZkI5VG7PnUdJ03Hech3vsglImZWEVoe0fHFosyFPeRVypGO3k2mjhGU0p+wTJBPGFYMSUQxf3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773424245; c=relaxed/simple; bh=kAwEflEFGn7BzQ7fjyXQ3m+H9l8udt0j6x9b5UyeQcs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SB66ktP2qyHbPQBrBSOR7TwZqNU/z50ECSgt/3sNLfftoDBrNvW/JAAnJhipCxoX7yblpRVoDnNzCt7qHGpz0IhY+KdVhay6hKxQ8mL+Qg8H/5MIo0RRGu9dNOGK4/x3bsJLaxu+1rsbPv1eM2k1D2BFLh6JxcYApsn9ADWyVww= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=bBz+zAtl; arc=none smtp.client-ip=198.175.65.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="bBz+zAtl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1773424244; x=1804960244; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kAwEflEFGn7BzQ7fjyXQ3m+H9l8udt0j6x9b5UyeQcs=; b=bBz+zAtlo8P6inuYhMu/xDjRCHKf9OYT3ij1eM5JAlVKST/h4nuQ4hn8 X9f9bmmYu9ehRBmtR1eaRLKQxWjkjRTnVHDJTknx0wDJW7Pq35vrQxeoF luOjtYB7GKc1o+bpC1pBu/LeJw7z8DwMzKdfiqPVSQYHAzJWcnpewq1Cv Jx9zrzVBonetpYRfi609kv4aW0QBSoVKcagDjRXdzY/vDMn9IZxqYHH7K FASAizp26lqdcMn5B2szO8QRTXlSDY9CMEM23G2g59PBbWM/SEwXut5Az ohmf68q0b30D/6yUBfuU/0n3yM3BuwI707KRNdLo4VtlRR8sGGD31seux w==; X-CSE-ConnectionGUID: R64Q9sy8Sk6izamCHsXTdw== X-CSE-MsgGUID: 8QmIAlpyRKSreHzf45hAGw== X-IronPort-AV: E=McAfee;i="6800,10657,11728"; a="74508744" X-IronPort-AV: E=Sophos;i="6.23,118,1770624000"; d="scan'208";a="74508744" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2026 10:50:44 -0700 X-CSE-ConnectionGUID: 0GdhrTloQeCmo9i89vUFHA== X-CSE-MsgGUID: 4WWVtyHsTTikSnYJIkPdBA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,118,1770624000"; d="scan'208";a="259128561" Received: from 9cc2c43eec6b.jf.intel.com ([10.54.77.29]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2026 10:50:43 -0700 From: Zide Chen To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers , Adrian Hunter , Alexander Shishkin , Andi Kleen , Eranian Stephane Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Dapeng Mi , Zide Chen , Steve Wahl , Chun-Tse Shao , Markus Elfring Subject: [PATCH V4 3/4] perf/x86/intel/uncore: Fix die ID init and look up bugs Date: Fri, 13 Mar 2026 10:40:49 -0700 Message-ID: <20260313174050.171704-4-zide.chen@intel.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260313174050.171704-1-zide.chen@intel.com> References: <20260313174050.171704-1-zide.chen@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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") Tested-by: Steve Wahl Signed-off-by: Zide Chen --- V2: - Fix the commit message to note that spr_update_device_location() is used by EMR, not GNR. - Rewrite the commit message for clarity. - Add a Tested-by tag. V4: no changes. --- 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 786bd51a0d89..e9cc1ba921c5 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 9b51883fd6fd..421378f681d7 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. --=20 2.53.0