From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753629AbdK2Ij2 (ORCPT ); Wed, 29 Nov 2017 03:39:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59712 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753609AbdK2IjZ (ORCPT ); Wed, 29 Nov 2017 03:39:25 -0500 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: Wed, 29 Nov 2017 09:38:51 +0100 Message-Id: <20171129083853.28022-7-jolsa@kernel.org> In-Reply-To: <20171129083853.28022-1-jolsa@kernel.org> References: <20171129083853.28022-1-jolsa@kernel.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 29 Nov 2017 08:39:25 +0000 (UTC) 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. 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 799bb352d99f..028adb24bf7a 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9673,6 +9673,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: @@ -9886,9 +9889,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