| 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: <CAP-5=fVDmEmwwV=-THt6ppDGmGoBy9AYVMDT_eob=GW0saepJQ@mail.gmail.com>
Date: Tue, 28 Sep 2021 11:02:29 -0700
From: Ian Rogers <irogers@...gle.com>
To: John Garry <john.garry@...wei.com>
Cc: will@...nel.org, mathieu.poirier@...aro.org, leo.yan@...aro.org,
peterz@...radead.org, mingo@...hat.com, acme@...nel.org,
mark.rutland@....com, alexander.shishkin@...ux.intel.com,
jolsa@...hat.com, namhyung@...nel.org,
linux-arm-kernel@...ts.infradead.org,
linux-perf-users@...r.kernel.org, linux-kernel@...r.kernel.org,
linuxarm@...wei.com, zhangshaokun@...ilicon.com,
liuqi115@...wei.com
Subject: Re: [PATCH 3/5] perf test: Verify more event members in pmu-events test
On Thu, Sep 16, 2021 at 5:39 AM John Garry <john.garry@...wei.com> wrote:
>
> Function compare_pmu_events() does not compare all struct pmu-events
> members, so add tests for missing members "name", "event", "aggr_mod",
> "event", "metric_constraint", and "metric_group", and re-order the tests
> to match current struct pmu-events member ordering.
>
> Also fix uncore_hisi_l3c_rd_hit_cpipe.event member, now that we're actually
> testing it.
>
> Signed-off-by: John Garry <john.garry@...wei.com>
Acked-by: Ian Rogers <irogers@...gle.com>
Thanks,
Ian
> ---
> tools/perf/tests/pmu-events.c | 50 ++++++++++++++++++++++++++++-------
> 1 file changed, 40 insertions(+), 10 deletions(-)
>
> diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
> index 8c5a6ba1cb14..adfc17f51c7b 100644
> --- a/tools/perf/tests/pmu-events.c
> +++ b/tools/perf/tests/pmu-events.c
> @@ -146,7 +146,7 @@ static const struct perf_pmu_test_event unc_cbo_xsnp_response_miss_eviction = {
> static const struct perf_pmu_test_event uncore_hisi_l3c_rd_hit_cpipe = {
> .event = {
> .name = "uncore_hisi_l3c.rd_hit_cpipe",
> - .event = "event=0x2",
> + .event = "event=0x7",
> .desc = "Total read hits. Unit: hisi_sccl,l3c ",
> .topic = "uncore",
> .long_desc = "Total read hits",
> @@ -255,6 +255,24 @@ static struct pmu_event *__test_pmu_get_sys_events_table(void)
>
> static int compare_pmu_events(struct pmu_event *e1, const struct pmu_event *e2)
> {
> + if (!is_same(e1->name, e2->name)) {
> + pr_debug2("testing event e1 %s: mismatched name string, %s vs %s\n",
> + e1->name, e1->name, e2->name);
> + return -1;
> + }
> +
> + if (!is_same(e1->compat, e2->compat)) {
> + pr_debug2("testing event e1 %s: mismatched compat string, %s vs %s\n",
> + e1->name, e1->compat, e2->compat);
> + return -1;
> + }
> +
> + if (!is_same(e1->event, e2->event)) {
> + pr_debug2("testing event e1 %s: mismatched event, %s vs %s\n",
> + e1->name, e1->event, e2->event);
> + return -1;
> + }
> +
> if (!is_same(e1->desc, e2->desc)) {
> pr_debug2("testing event e1 %s: mismatched desc, %s vs %s\n",
> e1->name, e1->desc, e2->desc);
> @@ -273,6 +291,12 @@ static int compare_pmu_events(struct pmu_event *e1, const struct pmu_event *e2)
> return -1;
> }
>
> + if (!is_same(e1->pmu, e2->pmu)) {
> + pr_debug2("testing event e1 %s: mismatched pmu string, %s vs %s\n",
> + e1->name, e1->pmu, e2->pmu);
> + return -1;
> + }
> +
> if (!is_same(e1->unit, e2->unit)) {
> pr_debug2("testing event e1 %s: mismatched unit, %s vs %s\n",
> e1->name, e1->unit, e2->unit);
> @@ -285,6 +309,12 @@ static int compare_pmu_events(struct pmu_event *e1, const struct pmu_event *e2)
> return -1;
> }
>
> + if (!is_same(e1->aggr_mode, e2->aggr_mode)) {
> + pr_debug2("testing event e1 %s: mismatched aggr_mode, %s vs %s\n",
> + e1->name, e1->aggr_mode, e2->aggr_mode);
> + return -1;
> + }
> +
> if (!is_same(e1->metric_expr, e2->metric_expr)) {
> pr_debug2("testing event e1 %s: mismatched metric_expr, %s vs %s\n",
> e1->name, e1->metric_expr, e2->metric_expr);
> @@ -297,21 +327,21 @@ static int compare_pmu_events(struct pmu_event *e1, const struct pmu_event *e2)
> return -1;
> }
>
> - if (!is_same(e1->deprecated, e2->deprecated)) {
> - pr_debug2("testing event e1 %s: mismatched deprecated, %s vs %s\n",
> - e1->name, e1->deprecated, e2->deprecated);
> + if (!is_same(e1->metric_group, e2->metric_group)) {
> + pr_debug2("testing event e1 %s: mismatched metric_group, %s vs %s\n",
> + e1->name, e1->metric_group, e2->metric_group);
> return -1;
> }
>
> - if (!is_same(e1->pmu, e2->pmu)) {
> - pr_debug2("testing event e1 %s: mismatched pmu string, %s vs %s\n",
> - e1->name, e1->pmu, e2->pmu);
> + if (!is_same(e1->deprecated, e2->deprecated)) {
> + pr_debug2("testing event e1 %s: mismatched deprecated, %s vs %s\n",
> + e1->name, e1->deprecated, e2->deprecated);
> return -1;
> }
>
> - if (!is_same(e1->compat, e2->compat)) {
> - pr_debug2("testing event e1 %s: mismatched compat string, %s vs %s\n",
> - e1->name, e1->compat, e2->compat);
> + if (!is_same(e1->metric_constraint, e2->metric_constraint)) {
> + pr_debug2("testing event e1 %s: mismatched metric_constant, %s vs %s\n",
> + e1->name, e1->metric_constraint, e2->metric_constraint);
> return -1;
> }
>
> --
> 2.26.2
>
Powered by blists - more mailing lists