linux-kernel - Re: [PATCH v2 1/2] perf x86 test: Update hybrid expectations

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <ZZfvQOl82ehC-rEY@FVFF77S0Q05N>
Date: Fri, 5 Jan 2024 12:00:00 +0000
From: Mark Rutland <mark.rutland@....com>
To: Ian Rogers <irogers@...gle.com>
Cc: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>,
	Arnaldo Carvalho de Melo <acme@...nel.org>,
	Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
	Jiri Olsa <jolsa@...nel.org>, Namhyung Kim <namhyung@...nel.org>,
	Adrian Hunter <adrian.hunter@...el.com>,
	Kan Liang <kan.liang@...ux.intel.com>,
	linux-perf-users@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 1/2] perf x86 test: Update hybrid expectations

On Wed, Jan 03, 2024 at 09:01:58AM -0800, Ian Rogers wrote:
> The legacy events cpu-cycles and instructions have sysfs event
> equivalents on x86 (see /sys/devices/cpu_core/events). As sysfs/JSON
> events are now higher in priority than legacy events this causes the
> hybrid test expectations not to be met. To fix this switch to legacy
> events that don't have sysfs versions, namely cpu-cycles becomes
> cycles and instructions becomes branches.
> 
> Fixes: a24d9d9dc096 ("perf parse-events: Make legacy events lower priority than sysfs/JSON")
> Reported-by: Arnaldo Carvalho de Melo <acme@...nel.org>
> Closes: https://lore.kernel.org/lkml/ZYbm5L7tw7bdpDpE@kernel.org/
> Signed-off-by: Ian Rogers <irogers@...gle.com>
> ---
>  tools/perf/arch/x86/tests/hybrid.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)

For both patches:

Acked-by: Mark Rutland <mark.rutland@....com>

Mark.

> 
> diff --git a/tools/perf/arch/x86/tests/hybrid.c b/tools/perf/arch/x86/tests/hybrid.c
> index eb152770f148..05a5f81e8167 100644
> --- a/tools/perf/arch/x86/tests/hybrid.c
> +++ b/tools/perf/arch/x86/tests/hybrid.c
> @@ -47,7 +47,7 @@ static int test__hybrid_hw_group_event(struct evlist *evlist)
>  	evsel = evsel__next(evsel);
>  	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->core.attr.type);
>  	TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel, PERF_TYPE_RAW));
> -	TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_INSTRUCTIONS));
> +	TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_BRANCH_INSTRUCTIONS));
>  	TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
>  	return TEST_OK;
>  }
> @@ -102,7 +102,7 @@ static int test__hybrid_group_modifier1(struct evlist *evlist)
>  	evsel = evsel__next(evsel);
>  	TEST_ASSERT_VAL("wrong type", PERF_TYPE_HARDWARE == evsel->core.attr.type);
>  	TEST_ASSERT_VAL("wrong hybrid type", test_hybrid_type(evsel, PERF_TYPE_RAW));
> -	TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_INSTRUCTIONS));
> +	TEST_ASSERT_VAL("wrong config", test_config(evsel, PERF_COUNT_HW_BRANCH_INSTRUCTIONS));
>  	TEST_ASSERT_VAL("wrong leader", evsel__has_leader(evsel, leader));
>  	TEST_ASSERT_VAL("wrong exclude_user", !evsel->core.attr.exclude_user);
>  	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->core.attr.exclude_kernel);
> @@ -171,27 +171,27 @@ struct evlist_test {
>  
>  static const struct evlist_test test__hybrid_events[] = {
>  	{
> -		.name  = "cpu_core/cpu-cycles/",
> +		.name  = "cpu_core/cycles/",
>  		.check = test__hybrid_hw_event_with_pmu,
>  		/* 0 */
>  	},
>  	{
> -		.name  = "{cpu_core/cpu-cycles/,cpu_core/instructions/}",
> +		.name  = "{cpu_core/cycles/,cpu_core/branches/}",
>  		.check = test__hybrid_hw_group_event,
>  		/* 1 */
>  	},
>  	{
> -		.name  = "{cpu-clock,cpu_core/cpu-cycles/}",
> +		.name  = "{cpu-clock,cpu_core/cycles/}",
>  		.check = test__hybrid_sw_hw_group_event,
>  		/* 2 */
>  	},
>  	{
> -		.name  = "{cpu_core/cpu-cycles/,cpu-clock}",
> +		.name  = "{cpu_core/cycles/,cpu-clock}",
>  		.check = test__hybrid_hw_sw_group_event,
>  		/* 3 */
>  	},
>  	{
> -		.name  = "{cpu_core/cpu-cycles/k,cpu_core/instructions/u}",
> +		.name  = "{cpu_core/cycles/k,cpu_core/branches/u}",
>  		.check = test__hybrid_group_modifier1,
>  		/* 4 */
>  	},
> -- 
> 2.43.0.472.g3155946c3a-goog
>