From: Kan Liang kan.liang@linux.intel.com
[ Upstream commit 27730c8cd60d1574d8337276e7a9d7d2ca92e0d1 ]
-F weight in perf script is broken.
# ./perf mem record # ./perf script -F weight Samples for 'dummy:HG' event do not have WEIGHT attribute set. Cannot print 'weight' field.
The sample type, PERF_SAMPLE_WEIGHT_STRUCT, is an alternative of the PERF_SAMPLE_WEIGHT sample type. They share the same space, weight. The lower 32 bits are exactly the same for both sample type. The higher 32 bits may be different for different architecture. For a new kernel on x86, the PERF_SAMPLE_WEIGHT_STRUCT is used. For an old kernel or other ARCHs, the PERF_SAMPLE_WEIGHT is used.
With -F weight, current perf script will only check the input string "weight" with the PERF_SAMPLE_WEIGHT sample type. Because the commit ea8d0ed6eae3 ("perf tools: Support PERF_SAMPLE_WEIGHT_STRUCT") didn't update the PERF_SAMPLE_WEIGHT_STRUCT sample type for perf script. For a new kernel on x86, the check fails.
Use PERF_SAMPLE_WEIGHT_TYPE, which supports both sample types, to replace PERF_SAMPLE_WEIGHT
Fixes: ea8d0ed6eae37b01 ("perf tools: Support PERF_SAMPLE_WEIGHT_STRUCT") Reported-by: Joe Mario jmario@redhat.com Reviewed-by: Kajol Jain kjain@linux.ibm.com Signed-off-by: Kan Liang kan.liang@linux.intel.com Tested-by: Jiri Olsa jolsa@redhat.com Tested-by: Joe Mario jmario@redhat.com Acked-by: Jiri Olsa jolsa@redhat.com Acked-by: Joe Mario jmario@redhat.com Cc: Andi Kleen ak@linux.intel.com Link: https://lore.kernel.org/r/1632929894-102778-1-git-send-email-kan.liang@linux... Signed-off-by: Arnaldo Carvalho de Melo acme@redhat.com Signed-off-by: Sasha Levin sashal@kernel.org --- tools/perf/builtin-script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 064da7f3618d..52ff827ca799 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -469,7 +469,7 @@ static int evsel__check_attr(struct evsel *evsel, struct perf_session *session) return -EINVAL;
if (PRINT_FIELD(WEIGHT) && - evsel__check_stype(evsel, PERF_SAMPLE_WEIGHT, "WEIGHT", PERF_OUTPUT_WEIGHT)) + evsel__check_stype(evsel, PERF_SAMPLE_WEIGHT_TYPE, "WEIGHT", PERF_OUTPUT_WEIGHT)) return -EINVAL;
if (PRINT_FIELD(SYM) &&