From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 D28278287E; Wed, 25 Mar 2026 00:35:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774398948; cv=none; b=KeGqhgTJ1Y4uMAIjiqmGFGj+TASECq/vHr6sIYR0GPBWBrPUF/H/cXsQtJVnCirziYlnCE2uRZms/mJoVINvt+6OljdzhC4HggBs2eFWKJ9adp06eoHtqcc+7RYh6vaQtyk9Ah4m2O0acT2Q/uz5oa20QKbZkL+HsQNmGsEdl18= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774398948; c=relaxed/simple; bh=ucyN4RURysqrObqEqU10wPsn1e70kuzgSf8CQzT6O/Q=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=dOrxJBgBIifOOwAHsIXWK+LmVWVNLBphwcSE5S36OfllX6tP1T2jNav9dxyq2tqzhTHhmZTobFKBKUWpF03dr7lzN0g16dxP4R58VUz1+izpKJCSfU4y6krtOTRjDNEWoR+y0yJj2n9KVjBVLVSDtGK5IYMGGTkcZGAgcv9D13E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=XIwfb+ji; arc=none smtp.client-ip=192.198.163.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="XIwfb+ji" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1774398947; x=1805934947; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=ucyN4RURysqrObqEqU10wPsn1e70kuzgSf8CQzT6O/Q=; b=XIwfb+jiR/HmsGJTnAd2oaTdPhHkrVME2dQGEmA8aYvfFeWvBmPELiDN 5gnGTcnnoplMFKSWsxyNi3ndlYEXC4W4a7S159dCR4lBhx9KmZ5E45c6u TIqTjeucFiCkHmHgs/k+yuAxLjbocqvlpEKG1nLrptpZUGF4pz9KvjSMc 8zSFWow6Ki8396RYdtWJ9W7D5sA9ie0rSq8d857JcckMZEHCiEQ/rT470 o0YFc6qoaO+ZPNIBsvQ+PbyIQjMMR/sb543ucV8r7hKxDUL5W/A//qkuC MKXMdWDBJFMs5SKS4wWtSrs9qGDQXCtyFRwZj+aJaS38B3fCRW1vgUqqW Q==; X-CSE-ConnectionGUID: 3lhk1A2PTIieJydCim/Z/A== X-CSE-MsgGUID: O6+botciR/2FQMDxD86dgw== X-IronPort-AV: E=McAfee;i="6800,10657,11739"; a="74455642" X-IronPort-AV: E=Sophos;i="6.23,139,1770624000"; d="scan'208";a="74455642" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2026 17:35:46 -0700 X-CSE-ConnectionGUID: T2nwQcbKSOaCHGwX2aZAzg== X-CSE-MsgGUID: uoZxD6EWTNC8EInn6p+quQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,139,1770624000"; d="scan'208";a="226150217" Received: from dapengmi-mobl1.ccr.corp.intel.com (HELO [10.124.241.147]) ([10.124.241.147]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2026 17:35:43 -0700 Message-ID: <019975ff-51a1-49f0-82b8-729ce99f56ae@linux.intel.com> Date: Wed, 25 Mar 2026 08:35:40 +0800 Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V5 3/4] perf/x86/intel/uncore: Fix die ID init and look up bugs To: Zide Chen , 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, Steve Wahl , Chun-Tse Shao , Markus Elfring References: <20260324214932.10068-1-zide.chen@intel.com> <20260324214932.10068-4-zide.chen@intel.com> Content-Language: en-US From: "Mi, Dapeng" In-Reply-To: <20260324214932.10068-4-zide.chen@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit LGTM. Reviewed-by: Dapeng Mi On 3/25/2026 5:49 AM, Zide Chen wrote: > 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 == -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 == -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 die 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. > > V5: > - Remove unused variable die_id (Dapeng). > --- > arch/x86/events/intel/uncore.c | 1 + > arch/x86/events/intel/uncore_snbep.c | 17 ++++++++--------- > 2 files changed, 9 insertions(+), 9 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; > } > > +/* Note: This API can only be used when NUMA information is available. */ > int uncore_device_to_die(struct pci_dev *dev) > { > int node = pcibus_to_node(dev->bus); > diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c > index 9b51883fd6fd..5ef205a70559 100644 > --- a/arch/x86/events/intel/uncore_snbep.c > +++ b/arch/x86/events/intel/uncore_snbep.c > @@ -1413,7 +1413,7 @@ static int topology_gidnid_map(int nodeid, u32 gidnid) > static int snbep_pci2phy_map_init(int devid, int nodeid_loc, int idmap_loc, bool reverse) > { > struct pci_dev *ubox_dev = NULL; > - int i, bus, nodeid, segment, die_id; > + int i, bus, nodeid, segment; > struct pci2phy_map *map; > int err = 0; > u32 config = 0; > @@ -1458,14 +1458,8 @@ static int snbep_pci2phy_map_init(int devid, int nodeid_loc, int idmap_loc, bool > break; > } > > - map->pbus_to_dieid[bus] = die_id = uncore_device_to_die(ubox_dev); > - > + map->pbus_to_dieid[bus] = uncore_device_to_die(ubox_dev); > raw_spin_unlock(&pci2phy_map_lock); > - > - if (WARN_ON_ONCE(die_id == -1)) { > - err = -EINVAL; > - break; > - } > } > } > > @@ -6420,7 +6414,7 @@ static void spr_update_device_location(int type_id) > > while ((dev = pci_get_device(PCI_VENDOR_ID_INTEL, device, dev)) != NULL) { > > - die = uncore_device_to_die(dev); > + die = uncore_pcibus_to_dieid(dev->bus); > if (die < 0) > continue; > > @@ -6444,6 +6438,11 @@ static void spr_update_device_location(int type_id) > > int spr_uncore_pci_init(void) > { > + int ret = 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.