From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751959AbeCLNrA (ORCPT ); Mon, 12 Mar 2018 09:47:00 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43782 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932311AbeCLNqI (ORCPT ); Mon, 12 Mar 2018 09:46:08 -0400 From: Jiri Olsa To: Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo Cc: lkml , Namhyung Kim , David Ahern , Andi Kleen , Milind Chabbi , Alexander Shishkin , Michael Ellerman , Hari Bathini , Jin Yao , Kan Liang , Sukadev Bhattiprolu , Oleg Nesterov , Will Deacon Subject: [PATCH 6/8] perf/core: Move perf_event_attr::sample_max_stack into perf_copy_attr Date: Mon, 12 Mar 2018 14:45:46 +0100 Message-Id: <20180312134548.31532-7-jolsa@kernel.org> In-Reply-To: <20180312134548.31532-1-jolsa@kernel.org> References: <20180312134548.31532-1-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Moving sample_max_stack check and setup into perf_copy_attr, so we have all perf_event_attr initial setup in one place and can easily compare attrs in the new ioctl introduced in following change. Suggested-by: Peter Zijlstra Signed-off-by: Jiri Olsa --- kernel/events/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 57898102847f..bd61b4d68a25 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9834,6 +9834,9 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, ret = -EINVAL; } + if (!attr->sample_max_stack) + attr->sample_max_stack = sysctl_perf_event_max_stack; + if (attr->sample_type & PERF_SAMPLE_REGS_INTR) ret = perf_reg_validate(attr->sample_regs_intr); out: @@ -10047,9 +10050,6 @@ SYSCALL_DEFINE5(perf_event_open, perf_paranoid_kernel() && !capable(CAP_SYS_ADMIN)) return -EACCES; - if (!attr.sample_max_stack) - attr.sample_max_stack = sysctl_perf_event_max_stack; - /* * In cgroup mode, the pid argument is used to pass the fd * opened to the cgroup directory in cgroupfs. The cpu argument -- 2.13.6