Skip to content

Commit 21f77d2

Browse files
author
Ingo Molnar
committed
Merge tag 'perf-core-for-mingo-20160516' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: User visible changes: - Honour the kernel.perf_event_max_stack knob more precisely by not counting PERF_CONTEXT_{KERNEL,USER} when deciding when to stop adding entries to the perf_sample->ip_callchain[] array (Arnaldo Carvalho de Melo) - Fix identation of 'stalled-backend-cycles' in 'perf stat' (Namhyung Kim) - Update runtime using 'cpu-clock' event in 'perf stat' (Namhyung Kim) - Use 'cpu-clock' for cpu targets in 'perf stat' (Namhyung Kim) - Avoid fractional digits for integer scales in 'perf stat' (Andi Kleen) - Store vdso buildid unconditionally, as it appears in callchains and we're not checking those when creating the build-id table, so we end up not being able to resolve VDSO symbols when doing analysis on a different machine than the one where recording was done, possibly of a different arch even (arm -> x86_64) (He Kuang) Infrastructure changes: - Generalize max_stack sysctl handler, will be used for configuring multiple kernel knobs related to callchains (Arnaldo Carvalho de Melo) Cleanups: - Introduce DSO__NAME_KALLSYMS and DSO__NAME_KCORE, to stop using open coded strings (Masami Hiramatsu) Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2 parents b0a434f + a29d5c9 commit 21f77d2

File tree

30 files changed

+201
-117
lines changed

30 files changed

+201
-117
lines changed

‎Documentation/sysctl/kernel.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ show up in /proc/sys/kernel:
6161
- perf_cpu_time_max_percent
6262
- perf_event_paranoid
6363
- perf_event_max_stack
64+
- perf_event_max_contexts_per_stack
6465
- pid_max
6566
- powersave-nap [ PPC only ]
6667
- printk
@@ -668,6 +669,19 @@ The default value is 127.
668669

669670
==============================================================
670671

672+
perf_event_max_contexts_per_stack:
673+
674+
Controls maximum number of stack frame context entries for
675+
(attr.sample_type & PERF_SAMPLE_CALLCHAIN) configured events, for
676+
instance, when using 'perf record -g' or 'perf trace --call-graph fp'.
677+
678+
This can only be done when no events are in use that have callchains
679+
enabled, otherwise writing to this file will return -EBUSY.
680+
681+
The default value is 8.
682+
683+
==============================================================
684+
671685
pid_max:
672686

673687
PID allocation wrap value. When the kernel's next PID value

‎arch/arc/kernel/perf_event.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct arc_callchain_trace {
4848
static int callchain_trace(unsigned int addr, void *data)
4949
{
5050
struct arc_callchain_trace *ctrl = data;
51-
struct perf_callchain_entry *entry = ctrl->perf_stuff;
51+
struct perf_callchain_entry_ctx *entry = ctrl->perf_stuff;
5252
perf_callchain_store(entry, addr);
5353

5454
if (ctrl->depth++ < 3)
@@ -58,7 +58,7 @@ static int callchain_trace(unsigned int addr, void *data)
5858
}
5959

6060
void
61-
perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
61+
perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
6262
{
6363
struct arc_callchain_trace ctrl = {
6464
.depth = 0,
@@ -69,7 +69,7 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
6969
}
7070

7171
void
72-
perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
72+
perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
7373
{
7474
/*
7575
* User stack can't be unwound trivially with kernel dwarf unwinder

‎arch/arm/kernel/perf_callchain.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct frame_tail {
3131
*/
3232
static struct frame_tail __user *
3333
user_backtrace(struct frame_tail __user *tail,
34-
struct perf_callchain_entry *entry)
34+
struct perf_callchain_entry_ctx *entry)
3535
{
3636
struct frame_tail buftail;
3737
unsigned long err;
@@ -59,7 +59,7 @@ user_backtrace(struct frame_tail __user *tail,
5959
}
6060

6161
void
62-
perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
62+
perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
6363
{
6464
struct frame_tail __user *tail;
6565

@@ -75,7 +75,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
7575

7676
tail = (struct frame_tail __user *)regs->ARM_fp - 1;
7777

78-
while ((entry->nr < sysctl_perf_event_max_stack) &&
78+
while ((entry->nr < entry->max_stack) &&
7979
tail && !((unsigned long)tail & 0x3))
8080
tail = user_backtrace(tail, entry);
8181
}
@@ -89,13 +89,13 @@ static int
8989
callchain_trace(struct stackframe *fr,
9090
void *data)
9191
{
92-
struct perf_callchain_entry *entry = data;
92+
struct perf_callchain_entry_ctx *entry = data;
9393
perf_callchain_store(entry, fr->pc);
9494
return 0;
9595
}
9696

9797
void
98-
perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
98+
perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
9999
{
100100
struct stackframe fr;
101101

‎arch/arm64/kernel/perf_callchain.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct frame_tail {
3131
*/
3232
static struct frame_tail __user *
3333
user_backtrace(struct frame_tail __user *tail,
34-
struct perf_callchain_entry *entry)
34+
struct perf_callchain_entry_ctx *entry)
3535
{
3636
struct frame_tail buftail;
3737
unsigned long err;
@@ -76,7 +76,7 @@ struct compat_frame_tail {
7676

7777
static struct compat_frame_tail __user *
7878
compat_user_backtrace(struct compat_frame_tail __user *tail,
79-
struct perf_callchain_entry *entry)
79+
struct perf_callchain_entry_ctx *entry)
8080
{
8181
struct compat_frame_tail buftail;
8282
unsigned long err;
@@ -106,7 +106,7 @@ compat_user_backtrace(struct compat_frame_tail __user *tail,
106106
}
107107
#endif /* CONFIG_COMPAT */
108108

109-
void perf_callchain_user(struct perf_callchain_entry *entry,
109+
void perf_callchain_user(struct perf_callchain_entry_ctx *entry,
110110
struct pt_regs *regs)
111111
{
112112
if (perf_guest_cbs && perf_guest_cbs->is_in_guest()) {
@@ -122,7 +122,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry,
122122

123123
tail = (struct frame_tail __user *)regs->regs[29];
124124

125-
while (entry->nr < sysctl_perf_event_max_stack &&
125+
while (entry->nr < entry->max_stack &&
126126
tail && !((unsigned long)tail & 0xf))
127127
tail = user_backtrace(tail, entry);
128128
} else {
@@ -132,7 +132,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry,
132132

133133
tail = (struct compat_frame_tail __user *)regs->compat_fp - 1;
134134

135-
while ((entry->nr < sysctl_perf_event_max_stack) &&
135+
while ((entry->nr < entry->max_stack) &&
136136
tail && !((unsigned long)tail & 0x3))
137137
tail = compat_user_backtrace(tail, entry);
138138
#endif
@@ -146,12 +146,12 @@ void perf_callchain_user(struct perf_callchain_entry *entry,
146146
*/
147147
static int callchain_trace(struct stackframe *frame, void *data)
148148
{
149-
struct perf_callchain_entry *entry = data;
149+
struct perf_callchain_entry_ctx *entry = data;
150150
perf_callchain_store(entry, frame->pc);
151151
return 0;
152152
}
153153

154-
void perf_callchain_kernel(struct perf_callchain_entry *entry,
154+
void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
155155
struct pt_regs *regs)
156156
{
157157
struct stackframe frame;

‎arch/metag/kernel/perf_callchain.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static bool is_valid_call(unsigned long calladdr)
2929

3030
static struct metag_frame __user *
3131
user_backtrace(struct metag_frame __user *user_frame,
32-
struct perf_callchain_entry *entry)
32+
struct perf_callchain_entry_ctx *entry)
3333
{
3434
struct metag_frame frame;
3535
unsigned long calladdr;
@@ -56,7 +56,7 @@ user_backtrace(struct metag_frame __user *user_frame,
5656
}
5757

5858
void
59-
perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
59+
perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
6060
{
6161
unsigned long sp = regs->ctx.AX[0].U0;
6262
struct metag_frame __user *frame;
@@ -65,7 +65,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
6565

6666
--frame;
6767

68-
while ((entry->nr < sysctl_perf_event_max_stack) && frame)
68+
while ((entry->nr < entry->max_stack) && frame)
6969
frame = user_backtrace(frame, entry);
7070
}
7171

@@ -78,13 +78,13 @@ static int
7878
callchain_trace(struct stackframe *fr,
7979
void *data)
8080
{
81-
struct perf_callchain_entry *entry = data;
81+
struct perf_callchain_entry_ctx *entry = data;
8282
perf_callchain_store(entry, fr->pc);
8383
return 0;
8484
}
8585

8686
void
87-
perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
87+
perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
8888
{
8989
struct stackframe fr;
9090

‎arch/mips/kernel/perf_event.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
* the user stack callchains, we will add it here.
2626
*/
2727

28-
static void save_raw_perf_callchain(struct perf_callchain_entry *entry,
29-
unsigned long reg29)
28+
static void save_raw_perf_callchain(struct perf_callchain_entry_ctx *entry,
29+
unsigned long reg29)
3030
{
3131
unsigned long *sp = (unsigned long *)reg29;
3232
unsigned long addr;
@@ -35,14 +35,14 @@ static void save_raw_perf_callchain(struct perf_callchain_entry *entry,
3535
addr = *sp++;
3636
if (__kernel_text_address(addr)) {
3737
perf_callchain_store(entry, addr);
38-
if (entry->nr >= sysctl_perf_event_max_stack)
38+
if (entry->nr >= entry->max_stack)
3939
break;
4040
}
4141
}
4242
}
4343

44-
void perf_callchain_kernel(struct perf_callchain_entry *entry,
45-
struct pt_regs *regs)
44+
void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
45+
struct pt_regs *regs)
4646
{
4747
unsigned long sp = regs->regs[29];
4848
#ifdef CONFIG_KALLSYMS
@@ -59,7 +59,7 @@ void perf_callchain_kernel(struct perf_callchain_entry *entry,
5959
}
6060
do {
6161
perf_callchain_store(entry, pc);
62-
if (entry->nr >= sysctl_perf_event_max_stack)
62+
if (entry->nr >= entry->max_stack)
6363
break;
6464
pc = unwind_stack(current, &sp, pc, &ra);
6565
} while (pc);

‎arch/powerpc/perf/callchain.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static int valid_next_sp(unsigned long sp, unsigned long prev_sp)
4747
}
4848

4949
void
50-
perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
50+
perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
5151
{
5252
unsigned long sp, next_sp;
5353
unsigned long next_ip;
@@ -76,7 +76,7 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
7676
next_ip = regs->nip;
7777
lr = regs->link;
7878
level = 0;
79-
perf_callchain_store(entry, PERF_CONTEXT_KERNEL);
79+
perf_callchain_store_context(entry, PERF_CONTEXT_KERNEL);
8080

8181
} else {
8282
if (level == 0)
@@ -232,7 +232,7 @@ static int sane_signal_64_frame(unsigned long sp)
232232
puc == (unsigned long) &sf->uc;
233233
}
234234

235-
static void perf_callchain_user_64(struct perf_callchain_entry *entry,
235+
static void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry,
236236
struct pt_regs *regs)
237237
{
238238
unsigned long sp, next_sp;
@@ -247,7 +247,7 @@ static void perf_callchain_user_64(struct perf_callchain_entry *entry,
247247
sp = regs->gpr[1];
248248
perf_callchain_store(entry, next_ip);
249249

250-
while (entry->nr < sysctl_perf_event_max_stack) {
250+
while (entry->nr < entry->max_stack) {
251251
fp = (unsigned long __user *) sp;
252252
if (!valid_user_sp(sp, 1) || read_user_stack_64(fp, &next_sp))
253253
return;
@@ -274,7 +274,7 @@ static void perf_callchain_user_64(struct perf_callchain_entry *entry,
274274
read_user_stack_64(&uregs[PT_R1], &sp))
275275
return;
276276
level = 0;
277-
perf_callchain_store(entry, PERF_CONTEXT_USER);
277+
perf_callchain_store_context(entry, PERF_CONTEXT_USER);
278278
perf_callchain_store(entry, next_ip);
279279
continue;
280280
}
@@ -319,7 +319,7 @@ static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret)
319319
return rc;
320320
}
321321

322-
static inline void perf_callchain_user_64(struct perf_callchain_entry *entry,
322+
static inline void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry,
323323
struct pt_regs *regs)
324324
{
325325
}
@@ -439,7 +439,7 @@ static unsigned int __user *signal_frame_32_regs(unsigned int sp,
439439
return mctx->mc_gregs;
440440
}
441441

442-
static void perf_callchain_user_32(struct perf_callchain_entry *entry,
442+
static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry,
443443
struct pt_regs *regs)
444444
{
445445
unsigned int sp, next_sp;
@@ -453,7 +453,7 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry,
453453
sp = regs->gpr[1];
454454
perf_callchain_store(entry, next_ip);
455455

456-
while (entry->nr < sysctl_perf_event_max_stack) {
456+
while (entry->nr < entry->max_stack) {
457457
fp = (unsigned int __user *) (unsigned long) sp;
458458
if (!valid_user_sp(sp, 0) || read_user_stack_32(fp, &next_sp))
459459
return;
@@ -473,7 +473,7 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry,
473473
read_user_stack_32(&uregs[PT_R1], &sp))
474474
return;
475475
level = 0;
476-
perf_callchain_store(entry, PERF_CONTEXT_USER);
476+
perf_callchain_store_context(entry, PERF_CONTEXT_USER);
477477
perf_callchain_store(entry, next_ip);
478478
continue;
479479
}
@@ -487,7 +487,7 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry,
487487
}
488488

489489
void
490-
perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
490+
perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
491491
{
492492
if (current_is_64bit())
493493
perf_callchain_user_64(entry, regs);

‎arch/s390/kernel/perf_event.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,13 @@ arch_initcall(service_level_perf_register);
224224

225225
static int __perf_callchain_kernel(void *data, unsigned long address)
226226
{
227-
struct perf_callchain_entry *entry = data;
227+
struct perf_callchain_entry_ctx *entry = data;
228228

229229
perf_callchain_store(entry, address);
230230
return 0;
231231
}
232232

233-
void perf_callchain_kernel(struct perf_callchain_entry *entry,
233+
void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
234234
struct pt_regs *regs)
235235
{
236236
if (user_mode(regs))

‎arch/sh/kernel/perf_callchain.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static int callchain_stack(void *data, char *name)
2121

2222
static void callchain_address(void *data, unsigned long addr, int reliable)
2323
{
24-
struct perf_callchain_entry *entry = data;
24+
struct perf_callchain_entry_ctx *entry = data;
2525

2626
if (reliable)
2727
perf_callchain_store(entry, addr);
@@ -33,7 +33,7 @@ static const struct stacktrace_ops callchain_ops = {
3333
};
3434

3535
void
36-
perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs)
36+
perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs)
3737
{
3838
perf_callchain_store(entry, regs->pc);
3939

0 commit comments

Comments
 (0)