On Thu, May 29, 2025 at 4:33 AM James Clark <james.clark@xxxxxxxxxx> wrote:
>
> perf_event_attr has gained a new field, config4, so add support for it
> extending the existing configN support.
>
> Reviewed-by: Leo Yan <leo.yan@xxxxxxx>
> Signed-off-by: James Clark <james.clark@xxxxxxxxxx>
Reviewed-by: Ian Rogers <irogers@xxxxxxxxxx>
Thanks,
Ian
> ---
> tools/perf/tests/parse-events.c | 14 +++++++++++++-
> tools/perf/util/parse-events.c | 11 +++++++++++
> tools/perf/util/parse-events.h | 1 +
> tools/perf/util/parse-events.l | 1 +
> tools/perf/util/pmu.c | 8 ++++++++
> tools/perf/util/pmu.h | 1 +
> 6 files changed, 35 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
> index 5ec2e5607987..5f624a63d550 100644
> --- a/tools/perf/tests/parse-events.c
> +++ b/tools/perf/tests/parse-events.c
> @@ -615,6 +615,8 @@ static int test__checkevent_pmu(struct evlist *evlist)
> TEST_ASSERT_VAL("wrong config1", 1 == evsel->core.attr.config1);
> TEST_ASSERT_VAL("wrong config2", 3 == evsel->core.attr.config2);
> TEST_ASSERT_VAL("wrong config3", 0 == evsel->core.attr.config3);
> + TEST_ASSERT_VAL("wrong config4", 0 == evsel->core.attr.config4);
> +
> /*
> * The period value gets configured within evlist__config,
> * while this test executes only parse events method.
> @@ -637,6 +639,7 @@ static int test__checkevent_list(struct evlist *evlist)
> TEST_ASSERT_VAL("wrong config1", 0 == evsel->core.attr.config1);
> TEST_ASSERT_VAL("wrong config2", 0 == evsel->core.attr.config2);
> TEST_ASSERT_VAL("wrong config3", 0 == evsel->core.attr.config3);
> + TEST_ASSERT_VAL("wrong config4", 0 == evsel->core.attr.config4);
> TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);
> TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->core.attr.exclude_kernel);
> TEST_ASSERT_VAL("wrong exclude_hv", !evsel->core.attr.exclude_hv);
> @@ -813,6 +816,15 @@ static int test__checkterms_simple(struct parse_events_terms *terms)
> TEST_ASSERT_VAL("wrong val", term->val.num == 4);
> TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "config3"));
>
> + /* config4=5 */
> + term = list_entry(term->list.next, struct parse_events_term, list);
> + TEST_ASSERT_VAL("wrong type term",
> + term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG4);
> + TEST_ASSERT_VAL("wrong type val",
> + term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
> + TEST_ASSERT_VAL("wrong val", term->val.num == 5);
> + TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "config4"));
> +
> /* umask=1*/
> term = list_entry(term->list.next, struct parse_events_term, list);
> TEST_ASSERT_VAL("wrong type term",
> @@ -2451,7 +2463,7 @@ struct terms_test {
>
> static const struct terms_test test__terms[] = {
> [0] = {
> - .str = "config=10,config1,config2=3,config3=4,umask=1,read,r0xead",
> + .str = "config=10,config1,config2=3,config3=4,config4=5,umask=1,read,r0xead",
> .check = test__checkterms_simple,
> },
> };
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index 5152fd5a6ead..7e37f91e7b49 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -247,6 +247,8 @@ __add_event(struct list_head *list, int *idx,
> PERF_PMU_FORMAT_VALUE_CONFIG2, "config2");
> perf_pmu__warn_invalid_config(pmu, attr->config3, name,
> PERF_PMU_FORMAT_VALUE_CONFIG3, "config3");
> + perf_pmu__warn_invalid_config(pmu, attr->config4, name,
> + PERF_PMU_FORMAT_VALUE_CONFIG4, "config4");
> }
> if (init_attr)
> event_attr_init(attr);
> @@ -783,6 +785,7 @@ const char *parse_events__term_type_str(enum parse_events__term_type term_type)
> [PARSE_EVENTS__TERM_TYPE_CONFIG1] = "config1",
> [PARSE_EVENTS__TERM_TYPE_CONFIG2] = "config2",
> [PARSE_EVENTS__TERM_TYPE_CONFIG3] = "config3",
> + [PARSE_EVENTS__TERM_TYPE_CONFIG4] = "config4",
> [PARSE_EVENTS__TERM_TYPE_NAME] = "name",
> [PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD] = "period",
> [PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ] = "freq",
> @@ -830,6 +833,7 @@ config_term_avail(enum parse_events__term_type term_type, struct parse_events_er
> case PARSE_EVENTS__TERM_TYPE_CONFIG1:
> case PARSE_EVENTS__TERM_TYPE_CONFIG2:
> case PARSE_EVENTS__TERM_TYPE_CONFIG3:
> + case PARSE_EVENTS__TERM_TYPE_CONFIG4:
> case PARSE_EVENTS__TERM_TYPE_NAME:
> case PARSE_EVENTS__TERM_TYPE_METRIC_ID:
> case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:
> @@ -898,6 +902,10 @@ do { \
> CHECK_TYPE_VAL(NUM);
> attr->config3 = term->val.num;
> break;
> + case PARSE_EVENTS__TERM_TYPE_CONFIG4:
> + CHECK_TYPE_VAL(NUM);
> + attr->config4 = term->val.num;
> + break;
> case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:
> CHECK_TYPE_VAL(NUM);
> break;
> @@ -1097,6 +1105,7 @@ static int config_term_tracepoint(struct perf_event_attr *attr,
> case PARSE_EVENTS__TERM_TYPE_CONFIG1:
> case PARSE_EVENTS__TERM_TYPE_CONFIG2:
> case PARSE_EVENTS__TERM_TYPE_CONFIG3:
> + case PARSE_EVENTS__TERM_TYPE_CONFIG4:
> case PARSE_EVENTS__TERM_TYPE_NAME:
> case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:
> case PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ:
> @@ -1237,6 +1246,7 @@ do { \
> case PARSE_EVENTS__TERM_TYPE_CONFIG1:
> case PARSE_EVENTS__TERM_TYPE_CONFIG2:
> case PARSE_EVENTS__TERM_TYPE_CONFIG3:
> + case PARSE_EVENTS__TERM_TYPE_CONFIG4:
> case PARSE_EVENTS__TERM_TYPE_NAME:
> case PARSE_EVENTS__TERM_TYPE_METRIC_ID:
> case PARSE_EVENTS__TERM_TYPE_RAW:
> @@ -1274,6 +1284,7 @@ static int get_config_chgs(struct perf_pmu *pmu, struct parse_events_terms *head
> case PARSE_EVENTS__TERM_TYPE_CONFIG1:
> case PARSE_EVENTS__TERM_TYPE_CONFIG2:
> case PARSE_EVENTS__TERM_TYPE_CONFIG3:
> + case PARSE_EVENTS__TERM_TYPE_CONFIG4:
> case PARSE_EVENTS__TERM_TYPE_NAME:
> case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:
> case PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ:
> diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
> index e176a34ab088..6e90c26066d4 100644
> --- a/tools/perf/util/parse-events.h
> +++ b/tools/perf/util/parse-events.h
> @@ -58,6 +58,7 @@ enum parse_events__term_type {
> PARSE_EVENTS__TERM_TYPE_CONFIG1,
> PARSE_EVENTS__TERM_TYPE_CONFIG2,
> PARSE_EVENTS__TERM_TYPE_CONFIG3,
> + PARSE_EVENTS__TERM_TYPE_CONFIG4,
> PARSE_EVENTS__TERM_TYPE_NAME,
> PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD,
> PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ,
> diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
> index 7ed86e3e34e3..8e2986d55bc4 100644
> --- a/tools/perf/util/parse-events.l
> +++ b/tools/perf/util/parse-events.l
> @@ -317,6 +317,7 @@ config { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG); }
> config1 { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG1); }
> config2 { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG2); }
> config3 { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG3); }
> +config4 { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_CONFIG4); }
> name { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NAME); }
> period { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD); }
> freq { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ); }
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index b7ebac5ab1d1..fc50df65d540 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -1427,6 +1427,10 @@ static int pmu_config_term(const struct perf_pmu *pmu,
> assert(term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
> pmu_format_value(bits, term->val.num, &attr->config3, zero);
> break;
> + case PARSE_EVENTS__TERM_TYPE_CONFIG4:
> + assert(term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
> + pmu_format_value(bits, term->val.num, &attr->config4, zero);
> + break;
> case PARSE_EVENTS__TERM_TYPE_USER: /* Not hardcoded. */
> return -EINVAL;
> case PARSE_EVENTS__TERM_TYPE_NAME ... PARSE_EVENTS__TERM_TYPE_HARDWARE:
> @@ -1474,6 +1478,9 @@ static int pmu_config_term(const struct perf_pmu *pmu,
> case PERF_PMU_FORMAT_VALUE_CONFIG3:
> vp = &attr->config3;
> break;
> + case PERF_PMU_FORMAT_VALUE_CONFIG4:
> + vp = &attr->config4;
> + break;
> default:
> return -EINVAL;
> }
> @@ -1787,6 +1794,7 @@ int perf_pmu__for_each_format(struct perf_pmu *pmu, void *state, pmu_format_call
> "config1=0..0xffffffffffffffff",
> "config2=0..0xffffffffffffffff",
> "config3=0..0xffffffffffffffff",
> + "config4=0..0xffffffffffffffff",
> "name=string",
> "period=number",
> "freq=number",
> diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
> index b93014cc3670..1ce5377935db 100644
> --- a/tools/perf/util/pmu.h
> +++ b/tools/perf/util/pmu.h
> @@ -22,6 +22,7 @@ enum {
> PERF_PMU_FORMAT_VALUE_CONFIG1,
> PERF_PMU_FORMAT_VALUE_CONFIG2,
> PERF_PMU_FORMAT_VALUE_CONFIG3,
> + PERF_PMU_FORMAT_VALUE_CONFIG4,
> PERF_PMU_FORMAT_VALUE_CONFIG_END,
> };
>
>
> --
> 2.34.1
>
