From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752654AbdFTJJg (ORCPT ); Tue, 20 Jun 2017 05:09:36 -0400 Received: from terminus.zytor.com ([65.50.211.136]:60837 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751078AbdFTJJd (ORCPT ); Tue, 20 Jun 2017 05:09:33 -0400 Date: Tue, 20 Jun 2017 02:05:53 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, fweisbec@gmail.com, acme@redhat.com, jolsa@kernel.org, mhiramat@kernel.org, mingo@kernel.org, rostedt@goodmis.org, namhyung@kernel.org, peterz@infradead.org Reply-To: rostedt@goodmis.org, mingo@kernel.org, mhiramat@kernel.org, jolsa@kernel.org, peterz@infradead.org, namhyung@kernel.org, fweisbec@gmail.com, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, acme@redhat.com In-Reply-To: <20170618142302.25390-2-namhyung@kernel.org> References: <20170618142302.25390-2-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf ftrace: Move setup_pager before opening trace_pipe Git-Commit-ID: 29681bc5bb4326c2f9eac5dc68d8fad3e88b4bb5 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: 29681bc5bb4326c2f9eac5dc68d8fad3e88b4bb5 Gitweb: http://git.kernel.org/tip/29681bc5bb4326c2f9eac5dc68d8fad3e88b4bb5 Author: Namhyung Kim AuthorDate: Sun, 18 Jun 2017 23:23:00 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 19 Jun 2017 22:05:52 -0300 perf ftrace: Move setup_pager before opening trace_pipe The 'perf ftrace' command fails to reset tracer after finishing recording like below: $ sudo perf ftrace -v hello write 'nop' to tracing/current_tracer failed: Device or resource busy ... This is because the trace_pipe file is open in pager process. Move the pager setup to before opening the file. Signed-off-by: Namhyung Kim Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Peter Zijlstra Cc: Steven Rostedt Cc: kernel-team@lge.com Fixes: 583359646fde ("perf ftrace: Use pager for displaying result") Link: http://lkml.kernel.org/r/20170618142302.25390-2-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-ftrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index 966a94f..982b98e 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -231,6 +231,8 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv) goto out_reset; } + setup_pager(); + trace_file = get_tracing_file("trace_pipe"); if (!trace_file) { pr_err("failed to open trace_pipe\n"); @@ -254,8 +256,6 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv) goto out_close_fd; } - setup_pager(); - perf_evlist__start_workload(ftrace->evlist); while (!done) {