From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B233338592 for ; Tue, 7 Apr 2026 20:39:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775594366; cv=none; b=BarrOeIuTlulSkmffotUkeajLT/UBmKvEb+P9RuFjfLwBNKCdMY0uXP7UroHMSNMaiFUKVdIDk84Soq4Cv+ouzEQ8vfq/4wqeUq65J1fb3Tw4N4/0ermhjSTRoqfl5YizYn+9b4M/CVzboA70109XYff/MSj3lV6JJO2VZMhCVg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775594366; c=relaxed/simple; bh=k2dWZ5MmlOHrByZ5QuXRkVEPzeUFfjmbKffgSXPD5hQ=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=YR7YdAkOv6MlpI+GQyfFhgXCq1Mi3XahZtVroOmFhcbVzHzklp83XCvxZgg7qA8tlDAYnmWIQ+sJB4RPHlnsDD9rZxS7fHgixNZtWUVwTg7BgsHhCJwUL+YKIngiLrFmLXsuTXNcvCfX53/uYTI0MNcZl67Mgt1UScyTgcjD4Gg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=h94ZJKlR; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="h94ZJKlR" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2bdd327d970so226868eec.1 for ; Tue, 07 Apr 2026 13:39:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775594365; x=1776199165; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=3ylz388L31ZKflHmIpZiFslLLaKeYzQOnrVutCauvK4=; b=h94ZJKlRy2ha9xAZVj3EuNHsStjM0DKchCnn2EHX/tk7ebbK87k8dwT1/7AW8RTz/W 3cn6zzqn3CRFsraWRsy07VCfb/BVC4Vr+bb514Wtf0DuMTQF7/ys3N6IzUE8GH+SHTG8 +voWRZAjSMPw4nQHTZ7W+W8jpITnQ9ieOh2ltjeOtv+bkJ6qEdx6loQzNigOpj54Gn9k s65+mHihDCg2lVwzzETRI4+J7OyPmhztdv6nW5iu9LBBAJDgLe/KxtwIg22WlmcZQPZM AySqRVehAkrA14e+lkj8fRekInymqCk2Xinb0p6tHP2rU84CtrR1XwwQ2X0tQmxG9uvl f6kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775594365; x=1776199165; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3ylz388L31ZKflHmIpZiFslLLaKeYzQOnrVutCauvK4=; b=ZFs+8tMKcmaSY5XDLnvdll+mU5ejBXVbPkfkIa7OcNY7i9asYZhtDxTuT2Et4pC1Cs qhTcR5GSvIph3PyH3TKnznB/GuXN7hSGSASsUM2vQP8jYt2Xxw+Q+4NPSmWyq2iPqYL+ OS/+rauVF3R+S2pt62VXFyTvBoke61j/oCDiqYJe9SwYpi/JFLWtYi4dmfFIpeHcuCU7 LtoX8EK/tX/swmDmE4UJinRc3OFLAYoCWWUWFtEaYHsjOwZvC6lXqdh3jzh89OiAk3pj lEeOMW3X/U30ewxSFGMOT7uw5gxskAVPsd9QQkLlhl3RcdafMnSYXngANYOZzA+15Z2X jOYQ== X-Gm-Message-State: AOJu0YxbnktwpwYTqmg+wm5BQnU7yKz5606AhDOEZXZd4jA3krpqrUVN /43s9wAPJJImUdNyvIBu7fyKgPIq4Kgl6/2V9+RntkH1lbsWfRMSF8ZleRppKkGw+AQqWLsI5HF zMMStDBSdMLSA67NMXu7o/P+8cKBSqOcxdG1q/RsbTAaKnamizyY0Lq2TTCjkoacfQ45rsAEpHC j8PGMidXsEp9sFRkoPBkNSdiN55hO6+3AXWLlP4r1reve3 X-Received: from dycuf4.prod.google.com ([2002:a05:7300:104:b0:2cc:b61:4c8b]) (user=ctshao job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:730d:b0:2d1:9b35:4edb with SMTP id 5a478bee46e88-2d19b4501aemr1379596eec.0.1775594364299; Tue, 07 Apr 2026 13:39:24 -0700 (PDT) Date: Tue, 7 Apr 2026 13:38:42 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260407203918.3178481-1-ctshao@google.com> Subject: [PATCH v5 1/2] perf pmu intel: Generalize SNC cpumask adjustment for multiple platforms From: Chun-Tse Shao To: linux-kernel@vger.kernel.org Cc: Chun-Tse Shao , peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, james.clark@linaro.org, zide.chen@intel.com, ravi.bangoria@amd.com, linux-perf-users@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Prepare for supporting more Intel platforms with sub-NUMA clustering by generalizing the GNR specific logic. Signed-off-by: Chun-Tse Shao --- v5: Split patch. v4: lore.kernel.org/20260402205300.1953706-1-ctshao@google.com Rebase. v3: lore.kernel.org/20260212223942.3832857-1-ctshao@google.com Fix a typo. v2: lore.kernel.org/20260205232220.1980168-1-ctshao@google.com Split EMR and GNR in the SNC2 IMC cpu map. v1: lore.kernel.org/20260108184430.1210223-1-ctshao@google.com tools/perf/arch/x86/util/pmu.c | 44 +++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c index 0661e0f0b02d..938be36ec0f7 100644 --- a/tools/perf/arch/x86/util/pmu.c +++ b/tools/perf/arch/x86/util/pmu.c @@ -23,20 +23,28 @@ #include "util/env.h" #include "util/header.h" -static bool x86__is_intel_graniterapids(void) +static bool x86__is_snc_supported(void) { - static bool checked_if_graniterapids; - static bool is_graniterapids; + static bool checked_if_snc_supported; + static bool is_supported; - if (!checked_if_graniterapids) { - const char *graniterapids_cpuid = "GenuineIntel-6-A[DE]"; + if (!checked_if_snc_supported) { + + /* Graniterapids supports SNC configuration. */ + static const char *const supported_cpuids[] = { + "GenuineIntel-6-A[DE]", /* Graniterapids */ + }; char *cpuid = get_cpuid_str((struct perf_cpu){0}); - is_graniterapids = cpuid && strcmp_cpuid_str(graniterapids_cpuid, cpuid) == 0; + for (size_t i = 0; i < ARRAY_SIZE(supported_cpuids); i++) { + is_supported = cpuid && strcmp_cpuid_str(supported_cpuids[i], cpuid) == 0; + if (is_supported) + break; + } free(cpuid); - checked_if_graniterapids = true; + checked_if_snc_supported = true; } - return is_graniterapids; + return is_supported; } static struct perf_cpu_map *read_sysfs_cpu_map(const char *sysfs_path) @@ -133,8 +141,8 @@ static int uncore_imc_snc(struct perf_pmu *pmu) // Compute the IMC SNC using lookup tables. unsigned int imc_num; int snc_nodes = snc_nodes_per_l3_cache(); - const u8 snc2_map[] = {1, 1, 0, 0, 1, 1, 0, 0}; - const u8 snc3_map[] = {1, 1, 0, 0, 2, 2, 1, 1, 0, 0, 2, 2}; + const u8 snc2_map[] = {1, 1, 0, 0}; + const u8 snc3_map[] = {1, 1, 0, 0, 2, 2}; const u8 *snc_map; size_t snc_map_len; @@ -157,11 +165,12 @@ static int uncore_imc_snc(struct perf_pmu *pmu) pr_warning("Unexpected: unable to compute IMC number '%s'\n", pmu->name); return 0; } - if (imc_num >= snc_map_len) { + if (imc_num >= snc_map_len * perf_cpu_map__nr(pmu->cpus)) { pr_warning("Unexpected IMC %d for SNC%d mapping\n", imc_num, snc_nodes); return 0; } - return snc_map[imc_num]; + + return snc_map[imc_num % snc_map_len]; } static int uncore_cha_imc_compute_cpu_adjust(int pmu_snc) @@ -201,7 +210,7 @@ static int uncore_cha_imc_compute_cpu_adjust(int pmu_snc) return cpu_adjust[pmu_snc]; } -static void gnr_uncore_cha_imc_adjust_cpumask_for_snc(struct perf_pmu *pmu, bool cha) +static void uncore_cha_imc_adjust_cpumask_for_snc(struct perf_pmu *pmu, bool cha) { // With sub-NUMA clustering (SNC) there is a NUMA node per SNC in the // topology. For example, a two socket graniterapids machine may be set @@ -301,11 +310,12 @@ void perf_pmu__arch_init(struct perf_pmu *pmu) pmu->mem_events = perf_mem_events_intel_aux; else pmu->mem_events = perf_mem_events_intel; - } else if (x86__is_intel_graniterapids()) { + } else if (x86__is_snc_supported()) { if (strstarts(pmu->name, "uncore_cha_")) - gnr_uncore_cha_imc_adjust_cpumask_for_snc(pmu, /*cha=*/true); - else if (strstarts(pmu->name, "uncore_imc_")) - gnr_uncore_cha_imc_adjust_cpumask_for_snc(pmu, /*cha=*/false); + uncore_cha_imc_adjust_cpumask_for_snc(pmu, /*cha=*/true); + else if (strstarts(pmu->name, "uncore_imc_") && + !strstarts(pmu->name, "uncore_imc_free_running")) + uncore_cha_imc_adjust_cpumask_for_snc(pmu, /*cha=*/false); } } } -- 2.53.0.1213.gd9a14994de-goog