| From 2ca35d072a24bddda16061190240855eee40b93a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 8 Apr 2022 15:40:56 +0100 |
| Subject: perf: arm-spe: Fix perf report --mem-mode |
| |
| From: James Clark <james.clark@arm.com> |
| |
| [ Upstream commit ffab487052054162b3b6c9c6005777ec6cfcea05 ] |
| |
| Since commit bb30acae4c4dacfa ("perf report: Bail out --mem-mode if mem |
| info is not available") "perf mem report" and "perf report --mem-mode" |
| don't allow opening the file unless one of the events has |
| PERF_SAMPLE_DATA_SRC set. |
| |
| SPE doesn't have this set even though synthetic memory data is generated |
| after it is decoded. Fix this issue by setting DATA_SRC on SPE events. |
| This has no effect on the data collected because the SPE driver doesn't |
| do anything with that flag and doesn't generate samples. |
| |
| Fixes: bb30acae4c4dacfa ("perf report: Bail out --mem-mode if mem info is not available") |
| Signed-off-by: James Clark <james.clark@arm.com> |
| Tested-by: Leo Yan <leo.yan@linaro.org> |
| Acked-by: Namhyung Kim <namhyung@kernel.org> |
| Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Cc: German Gomez <german.gomez@arm.com> |
| Cc: Jiri Olsa <jolsa@kernel.org> |
| Cc: John Garry <john.garry@huawei.com> |
| Cc: Leo Yan <leo.yan@linaro.org> |
| Cc: linux-arm-kernel@lists.infradead.org |
| Cc: Mark Rutland <mark.rutland@arm.com> |
| Cc: Mathieu Poirier <mathieu.poirier@linaro.org> |
| Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com> |
| Cc: Will Deacon <will@kernel.org> |
| Link: https://lore.kernel.org/r/20220408144056.1955535-1-james.clark@arm.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/perf/arch/arm64/util/arm-spe.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c |
| index 2100d46ccf5e..bb4ab99afa7f 100644 |
| --- a/tools/perf/arch/arm64/util/arm-spe.c |
| +++ b/tools/perf/arch/arm64/util/arm-spe.c |
| @@ -239,6 +239,12 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, |
| arm_spe_set_timestamp(itr, arm_spe_evsel); |
| } |
| |
| + /* |
| + * Set this only so that perf report knows that SPE generates memory info. It has no effect |
| + * on the opening of the event or the SPE data produced. |
| + */ |
| + evsel__set_sample_bit(arm_spe_evsel, DATA_SRC); |
| + |
| /* Add dummy event to keep tracking */ |
| err = parse_events(evlist, "dummy:u", NULL); |
| if (err) |
| -- |
| 2.35.1 |
| |