Skip to content

Commit 6057b90

Browse files
namhyungIngo Molnar
authored andcommitted
perf/core: Export perf_exclude_event()
While at it, rename the same function in s390 cpum_sf PMU. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Tested-by: Ravi Bangoria <ravi.bangoria@amd.com> Reviewed-by: Ravi Bangoria <ravi.bangoria@amd.com> Acked-by: Thomas Richter <tmricht@linux.ibm.com> Link: https://lore.kernel.org/r/20241203180441.1634709-2-namhyung@kernel.org
1 parent 8622e45 commit 6057b90

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

arch/s390/kernel/perf_cpum_sf.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ static void cpumsf_pmu_disable(struct pmu *pmu)
981981
cpuhw->flags &= ~PMU_F_ENABLED;
982982
}
983983

984-
/* perf_exclude_event() - Filter event
984+
/* perf_event_exclude() - Filter event
985985
* @event: The perf event
986986
* @regs: pt_regs structure
987987
* @sde_regs: Sample-data-entry (sde) regs structure
@@ -990,7 +990,7 @@ static void cpumsf_pmu_disable(struct pmu *pmu)
990990
*
991991
* Return non-zero if the event shall be excluded.
992992
*/
993-
static int perf_exclude_event(struct perf_event *event, struct pt_regs *regs,
993+
static int perf_event_exclude(struct perf_event *event, struct pt_regs *regs,
994994
struct perf_sf_sde_regs *sde_regs)
995995
{
996996
if (event->attr.exclude_user && user_mode(regs))
@@ -1073,7 +1073,7 @@ static int perf_push_sample(struct perf_event *event,
10731073
data.tid_entry.pid = basic->hpp & LPP_PID_MASK;
10741074

10751075
overflow = 0;
1076-
if (perf_exclude_event(event, &regs, sde_regs))
1076+
if (perf_event_exclude(event, &regs, sde_regs))
10771077
goto out;
10781078
if (perf_event_overflow(event, &data, &regs)) {
10791079
overflow = 1;

include/linux/perf_event.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,6 +1690,8 @@ static inline int perf_allow_tracepoint(struct perf_event_attr *attr)
16901690
return security_perf_event_open(attr, PERF_SECURITY_TRACEPOINT);
16911691
}
16921692

1693+
extern int perf_exclude_event(struct perf_event *event, struct pt_regs *regs);
1694+
16931695
extern void perf_event_init(void);
16941696
extern void perf_tp_event(u16 event_type, u64 count, void *record,
16951697
int entry_size, struct pt_regs *regs,
@@ -1895,6 +1897,10 @@ static inline u64 perf_event_pause(struct perf_event *event, bool reset)
18951897
{
18961898
return 0;
18971899
}
1900+
static inline int perf_exclude_event(struct perf_event *event, struct pt_regs *regs)
1901+
{
1902+
return 0;
1903+
}
18981904
#endif
18991905

19001906
#if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_INTEL)

kernel/events/core.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10039,8 +10039,7 @@ static void perf_swevent_event(struct perf_event *event, u64 nr,
1003910039
perf_swevent_overflow(event, 0, data, regs);
1004010040
}
1004110041

10042-
static int perf_exclude_event(struct perf_event *event,
10043-
struct pt_regs *regs)
10042+
int perf_exclude_event(struct perf_event *event, struct pt_regs *regs)
1004410043
{
1004510044
if (event->hw.state & PERF_HES_STOPPED)
1004610045
return 1;

0 commit comments

Comments
 (0)