From patchwork Wed May 25 13:44:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 68604 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp1226571qge; Wed, 25 May 2016 06:51:05 -0700 (PDT) X-Received: by 10.66.168.228 with SMTP id zz4mr5911212pab.23.1464184265428; Wed, 25 May 2016 06:51:05 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pb2si12895355pac.41.2016.05.25.06.51.05; Wed, 25 May 2016 06:51:05 -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 S1753324AbcEYNvB (ORCPT + 30 others); Wed, 25 May 2016 09:51:01 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:37408 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751638AbcEYNu7 (ORCPT ); Wed, 25 May 2016 09:50:59 -0400 Received: from 172.24.1.36 (EHLO szxeml433-hub.china.huawei.com) ([172.24.1.36]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CCE84140; Wed, 25 May 2016 21:45:14 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml433-hub.china.huawei.com (10.82.67.210) with Microsoft SMTP Server id 14.3.235.1; Wed, 25 May 2016 21:45:04 +0800 From: Wang Nan To: CC: , , Wang Nan , He Kuang , "Arnaldo Carvalho de Melo" , Jiri Olsa , Masami Hiramatsu , Namhyung Kim , "Zefan Li" Subject: [PATCH v6 04/10] perf record: Introduce rec->overwrite_evlist for overwritable events Date: Wed, 25 May 2016 13:44:52 +0000 Message-ID: <1464183898-174512-5-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1464183898-174512-1-git-send-email-wangnan0@huawei.com> References: <1464183898-174512-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.0A020201.5745AC6B.0075, 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: 3d4f2f8d67f050667a8333d18484112f 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: pi3orama@163.com --- tools/perf/builtin-record.c | 140 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 117 insertions(+), 23 deletions(-) -- 1.8.3.4 diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index d4cf1b0..8108332 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -50,6 +50,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; @@ -341,6 +342,84 @@ 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(evlist, pos) { + if (!pos->overwrite) + 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, + bool overwrite) +{ + struct record_opts *opts = &rec->opts; + char msg[512]; + + /* + * 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) { + pr_err("Permission error mapping pages.\n" + "Consider increasing " + "/proc/sys/kernel/perf_event_mlock_kb,\n" + "or try again with a smaller value of -m/--mmap_pages.\n" + "(current value: %u,%u)\n", + opts->mmap_pages, opts->auxtrace_mmap_pages); + return -errno; + } else { + pr_err("failed to mmap with %d (%s)\n", errno, + strerror_r(errno, msg, sizeof(msg))); + if (errno) + return -errno; + else + return -EINVAL; + } + } + return 0; +} + +static int record__mmap(struct record *rec) +{ + 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; + + err = record__mmap_evlist(rec, rec->overwrite_evlist, true); + if (err) + return err; + return 0; +} + static int record__open(struct record *rec) { char msg[512]; @@ -353,6 +432,13 @@ static int record__open(struct record *rec) perf_evlist__config(evlist, opts, &callchain_param); evlist__for_each(evlist, pos) { + if (pos->overwrite) { + if (!pos->attr.write_backward) { + ui__warning("Unable to read from overwrite ring buffer\n\n"); + rc = -ENOSYS; + goto out; + } + } try_again: if (perf_evsel__open(pos, pos->cpus, pos->threads) < 0) { if (perf_evsel__fallback(pos, errno, msg, sizeof(msg))) { @@ -377,28 +463,9 @@ try_again: goto out; } - if (perf_evlist__mmap_ex(evlist, opts->mmap_pages, false, - opts->auxtrace_mmap_pages, - opts->auxtrace_snapshot_mode) < 0) { - if (errno == EPERM) { - pr_err("Permission error mapping pages.\n" - "Consider increasing " - "/proc/sys/kernel/perf_event_mlock_kb,\n" - "or try again with a smaller value of -m/--mmap_pages.\n" - "(current value: %u,%u)\n", - opts->mmap_pages, opts->auxtrace_mmap_pages); - rc = -errno; - } else { - pr_err("failed to mmap with %d (%s)\n", errno, - strerror_r(errno, msg, sizeof(msg))); - if (errno) - rc = -errno; - else - rc = -EINVAL; - } + rc = record__mmap(rec); + if (rc) goto out; - } - session->evlist = evlist; perf_session__set_id_hdr_size(session); out: @@ -655,10 +722,26 @@ perf_event__synth_time_conv(const struct perf_event_mmap_page *pc __maybe_unused return 0; } +static const struct perf_event_mmap_page * +perf_evlist__pick_pc(struct perf_evlist *evlist) +{ + if (evlist && evlist->mmap && evlist->mmap[0].base) + return evlist->mmap[0].base; + return NULL; +} + static const struct perf_event_mmap_page *record__pick_pc(struct record *rec) { - if (rec->evlist && rec->evlist->mmap && rec->evlist->mmap[0].base) - return rec->evlist->mmap[0].base; + 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; + pc = perf_evlist__pick_pc(rec->overwrite_evlist); + if (pc) + return pc; + return NULL; } @@ -941,6 +1024,14 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) err = 0; waking++; + /* + * Although we may have auxiliray evlist, there is + * only one pollfd, so we don't need to filter pollfd + * for auxiliray evlist. + * + * TODO: if an event is terminated (POLLERR | POLLHUP), + * unmap mmaps for auxiliray evlist too. + */ if (perf_evlist__filter_pollfd(rec->evlist, POLLERR | POLLHUP) == 0) draining = true; } @@ -1269,6 +1360,7 @@ static struct record record = { .mmap2 = perf_event__process_mmap2, .ordered_events = true, }, + .overwrite_evlist = NULL, }; const char record_callchain_help[] = CALLCHAIN_RECORD_HELP @@ -1565,6 +1657,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;