Skip to content

perf script: Fix PERF_SAMPLE_WEIGHT_STRUCT support

Michael Petlan requested to merge mpetlan/centos-stream-9:my_bz2009378 into main

Bugzilla: https://bugzilla.redhat.com/2009378

upstream

commit 27730c8cd60d1574d8337276e7a9d7d2ca92e0d1
Author: Kan Liang kan.liang@linux.intel.com
Date: Wed Sep 29 08:38:13 2021 -0700

description

-F weight in perf script is broken.
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
ea8d0ed6 ("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: ea8d0ed6 ("perf tools: Support PERF_SAMPLE_WEIGHT_STRUCT")
Link: https://lore.kernel.org/r/1632929894-102778-1-git-send-email-kan.liang@linux.intel.com

Signed-off-by: Michael Petlan mpetlan@redhat.com

Edited by Prarit Bhargava

Merge request reports