Commit 6057b90e authored by Namhyung Kim's avatar Namhyung Kim Committed by Ingo Molnar
Browse files

perf/core: Export perf_exclude_event() 



While at it, rename the same function in s390 cpum_sf PMU.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarRavi Bangoria <ravi.bangoria@amd.com>
Reviewed-by: default avatarRavi Bangoria <ravi.bangoria@amd.com>
Acked-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Link: https://lore.kernel.org/r/20241203180441.1634709-2-namhyung@kernel.org
parent 8622e45b

arch/s390/kernel/perf_cpum_sf.c

+3 −3
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ static void cpumsf_pmu_disable(struct pmu *pmu) 
	cpuhw->flags &= ~PMU_F_ENABLED;

}



/* perf_exclude_event() - Filter event

/* perf_event_exclude() - Filter event

 * @event:	The perf event

 * @regs:	pt_regs structure

 * @sde_regs:	Sample-data-entry (sde) regs structure
@@ -990,7 +990,7 @@ static void cpumsf_pmu_disable(struct pmu *pmu) 
 *

 * Return non-zero if the event shall be excluded.

 */

static int perf_exclude_event(struct perf_event *event, struct pt_regs *regs,

static int perf_event_exclude(struct perf_event *event, struct pt_regs *regs,

			      struct perf_sf_sde_regs *sde_regs)

{

	if (event->attr.exclude_user && user_mode(regs))
@@ -1073,7 +1073,7 @@ static int perf_push_sample(struct perf_event *event, 
	data.tid_entry.pid = basic->hpp & LPP_PID_MASK;



	overflow = 0;

	if (perf_exclude_event(event, &regs, sde_regs))

	if (perf_event_exclude(event, &regs, sde_regs))

		goto out;

	if (perf_event_overflow(event, &data, &regs)) {

		overflow = 1;

include/linux/perf_event.h

+6 −0
Original line number Diff line number Diff line
@@ -1690,6 +1690,8 @@ static inline int perf_allow_tracepoint(struct perf_event_attr *attr) 
	return security_perf_event_open(attr, PERF_SECURITY_TRACEPOINT);

}



extern int perf_exclude_event(struct perf_event *event, struct pt_regs *regs);



extern void perf_event_init(void);

extern void perf_tp_event(u16 event_type, u64 count, void *record,

			  int entry_size, struct pt_regs *regs,
@@ -1895,6 +1897,10 @@ static inline u64 perf_event_pause(struct perf_event *event, bool reset) 
{

	return 0;

}

static inline int perf_exclude_event(struct perf_event *event, struct pt_regs *regs)

{

	return 0;

}

#endif



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

kernel/events/core.c

+1 −2
Original line number Diff line number Diff line
@@ -10039,8 +10039,7 @@ static void perf_swevent_event(struct perf_event *event, u64 nr, 
	perf_swevent_overflow(event, 0, data, regs);

}



static int perf_exclude_event(struct perf_event *event,

			      struct pt_regs *regs)

int perf_exclude_event(struct perf_event *event, struct pt_regs *regs)

{

	if (event->hw.state & PERF_HES_STOPPED)

		return 1;