Commit 04782e63 authored by Colton Lewis's avatar Colton Lewis Committed by Ingo Molnar
Browse files

perf/core: Hoist perf_instruction_pointer() and perf_misc_flags() 



For clarity, rename the arch-specific definitions of these functions
to perf_arch_* to denote they are arch-specifc. Define the
generic-named functions in one place where they can call the
arch-specific ones as needed.

Signed-off-by: default avatarColton Lewis <coltonlewis@google.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Acked-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarMadhavan Srinivasan <maddy@linux.ibm.com>
Acked-by: default avatarKan Liang <kan.liang@linux.intel.com>
Link: https://lore.kernel.org/r/20241113190156.2145593-3-coltonlewis@google.com
parent e33ed362

arch/arm64/include/asm/perf_event.h

+3 −3
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 


#ifdef CONFIG_PERF_EVENTS

struct pt_regs;

extern unsigned long perf_instruction_pointer(struct pt_regs *regs);

extern unsigned long perf_misc_flags(struct pt_regs *regs);

#define perf_misc_flags(regs)	perf_misc_flags(regs)

extern unsigned long perf_arch_instruction_pointer(struct pt_regs *regs);

extern unsigned long perf_arch_misc_flags(struct pt_regs *regs);

#define perf_arch_misc_flags(regs)	perf_misc_flags(regs)

#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs

#endif

arch/arm64/kernel/perf_callchain.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, 
	arch_stack_walk(callchain_trace, entry, current, regs);

}



unsigned long perf_instruction_pointer(struct pt_regs *regs)

unsigned long perf_arch_instruction_pointer(struct pt_regs *regs)

{

	if (perf_guest_state())

		return perf_guest_get_ip();
@@ -47,7 +47,7 @@ unsigned long perf_instruction_pointer(struct pt_regs *regs) 
	return instruction_pointer(regs);

}



unsigned long perf_misc_flags(struct pt_regs *regs)

unsigned long perf_arch_misc_flags(struct pt_regs *regs)

{

	unsigned int guest_state = perf_guest_state();

	int misc = 0;

arch/powerpc/include/asm/perf_event_server.h

+3 −3
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ struct power_pmu { 
int __init register_power_pmu(struct power_pmu *pmu);



struct pt_regs;

extern unsigned long perf_misc_flags(struct pt_regs *regs);

extern unsigned long perf_instruction_pointer(struct pt_regs *regs);

extern unsigned long perf_arch_misc_flags(struct pt_regs *regs);

extern unsigned long perf_arch_instruction_pointer(struct pt_regs *regs);

extern unsigned long int read_bhrb(int n);



/*
@@ -111,7 +111,7 @@ extern unsigned long int read_bhrb(int n); 
 * if we have hardware PMU support.

 */

#ifdef CONFIG_PPC_PERF_CTRS

#define perf_misc_flags(regs)	perf_misc_flags(regs)

#define perf_arch_misc_flags(regs)	perf_arch_misc_flags(regs)

#endif



/*

arch/powerpc/perf/core-book3s.c

+2 −2
Original line number Diff line number Diff line
@@ -2332,7 +2332,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val, 
 * Called from generic code to get the misc flags (i.e. processor mode)

 * for an event_id.

 */

unsigned long perf_misc_flags(struct pt_regs *regs)

unsigned long perf_arch_misc_flags(struct pt_regs *regs)

{

	u32 flags = perf_get_misc_flags(regs);
@@ -2346,7 +2346,7 @@ unsigned long perf_misc_flags(struct pt_regs *regs) 
 * Called from generic code to get the instruction pointer

 * for an event_id.

 */

unsigned long perf_instruction_pointer(struct pt_regs *regs)

unsigned long perf_arch_instruction_pointer(struct pt_regs *regs)

{

	unsigned long siar = mfspr(SPRN_SIAR);

arch/s390/include/asm/perf_event.h

+3 −3
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ extern ssize_t cpumf_events_sysfs_show(struct device *dev, 


/* Perf callbacks */

struct pt_regs;

extern unsigned long perf_instruction_pointer(struct pt_regs *regs);

extern unsigned long perf_misc_flags(struct pt_regs *regs);

#define perf_misc_flags(regs) perf_misc_flags(regs)

extern unsigned long perf_arch_instruction_pointer(struct pt_regs *regs);

extern unsigned long perf_arch_misc_flags(struct pt_regs *regs);

#define perf_arch_misc_flags(regs) perf_arch_misc_flags(regs)

#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs



/* Perf pt_regs extension for sample-data-entry indicators */