Skip to content

Commit 28924df

Browse files
committed
Merge tag 'perf-tools-fixes-for-v7.3-2026-09-07' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools
Pull perf tools fixes from Namhyung Kim: "Two simple fixes for this cycle: - Do not use separate debug files for Intel PT decoding - Fix size of raw data in the PowerPC VPA DTL samples" * tag 'perf-tools-fixes-for-v7.3-2026-09-07' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools: perf powerpc-vpadtl: Fix raw_size of DTL samples perf symbol: Do not use debug file as the binary type
2 parents c297ed9 + aadea57 commit 28924df

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

tools/perf/util/powerpc-vpadtl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ static int powerpc_vpadtl_sample(struct powerpc_vpadtl_entry *record,
196196
sample.cpumode = PERF_RECORD_MISC_KERNEL;
197197
sample.time = save;
198198
sample.raw_data = record;
199-
sample.raw_size = sizeof(record);
199+
sample.raw_size = sizeof(*record);
200200
event.sample.header.type = PERF_RECORD_SAMPLE;
201201
event.sample.header.misc = sample.cpumode;
202202
event.sample.header.size = sizeof(struct perf_event_header);

tools/perf/util/symbol.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1947,7 +1947,16 @@ int dso__load(struct dso *dso, struct map *map)
19471947
if (next_slot) {
19481948
ss_pos++;
19491949

1950-
if (dso__binary_type(dso) == DSO_BINARY_TYPE__NOT_FOUND)
1950+
/*
1951+
* The binary type is used to find the file containing
1952+
* the executed instructions, so prefer the types that
1953+
* refer to the actual object over debug-only files such
1954+
* as DSO_BINARY_TYPE__DEBUGLINK.
1955+
*/
1956+
if (dso__binary_type(dso) == DSO_BINARY_TYPE__NOT_FOUND ||
1957+
symtab_type == DSO_BINARY_TYPE__BUILD_ID_CACHE ||
1958+
(symtab_type == DSO_BINARY_TYPE__SYSTEM_PATH_DSO &&
1959+
dso__binary_type(dso) != DSO_BINARY_TYPE__BUILD_ID_CACHE))
19511960
dso__set_binary_type(dso, symtab_type);
19521961

19531962
if (syms_ss && runtime_ss)

0 commit comments

Comments
 (0)