powerpc/perf: Update check for PERF_SAMPLE_DATA_SRC marked events
PATCH 1/1 powerpc/perf: Update check for PERF_SAMPLE_DATA_SRC marked events
The core-book3s PMU sampling code validates the SIER TYPE field when PERF_SAMPLE_DATA_SRC is requested. The SIER TYPE field indicates the instruction type and is only valid for random sampling (marked events). To handle cases observed where SIER TYPE could be zero even for marked events,validation was added to drop such samples and increment event->lost_samples.
However, this validation was applied to all samples, including continuous sampling. In continuous sampling mode, the PMU does not set the SIER TYPE field, so it remains zero. As a result, valid continuous samples were incorrectly treated as invalid and dropped. Fixed this by gating the SIER TYPE validation with mark_event, so the check runs only for marked (random) events. Continuous samples now skip this check and are recorded normally in the final data recording path.
---
arch/powerpc/perf/core-book3s.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/powerpc/perf/core-book3s.c +3 -2
@@ -2242,6 +2242,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val,const u64 last_period = event->hw.last_period;s64 prev, delta, left;int record =0 ; +int mark_event = regs->dsisr &MMCRA_SAMPLE_ENABLE ;if (event->hw.state &PERF_HES_STOPPED ) {write_pmc (event->hw.idx,0 );
@@ -2304,9 +2305,9 @@ static void record_and_restart(struct perf_event *event, unsigned long val,* 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 "type" has reserved values for this field with a -* ISA version check. +* ISA version check for marked events. */ -if (event->attr.sample_type &PERF_SAMPLE_DATA_SRC && +if (mark_event && event->attr.sample_type &PERF_SAMPLE_DATA_SRC && ppmu->get_mem_data_src) { val = (regs->dar &SIER_TYPE_MASK ) >>SIER_TYPE_SHIFT ;if (val ==0 || (val ==7 && !cpu_has_feature (CPU_FTR_ARCH_31 ))) {
Signature · 1 line
2.47.3
Quoted 20 lines · Shivani Nittor
The core-book3s PMU sampling code validates the SIER TYPE field when
PERF_SAMPLE_DATA_SRCis requested. The SIER TYPE field indicates the instruction type and is only valid for random sampling (marked events). To handle cases observed where SIER TYPE could be zero even for marked events,validation was added to drop such samples and incrementevent->lost_samples.However, this validation was applied to all samples, including continuous sampling. In continuous sampling mode, the PMU does not set the SIER TYPE field, so it remains zero. As a result, valid continuous samples were incorrectly treated as invalid and dropped. Fixed this by gating the SIER TYPE validation with
mark_event, so the check runs only for marked (random) events. Continuous samples now skip this check and are recorded normally in the final data recording path.
Quoted 2 lines
Fixes 2ffb26afa642 ("arch/powerpc/perf: Check the instruction type before creating sample with perf_mem_data_src")Signed-off-by Shivani Nittor <[email protected]>
The changes looks good to me.
Thanks
Athira
Quoted 32 lines
---
arch/powerpc/perf/core-book3s.c| 5 +++--1 file changed, 3 insertions(+), 2 deletions(-)arch/powerpc/perf/core-book3s.c +3
-2@@ -2242,6 +2242,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val,const u64 last_period = event->hw.last_period;s64 prev, delta, left;int record =0 ; +int mark_event = regs->dsisr &MMCRA_SAMPLE_ENABLE ;if (event->hw.state &PERF_HES_STOPPED ) {write_pmc (event->hw.idx,0 );@@ -2304,9 +2305,9 @@ static void record_and_restart(struct perf_event *event, unsigned long val,* 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 "type" has reserved values for this field with a -* ISA version check. +* ISA version check for marked events. */ -if (event->attr.sample_type &PERF_SAMPLE_DATA_SRC && +if (mark_event && event->attr.sample_type &PERF_SAMPLE_DATA_SRC && ppmu->get_mem_data_src) { val = (regs->dar &SIER_TYPE_MASK ) >>SIER_TYPE_SHIFT ;if (val ==0 || (val ==7 && !cpu_has_feature (CPU_FTR_ARCH_31 ))) {Signature · 1 line
2.47.3
Quoted 51 lines · Shivani Nittor
The core-book3s PMU sampling code validates the SIER TYPE field when
PERF_SAMPLE_DATA_SRCis requested. The SIER TYPE field indicates the instruction type and is only valid for random sampling (marked events). To handle cases observed where SIER TYPE could be zero even for marked events,validation was added to drop such samples and incrementevent->lost_samples.However, this validation was applied to all samples, including continuous sampling. In continuous sampling mode, the PMU does not set the SIER TYPE field, so it remains zero. As a result, valid continuous samples were incorrectly treated as invalid and dropped. Fixed this by gating the SIER TYPE validation with
mark_event, so the check runs only for marked (random) events. Continuous samples now skip this check and are recorded normally in the final data recording path.Fixes 2ffb26afa642 ("arch/powerpc/perf: Check the instruction type before creating sample with perf_mem_data_src")Signed-off-by Shivani Nittor <[email protected]>---
arch/powerpc/perf/core-book3s.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)arch/powerpc/perf/core-book3s.c +3
-2@@ -2242,6 +2242,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val,const u64 last_period = event->hw.last_period;s64 prev, delta, left;int record =0 ; +int mark_event = regs->dsisr &MMCRA_SAMPLE_ENABLE ;if (event->hw.state &PERF_HES_STOPPED ) {write_pmc (event->hw.idx,0 );@@ -2304,9 +2305,9 @@ static void record_and_restart(struct perf_event *event, unsigned long val,* 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 "type" has reserved values for this field with a -* ISA version check. +* ISA version check for marked events. */ -if (event->attr.sample_type &PERF_SAMPLE_DATA_SRC && +if (mark_event && event->attr.sample_type &PERF_SAMPLE_DATA_SRC && ppmu->get_mem_data_src) { val = (regs->dar &SIER_TYPE_MASK ) >>SIER_TYPE_SHIFT ;if (val ==0 || (val ==7 && !cpu_has_feature (CPU_FTR_ARCH_31 ))) {Signature · 1 line
2.47.3
LGTM
Quoted 8 lines · Shivani Nittor
The core-book3s PMU sampling code validates the SIER TYPE field when
PERF_SAMPLE_DATA_SRCis requested. The SIER TYPE field indicates the instruction type and is only valid for random sampling (marked events). To handle cases observed where SIER TYPE could be zero even for marked events,validation was added to drop such samples and incrementevent->lost_samples.[...]
Applied to powerpc/fixes.
[1/1] powerpc/perf: Update check for PERF_SAMPLE_DATA_SRC marked events
https://git.kernel.org/powerpc/c/131717e656b379addb95af2dcb2d90c723bae24b
cheers