aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2016-05-10 15:34:53 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-05-16 22:11:49 -0400
commita831100aeefbe6d9f3e47a3e2712f82c042f1f5c (patch)
tree7771949ed9e7c8519edab809c4cbd4aa5731d104 /kernel
parent0a77582f0407e7f9b5d775bebc31297a1b890be0 (diff)
perf core: Generalize max_stack sysctl handler
So that it can be used for other stack related knobs, such as the upcoming one to tweak the max number of of contexts per stack sample. In all those cases we can only change the value if there are no perf sessions collecting stacks, so they need to grab that mutex, etc. Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/n/tip-8t3fk94wuzp8m2z1n4gc0s17@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/events/callchain.c5
-rw-r--r--kernel/sysctl.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index b9325e7dcba1..7fc89939ede9 100644
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -228,7 +228,8 @@ exit_put:
228int perf_event_max_stack_handler(struct ctl_table *table, int write, 228int perf_event_max_stack_handler(struct ctl_table *table, int write,
229 void __user *buffer, size_t *lenp, loff_t *ppos) 229 void __user *buffer, size_t *lenp, loff_t *ppos)
230{ 230{
231 int new_value = sysctl_perf_event_max_stack, ret; 231 int *value = table->data;
232 int new_value = *value, ret;
232 struct ctl_table new_table = *table; 233 struct ctl_table new_table = *table;
233 234
234 new_table.data = &new_value; 235 new_table.data = &new_value;
@@ -240,7 +241,7 @@ int perf_event_max_stack_handler(struct ctl_table *table, int write,
240 if (atomic_read(&nr_callchain_events)) 241 if (atomic_read(&nr_callchain_events))
241 ret = -EBUSY; 242 ret = -EBUSY;
242 else 243 else
243 sysctl_perf_event_max_stack = new_value; 244 *value = new_value;
244 245
245 mutex_unlock(&callchain_mutex); 246 mutex_unlock(&callchain_mutex);
246 247
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index c8b318663525..0ec6907a16b3 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1149,7 +1149,7 @@ static struct ctl_table kern_table[] = {
1149 }, 1149 },
1150 { 1150 {
1151 .procname = "perf_event_max_stack", 1151 .procname = "perf_event_max_stack",
1152 .data = NULL, /* filled in by handler */ 1152 .data = &sysctl_perf_event_max_stack,
1153 .maxlen = sizeof(sysctl_perf_event_max_stack), 1153 .maxlen = sizeof(sysctl_perf_event_max_stack),
1154 .mode = 0644, 1154 .mode = 0644,
1155 .proc_handler = perf_event_max_stack_handler, 1155 .proc_handler = perf_event_max_stack_handler,