mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 05:44:11 +00:00
perf archive: Add new option '--all' to pack perf.data with DSOs
'perf archive' has limited functionality and people from Red Hat Global
Support Services sent a request for a new feature that would pack
perf.data file together with an archive with debug symbols created by
the command 'perf archive' as customers were being confused and often
would forget to send perf.data file with the debug symbols.
With this patch 'perf archive' now accepts an option '--all' that
generates archive 'perf.all-hostname-date-time.tar.bz2' that holds file
'perf.data' and a sub-tar 'perf.symbols.tar.bz2' with debug symbols. The
functionality of the command 'perf archive' was not changed.
Committer testing:
Run 'perf record' on a Intel 14900K machine, hybrid:
root@number:~# perf record -a sleep 5s
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 4.006 MB perf.data (15427 samples) ]
root@number:~# perf archive --all
Now please run:
$ tar xvf perf.all-number-20231219-104854.tar.bz2 && tar xvf perf.symbols.tar.bz2 -C ~/.debug
wherever you need to run 'perf report' on.
root@number:~#
root@number:~# perf report --header-only
# ========
# captured on : Tue Dec 19 10:48:48 2023
# header version : 1
# data offset : 1008
# data size : 4199936
# feat offset : 4200944
# hostname : number
# os release : 6.6.4-200.fc39.x86_64
# perf version : 6.7.rc6.gca90f8e17b84
# arch : x86_64
# nrcpus online : 28
# nrcpus avail : 28
# cpudesc : Intel(R) Core(TM) i7-14700K
# cpuid : GenuineIntel,6,183,1
# total memory : 32610508 kB
# cmdline : /home/acme/bin/perf (deleted) record -a sleep 5s
# event : name = cpu_atom/cycles/P, , id = { 5088024, 5088025, 5088026, 5088027, 5088028, 5088029, 5088030, 5088031, 5088032, 5088033, 5088034, 5088035 }, type = 0 (PERF_TYPE_HARDWARE), size>
# event : name = cpu_core/cycles/P, , id = { 5088036, 5088037, 5088038, 5088039, 5088040, 5088041, 5088042, 5088043, 5088044, 5088045, 5088046, 5088047, 5088048, 5088049, 5088050, 5088051 },>
# event : name = dummy:u, , id = { 5088052, 5088053, 5088054, 5088055, 5088056, 5088057, 5088058, 5088059, 5088060, 5088061, 5088062, 5088063, 5088064, 5088065, 5088066, 5088067, 5088068, 50>
# CPU_TOPOLOGY info available, use -I to display
# NUMA_TOPOLOGY info available, use -I to display
# pmu mappings: cpu_atom = 10, cpu_core = 4, breakpoint = 5, cstate_core = 34, cstate_pkg = 35, i915 = 14, intel_bts = 11, intel_pt = 12, kprobe = 8, msr = 13, power = 36, software = 1, trac>
# CACHE info available, use -I to display
# time of first sample : 124739.850375
# time of last sample : 124744.855181
# sample duration : 5004.806 ms
# sample duration : 5004.806 ms
# MEM_TOPOLOGY info available, use -I to display
# bpf_prog_info 2: bpf_prog_7cc47bbf07148bfe_hid_tail_call addr 0xffffffffc0000978 size 113
# bpf_prog_info 47: bpf_prog_713a545fe0530ce7_restrict_filesystems addr 0xffffffffc0000748 size 305
# bpf_prog_info 163: bpf_prog_bd834b0730296056 addr 0xffffffffc000df14 size 331
# bpf_prog_info 258: bpf_prog_ee0e253c78993a24_sd_devices addr 0xffffffffc001fc08 size 264
# bpf_prog_info 259: bpf_prog_40ddf486530245f5_sd_devices addr 0xffffffffc00204bc size 318
# bpf_prog_info 260: bpf_prog_6deef7357e7b4530_sd_fw_egress addr 0xffffffffc0020630 size 63
# bpf_prog_info 261: bpf_prog_6deef7357e7b4530_sd_fw_ingress addr 0xffffffffc0020688 size 63
# bpf_prog_info 262: bpf_prog_b37200ab714f0e17_sd_devices addr 0xffffffffc002072c size 110
# bpf_prog_info 263: bpf_prog_b90a282ee45cfed9_sd_devices addr 0xffffffffc00207d8 size 393
# bpf_prog_info 264: bpf_prog_ee0e253c78993a24_sd_devices addr 0xffffffffc002099c size 264
# bpf_prog_info 265: bpf_prog_6deef7357e7b4530_sd_fw_egress addr 0xffffffffc0020ad4 size 63
# bpf_prog_info 266: bpf_prog_6deef7357e7b4530_sd_fw_ingress addr 0xffffffffc0020b50 size 63
# bpf_prog_info 267: bpf_prog_ee0e253c78993a24_sd_devices addr 0xffffffffc002d98c size 264
# bpf_prog_info 268: bpf_prog_be31ae23198a0378_sd_devices addr 0xffffffffc002dac8 size 297
# bpf_prog_info 269: bpf_prog_ccbbf91f3c6979c7_sd_devices addr 0xffffffffc002dc54 size 360
# bpf_prog_info 270: bpf_prog_3a0ef5414c2f6fca_sd_devices addr 0xffffffffc002dde8 size 456
# bpf_prog_info 271: bpf_prog_6deef7357e7b4530_sd_fw_egress addr 0xffffffffc0020bd4 size 63
# bpf_prog_info 272: bpf_prog_6deef7357e7b4530_sd_fw_ingress addr 0xffffffffc00299b4 size 63
# bpf_prog_info 273: bpf_prog_ee0e253c78993a24_sd_devices addr 0xffffffffc002dfd0 size 264
# bpf_prog_info 274: bpf_prog_6deef7357e7b4530_sd_fw_egress addr 0xffffffffc0029a3c size 63
# bpf_prog_info 275: bpf_prog_6deef7357e7b4530_sd_fw_ingress addr 0xffffffffc002d71c size 63
# bpf_prog_info 276: bpf_prog_6deef7357e7b4530_sd_fw_egress addr 0xffffffffc002d7a8 size 63
# bpf_prog_info 277: bpf_prog_6deef7357e7b4530_sd_fw_ingress addr 0xffffffffc002e13c size 63
# bpf_prog_info 278: bpf_prog_6deef7357e7b4530_sd_fw_egress addr 0xffffffffc002e1a8 size 63
# bpf_prog_info 279: bpf_prog_6deef7357e7b4530_sd_fw_ingress addr 0xffffffffc002e234 size 63
# bpf_prog_info 280: bpf_prog_be31ae23198a0378_sd_devices addr 0xffffffffc002e2ac size 297
# bpf_prog_info 281: bpf_prog_6deef7357e7b4530_sd_fw_egress addr 0xffffffffc002e42c size 63
# bpf_prog_info 282: bpf_prog_6deef7357e7b4530_sd_fw_ingress addr 0xffffffffc002e49c size 63
# bpf_prog_info 290: bpf_prog_ee0e253c78993a24_sd_devices addr 0xffffffffc0004b18 size 264
# bpf_prog_info 294: bpf_prog_0b1566e4b83190c5_sd_devices addr 0xffffffffc0004c50 size 360
# bpf_prog_info 295: bpf_prog_ee0e253c78993a24_sd_devices addr 0xffffffffc001cfc8 size 264
# bpf_prog_info 296: bpf_prog_6deef7357e7b4530_sd_fw_egress addr 0xffffffffc0013abc size 63
# bpf_prog_info 297: bpf_prog_6deef7357e7b4530_sd_fw_ingress addr 0xffffffffc0013b24 size 63
# btf info of id 2
# btf info of id 52
# HYBRID_TOPOLOGY info available, use -I to display
# cpu_atom pmu capabilities: branches=32, max_precise=3, pmu_name=alderlake_hybrid
# cpu_core pmu capabilities: branches=32, max_precise=3, pmu_name=alderlake_hybrid
# intel_pt pmu capabilities: topa_multiple_entries=1, psb_cyc=1, single_range_output=1, mtc_periods=249, ip_filtering=1, output_subsys=0, cr3_filtering=1, psb_periods=3f, event_trace=0, cycl>
# missing features: TRACING_DATA BRANCH_STACK GROUP_DESC AUXTRACE STAT CLOCKID DIR_FORMAT COMPRESSED CPU_PMU_CAPS CLOCK_DATA
# ========
#
root@number:~#
And then transferring it to a ARM64 machine, a Libre Computer RK3399-PC:
root@number:~# scp perf.all-number-20231219-104854.tar.bz2 acme@192.168.86.114:.
acme@192.168.86.114's password:
perf.all-number-20231219-104854.tar.bz2 100% 145MB 85.4MB/s 00:01
root@number:~#
root@number:~# ssh acme@192.168.86.114
acme@192.168.86.114's password:
Welcome to Ubuntu 23.04 (GNU/Linux 6.1.68-12200-g1c40dda3081e aarch64)
* Documentation: https://help.ubuntu.com
* Management: https://landscape.canonical.com
* Support: https://ubuntu.com/advantage
Last login: Tue Dec 19 14:53:18 2023 from 192.168.86.42
acme@roc-rk3399-pc:~$ tar xvf perf.all-number-20231219-104854.tar.bz2 && tar xvf perf.symbols.tar.bz2 -C ~/.debug
perf.data
perf.symbols.tar.bz2
.build-id/ad/acc227f470409213308050b71f664322e2956c
[kernel.kallsyms]/adacc227f470409213308050b71f664322e2956c/
[kernel.kallsyms]/adacc227f470409213308050b71f664322e2956c/kallsyms
[kernel.kallsyms]/adacc227f470409213308050b71f664322e2956c/probes
.build-id/76/c91f4d62baa06bb52e07e20aba36d21a8f9797
usr/lib64/libz.so.1.2.13/76c91f4d62baa06bb52e07e20aba36d21a8f9797/
<SNIP>
.build-id/09/d7e96bc1e3f599d15ca28b36959124b2d74410
usr/lib64/librpm_sequoia.so.1/09d7e96bc1e3f599d15ca28b36959124b2d74410/
usr/lib64/librpm_sequoia.so.1/09d7e96bc1e3f599d15ca28b36959124b2d74410/elf
usr/lib64/librpm_sequoia.so.1/09d7e96bc1e3f599d15ca28b36959124b2d74410/probes
acme@roc-rk3399-pc:~$
acme@roc-rk3399-pc:~$ perf report --stdio | head -40
# To display the perf.data header info, please use --header/--header-only options.
#
# Total Lost Samples: 0
#
# Samples: 6K of event 'cpu_atom/cycles/P'
# Event count (approx.): 4519946621
#
# Overhead Command Shared Object Symbol
# ........ ............... .............................................. .........................................................................................................................................................
#
1.73% swapper [kernel.kallsyms] [k] intel_idle
1.43% sh [kernel.kallsyms] [k] next_uptodate_folio
0.94% make ld-linux-x86-64.so.2 [.] do_lookup_x
0.90% sh ld-linux-x86-64.so.2 [.] do_lookup_x
0.82% sh [kernel.kallsyms] [k] perf_event_mmap_output
0.74% sh [kernel.kallsyms] [k] filemap_map_pages
0.72% sh ld-linux-x86-64.so.2 [.] _dl_relocate_object
0.69% cc1 [kernel.kallsyms] [k] clear_page_erms
0.61% sh [kernel.kallsyms] [k] unmap_page_range
0.56% swapper [kernel.kallsyms] [k] poll_idle
0.52% cc1 ld-linux-x86-64.so.2 [.] do_lookup_x
0.47% make ld-linux-x86-64.so.2 [.] _dl_relocate_object
0.44% cc1 cc1 [.] make_node(tree_code)
0.43% sh [kernel.kallsyms] [k] native_irq_return_iret
0.38% sh libc.so.6 [.] _int_malloc
0.38% cc1 cc1 [.] decl_attributes(tree_node**, tree_node*, int, tree_node*)
0.38% sh [kernel.kallsyms] [k] clear_page_erms
0.37% cc1 cc1 [.] ht_lookup_with_hash(ht*, unsigned char const*, unsigned long, unsigned int, ht_lookup_option)
0.37% make [kernel.kallsyms] [k] perf_event_mmap_output
0.37% make ld-linux-x86-64.so.2 [.] _dl_lookup_symbol_x
0.35% sh [kernel.kallsyms] [k] _compound_head
0.35% make make [.] hash_find_slot
0.33% sh libc.so.6 [.] __strlen_avx2
0.33% cc1 cc1 [.] ggc_internal_alloc(unsigned long, void (*)(void*), unsigned long, unsigned long)
0.33% sh [kernel.kallsyms] [k] perf_iterate_ctx
0.31% make make [.] jhash_string
0.31% sh [kernel.kallsyms] [k] page_remove_rmap
0.30% cc1 libc.so.6 [.] _int_malloc
0.30% make libc.so.6 [.] _int_malloc
acme@roc-rk3399-pc:~$
Signed-off-by: Veronika Molnarova <vmolnaro@redhat.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Link: https://lore.kernel.org/r/20231212165909.14459-1-vmolnaro@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Veronika Molnarova
Arnaldo Carvalho de Melo
parent
ab1c247094
commit
624dda101e
1 changed files with 32 additions and 8 deletions
40
tools/perf/perf-archive.sh
Normal file → Executable file
40
tools/perf/perf-archive.sh
Normal file → Executable file
|
|
@ -4,9 +4,19 @@
|
|||
# Arnaldo Carvalho de Melo <acme@redhat.com>
|
||||
|
||||
PERF_DATA=perf.data
|
||||
if [ $# -ne 0 ] ; then
|
||||
PERF_DATA=$1
|
||||
fi
|
||||
PERF_SYMBOLS=perf.symbols
|
||||
PERF_ALL=perf.all
|
||||
ALL=0
|
||||
|
||||
while [ $# -gt 0 ] ; do
|
||||
if [ $1 == "--all" ]; then
|
||||
ALL=1
|
||||
shift
|
||||
else
|
||||
PERF_DATA=$1
|
||||
shift
|
||||
fi
|
||||
done
|
||||
|
||||
#
|
||||
# PERF_BUILDID_DIR environment variable set by perf
|
||||
|
|
@ -39,9 +49,23 @@ while read build_id ; do
|
|||
echo ${filename#$PERF_BUILDID_LINKDIR} >> $MANIFEST
|
||||
done
|
||||
|
||||
tar cjf $PERF_DATA.tar.bz2 -C $PERF_BUILDID_DIR -T $MANIFEST
|
||||
rm $MANIFEST $BUILDIDS || true
|
||||
echo -e "Now please run:\n"
|
||||
echo -e "$ tar xvf $PERF_DATA.tar.bz2 -C ~/.debug\n"
|
||||
echo "wherever you need to run 'perf report' on."
|
||||
if [ $ALL -eq 1 ]; then # pack perf.data file together with tar containing debug symbols
|
||||
HOSTNAME=$(hostname)
|
||||
DATE=$(date '+%Y%m%d-%H%M%S')
|
||||
tar cjf $PERF_SYMBOLS.tar.bz2 -C $PERF_BUILDID_DIR -T $MANIFEST
|
||||
tar cjf $PERF_ALL-$HOSTNAME-$DATE.tar.bz2 $PERF_DATA $PERF_SYMBOLS.tar.bz2
|
||||
rm $PERF_SYMBOLS.tar.bz2 $MANIFEST $BUILDIDS || true
|
||||
|
||||
echo -e "Now please run:\n"
|
||||
echo -e "$ tar xvf $PERF_ALL-$HOSTNAME-$DATE.tar.bz2 && tar xvf $PERF_SYMBOLS.tar.bz2 -C ~/.debug\n"
|
||||
echo "wherever you need to run 'perf report' on."
|
||||
else # pack only the debug symbols
|
||||
tar cjf $PERF_DATA.tar.bz2 -C $PERF_BUILDID_DIR -T $MANIFEST
|
||||
rm $MANIFEST $BUILDIDS || true
|
||||
|
||||
echo -e "Now please run:\n"
|
||||
echo -e "$ tar xvf $PERF_DATA.tar.bz2 -C ~/.debug\n"
|
||||
echo "wherever you need to run 'perf report' on."
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
Loading…
Reference in a new issue