Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arch/powerpc/perf: Check the instruction type before creating sample with perf_mem_data_src

perf mem report aborts as below sometimes (during some corner
case) in powerpc:

# ./perf mem report 1>out
*** stack smashing detected ***: terminated
Aborted (core dumped)

The backtrace is as below:
__pthread_kill_implementation ()
raise ()
abort ()
__libc_message
__fortify_fail
__stack_chk_fail
hist_entry.lvl_snprintf
__sort__hpp_entry
__hist_entry__snprintf
hists.fprintf
cmd_report
cmd_mem

Snippet of code which triggers the issue
from tools/perf/util/sort.c

static int hist_entry__lvl_snprintf(struct hist_entry *he, char *bf,
size_t size, unsigned int width)
{
char out[64];

perf_mem__lvl_scnprintf(out, sizeof(out), he->mem_info);
return repsep_snprintf(bf, size, "%-*s", width, out);
}

The value of "out" is filled from perf_mem_data_src value.
Debugging this further showed that for some corner cases, the
value of "data_src" was pointing to wrong value. This resulted
in bigger size of string and causing stack check fail.

The perf mem data source values are captured in the sample via
isa207_get_mem_data_src function. The initial check is to fetch
the type of sampled instruction. If the type of instruction is
not valid (not a load/store instruction), the function returns.

Since 'commit e16fd7f2cb1a ("perf: Use sample_flags for data_src")',
data_src field is not initialized by the perf_sample_data_init()
function. If the PMU driver doesn't set the data_src value to zero if
type is not valid, this will result in uninitailised value for data_src.
The uninitailised value of data_src resulted in stack check fail
followed by abort for "perf mem report".

When requesting for data source information in the sample, the
instruction type is expected to be load or store instruction.
In ISA v3.0, due to hardware limitation, there are corner cases
where the instruction type other than load or store is observed.
In ISA v3.0 and before values "0" and "7" are considered reserved.
In ISA v3.1, value "7" has been used to indicate "larx/stcx".
Drop the sample if instruction type has reserved values for this
field with a ISA version check. Initialize data_src to zero in
isa207_get_mem_data_src if the instruction type is not load/store.

Reported-by: Disha Goel <disgoel@linux.vnet.ibm.com>
Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20250121131621.39054-1-atrajeev@linux.vnet.ibm.com

authored by

Athira Rajeev and committed by
Madhavan Srinivasan
2ffb26af 61c403b5

+23 -1
+20
arch/powerpc/perf/core-book3s.c
··· 2222 2222 #define PERF_SAMPLE_ADDR_TYPE (PERF_SAMPLE_ADDR | \ 2223 2223 PERF_SAMPLE_PHYS_ADDR | \ 2224 2224 PERF_SAMPLE_DATA_PAGE_SIZE) 2225 + 2226 + #define SIER_TYPE_SHIFT 15 2227 + #define SIER_TYPE_MASK (0x7ull << SIER_TYPE_SHIFT) 2228 + 2225 2229 /* 2226 2230 * A counter has overflowed; update its count and record 2227 2231 * things if requested. Note that interrupts are hard-disabled ··· 2293 2289 (event->attr.sample_type & PERF_SAMPLE_IP) && 2294 2290 is_kernel_addr(mfspr(SPRN_SIAR))) 2295 2291 record = 0; 2292 + 2293 + /* 2294 + * SIER[46-48] presents instruction type of the sampled instruction. 2295 + * In ISA v3.0 and before values "0" and "7" are considered reserved. 2296 + * In ISA v3.1, value "7" has been used to indicate "larx/stcx". 2297 + * Drop the sample if "type" has reserved values for this field with a 2298 + * ISA version check. 2299 + */ 2300 + if (event->attr.sample_type & PERF_SAMPLE_DATA_SRC && 2301 + ppmu->get_mem_data_src) { 2302 + val = (regs->dar & SIER_TYPE_MASK) >> SIER_TYPE_SHIFT; 2303 + if (val == 0 || (val == 7 && !cpu_has_feature(CPU_FTR_ARCH_31))) { 2304 + record = 0; 2305 + atomic64_inc(&event->lost_samples); 2306 + } 2307 + } 2296 2308 2297 2309 /* 2298 2310 * Finally record data if requested.
+3 -1
arch/powerpc/perf/isa207-common.c
··· 321 321 322 322 sier = mfspr(SPRN_SIER); 323 323 val = (sier & ISA207_SIER_TYPE_MASK) >> ISA207_SIER_TYPE_SHIFT; 324 - if (val != 1 && val != 2 && !(val == 7 && cpu_has_feature(CPU_FTR_ARCH_31))) 324 + if (val != 1 && val != 2 && !(val == 7 && cpu_has_feature(CPU_FTR_ARCH_31))) { 325 + dsrc->val = 0; 325 326 return; 327 + } 326 328 327 329 idx = (sier & ISA207_SIER_LDST_MASK) >> ISA207_SIER_LDST_SHIFT; 328 330 sub_idx = (sier & ISA207_SIER_DATA_SRC_MASK) >> ISA207_SIER_DATA_SRC_SHIFT;