| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <c406571bc3c5ee5840ad5c59cd01ff5d7e7decd8.camel@arm.com>
Date: Mon, 25 Nov 2024 16:02:02 +0000
From: Deepak Surti <Deepak.Surti@....com>
To: "irogers@...gle.com" <irogers@...gle.com>
CC: Ben Gainey <Ben.Gainey@....com>, "alexander.shishkin@...ux.intel.com"
<alexander.shishkin@...ux.intel.com>, Mark Barnett <Mark.Barnett@....com>,
James Clark <James.Clark@....com>, "adrian.hunter@...el.com"
<adrian.hunter@...el.com>, "ak@...ux.intel.com" <ak@...ux.intel.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"mingo@...hat.com" <mingo@...hat.com>, "linux-perf-users@...r.kernel.org"
<linux-perf-users@...r.kernel.org>, "will@...nel.org" <will@...nel.org>, Mark
Rutland <Mark.Rutland@....com>, "peterz@...radead.org"
<peterz@...radead.org>, "linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>, "acme@...nel.org" <acme@...nel.org>,
"jolsa@...nel.org" <jolsa@...nel.org>, "namhyung@...nel.org"
<namhyung@...nel.org>
Subject: Re: [PATCH v1 3/4] tools/perf: Modify event parser to support
alt-period term
On Wed, 2024-11-13 at 18:10 -0800, Ian Rogers wrote:
> On Thu, Nov 7, 2024 at 8:08 AM Deepak Surti <deepak.surti@....com>
> wrote:
> >
> > From: Ben Gainey <ben.gainey@....com>
> >
> > parse-events is modified, adding the "alt-period" term which can be
> > used
> > to specify the alternative sampling period.
> >
> > Signed-off-by: Ben Gainey <ben.gainey@....com>
>
> Hi Deepak,
>
> this and the next change conflict with:
> https://lore.kernel.org/all/20241015000158.871828-1-irogers@google.com/
> https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/commit/tools/perf/tests/shell/attr.sh?h=perf-tools-next&id=8519e4f44c2af72214dc029f0334be068466e71f
>
Hi Ian,
> Could you migrate the work to perf-tools-next?
Acknowledged. Will do this in the next version 2 of the patch.
Thanks,
Deepak
> Thanks,
> Ian
>
> > ---
> > tools/include/uapi/linux/perf_event.h | 3 +++
> > tools/perf/tests/attr.c | 1 +
> > tools/perf/tests/attr.py | 1 +
> > tools/perf/tests/attr/base-record | 3 ++-
> > tools/perf/tests/attr/base-record-spe | 1 +
> > tools/perf/tests/attr/base-stat | 3 ++-
> > tools/perf/tests/attr/system-wide-dummy | 3 ++-
> > tools/perf/tests/attr/test-record-alt-period-term | 12
> > ++++++++++++
> > tools/perf/tests/attr/test-record-dummy-C0 | 3 ++-
> > tools/perf/util/parse-events.c | 15
> > +++++++++++++++
> > tools/perf/util/parse-events.h | 3 ++-
> > tools/perf/util/parse-events.l | 1 +
> > tools/perf/util/perf_event_attr_fprintf.c | 1 +
> > tools/perf/util/pmu.c | 1 +
> > 14 files changed, 46 insertions(+), 5 deletions(-)
> > create mode 100644 tools/perf/tests/attr/test-record-alt-period-
> > term
> >
> > diff --git a/tools/include/uapi/linux/perf_event.h
> > b/tools/include/uapi/linux/perf_event.h
> > index 4842c36fdf80..bedae424ba36 100644
> > --- a/tools/include/uapi/linux/perf_event.h
> > +++ b/tools/include/uapi/linux/perf_event.h
> > @@ -379,6 +379,7 @@ enum perf_event_read_format {
> > #define PERF_ATTR_SIZE_VER6 120 /* add: aux_sample_size */
> > #define PERF_ATTR_SIZE_VER7 128 /* add: sig_data */
> > #define PERF_ATTR_SIZE_VER8 136 /* add: config3 */
> > +#define PERF_ATTR_SIZE_VER9 144 /* add:
> > alternative_sample_period */
> >
> > /*
> > * Hardware event_id to monitor via a performance monitoring
> > event:
> > @@ -522,6 +523,8 @@ struct perf_event_attr {
> > __u64 sig_data;
> >
> > __u64 config3; /* extension of config2 */
> > +
> > + __u64 alternative_sample_period;
> > };
> >
> > /*
> > diff --git a/tools/perf/tests/attr.c b/tools/perf/tests/attr.c
> > index 97e1bdd6ec0e..956b58c7ba8f 100644
> > --- a/tools/perf/tests/attr.c
> > +++ b/tools/perf/tests/attr.c
> > @@ -139,6 +139,7 @@ static int store_event(struct perf_event_attr
> > *attr, pid_t pid, struct perf_cpu
> > WRITE_ASS(branch_sample_type, "llu");
> > WRITE_ASS(sample_regs_user, "llu");
> > WRITE_ASS(sample_stack_user, PRIu32);
> > + WRITE_ASS(alternative_sample_period, "llu");
> >
> > fclose(file);
> > return 0;
> > diff --git a/tools/perf/tests/attr.py b/tools/perf/tests/attr.py
> > index e890c261ad26..75c4527393f9 100644
> > --- a/tools/perf/tests/attr.py
> > +++ b/tools/perf/tests/attr.py
> > @@ -91,6 +91,7 @@ class Event(dict):
> > 'branch_sample_type',
> > 'sample_regs_user',
> > 'sample_stack_user',
> > + 'alternative_sample_period',
> > ]
> >
> > def add(self, data):
> > diff --git a/tools/perf/tests/attr/base-record
> > b/tools/perf/tests/attr/base-record
> > index b44e4e6e4443..403de2e2c891 100644
> > --- a/tools/perf/tests/attr/base-record
> > +++ b/tools/perf/tests/attr/base-record
> > @@ -5,7 +5,7 @@ group_fd=-1
> > flags=0|8
> > cpu=*
> > type=0|1
> > -size=136
> > +size=144
> > config=0|1
> > sample_period=*
> > sample_type=263
> > @@ -39,3 +39,4 @@ config2=0
> > branch_sample_type=0
> > sample_regs_user=0
> > sample_stack_user=0
> > +alternative_sample_period=0
> > \ No newline at end of file
> > diff --git a/tools/perf/tests/attr/base-record-spe
> > b/tools/perf/tests/attr/base-record-spe
> > index 08fa96b59240..db528d7d8b73 100644
> > --- a/tools/perf/tests/attr/base-record-spe
> > +++ b/tools/perf/tests/attr/base-record-spe
> > @@ -38,3 +38,4 @@ config2=*
> > branch_sample_type=*
> > sample_regs_user=*
> > sample_stack_user=*
> > +alternative_sample_period=0
> > \ No newline at end of file
> > diff --git a/tools/perf/tests/attr/base-stat
> > b/tools/perf/tests/attr/base-stat
> > index fccd8ec4d1b0..27ef0fa1386f 100644
> > --- a/tools/perf/tests/attr/base-stat
> > +++ b/tools/perf/tests/attr/base-stat
> > @@ -5,7 +5,7 @@ group_fd=-1
> > flags=0|8
> > cpu=*
> > type=0
> > -size=136
> > +size=144
> > config=0
> > sample_period=0
> > sample_type=65536
> > @@ -39,3 +39,4 @@ config2=0
> > branch_sample_type=0
> > sample_regs_user=0
> > sample_stack_user=0
> > +alternative_sample_period=0
> > diff --git a/tools/perf/tests/attr/system-wide-dummy
> > b/tools/perf/tests/attr/system-wide-dummy
> > index a1e1d6a263bf..5c4d2a60931d 100644
> > --- a/tools/perf/tests/attr/system-wide-dummy
> > +++ b/tools/perf/tests/attr/system-wide-dummy
> > @@ -7,7 +7,7 @@ cpu=*
> > pid=-1
> > flags=8
> > type=1
> > -size=136
> > +size=144
> > config=9
> > sample_period=1
> > # PERF_SAMPLE_IP | PERF_SAMPLE_TID | PERF_SAMPLE_TIME |
> > @@ -50,3 +50,4 @@ config2=0
> > branch_sample_type=0
> > sample_regs_user=0
> > sample_stack_user=0
> > +alternative_sample_period=0
> > diff --git a/tools/perf/tests/attr/test-record-alt-period-term
> > b/tools/perf/tests/attr/test-record-alt-period-term
> > new file mode 100644
> > index 000000000000..e0de4c8eb1c8
> > --- /dev/null
> > +++ b/tools/perf/tests/attr/test-record-alt-period-term
> > @@ -0,0 +1,12 @@
> > +[config]
> > +command = record
> > +args = --no-bpf-event -e cycles/period=3,alt-period=2/ -- kill
> > >/dev/null 2>&1
> > +ret = 1
> > +kernel_since = 6.11
> > +
> > +[event-10:base-record]
> > +sample_period=3
> > +alternative_sample_period=2
> > +
> > +freq=0
> > +sample_type=7
> > diff --git a/tools/perf/tests/attr/test-record-dummy-C0
> > b/tools/perf/tests/attr/test-record-dummy-C0
> > index 576ec48b3aaf..d4f0546e02b6 100644
> > --- a/tools/perf/tests/attr/test-record-dummy-C0
> > +++ b/tools/perf/tests/attr/test-record-dummy-C0
> > @@ -10,7 +10,7 @@ cpu=0
> > pid=-1
> > flags=8
> > type=1
> > -size=136
> > +size=144
> > config=9
> > sample_period=4000
> > # PERF_SAMPLE_IP | PERF_SAMPLE_TID | PERF_SAMPLE_TIME |
> > @@ -53,3 +53,4 @@ config2=0
> > branch_sample_type=0
> > sample_regs_user=0
> > sample_stack_user=0
> > +alternative_sample_period=0
> > diff --git a/tools/perf/util/parse-events.c
> > b/tools/perf/util/parse-events.c
> > index 9a8be1e46d67..48723cea3a51 100644
> > --- a/tools/perf/util/parse-events.c
> > +++ b/tools/perf/util/parse-events.c
> > @@ -826,6 +826,7 @@ static const char *config_term_name(enum
> > parse_events__term_type term_type)
> > [PARSE_EVENTS__TERM_TYPE_RAW] =
> > "raw",
> > [PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE] =
> > "legacy-cache",
> > [PARSE_EVENTS__TERM_TYPE_HARDWARE] =
> > "hardware",
> > + [PARSE_EVENTS__TERM_TYPE_ALT_SAMPLE_PERIOD] =
> > "alt-period",
> > };
> > if ((unsigned int)term_type >=
> > __PARSE_EVENTS__TERM_TYPE_NR)
> > return "unknown term";
> > @@ -854,6 +855,7 @@ config_term_avail(enum parse_events__term_type
> > term_type, struct parse_events_er
> > case PARSE_EVENTS__TERM_TYPE_NAME:
> > case PARSE_EVENTS__TERM_TYPE_METRIC_ID:
> > case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:
> > + case PARSE_EVENTS__TERM_TYPE_ALT_SAMPLE_PERIOD:
> > case PARSE_EVENTS__TERM_TYPE_PERCORE:
> > return true;
> > case PARSE_EVENTS__TERM_TYPE_USER:
> > @@ -998,6 +1000,16 @@ do
> > {
> > \
> > return -EINVAL;
> > }
> > break;
> > + case PARSE_EVENTS__TERM_TYPE_ALT_SAMPLE_PERIOD:
> > + CHECK_TYPE_VAL(NUM);
> > + if (term->val.num == 0) {
> > + parse_events_error__handle(err, term-
> > >err_val,
> > + strdup("expected a
> > non-zero value"),
> > + NULL);
> > + return -EINVAL;
> > + }
> > + attr->alternative_sample_period = term->val.num;
> > + break;
> > case PARSE_EVENTS__TERM_TYPE_DRV_CFG:
> > case PARSE_EVENTS__TERM_TYPE_USER:
> > case PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE:
> > @@ -1124,6 +1136,7 @@ static int config_term_tracepoint(struct
> > perf_event_attr *attr,
> > case PARSE_EVENTS__TERM_TYPE_RAW:
> > case PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE:
> > case PARSE_EVENTS__TERM_TYPE_HARDWARE:
> > + case PARSE_EVENTS__TERM_TYPE_ALT_SAMPLE_PERIOD:
> > default:
> > if (err) {
> > parse_events_error__handle(err, term-
> > >err_term,
> > @@ -1255,6 +1268,7 @@ do
> > { \
> > case PARSE_EVENTS__TERM_TYPE_RAW:
> > case PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE:
> > case PARSE_EVENTS__TERM_TYPE_HARDWARE:
> > + case PARSE_EVENTS__TERM_TYPE_ALT_SAMPLE_PERIOD:
> > default:
> > break;
> > }
> > @@ -1308,6 +1322,7 @@ static int get_config_chgs(struct perf_pmu
> > *pmu, struct parse_events_terms *head
> > case PARSE_EVENTS__TERM_TYPE_RAW:
> > case PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE:
> > case PARSE_EVENTS__TERM_TYPE_HARDWARE:
> > + case PARSE_EVENTS__TERM_TYPE_ALT_SAMPLE_PERIOD:
> > default:
> > break;
> > }
> > diff --git a/tools/perf/util/parse-events.h
> > b/tools/perf/util/parse-events.h
> > index 10cc9c433116..f1482361321a 100644
> > --- a/tools/perf/util/parse-events.h
> > +++ b/tools/perf/util/parse-events.h
> > @@ -79,7 +79,8 @@ enum parse_events__term_type {
> > PARSE_EVENTS__TERM_TYPE_RAW,
> > PARSE_EVENTS__TERM_TYPE_LEGACY_CACHE,
> > PARSE_EVENTS__TERM_TYPE_HARDWARE,
> > -#define __PARSE_EVENTS__TERM_TYPE_NR
> > (PARSE_EVENTS__TERM_TYPE_HARDWARE + 1)
> > + PARSE_EVENTS__TERM_TYPE_ALT_SAMPLE_PERIOD,
> > +#define __PARSE_EVENTS__TERM_TYPE_NR
> > (PARSE_EVENTS__TERM_TYPE_ALT_SAMPLE_PERIOD + 1)
> > };
> >
> > struct parse_events_term {
> > diff --git a/tools/perf/util/parse-events.l
> > b/tools/perf/util/parse-events.l
> > index 5a0bcd7f166a..1972a5a696ef 100644
> > --- a/tools/perf/util/parse-events.l
> > +++ b/tools/perf/util/parse-events.l
> > @@ -331,6 +331,7 @@ percore { return
> > term(yyscanner, PARSE_EVENTS__TERM_TYPE_PERCORE); }
> > aux-output { return term(yyscanner,
> > PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT); }
> > aux-sample-size { return term(yyscanner,
> > PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE); }
> > metric-id { return term(yyscanner,
> > PARSE_EVENTS__TERM_TYPE_METRIC_ID); }
> > +alt-period { return term(yyscanner,
> > PARSE_EVENTS__TERM_TYPE_ALT_SAMPLE_PERIOD); }
> > cpu-cycles|cycles { return
> > hw_term(yyscanner, PERF_COUNT_HW_CPU_CYCLES); }
> > stalled-cycles-frontend|idle-cycles-frontend { return
> > hw_term(yyscanner, PERF_COUNT_HW_STALLED_CYCLES_FRONTEND); }
> > stalled-cycles-backend|idle-cycles-backend { return
> > hw_term(yyscanner, PERF_COUNT_HW_STALLED_CYCLES_BACKEND); }
> > diff --git a/tools/perf/util/perf_event_attr_fprintf.c
> > b/tools/perf/util/perf_event_attr_fprintf.c
> > index 59fbbba79697..c6af598070b5 100644
> > --- a/tools/perf/util/perf_event_attr_fprintf.c
> > +++ b/tools/perf/util/perf_event_attr_fprintf.c
> > @@ -335,6 +335,7 @@ int perf_event_attr__fprintf(FILE *fp, struct
> > perf_event_attr *attr,
> > PRINT_ATTRf(sample_max_stack, p_unsigned);
> > PRINT_ATTRf(aux_sample_size, p_unsigned);
> > PRINT_ATTRf(sig_data, p_unsigned);
> > + PRINT_ATTRf(alternative_sample_period, p_unsigned);
> >
> > return ret;
> > }
> > diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> > index 61bdda01a05a..7615d05e389f 100644
> > --- a/tools/perf/util/pmu.c
> > +++ b/tools/perf/util/pmu.c
> > @@ -1738,6 +1738,7 @@ int perf_pmu__for_each_format(struct perf_pmu
> > *pmu, void *state, pmu_format_call
> > "percore",
> > "aux-output",
> > "aux-sample-size=number",
> > + "alt-period=number",
> > };
> > struct perf_pmu_format *format;
> > int ret;
> > --
> > 2.43.0
> >
Powered by blists - more mailing lists