mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-09-18 22:09:30 +02:00
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
This commit is contained in:
@@ -196,7 +196,7 @@ static int powerpc_vpadtl_sample(struct powerpc_vpadtl_entry *record,
|
||||
sample.cpumode = PERF_RECORD_MISC_KERNEL;
|
||||
sample.time = save;
|
||||
sample.raw_data = record;
|
||||
sample.raw_size = sizeof(record);
|
||||
sample.raw_size = sizeof(*record);
|
||||
event.sample.header.type = PERF_RECORD_SAMPLE;
|
||||
event.sample.header.misc = sample.cpumode;
|
||||
event.sample.header.size = sizeof(struct perf_event_header);
|
||||
|
||||
@@ -1947,7 +1947,16 @@ int dso__load(struct dso *dso, struct map *map)
|
||||
if (next_slot) {
|
||||
ss_pos++;
|
||||
|
||||
if (dso__binary_type(dso) == DSO_BINARY_TYPE__NOT_FOUND)
|
||||
/*
|
||||
* The binary type is used to find the file containing
|
||||
* the executed instructions, so prefer the types that
|
||||
* refer to the actual object over debug-only files such
|
||||
* as DSO_BINARY_TYPE__DEBUGLINK.
|
||||
*/
|
||||
if (dso__binary_type(dso) == DSO_BINARY_TYPE__NOT_FOUND ||
|
||||
symtab_type == DSO_BINARY_TYPE__BUILD_ID_CACHE ||
|
||||
(symtab_type == DSO_BINARY_TYPE__SYSTEM_PATH_DSO &&
|
||||
dso__binary_type(dso) != DSO_BINARY_TYPE__BUILD_ID_CACHE))
|
||||
dso__set_binary_type(dso, symtab_type);
|
||||
|
||||
if (syms_ss && runtime_ss)
|
||||
|
||||
Reference in New Issue
Block a user