From patchwork Mon May 23 07:13:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 68328 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp1073010qge; Mon, 23 May 2016 00:15:10 -0700 (PDT) X-Received: by 10.66.220.7 with SMTP id ps7mr12216462pac.77.1463987707794; Mon, 23 May 2016 00:15:07 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pt18si49779125pab.194.2016.05.23.00.15.07; Mon, 23 May 2016 00:15:07 -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 S1753368AbcEWHO5 (ORCPT + 30 others); Mon, 23 May 2016 03:14:57 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:38603 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753290AbcEWHOv (ORCPT ); Mon, 23 May 2016 03:14:51 -0400 Received: from 172.24.1.60 (EHLO szxeml432-hub.china.huawei.com) ([172.24.1.60]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DHM41872; Mon, 23 May 2016 15:14:07 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.235.1; Mon, 23 May 2016 15:13:56 +0800 From: Wang Nan To: CC: , , Wang Nan , He Kuang , "Arnaldo Carvalho de Melo" , Jiri Olsa , Masami Hiramatsu , Namhyung Kim , "Zefan Li" Subject: [PATCH v3 05/11] perf evlist: Introduce aux perf evlist Date: Mon, 23 May 2016 07:13:42 +0000 Message-ID: <1463987628-163563-6-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1463987628-163563-1-git-send-email-wangnan0@huawei.com> References: <1463987628-163563-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.0A090205.5742ADC1.007C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: b7c5b3d368bd791ebe9a0351b472772b Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce auxiliary perf evlist. Such evlists created by perf_evlist__new_aux() using an existing evlist. A 'parent' pointer points to the template. A 'evlist->parent' pointer is added to 'struct perf_evlist' and points to the evlist itself for normal evlists (so in this patch changing 'evlist' to 'evlist->parent' won't causes any error). Following commits uses auxiliary evlist as container of 'struct perf_mmap', creates auxiliary evlist for overwritable events, allow them to create separated mmaps. To achieve this goal, this patch carefully changes 'evlist' to 'evlist->parent' in all functions in the patch of 'perf_evlist__mmap_ex', except 'evlist->mmap' related operations, to make sure all evlist modifications like pollfd and event id hash tables goes to original 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/util/evlist.c | 31 +++++++++++++++++++++---------- tools/perf/util/evlist.h | 3 +++ 2 files changed, 24 insertions(+), 10 deletions(-) -- 1.8.3.4 diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 1305910..af0bea7 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -45,6 +45,7 @@ void perf_evlist__init(struct perf_evlist *evlist, struct cpu_map *cpus, fdarray__init(&evlist->pollfd, 64); evlist->workload.pid = -1; evlist->backward = false; + evlist->parent = evlist; } struct perf_evlist *perf_evlist__new(void) @@ -994,7 +995,7 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx, { struct perf_evsel *evsel; - evlist__for_each(evlist, evsel) { + evlist__for_each(evlist->parent, evsel) { int fd; if (evsel->system_wide && thread) @@ -1021,16 +1022,16 @@ static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx, * Therefore don't add it for polling. */ if (!evsel->system_wide && - __perf_evlist__add_pollfd(evlist, fd, idx) < 0) { + __perf_evlist__add_pollfd(evlist->parent, fd, idx) < 0) { perf_evlist__mmap_put(evlist, idx); return -1; } if (evsel->attr.read_format & PERF_FORMAT_ID) { - if (perf_evlist__id_add_fd(evlist, evsel, cpu, thread, + if (perf_evlist__id_add_fd(evlist->parent, evsel, cpu, thread, fd) < 0) return -1; - perf_evlist__set_sid_idx(evlist, evsel, idx, cpu, + perf_evlist__set_sid_idx(evlist->parent, evsel, idx, cpu, thread); } } @@ -1071,13 +1072,13 @@ static int perf_evlist__mmap_per_thread(struct perf_evlist *evlist, struct mmap_params *mp) { int thread; - int nr_threads = thread_map__nr(evlist->threads); + int nr_threads = thread_map__nr(evlist->parent->threads); pr_debug2("perf event ring buffer mmapped per thread\n"); for (thread = 0; thread < nr_threads; thread++) { int output = -1; - auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist, thread, + auxtrace_mmap_params__set_idx(&mp->auxtrace_mp, evlist->parent, thread, false); if (perf_evlist__mmap_per_evsel(evlist, thread, mp, 0, thread, @@ -1216,8 +1217,8 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, bool auxtrace_overwrite) { struct perf_evsel *evsel; - const struct cpu_map *cpus = evlist->cpus; - const struct thread_map *threads = evlist->threads; + const struct cpu_map *cpus = evlist->parent->cpus; + const struct thread_map *threads = evlist->parent->threads; struct mmap_params mp = { .prot = PROT_READ | (overwrite ? 0 : PROT_WRITE), }; @@ -1225,7 +1226,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, if (evlist->mmap == NULL && perf_evlist__alloc_mmap(evlist) < 0) return -ENOMEM; - if (evlist->pollfd.entries == NULL && perf_evlist__alloc_pollfd(evlist) < 0) + if (evlist->parent->pollfd.entries == NULL && perf_evlist__alloc_pollfd(evlist->parent) < 0) return -ENOMEM; evlist->overwrite = overwrite; @@ -1236,7 +1237,7 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, auxtrace_mmap_params__init(&mp.auxtrace_mp, evlist->mmap_len, auxtrace_pages, auxtrace_overwrite); - evlist__for_each(evlist, evsel) { + evlist__for_each(evlist->parent, evsel) { if ((evsel->attr.read_format & PERF_FORMAT_ID) && evsel->sample_id == NULL && perf_evsel__alloc_id(evsel, cpu_map__nr(cpus), threads->nr) < 0) @@ -1893,3 +1894,13 @@ perf_evlist__find_evsel_by_str(struct perf_evlist *evlist, return NULL; } + +struct perf_evlist *perf_evlist__new_aux(struct perf_evlist *parent) +{ + struct perf_evlist *evlist = zalloc(sizeof(*evlist)); + + if (evlist != NULL) + perf_evlist__init(evlist, parent->cpus, parent->threads); + evlist->parent = parent->parent; + return evlist; +} diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index d740fb8..0505012 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -60,6 +60,7 @@ struct perf_evlist { struct perf_evsel *selected; struct events_stats stats; struct perf_env *env; + struct perf_evlist *parent; }; struct perf_evsel_str_handler { @@ -70,6 +71,8 @@ struct perf_evsel_str_handler { struct perf_evlist *perf_evlist__new(void); struct perf_evlist *perf_evlist__new_default(void); struct perf_evlist *perf_evlist__new_dummy(void); +struct perf_evlist *perf_evlist__new_aux(struct perf_evlist *); + void perf_evlist__init(struct perf_evlist *evlist, struct cpu_map *cpus, struct thread_map *threads); void perf_evlist__exit(struct perf_evlist *evlist);