From nobody Fri Dec 19 12:15:20 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.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 00A7916C850 for ; Wed, 26 Mar 2025 03:51:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742961070; cv=none; b=ETDA/Yg3h+76DIx+d8p9jCW0WIGhItPJ6k2x4zK5sATvVdVwM0ghFkdfNcfj03uJHmSdVZ1rvqbYc8HEKj8YMYpfgV2yy0JsFD54aqjuRmQQ9CIXjsV3PezRspNUeuB0qvhYdO0yLo4gCM9DSS4yG8SA7n2vZeaDP7pJ/pUHVa4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742961070; c=relaxed/simple; bh=3jxraLjE69gnQLWEysFoeBUKLHVIso6rk3eWNHc+GA4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NdxkbSj/9ClGpVA5jvnTF2l778xLG7MLqDLkSX/ahcuDy/mV5ekQkD4qfRv+Pz+fQ6RLBXamR0YbgevjIlkAaZif+8goWhRzcsE3HsN8ZZ/YFLYOteNDzVKbDMSEmtyoOPYWTf7CPfqdF0eQcbVRBrajKpmce5PaWlbZZGWtS2U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=4sCmJBYS; arc=none smtp.client-ip=209.85.214.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--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="4sCmJBYS" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2242ca2a4a5so77706535ad.2 for ; Tue, 25 Mar 2025 20:51:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1742961068; x=1743565868; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=uCVS+DhgJOLHYroH5VuWGGnd2W5CTNd7YHsjO54Adcw=; b=4sCmJBYSBM9f8ses29SkX7L/YfCuEuYdJ9qk/wiqtMwQK/+ZGKA8RSKhf1k42btH4U pW+lahVBnT1QCi3Q0fHi5l3sUO/a0oF18pkSOp2Ww9VicfoAbH82GQo+7apVDBMueQZU tO5v2PupokHp/tdribX6mXMRN4GbZge+kb21yUNdEpBPmzzCaFeqV6Y3zggammponV49 BigkFNd4ovyRxOsBxBKL35TCW/mHEyo2XNO33hh5/txzk+9ThVlxYgk3k+c4jNjfTatI 5LxK6SDJLML9Mg1HOmmJWBu3a9NKskSJuNsZU6RTJqOb8pFblb5LwDrHolX7Wi5OHrNW iT8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742961068; x=1743565868; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uCVS+DhgJOLHYroH5VuWGGnd2W5CTNd7YHsjO54Adcw=; b=VSSi2FqDMggNifqocGmmv/3MYqI+JyGh+NzRJ+YMBnSzIEEysGjB0OAFtrKWAcGGOO b7aEbo3Lcyiguuoy/LYEaLGwhIOUKbD0vrVSQhkGe1faPwYQA0Mym4BORGnpT1/XZwDe EHXHjNQPXrqfy/7xnDrp/EcuLqk7SW9t1vJqj9TVDId0E96cKeUlZ3e4WDMlcz067KmH TXya/0hDNIJc6QHQfMUguKL9grmMwIJO9+azEv3IlQD4prk6+gnxa0NF+KVKceUrmBmj B/mbRTb4ROGuAK40ax5PU7n7M9ZzUDBMjgPBm5RVFPNDv7wN+ElJPlP9yjWOvwfqNT8/ CMOA== X-Forwarded-Encrypted: i=1; AJvYcCVrDufSp/QeoD4TsWeegxh6TkPA6XqoGAUx/SXUj5COLL2RGZN0BG4Th3rH8rMPihKav9Nk/sCXfeLMaM4=@vger.kernel.org X-Gm-Message-State: AOJu0YxMaFpEPTrXPLlyJRqg156svbFGhYYJbhLkmunJLadUCcIYTHrJ B0j4QhKoldszGTjeVCA1gjbemUyM2A7htrLeL0mt7XQkmCqke0TFygH3QGi2sv+B32yu4rQG8yn vjbm3Dg== X-Google-Smtp-Source: AGHT+IFVfYoE7t8L3UJr15qQGlHKncIQsy7nPhLY5dK19DZs1BWjoNZ2pWij3AjrrsHCyI9ogBO2Nzy6GO4k X-Received: from pfiy3.prod.google.com ([2002:a05:6a00:1903:b0:736:8727:67fd]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:80e:b0:736:6279:ca25 with SMTP id d2e1a72fcca58-73905a27ae5mr34688941b3a.24.1742961067760; Tue, 25 Mar 2025 20:51:07 -0700 (PDT) Date: Tue, 25 Mar 2025 20:50:42 -0700 In-Reply-To: <20250326035045.129440-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250326035045.129440-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.395.g12beb8f557-goog Message-ID: <20250326035045.129440-2-irogers@google.com> Subject: [PATCH v2 1/4] perf parse-events: Avoid scanning PMUs that can't contain events From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , "Masami Hiramatsu (Google)" , James Clark , Weilin Wang , Dominique Martinet , Thomas Richter , Junhao He , Jean-Philippe Romain , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add perf_pmus__scan_for_event that only reads sysfs for pmus that could contain a given event. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 4 ++-- tools/perf/util/pmus.c | 35 ++++++++++++++++++++++++++++++++++ tools/perf/util/pmus.h | 1 + 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 5152fd5a6ead..d77af1d24985 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -434,7 +434,7 @@ int parse_events_add_cache(struct list_head *list, int = *idx, const char *name, const char *config_name =3D get_config_name(parsed_terms); const char *metric_id =3D get_config_metric_id(parsed_terms); =20 - while ((pmu =3D perf_pmus__scan(pmu)) !=3D NULL) { + while ((pmu =3D perf_pmus__scan_for_event(pmu, name)) !=3D NULL) { LIST_HEAD(config_terms); struct perf_event_attr attr; int ret; @@ -1585,7 +1585,7 @@ int parse_events_multi_pmu_add(struct parse_events_st= ate *parse_state, =20 INIT_LIST_HEAD(list); =20 - while ((pmu =3D perf_pmus__scan(pmu)) !=3D NULL) { + while ((pmu =3D perf_pmus__scan_for_event(pmu, event_name)) !=3D NULL) { bool auto_merge_stats; =20 if (parse_events__filter_pmu(parse_state, pmu)) diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index b99292de7669..f2706c395509 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -350,6 +350,41 @@ struct perf_pmu *perf_pmus__scan_core(struct perf_pmu = *pmu) return NULL; } =20 +struct perf_pmu *perf_pmus__scan_for_event(struct perf_pmu *pmu, const cha= r *event) +{ + bool use_core_pmus =3D !pmu || pmu->is_core; + + if (!pmu) { + /* Hwmon filename values that aren't used. */ + enum hwmon_type type; + int number; + /* + * Core PMUs, other sysfs PMUs and tool PMU can take all event + * types or aren't wother optimizing for. + */ + unsigned int to_read_pmus =3D PERF_TOOL_PMU_TYPE_PE_CORE_MASK | + PERF_TOOL_PMU_TYPE_PE_OTHER_MASK | + PERF_TOOL_PMU_TYPE_TOOL_MASK; + + /* Could the event be a hwmon event? */ + if (parse_hwmon_filename(event, &type, &number, /*item=3D*/NULL, /*alarm= =3D*/NULL)) + to_read_pmus |=3D PERF_TOOL_PMU_TYPE_HWMON_MASK; + + pmu_read_sysfs(to_read_pmus); + pmu =3D list_prepare_entry(pmu, &core_pmus, list); + } + if (use_core_pmus) { + list_for_each_entry_continue(pmu, &core_pmus, list) + return pmu; + + pmu =3D NULL; + pmu =3D list_prepare_entry(pmu, &other_pmus, list); + } + list_for_each_entry_continue(pmu, &other_pmus, list) + return pmu; + return NULL; +} + static struct perf_pmu *perf_pmus__scan_skip_duplicates(struct perf_pmu *p= mu) { bool use_core_pmus =3D !pmu || pmu->is_core; diff --git a/tools/perf/util/pmus.h b/tools/perf/util/pmus.h index 8def20e615ad..213ee65306d6 100644 --- a/tools/perf/util/pmus.h +++ b/tools/perf/util/pmus.h @@ -19,6 +19,7 @@ struct perf_pmu *perf_pmus__find_by_type(unsigned int typ= e); =20 struct perf_pmu *perf_pmus__scan(struct perf_pmu *pmu); struct perf_pmu *perf_pmus__scan_core(struct perf_pmu *pmu); +struct perf_pmu *perf_pmus__scan_for_event(struct perf_pmu *pmu, const cha= r *event); =20 const struct perf_pmu *perf_pmus__pmu_for_pmu_filter(const char *str); =20 --=20 2.49.0.395.g12beb8f557-goog