mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-27 17:35:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

perf test sample-parsing: Validate PERF_FORMAT_GROUP values without LOST

Browse Source 
The sample parsing test only validates grouped read values when
PERF_FORMAT_LOST is present.

For PERF_FORMAT_GROUP without PERF_FORMAT_LOST, the contents of
read.group.values[] are not validated, allowing corruption of the parsed
value and id fields to go undetected.

The values are also handed to the synthesis as a plain array of struct
sample_read_value, which always has a 24-byte stride, while
read.group.values is expected to be packed according to read_format --
evsel__parse_sample() points it into the event data.  Without
PERF_FORMAT_LOST the stride is 16, so both the synthesis and the
comparison walk overlapping bytes and the test passes regardless of the
contents.

Validate value and id for grouped reads and continue to validate lost
when PERF_FORMAT_LOST is present, walking the entries with
next_sample_read_value().  Also build the input packed using
sample_read_value_size() so the compared fields are the real ones.

Verified with a deliberate stride bug in copy_read_group_values(): the
test still passes without this change and fails at read_format 0xc with
it applied.

Signed-off-by: PVS Narasimha Rao <venkatasuryapala@gmail.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
PVS Narasimha Rao
2026-08-10 11:49:25 +05:30
committed by Namhyung Kim
parent 62972e5644
commit 6ae6fb96cc
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tools/perf/tests/sample-parsing.c
View File

@@ -86,10 +86,27 @@ static bool samples_same(struct perf_sample *s1,
COMP(read.time_running);
/* PERF_FORMAT_ID is forced for PERF_SAMPLE_READ */
if (read_format & PERF_FORMAT_GROUP) {
struct sample_read_value *v1 = s1->read.group.values;
struct sample_read_value *v2 = s2->read.group.values;
for (i = 0; i < s1->read.group.nr; i++) {
/* FIXME: check values without LOST */
if (read_format & PERF_FORMAT_LOST)
MCOMP(read.group.values[i]);
if (v1->value != v2->value) {
pr_debug("Samples differ at 'read.group.values[].value'\n");
return false;
}
if (v1->id != v2->id) {
pr_debug("Samples differ at 'read.group.values[].id'\n");
return false;
}
if (read_format & PERF_FORMAT_LOST &&
v1->lost != v2->lost) {
pr_debug("Samples differ at 'read.group.values[].lost'\n");
return false;
}
v1 = next_sample_read_value(v1, read_format);
v2 = next_sample_read_value(v2, read_format);
}
} else {
COMP(read.one.id);
@@ -279,6 +296,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)
},
};
struct sample_read_value values[] = {{1, 5, 0}, {9, 3, 0}, {2, 7, 0}, {6, 4, 1},};
struct sample_read_value packed_values[ARRAY_SIZE(values)];
struct perf_sample sample_out, sample_out_endian;
size_t i, sz, bufsz;
int err, ret = -1;
@@ -303,8 +321,19 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)
*(i + (u8 *)regs) = i & 0xfe;
if (read_format & PERF_FORMAT_GROUP) {
sample.read.group.nr = 4;
sample.read.group.values = values;
size_t vsz = sample_read_value_size(read_format);
/*
* evsel__parse_sample() points read.group.values at the event
* data, where the entries are packed according to read_format,
* so build the input the same way. Otherwise the fields
* compared afterwards are just overlapping bytes.
*/
for (i = 0; i < ARRAY_SIZE(values); i++)
memcpy((void *)packed_values + i * vsz, &values[i], vsz);
sample.read.group.nr = ARRAY_SIZE(values);
sample.read.group.values = packed_values;
} else {
sample.read.one.value = 0x08789faeb786aa87ULL;
sample.read.one.id = 99;