From nobody Fri Oct 3 18:02:01 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 D56A527A130 for ; Thu, 28 Aug 2025 06:42:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756363359; cv=none; b=FeihiTD7Rt0sjRKtWKqTJzkQWlRctVuWYhPKAxkM+G76+9YC70kZhd+WHZK+nr2BMPzAisELqQojTSuZ6ARvRDhwjQR8ikCKwyzV+d7l2/BsyrJ9SKzjHSV6Oju0LWkJXIrkGSsI9yPYpO3uxwKij0bZ2owaSGtv7PVtA+Sq4xk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756363359; c=relaxed/simple; bh=J11KFE1Be/Xr62/bc+bzuCs7KvWgB6SiP/dHHQRBxgQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=t9401hbOhJH5ExSQsEoi5DDX6cVhMAkDc/voG18CDum46YHrwYMK6fl7nYF02ueqEBzqiMLzFVJTTb+VA2/IxbgzcTvPrqNnU8K6XRTf7XLb7Z4D8JMJpH63D5/jFvIqlj+w0Fef7PyiEus4yYnsymOTXHzRedw1/pp45kiA7C0= 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=4I38djJk; arc=none smtp.client-ip=209.85.216.74 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="4I38djJk" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3276f51798dso1958925a91.1 for ; Wed, 27 Aug 2025 23:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756363357; x=1756968157; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=VQ/ghY8pg6tJyPFakofOZholK8TaewPdt9a6aHSESZA=; b=4I38djJk5Jfks+CR8EYgBiYduB/07JA3XmOxFbnsGlkWXC+x2Pilj+gXbguWyJg2kY NelJPkQFTU1py8p0eGDADs3b9m3GTJX5nG5xfRZQLWPOqnh7iP7td8ko2KSaDhTWc1sW cjUFgZvRvCoCP2mw+xwd1kMHZ3hPrt3GPg1QnB1GKUpdhmgHKwJm+CPWYfUF4k9ikNVu IWb8YOuASq4cEYX4yFhqGqaHCMUOIc0C+udh5PI+cCgfUpKCv/P1NgVTxccLVlXFmsdj pAhPC17DCKDb/gVyMB/o3hWMawWJwKqb4xqufSavSNnKXd/zVUBcr4HIoovJEP6UFwn5 NW6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756363357; x=1756968157; h=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=VQ/ghY8pg6tJyPFakofOZholK8TaewPdt9a6aHSESZA=; b=ouHA2nrDNWA6CfTi28Ec//ZVW6USdo6K9Ep5vBckLTpWqbN2IXax/hbrCmLRiDVkv2 f3+8j4nJa5HnllJfMAuzhlpAEbNa+4K7PTpszeTZI4WPsf0c9tgz0+QhF31/VsDazs8r rRuNe5WZRiRKw+Fx738MarVQ/C0NlocHkteQmeZZg2iOhLC/AenWrfM5CaWiCoE2Zijy 1f4DFUr+ZZBCNJnVrM3o4j6p0e6KkxcfpljLFPcxYQEbFS6sF5P0mAVeMyQpWqNx87mv nA7uEpkVHAnCB7ud6nkzsQevJ9zMORhWzcJ+UT06SMIgbunX5oM46kjFjmvL/r47VPOF qu7w== X-Forwarded-Encrypted: i=1; AJvYcCW6Zm4eDRkTPxwnT9oJ6gNTgBik7A5ZyjNmGFLSy18dCWU5m6FWt2tRpibJn0a9L0bTsgyKg02qlXQ78cg=@vger.kernel.org X-Gm-Message-State: AOJu0YxgDgncgnpKRWRoO3MpCAhZjir3jOtok5ekVpP3G+IYQA2gi07b UivpC/OF0Y6qkIwHkZ0vcLpgy4gc+BywLXMKuGBLSYvnL+fY+/9v1AxQwbvPYFzIUZdEJ7jT9RH WEAGeB/2PTw== X-Google-Smtp-Source: AGHT+IEzx0qAvHtKrMlphcUqFxckFi7ecwTjcK6nifIhNkPX7mvuq35j2hOeabcXtlhwMfpuOO85m6fStcq+ X-Received: from pji6.prod.google.com ([2002:a17:90b:3fc6:b0:327:7035:d848]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:380a:b0:321:335e:19cc with SMTP id 98e67ed59e1d1-3275085e80dmr10021787a91.4.1756363357011; Wed, 27 Aug 2025 23:42:37 -0700 (PDT) Date: Wed, 27 Aug 2025 23:42:19 -0700 In-Reply-To: <20250828064231.1762997-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: <20250828064231.1762997-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.268.g9569e192d0-goog Message-ID: <20250828064231.1762997-2-irogers@google.com> Subject: [PATCH v1 01/13] perf parse-events: Fix legacy cache events if event is duplicated in a PMU 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 , James Clark , Xu Yang , Thomas Falcon , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, Atish Patra , Beeman Strong , Leo Yan Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The term list when adding an event to a PMU is expected to have the event name for the alias lookup. Also, set found_supported so that -EINVAL isn't returned. Fixes: 62593394f66a ("perf parse-events: Legacy cache names on all PMUs and lower priority") Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 28 +++++++++++++++++++++++++++- tools/perf/util/parse-events.h | 3 ++- tools/perf/util/parse-events.y | 2 +- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 8282ddf68b98..c219e3ffae65 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -465,8 +465,10 @@ static int parse_events_add_pmu(struct parse_events_st= ate *parse_state, =20 int parse_events_add_cache(struct list_head *list, int *idx, const char *n= ame, struct parse_events_state *parse_state, - struct parse_events_terms *parsed_terms) + struct parse_events_terms *parsed_terms, + void *loc_) { + YYLTYPE *loc =3D loc_; struct perf_pmu *pmu =3D NULL; bool found_supported =3D false; const char *config_name =3D get_config_name(parsed_terms); @@ -487,12 +489,36 @@ int parse_events_add_cache(struct list_head *list, in= t *idx, const char *name, * The PMU has the event so add as not a legacy cache * event. */ + struct parse_events_terms temp_terms; + struct parse_events_term *term; + char *config =3D strdup(name); + + if (!config) + goto out_err; + + parse_events_terms__init(&temp_terms); + if (!parsed_terms) + parsed_terms =3D &temp_terms; + + if (parse_events_term__num(&term, + PARSE_EVENTS__TERM_TYPE_USER, + config, /*num=3D*/1, /*novalue=3D*/true, + loc, /*loc_val=3D*/NULL) < 0) { + zfree(&config); + goto out_err; + } + list_add(&term->list, &parsed_terms->terms); + ret =3D parse_events_add_pmu(parse_state, list, pmu, parsed_terms, first_wildcard_match, /*alternate_hw_config=3D*/PERF_COUNT_HW_MAX); + list_del_init(&term->list); + parse_events_term__delete(term); + parse_events_terms__exit(&temp_terms); if (ret) goto out_err; + found_supported =3D true; if (first_wildcard_match =3D=3D NULL) first_wildcard_match =3D container_of(list->prev, struct evsel, core.node); diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 62dc7202e3ba..c498d896badf 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -235,7 +235,8 @@ int parse_events_add_numeric(struct parse_events_state = *parse_state, bool wildcard); int parse_events_add_cache(struct list_head *list, int *idx, const char *n= ame, struct parse_events_state *parse_state, - struct parse_events_terms *parsed_terms); + struct parse_events_terms *parsed_terms, + void *loc); int parse_events__decode_legacy_cache(const char *name, int pmu_type, __u6= 4 *config); int parse_events_add_breakpoint(struct parse_events_state *parse_state, struct list_head *list, diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index a2361c0040d7..ced26c549c33 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -353,7 +353,7 @@ PE_LEGACY_CACHE opt_event_config if (!list) YYNOMEM; =20 - err =3D parse_events_add_cache(list, &parse_state->idx, $1, parse_state, = $2); + err =3D parse_events_add_cache(list, &parse_state->idx, $1, parse_state, = $2, &@1); =20 parse_events_terms__delete($2); free($1); --=20 2.51.0.268.g9569e192d0-goog