From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 575D9EE4993 for ; Wed, 23 Aug 2023 10:15:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231281AbjHWKPg (ORCPT ); Wed, 23 Aug 2023 06:15:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233711AbjHWIKp (ORCPT ); Wed, 23 Aug 2023 04:10:45 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B777171F for ; Wed, 23 Aug 2023 01:09:15 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d72e09f1263so6351731276.1 for ; Wed, 23 Aug 2023 01:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692778154; x=1693382954; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=tqUDw45wGk5wmr8fIVvlAS7pZKUjU6uqt9APs5CQJVc=; b=qAm/aD6Z6Ljdyyrmm++JzGbt1r/95IixuTi7ANNYuGV1cUcbDq7vIVQUDAOrt1bnYY Xz2KPn1qgtcjduzR5JnEtMgBfkxfUwjyIQnuH3pjTv2xR9lC38hRr+kbdpx3+/fCZHtT U3kjwbYsBiyp5TUEIxhtn9VYYjFk4R6/q3zYnwlH7k7SAjWmvWiAPj8A25T5koGfrVaS reJeXCQciXPy55c8DozAMyYWVjgNaPvFZWLTKv1BOXQb6BABVoJZXfgNOaVHc/v5tRfc 8lzWoehcWUiiheSszlIxRwGJIzdXK11RaWxTspX28AQ8TrEkc3PWRNfito1TlCrkURqe 2XKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692778154; x=1693382954; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tqUDw45wGk5wmr8fIVvlAS7pZKUjU6uqt9APs5CQJVc=; b=Z0d9GS4d7VvlkI2N+OIUcUGzP2BswMp4Ur4xHqcRO83Pg/JyAOy6VDUuTKhH0+y+AT 9HaBs/cuhUHlGfU1LAJNHZzZVFnjbqv1y899WR5Cw1/rw7ZRJKhAmQLAXijxtvpcL6Tr /FG5UmrWwnqvdbdScl7dfxnhPTUihCyWE5jZ8e8jsVeQ9jvq0Lsuh6VPK5vEzjLN+C2Y 7Uinj5k75cZ7uyOzR417sNr6zaDK62e4A3gnjZHzBUivwFlzgKZE+bO1cPOEyW6pQmbD drHJdn3w3sKAwh9g061vaUmgUCoWCS0heCOs54TgIjztvsDPhOmy6GCSV3c3AEfvtjoF gJKA== X-Gm-Message-State: AOJu0YzWyc0yUAxBDJCdzHW68ioxYyj6QIpKcMwihpcYMEFEMH5SDviD yVw57bhIkfqrzcqrj8TWGG9Q806wgeSO X-Google-Smtp-Source: AGHT+IEkFt4zRg0YzBMzij0vo1EgVVOdMaEe7xJEgiOwgjnFiCLfEgUQjLjA/MUyuB3Q1Lvv+YMYT0PZbypS X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:3971:e84:f508:9a36]) (user=irogers job=sendgmr) by 2002:a25:ab26:0:b0:d77:9722:8eda with SMTP id u35-20020a25ab26000000b00d7797228edamr68927ybi.4.1692778154591; Wed, 23 Aug 2023 01:09:14 -0700 (PDT) Date: Wed, 23 Aug 2023 01:08:20 -0700 In-Reply-To: <20230823080828.1460376-1-irogers@google.com> Message-Id: <20230823080828.1460376-18-irogers@google.com> Mime-Version: 1.0 References: <20230823080828.1460376-1-irogers@google.com> X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog Subject: [PATCH v1 17/25] perf pmu: Parse sysfs events directly from a file From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , James Clark , Kan Liang , John Garry , Kajol Jain , Jing Zhang , Ravi Bangoria , Rob Herring , Gaosheng Cui , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Rather than read a sysfs events file into a 256 byte char buffer, pass the FILE* directly to the lex/yacc parser. This avoids there being a maximum events file size. While changing the API, constify some arguments to remove unnecessary casts. Allocating the read buffer decreases the performance of pmu-scan by around 3%. Signed-off-by: Ian Rogers --- tools/perf/arch/x86/util/intel-pt.c | 2 +- tools/perf/tests/parse-events.c | 2 +- tools/perf/util/parse-events.c | 18 +++++++---- tools/perf/util/parse-events.h | 3 +- tools/perf/util/pmu.c | 48 ++++++++++------------------- 5 files changed, 33 insertions(+), 40 deletions(-) diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c index 27944c15ac14..31807791589e 100644 --- a/tools/perf/arch/x86/util/intel-pt.c +++ b/tools/perf/arch/x86/util/intel-pt.c @@ -74,7 +74,7 @@ static int intel_pt_parse_terms_with_default(struct perf_pmu *pmu, INIT_LIST_HEAD(terms); - err = parse_events_terms(terms, str); + err = parse_events_terms(terms, str, /*input=*/ NULL); if (err) goto out_free; diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c index 658fb9599d95..d86076d575ed 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -2472,7 +2472,7 @@ static int test_term(const struct terms_test *t) INIT_LIST_HEAD(&terms); - ret = parse_events_terms(&terms, t->str); + ret = parse_events_terms(&terms, t->str, /*input=*/ NULL); if (ret) { pr_debug("failed to parse terms '%s', err %d\n", t->str , ret); diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 781747bedc3e..c71e135d7335 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1715,6 +1715,7 @@ int parse_events_name(struct list_head *list, const char *name) } static int parse_events__scanner(const char *str, + FILE *input, struct parse_events_state *parse_state) { YY_BUFFER_STATE buffer; @@ -1725,7 +1726,10 @@ static int parse_events__scanner(const char *str, if (ret) return ret; - buffer = parse_events__scan_string(str, scanner); + if (str) + buffer = parse_events__scan_string(str, scanner); + else + parse_events_set_in(input, scanner); #ifdef PARSER_DEBUG parse_events_debug = 1; @@ -1733,8 +1737,10 @@ static int parse_events__scanner(const char *str, #endif ret = parse_events_parse(parse_state, scanner); - parse_events__flush_buffer(buffer, scanner); - parse_events__delete_buffer(buffer, scanner); + if (str) { + parse_events__flush_buffer(buffer, scanner); + parse_events__delete_buffer(buffer, scanner); + } parse_events_lex_destroy(scanner); return ret; } @@ -1742,7 +1748,7 @@ static int parse_events__scanner(const char *str, /* * parse event config string, return a list of event terms. */ -int parse_events_terms(struct list_head *terms, const char *str) +int parse_events_terms(struct list_head *terms, const char *str, FILE *input) { struct parse_events_state parse_state = { .terms = NULL, @@ -1750,7 +1756,7 @@ int parse_events_terms(struct list_head *terms, const char *str) }; int ret; - ret = parse_events__scanner(str, &parse_state); + ret = parse_events__scanner(str, input, &parse_state); if (!ret) { list_splice(parse_state.terms, terms); @@ -2001,7 +2007,7 @@ int __parse_events(struct evlist *evlist, const char *str, const char *pmu_filte }; int ret, ret2; - ret = parse_events__scanner(str, &parse_state); + ret = parse_events__scanner(str, /*input=*/ NULL, &parse_state); if (!ret && list_empty(&parse_state.list)) { WARN_ONCE(true, "WARNING: event parser found nothing\n"); diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 411f69b2ac3a..c7f779420723 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -9,6 +9,7 @@ #include #include #include +#include #include struct evsel; @@ -42,7 +43,7 @@ static inline int parse_events(struct evlist *evlist, const char *str, int parse_event(struct evlist *evlist, const char *str); -int parse_events_terms(struct list_head *terms, const char *str); +int parse_events_terms(struct list_head *terms, const char *str, FILE *input); int parse_filter(const struct option *opt, const char *str, int unset); int exclude_perf(const struct option *opt, const char *arg, int unset); diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 284962c133b3..6db14967ded9 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -276,7 +276,7 @@ int perf_pmu__convert_scale(const char *scale, char **end, double *sval) return ret; } -static int perf_pmu__parse_scale(struct perf_pmu_alias *alias, int dirfd, char *name) +static int perf_pmu__parse_scale(struct perf_pmu_alias *alias, int dirfd, const char *name) { struct stat st; ssize_t sret; @@ -308,7 +308,7 @@ static int perf_pmu__parse_scale(struct perf_pmu_alias *alias, int dirfd, char * return ret; } -static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, int dirfd, char *name) +static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, int dirfd, const char *name) { char path[PATH_MAX]; ssize_t sret; @@ -339,7 +339,7 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, int dirfd, char *n } static int -perf_pmu__parse_per_pkg(struct perf_pmu_alias *alias, int dirfd, char *name) +perf_pmu__parse_per_pkg(struct perf_pmu_alias *alias, int dirfd, const char *name) { char path[PATH_MAX]; int fd; @@ -357,7 +357,7 @@ perf_pmu__parse_per_pkg(struct perf_pmu_alias *alias, int dirfd, char *name) } static int perf_pmu__parse_snapshot(struct perf_pmu_alias *alias, - int dirfd, char *name) + int dirfd, const char *name) { char path[PATH_MAX]; int fd; @@ -450,8 +450,9 @@ static bool perf_pmu_merge_alias(struct perf_pmu_alias *newalias, return false; } -static int __perf_pmu__new_alias(struct list_head *list, int dirfd, char *name, - char *desc, char *val, const struct pmu_event *pe) +static int perf_pmu__new_alias(struct list_head *list, int dirfd, const char *name, + const char *desc, const char *val, FILE *val_fd, + const struct pmu_event *pe) { struct parse_events_term *term; struct perf_pmu_alias *alias; @@ -480,7 +481,7 @@ static int __perf_pmu__new_alias(struct list_head *list, int dirfd, char *name, alias->snapshot = false; alias->deprecated = deprecated; - ret = parse_events_terms(&alias->terms, val); + ret = parse_events_terms(&alias->terms, val, val_fd); if (ret) { pr_err("Cannot parse alias %s: %d\n", val, ret); free(alias); @@ -537,23 +538,6 @@ static int __perf_pmu__new_alias(struct list_head *list, int dirfd, char *name, return 0; } -static int perf_pmu__new_alias(struct list_head *list, int dirfd, char *name, FILE *file) -{ - char buf[256]; - int ret; - - ret = fread(buf, 1, sizeof(buf), file); - if (ret == 0) - return -EINVAL; - - buf[ret] = 0; - - /* Remove trailing newline from sysfs file */ - strim(buf); - - return __perf_pmu__new_alias(list, dirfd, name, NULL, buf, NULL); -} - static inline bool pmu_alias_info_file(char *name) { size_t len; @@ -609,7 +593,8 @@ static int pmu_aliases_parse(int dirfd, struct list_head *head) continue; } - if (perf_pmu__new_alias(head, dirfd, name, file) < 0) + if (perf_pmu__new_alias(head, dirfd, name, /*desc=*/ NULL, + /*val=*/ NULL, file, /*pe=*/ NULL) < 0) pr_debug("Cannot set up %s\n", name); fclose(file); } @@ -862,7 +847,7 @@ static int pmu_add_cpu_aliases_map_callback(const struct pmu_event *pe, struct list_head *head = vdata; /* need type casts to override 'const' */ - __perf_pmu__new_alias(head, -1, (char *)pe->name, (char *)pe->desc, (char *)pe->event, pe); + perf_pmu__new_alias(head, -1, pe->name, pe->desc, pe->event, /*val_fd=*/ NULL, pe); return 0; } @@ -903,11 +888,12 @@ static int pmu_add_sys_aliases_iter_fn(const struct pmu_event *pe, if (!strcmp(pmu->id, pe->compat) && pmu_uncore_alias_match(pe->pmu, pmu->name)) { - __perf_pmu__new_alias(idata->head, -1, - (char *)pe->name, - (char *)pe->desc, - (char *)pe->event, - pe); + perf_pmu__new_alias(idata->head, -1, + pe->name, + pe->desc, + pe->event, + /*val_fd=*/ NULL, + pe); } return 0; -- 2.42.0.rc1.204.g551eb34607-goog