From patchwork Mon Jul 11 06:51:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 71711 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp459585qga; Sun, 10 Jul 2016 23:55:32 -0700 (PDT) X-Received: by 10.98.73.69 with SMTP id w66mr32673691pfa.104.1468220131242; Sun, 10 Jul 2016 23:55:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id px16si5524176pab.268.2016.07.10.23.55.30; Sun, 10 Jul 2016 23:55:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757911AbcGKGzM (ORCPT + 30 others); Mon, 11 Jul 2016 02:55:12 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:40613 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757824AbcGKGzG (ORCPT ); Mon, 11 Jul 2016 02:55:06 -0400 Received: from 172.24.1.47 (EHLO szxeml425-hub.china.huawei.com) ([172.24.1.47]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CEP02745; Mon, 11 Jul 2016 14:51:34 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.235.1; Mon, 11 Jul 2016 14:51:23 +0800 From: Wang Nan To: , CC: , , , Wang Nan , He Kuang , "Arnaldo Carvalho de Melo" , Jiri Olsa , "Masami Hiramatsu" , Namhyung Kim , "Nilay Vaish" Subject: [PATCH v15 4/8] perf record: Introduce rec->overwrite_evlist for overwritable events Date: Mon, 11 Jul 2016 06:51:11 +0000 Message-ID: <1468219875-243457-5-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1468219875-243457-1-git-send-email-wangnan0@huawei.com> References: <1468219875-243457-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090202.578342B3.0026, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 32419b466c38e705036bed4f4c1056d0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Create an auxiliary evlist for overwritable events. Before mmap, build this evlist and set 'overwrite' and 'backward' attribute. Since perf_evlist__mmap_ex() only maps events when evsel->overwrite matches evlist's corresponding attributes, with these two evlists an event goes to either rec->evlist or rec->overwrite_evlist. Signed-off-by: Wang Nan Cc: He Kuang Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: Nilay Vaish Cc: pi3orama@163.com --- tools/perf/builtin-record.c | 54 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) -- 1.8.3.4 diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index b2b3b60..ec1f90c 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -51,6 +51,7 @@ struct record { struct perf_data_file file; struct auxtrace_record *itr; struct perf_evlist *evlist; + struct perf_evlist *overwrite_evlist; struct perf_session *session; const char *progname; int realtime_prio; @@ -342,13 +343,41 @@ int auxtrace_record__snapshot_start(struct auxtrace_record *itr __maybe_unused) #endif +static int record__create_overwrite_evlist(struct record *rec) +{ + struct perf_evlist *evlist = rec->evlist; + struct perf_evsel *pos; + + evlist__for_each_entry(evlist, pos) { + if (!pos->attr.write_backward) + continue; + + if (!rec->overwrite_evlist) { + rec->overwrite_evlist = perf_evlist__new_aux(evlist); + if (rec->overwrite_evlist) { + rec->overwrite_evlist->backward = true; + rec->overwrite_evlist->overwrite = true; + return 0; + } else + return -ENOMEM; + } + } + return 0; +} + static int record__mmap_evlist(struct record *rec, - struct perf_evlist *evlist) + struct perf_evlist *evlist, + bool overwrite) { struct record_opts *opts = &rec->opts; char msg[512]; - if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false, + /* + * Don't use evlist->overwrite because it is logically an + * internal attribute and is set by perf_evlist__mmap_ex(). + * Avoid circular dependency. + */ + if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, overwrite, opts->auxtrace_mmap_pages, opts->auxtrace_snapshot_mode) < 0) { if (errno == EPERM) { @@ -373,7 +402,20 @@ static int record__mmap_evlist(struct record *rec, static int record__mmap(struct record *rec) { - return record__mmap_evlist(rec, rec->evlist); + int err; + + err = record__create_overwrite_evlist(rec); + if (err) + return err; + + err = record__mmap_evlist(rec, rec->evlist, false); + if (err) + return err; + + if (!rec->overwrite_evlist) + return 0; + + return record__mmap_evlist(rec, rec->overwrite_evlist, true); } static int record__open(struct record *rec) @@ -698,10 +740,11 @@ static const struct perf_event_mmap_page *record__pick_pc(struct record *rec) { const struct perf_event_mmap_page *pc; + /* Change it to a loop if a new aux evlist is added */ pc = perf_evlist__pick_pc(rec->evlist); if (pc) return pc; - return NULL; + return perf_evlist__pick_pc(rec->overwrite_evlist); } static int record__synthesize(struct record *rec) @@ -1311,6 +1354,7 @@ static struct record record = { .mmap2 = perf_event__process_mmap2, .ordered_events = true, }, + .overwrite_evlist = NULL, }; const char record_callchain_help[] = CALLCHAIN_RECORD_HELP @@ -1614,6 +1658,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) err = __cmd_record(&record, argc, argv); out_symbol_exit: perf_evlist__delete(rec->evlist); + if (rec->overwrite_evlist) + perf_evlist__delete(rec->overwrite_evlist); symbol__exit(); auxtrace_record__free(rec->itr); return err;