Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1386781
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl |
| Date | 2016-04-25 21:30 +0200 |
| Message-ID | <rrUmL-2Ic-47@gated-at.bofh.it> (permalink) |
| References | (2 earlier) <rqQlb-88k-3@gated-at.bofh.it> <rqRqX-Lm-23@gated-at.bofh.it> <rqRAD-Pr-47@gated-at.bofh.it> <rrRoU-mn-35@gated-at.bofh.it> <rrRyA-t4-63@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Em Mon, Apr 25, 2016 at 01:27:06PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Mon, Apr 25, 2016 at 01:14:25PM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Fri, Apr 22, 2016 at 03:18:08PM -0700, Alexei Starovoitov escreveu:
> > > right... and looking into it further, realized that the patch is broken,
> > > since get_callchain_entry() is doing:
> > > return &entries->cpu_entries[cpu][*rctx];
> > > whereas it should be dynamic offset based on sysctl_perf_event_max_stack*8
> > > So definitely needs another respin.
> struct perf_callchain_entry {
> __u64 nr;
> __u64 ip[0]; /* /proc/sys/kernel/perf_event_max_stack */
> };
> But perf_callchain_entry->ip is not a pointer... Got it ;-\
This is what I am building now, a patch on top of the previous, that
will be combined and sent as v3, if I don't find any more funnies:
diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index 6fe77349fa9d..40657892a7e0 100644
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -20,11 +20,10 @@ struct callchain_cpus_entries {
int sysctl_perf_event_max_stack __read_mostly = PERF_MAX_STACK_DEPTH;
-static size_t perf_callchain_entry__sizeof(void)
-{
- return sizeof(struct perf_callchain_entry) +
- sizeof(__u64) * sysctl_perf_event_max_stack;
-}
+#define __perf_callchain_entry_size(entries) \
+ (sizeof(struct perf_callchain_entry) + sizeof(__u64) * entries)
+
+static size_t perf_callchain_entry_size __read_mostly = __perf_callchain_entry_size(PERF_MAX_STACK_DEPTH);
static DEFINE_PER_CPU(int, callchain_recursion[PERF_NR_CONTEXTS]);
static atomic_t nr_callchain_events;
@@ -81,7 +80,7 @@ static int alloc_callchain_buffers(void)
if (!entries)
return -ENOMEM;
- size = perf_callchain_entry__sizeof() * PERF_NR_CONTEXTS;
+ size = perf_callchain_entry_size * PERF_NR_CONTEXTS;
for_each_possible_cpu(cpu) {
entries->cpu_entries[cpu] = kmalloc_node(size, GFP_KERNEL,
@@ -155,7 +154,8 @@ static struct perf_callchain_entry *get_callchain_entry(int *rctx)
cpu = smp_processor_id();
- return &entries->cpu_entries[cpu][*rctx];
+ return (((void *)&entries->cpu_entries[cpu][0]) +
+ (*rctx * perf_callchain_entry_size));
}
static void
@@ -236,10 +236,12 @@ int perf_event_max_stack_handler(struct ctl_table *table, int write,
return ret;
mutex_lock(&callchain_mutex);
- if (atomic_read(&nr_callchain_events))
+ if (atomic_read(&nr_callchain_events)) {
ret = -EBUSY;
- else
+ } else {
sysctl_perf_event_max_stack = new_value;
+ perf_callchain_entry_size = __perf_callchain_entry_size(new_value);
+ }
mutex_unlock(&callchain_mutex);
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH/RFC] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-21 00:50 +0200
Re: [PATCH/RFC] perf core: Allow setting up max frame stack depth via sysctl Alexei Starovoitov <alexei.starovoitov@gmail.com> - 2016-04-21 01:10 +0200
[PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-22 23:00 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Alexei Starovoitov <alexei.starovoitov@gmail.com> - 2016-04-22 23:40 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl David Ahern <dsahern@gmail.com> - 2016-04-23 00:10 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Alexei Starovoitov <alexei.starovoitov@gmail.com> - 2016-04-23 00:20 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-25 18:20 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-25 18:30 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-25 21:30 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Alexei Starovoitov <alexei.starovoitov@gmail.com> - 2016-04-25 22:10 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-25 22:20 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Alexei Starovoitov <alexei.starovoitov@gmail.com> - 2016-04-26 00:10 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-26 01:50 +0200
Re: [PATCH/RFC v2] perf core: Allow setting up max frame stack depth via sysctl Alexei Starovoitov <alexei.starovoitov@gmail.com> - 2016-04-26 02:10 +0200
[PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-26 02:30 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-26 02:50 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Brendan Gregg <brendan.d.gregg@gmail.com> - 2016-04-26 03:00 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-26 18:40 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl David Ahern <dsahern@gmail.com> - 2016-04-26 18:50 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 15:30 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Brendan Gregg <brendan.d.gregg@gmail.com> - 2016-04-26 22:10 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-26 23:10 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Peter Zijlstra <peterz@infradead.org> - 2016-04-27 00:00 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 15:00 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Brendan Gregg <brendan.d.gregg@gmail.com> - 2016-04-27 00:00 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Peter Zijlstra <peterz@infradead.org> - 2016-04-27 00:20 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 15:00 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Alexei Starovoitov <alexei.starovoitov@gmail.com> - 2016-04-26 02:50 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Frederic Weisbecker <fweisbec@gmail.com> - 2016-04-27 00:00 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-27 15:00 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl Frederic Weisbecker <fweisbec@gmail.com> - 2016-04-27 18:10 +0200
Re: [PATCH/RFC v3] perf core: Allow setting up max frame stack depth via sysctl David Ahern <dsahern@gmail.com> - 2016-04-27 18:30 +0200
[tip:perf/core] perf core: Allow setting up max frame stack depth via sysctl tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com> - 2016-04-27 17:50 +0200
Re: [PATCH/RFC] perf core: Allow setting up max frame stack depth via sysctl David Ahern <dsahern@gmail.com> - 2016-04-21 01:20 +0200
Re: [PATCH/RFC] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-21 02:20 +0200
Re: [PATCH/RFC] perf core: Allow setting up max frame stack depth via sysctl Peter Zijlstra <peterz@infradead.org> - 2016-04-21 13:00 +0200
Re: [PATCH/RFC] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-21 17:20 +0200
Re: [PATCH/RFC] perf core: Allow setting up max frame stack depth via sysctl Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-21 17:50 +0200
csiph-web