From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752009AbeCMGVx (ORCPT ); Tue, 13 Mar 2018 02:21:53 -0400 Received: from terminus.zytor.com ([198.137.202.136]:57259 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751579AbeCMGVv (ORCPT ); Tue, 13 Mar 2018 02:21:51 -0400 Date: Mon, 12 Mar 2018 23:21:13 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: torvalds@linux-foundation.org, mingo@kernel.org, jolsa@redhat.com, tglx@linutronix.de, peterz@infradead.org, yao.jin@linux.intel.com, namhyung@kernel.org, mpe@ellerman.id.au, alexander.shishkin@linux.intel.com, hbathini@linux.vnet.ibm.com, hpa@zytor.com, kan.liang@intel.com, dsahern@gmail.com, sukadev@linux.vnet.ibm.com, fweisbec@gmail.com, chabbi.milind@gmail.com, acme@redhat.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, onestero@redhat.com, a.p.zijlstra@chello.nl, jolsa@kernel.org Reply-To: mpe@ellerman.id.au, alexander.shishkin@linux.intel.com, hbathini@linux.vnet.ibm.com, hpa@zytor.com, torvalds@linux-foundation.org, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, jolsa@redhat.com, namhyung@kernel.org, yao.jin@linux.intel.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, onestero@redhat.com, a.p.zijlstra@chello.nl, jolsa@kernel.org, fweisbec@gmail.com, sukadev@linux.vnet.ibm.com, kan.liang@intel.com, dsahern@gmail.com, chabbi.milind@gmail.com, acme@redhat.com In-Reply-To: <20180312134548.31532-7-jolsa@kernel.org> References: <20180312134548.31532-7-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/core: Move perf_event_attr::sample_max_stack into perf_copy_attr() Git-Commit-ID: 5f970521d3279d99adcdebf329631e36cb9f0deb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5f970521d3279d99adcdebf329631e36cb9f0deb Gitweb: https://git.kernel.org/tip/5f970521d3279d99adcdebf329631e36cb9f0deb Author: Jiri Olsa AuthorDate: Mon, 12 Mar 2018 14:45:46 +0100 Committer: Ingo Molnar CommitDate: Tue, 13 Mar 2018 06:56:08 +0100 perf/core: Move perf_event_attr::sample_max_stack into perf_copy_attr() Move the 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 Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Frederic Weisbecker Cc: Hari Bathini Cc: Jin Yao Cc: Jiri Olsa Cc: Kan Liang Cc: Linus Torvalds Cc: Michael Ellerman Cc: Milind Chabbi Cc: Namhyung Kim Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Sukadev Bhattiprolu Cc: Thomas Gleixner Cc: Will Deacon Link: http://lkml.kernel.org/r/20180312134548.31532-7-jolsa@kernel.org Signed-off-by: Ingo Molnar --- 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 969f865f9f1c..ee145bdee6ed 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -10125,6 +10125,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: @@ -10338,9 +10341,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