From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752787AbbDCFIe (ORCPT ); Fri, 3 Apr 2015 01:08:34 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42999 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922AbbDCFI2 (ORCPT ); Fri, 3 Apr 2015 01:08:28 -0400 Date: Thu, 2 Apr 2015 22:08:03 -0700 From: tip-bot for Yunlong Song Message-ID: Cc: paulus@samba.org, acme@redhat.com, hpa@zytor.com, tglx@linutronix.de, wangnan0@huawei.com, mingo@kernel.org, yunlong.song@huawei.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl Reply-To: paulus@samba.org, acme@redhat.com, hpa@zytor.com, tglx@linutronix.de, wangnan0@huawei.com, mingo@kernel.org, yunlong.song@huawei.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl In-Reply-To: <1427982439-27388-2-git-send-email-yunlong.song@huawei.com> References: <1427982439-27388-2-git-send-email-yunlong.song@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evlist: Support using -f to override perf.data file ownership Git-Commit-ID: 9e3b6ec17374299516d83c2e36135b958a895aa3 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: 9e3b6ec17374299516d83c2e36135b958a895aa3 Gitweb: http://git.kernel.org/tip/9e3b6ec17374299516d83c2e36135b958a895aa3 Author: Yunlong Song AuthorDate: Thu, 2 Apr 2015 21:47:10 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 2 Apr 2015 13:18:45 -0300 perf evlist: Support using -f to override perf.data file ownership Enable perf evlist to use perf.data when it is not owned by current user or root. Example: # perf record ls # chown Yunlong.Song:Yunlong.Song perf.data # ls -al perf.data -rw------- 1 Yunlong.Song Yunlong.Song 28260 Apr 2 10:18 perf.data # id uid=0(root) gid=0(root) groups=0(root),64(pkcs11) Before this patch: # perf evlist File perf.data not owned by current user or root (use -f to override) # perf evlist -f Error: unknown switch `f' usage: perf evlist [] -i, --input Input file name -F, --freq Show the sample frequency -v, --verbose Show all event attr details -g, --group Show event group information As shown above, the -f option does not work at all. After this patch: # perf evlist File perf.data not owned by current user or root (use -f to override) # perf evlist -f cycles As shown above, the -f option really works now. Signed-off-by: Yunlong Song Tested-by: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1427982439-27388-2-git-send-email-yunlong.song@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-evlist.c | 2 ++ tools/perf/util/evsel.h | 1 + 2 files changed, 3 insertions(+) diff --git a/tools/perf/builtin-evlist.c b/tools/perf/builtin-evlist.c index 0f93f85..695ec5a 100644 --- a/tools/perf/builtin-evlist.c +++ b/tools/perf/builtin-evlist.c @@ -24,6 +24,7 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *details struct perf_data_file file = { .path = file_name, .mode = PERF_DATA_MODE_READ, + .force = details->force, }; session = perf_session__new(&file, 0, NULL); @@ -47,6 +48,7 @@ int cmd_evlist(int argc, const char **argv, const char *prefix __maybe_unused) "Show all event attr details"), OPT_BOOLEAN('g', "group", &details.event_group, "Show event group information"), + OPT_BOOLEAN('f', "force", &details.force, "don't complain, do it"), OPT_END() }; const char * const evlist_usage[] = { diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index dcf202a..c5a43d6 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -335,6 +335,7 @@ struct perf_attr_details { bool freq; bool verbose; bool event_group; + bool force; }; int perf_evsel__fprintf(struct perf_evsel *evsel,