Skip to content

Commit d32ea25

Browse files
author
Fox Snowpatch
committed
From patchwork series 424679
https://patchwork.ozlabs.org//project/linuxppc-dev/list/?series=424679
1 parent f2e1230 commit d32ea25

File tree

15 files changed

+95
-99
lines changed

15 files changed

+95
-99
lines changed

‎arch/arm/include/asm/perf_event.h

-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
#ifndef __ARM_PERF_EVENT_H__
99
#define __ARM_PERF_EVENT_H__
1010

11-
#ifdef CONFIG_PERF_EVENTS
12-
struct pt_regs;
13-
extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
14-
extern unsigned long perf_misc_flags(struct pt_regs *regs);
15-
#define perf_misc_flags(regs) perf_misc_flags(regs)
16-
#endif
17-
1811
#define perf_arch_fetch_caller_regs(regs, __ip) { \
1912
(regs)->ARM_pc = (__ip); \
2013
frame_pointer((regs)) = (unsigned long) __builtin_frame_address(0); \

‎arch/arm/kernel/perf_callchain.c

-17
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,3 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re
9696
arm_get_current_stackframe(regs, &fr);
9797
walk_stackframe(&fr, callchain_trace, entry);
9898
}
99-
100-
unsigned long perf_instruction_pointer(struct pt_regs *regs)
101-
{
102-
return instruction_pointer(regs);
103-
}
104-
105-
unsigned long perf_misc_flags(struct pt_regs *regs)
106-
{
107-
int misc = 0;
108-
109-
if (user_mode(regs))
110-
misc |= PERF_RECORD_MISC_USER;
111-
else
112-
misc |= PERF_RECORD_MISC_KERNEL;
113-
114-
return misc;
115-
}

‎arch/arm64/include/asm/perf_event.h

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
#include <asm/ptrace.h>
1111

1212
#ifdef CONFIG_PERF_EVENTS
13-
struct pt_regs;
14-
extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
15-
extern unsigned long perf_misc_flags(struct pt_regs *regs);
16-
#define perf_misc_flags(regs) perf_misc_flags(regs)
1713
#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs
1814
#endif
1915

‎arch/arm64/kernel/perf_callchain.c

-28
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,3 @@ void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
3838

3939
arch_stack_walk(callchain_trace, entry, current, regs);
4040
}
41-
42-
unsigned long perf_instruction_pointer(struct pt_regs *regs)
43-
{
44-
if (perf_guest_state())
45-
return perf_guest_get_ip();
46-
47-
return instruction_pointer(regs);
48-
}
49-
50-
unsigned long perf_misc_flags(struct pt_regs *regs)
51-
{
52-
unsigned int guest_state = perf_guest_state();
53-
int misc = 0;
54-
55-
if (guest_state) {
56-
if (guest_state & PERF_GUEST_USER)
57-
misc |= PERF_RECORD_MISC_GUEST_USER;
58-
else
59-
misc |= PERF_RECORD_MISC_GUEST_KERNEL;
60-
} else {
61-
if (user_mode(regs))
62-
misc |= PERF_RECORD_MISC_USER;
63-
else
64-
misc |= PERF_RECORD_MISC_KERNEL;
65-
}
66-
67-
return misc;
68-
}

‎arch/powerpc/include/asm/perf_event_server.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,16 @@ struct power_pmu {
102102
int __init register_power_pmu(struct power_pmu *pmu);
103103

104104
struct pt_regs;
105-
extern unsigned long perf_misc_flags(struct pt_regs *regs);
106-
extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
105+
extern unsigned long perf_arch_misc_flags(struct pt_regs *regs);
106+
extern unsigned long perf_arch_instruction_pointer(struct pt_regs *regs);
107107
extern unsigned long int read_bhrb(int n);
108108

109109
/*
110110
* Only override the default definitions in include/linux/perf_event.h
111111
* if we have hardware PMU support.
112112
*/
113113
#ifdef CONFIG_PPC_PERF_CTRS
114-
#define perf_misc_flags(regs) perf_misc_flags(regs)
114+
#define perf_arch_misc_flags(regs) perf_arch_misc_flags(regs)
115115
#endif
116116

117117
/*

‎arch/powerpc/perf/callchain.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re
5151

5252
lr = regs->link;
5353
sp = regs->gpr[1];
54-
perf_callchain_store(entry, perf_instruction_pointer(regs));
54+
perf_callchain_store(entry, perf_arch_instruction_pointer(regs));
5555

5656
if (!validate_sp(sp, current))
5757
return;

‎arch/powerpc/perf/callchain_32.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry,
139139
long level = 0;
140140
unsigned int __user *fp, *uregs;
141141

142-
next_ip = perf_instruction_pointer(regs);
142+
next_ip = perf_arch_instruction_pointer(regs);
143143
lr = regs->link;
144144
sp = regs->gpr[1];
145145
perf_callchain_store(entry, next_ip);

‎arch/powerpc/perf/callchain_64.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry,
7474
struct signal_frame_64 __user *sigframe;
7575
unsigned long __user *fp, *uregs;
7676

77-
next_ip = perf_instruction_pointer(regs);
77+
next_ip = perf_arch_instruction_pointer(regs);
7878
lr = regs->link;
7979
sp = regs->gpr[1];
8080
perf_callchain_store(entry, next_ip);

‎arch/powerpc/perf/core-book3s.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2332,7 +2332,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val,
23322332
* Called from generic code to get the misc flags (i.e. processor mode)
23332333
* for an event_id.
23342334
*/
2335-
unsigned long perf_misc_flags(struct pt_regs *regs)
2335+
unsigned long perf_arch_misc_flags(struct pt_regs *regs)
23362336
{
23372337
u32 flags = perf_get_misc_flags(regs);
23382338

@@ -2346,7 +2346,7 @@ unsigned long perf_misc_flags(struct pt_regs *regs)
23462346
* Called from generic code to get the instruction pointer
23472347
* for an event_id.
23482348
*/
2349-
unsigned long perf_instruction_pointer(struct pt_regs *regs)
2349+
unsigned long perf_arch_instruction_pointer(struct pt_regs *regs)
23502350
{
23512351
unsigned long siar = mfspr(SPRN_SIAR);
23522352

‎arch/s390/include/asm/perf_event.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ extern ssize_t cpumf_events_sysfs_show(struct device *dev,
3737

3838
/* Perf callbacks */
3939
struct pt_regs;
40-
extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
41-
extern unsigned long perf_misc_flags(struct pt_regs *regs);
42-
#define perf_misc_flags(regs) perf_misc_flags(regs)
40+
extern unsigned long perf_arch_instruction_pointer(struct pt_regs *regs);
41+
extern unsigned long perf_arch_misc_flags(struct pt_regs *regs);
42+
#define perf_arch_misc_flags(regs) perf_misc_flags(regs)
4343
#define perf_arch_bpf_user_pt_regs(regs) &regs->user_regs
4444

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

‎arch/s390/kernel/perf_event.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static unsigned long instruction_pointer_guest(struct pt_regs *regs)
5757
return sie_block(regs)->gpsw.addr;
5858
}
5959

60-
unsigned long perf_instruction_pointer(struct pt_regs *regs)
60+
unsigned long perf_arch_instruction_pointer(struct pt_regs *regs)
6161
{
6262
return is_in_guest(regs) ? instruction_pointer_guest(regs)
6363
: instruction_pointer(regs);
@@ -84,7 +84,7 @@ static unsigned long perf_misc_flags_sf(struct pt_regs *regs)
8484
return flags;
8585
}
8686

87-
unsigned long perf_misc_flags(struct pt_regs *regs)
87+
unsigned long perf_arch_misc_flags(struct pt_regs *regs)
8888
{
8989
/* Check if the cpum_sf PMU has created the pt_regs structure.
9090
* In this case, perf misc flags can be easily extracted. Otherwise,

‎arch/x86/events/core.c

+27-20
Original file line numberDiff line numberDiff line change
@@ -3003,33 +3003,40 @@ static unsigned long code_segment_base(struct pt_regs *regs)
30033003
return 0;
30043004
}
30053005

3006-
unsigned long perf_instruction_pointer(struct pt_regs *regs)
3006+
unsigned long perf_arch_instruction_pointer(struct pt_regs *regs)
30073007
{
3008-
if (perf_guest_state())
3009-
return perf_guest_get_ip();
3010-
30113008
return regs->ip + code_segment_base(regs);
30123009
}
30133010

3014-
unsigned long perf_misc_flags(struct pt_regs *regs)
3011+
static unsigned long common_misc_flags(struct pt_regs *regs)
30153012
{
3016-
unsigned int guest_state = perf_guest_state();
3017-
int misc = 0;
3013+
if (regs->flags & PERF_EFLAGS_EXACT)
3014+
return PERF_RECORD_MISC_EXACT_IP;
30183015

3019-
if (guest_state) {
3020-
if (guest_state & PERF_GUEST_USER)
3021-
misc |= PERF_RECORD_MISC_GUEST_USER;
3022-
else
3023-
misc |= PERF_RECORD_MISC_GUEST_KERNEL;
3024-
} else {
3025-
if (user_mode(regs))
3026-
misc |= PERF_RECORD_MISC_USER;
3027-
else
3028-
misc |= PERF_RECORD_MISC_KERNEL;
3029-
}
3016+
return 0;
3017+
}
30303018

3031-
if (regs->flags & PERF_EFLAGS_EXACT)
3032-
misc |= PERF_RECORD_MISC_EXACT_IP;
3019+
unsigned long perf_arch_guest_misc_flags(struct pt_regs *regs)
3020+
{
3021+
unsigned long guest_state = perf_guest_state();
3022+
unsigned long flags = common_misc_flags(regs);
3023+
3024+
if (guest_state & PERF_GUEST_USER)
3025+
flags |= PERF_RECORD_MISC_GUEST_USER;
3026+
else if (guest_state & PERF_GUEST_ACTIVE)
3027+
flags |= PERF_RECORD_MISC_GUEST_KERNEL;
3028+
3029+
return flags;
3030+
}
3031+
3032+
unsigned long perf_arch_misc_flags(struct pt_regs *regs)
3033+
{
3034+
unsigned long misc = common_misc_flags(regs);
3035+
3036+
if (user_mode(regs))
3037+
misc |= PERF_RECORD_MISC_USER;
3038+
else
3039+
misc |= PERF_RECORD_MISC_KERNEL;
30333040

30343041
return misc;
30353042
}

‎arch/x86/include/asm/perf_event.h

+7-5
Original file line numberDiff line numberDiff line change
@@ -536,15 +536,17 @@ struct x86_perf_regs {
536536
u64 *xmm_regs;
537537
};
538538

539-
extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
540-
extern unsigned long perf_misc_flags(struct pt_regs *regs);
541-
#define perf_misc_flags(regs) perf_misc_flags(regs)
539+
extern unsigned long perf_arch_instruction_pointer(struct pt_regs *regs);
540+
extern unsigned long perf_arch_misc_flags(struct pt_regs *regs);
541+
extern unsigned long perf_arch_guest_misc_flags(struct pt_regs *regs);
542+
#define perf_arch_misc_flags(regs) perf_arch_misc_flags(regs)
543+
#define perf_arch_guest_misc_flags(regs) perf_arch_guest_misc_flags(regs)
542544

543545
#include <asm/stacktrace.h>
544546

545547
/*
546-
* We abuse bit 3 from flags to pass exact information, see perf_misc_flags
547-
* and the comment with PERF_EFLAGS_EXACT.
548+
* We abuse bit 3 from flags to pass exact information, see
549+
* perf_arch_misc_flags() and the comment with PERF_EFLAGS_EXACT.
548550
*/
549551
#define perf_arch_fetch_caller_regs(regs, __ip) { \
550552
(regs)->ip = (__ip); \

‎include/linux/perf_event.h

+23-3
Original file line numberDiff line numberDiff line change
@@ -1655,15 +1655,35 @@ extern void perf_tp_event(u16 event_type, u64 count, void *record,
16551655
struct task_struct *task);
16561656
extern void perf_bp_event(struct perf_event *event, void *data);
16571657

1658-
#ifndef perf_misc_flags
1659-
# define perf_misc_flags(regs) \
1658+
extern unsigned long perf_misc_flags(struct perf_event *event, struct pt_regs *regs);
1659+
extern unsigned long perf_instruction_pointer(struct perf_event *event,
1660+
struct pt_regs *regs);
1661+
1662+
#ifndef perf_arch_misc_flags
1663+
# define perf_arch_misc_flags(regs) \
16601664
(user_mode(regs) ? PERF_RECORD_MISC_USER : PERF_RECORD_MISC_KERNEL)
1661-
# define perf_instruction_pointer(regs) instruction_pointer(regs)
1665+
# define perf_arch_instruction_pointer(regs) instruction_pointer(regs)
16621666
#endif
16631667
#ifndef perf_arch_bpf_user_pt_regs
16641668
# define perf_arch_bpf_user_pt_regs(regs) regs
16651669
#endif
16661670

1671+
#ifndef perf_arch_guest_misc_flags
1672+
static inline unsigned long perf_arch_guest_misc_flags(struct pt_regs *regs)
1673+
{
1674+
unsigned long guest_state = perf_guest_state();
1675+
1676+
if (guest_state & PERF_GUEST_USER)
1677+
return PERF_RECORD_MISC_GUEST_USER;
1678+
1679+
if (guest_state & PERF_GUEST_ACTIVE)
1680+
return PERF_RECORD_MISC_GUEST_KERNEL;
1681+
1682+
return 0;
1683+
}
1684+
# define perf_arch_guest_misc_flags(regs) perf_arch_guest_misc_flags(regs)
1685+
#endif
1686+
16671687
static inline bool has_branch_stack(struct perf_event *event)
16681688
{
16691689
return event->attr.sample_type & PERF_SAMPLE_BRANCH_STACK;

‎kernel/events/core.c

+25-2
Original file line numberDiff line numberDiff line change
@@ -7023,6 +7023,29 @@ void perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks *cbs)
70237023
EXPORT_SYMBOL_GPL(perf_unregister_guest_info_callbacks);
70247024
#endif
70257025

7026+
static bool should_sample_guest(struct perf_event *event)
7027+
{
7028+
return !event->attr.exclude_guest && perf_guest_state();
7029+
}
7030+
7031+
unsigned long perf_misc_flags(struct perf_event *event,
7032+
struct pt_regs *regs)
7033+
{
7034+
if (should_sample_guest(event))
7035+
return perf_arch_guest_misc_flags(regs);
7036+
7037+
return perf_arch_misc_flags(regs);
7038+
}
7039+
7040+
unsigned long perf_instruction_pointer(struct perf_event *event,
7041+
struct pt_regs *regs)
7042+
{
7043+
if (should_sample_guest(event))
7044+
return perf_guest_get_ip();
7045+
7046+
return perf_arch_instruction_pointer(regs);
7047+
}
7048+
70267049
static void
70277050
perf_output_sample_regs(struct perf_output_handle *handle,
70287051
struct pt_regs *regs, u64 mask)
@@ -7840,7 +7863,7 @@ void perf_prepare_sample(struct perf_sample_data *data,
78407863
__perf_event_header__init_id(data, event, filtered_sample_type);
78417864

78427865
if (filtered_sample_type & PERF_SAMPLE_IP) {
7843-
data->ip = perf_instruction_pointer(regs);
7866+
data->ip = perf_instruction_pointer(event, regs);
78447867
data->sample_flags |= PERF_SAMPLE_IP;
78457868
}
78467869

@@ -8004,7 +8027,7 @@ void perf_prepare_header(struct perf_event_header *header,
80048027
{
80058028
header->type = PERF_RECORD_SAMPLE;
80068029
header->size = perf_sample_data_size(data, event);
8007-
header->misc = perf_misc_flags(regs);
8030+
header->misc = perf_misc_flags(event, regs);
80088031

80098032
/*
80108033
* If you're adding more sample types here, you likely need to do

0 commit comments

Comments
 (0)