Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932374AbbLNKkM (ORCPT ); Mon, 14 Dec 2015 05:40:12 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:53114 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932198AbbLNKkI (ORCPT ); Mon, 14 Dec 2015 05:40:08 -0500 From: Wang Nan To: , , CC: , , , He Kuang , Wang Nan , "Alexei Starovoitov" , Arnaldo Carvalho de Melo , Namhyung Kim Subject: [PATCH v5 08/14] perf tools: Support perf event alias name Date: Mon, 14 Dec 2015 10:39:17 +0000 Message-ID: <1450089563-122430-9-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1450089563-122430-1-git-send-email-wangnan0@huawei.com> References: <1450089563-122430-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.566E9C7C.011E,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: 659f34d01a7e04dd23dbd8c27ef9f572 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9508 Lines: 275 From: He Kuang This patch is useful when trying to pass a perf event to BPF map. Before this patch we are unable to pass an event with config term to BPF maps. For example: # perf record -a -e cycles/no-inherit,period=0x7fffffffffffffff/ \ -e './test_bpf_map_2.c/maps:pmu_map.event=cycles/no-inherit,period=0x7fffffffffffffff//' ls / event syntax error: '..ps:pmu_map.event=cycles/' \___ Event not found for map setting Because those '/' and ',' embarrass parser. This patch adds new bison rules for specifying an alias name to a perf event, which allows cmdline refer to previous defined perf event through its name. With this patch user can give alias name to a perf event using following cmdline. The above goal can be achieved using: # perf record -a -e cyc=cycles/no-inherit,period=0x7fffffffffffffff/ \ -e './test_bpf_map_2.c/maps:pmu_map.event=cyc/' ls / If alias is not provided (normal case): # perf record -e cycles ... It will be set to event's name automatically ('cycles' in the above example). To allow parser refer to existing event selector, pass event list to 'struct parse_events_evlist'. perf_evlist__find_evsel_by_alias() is introduced to get evsel through its alias. Test result: # cat ./test_bpf_map_2.c /************************ BEGIN **************************/ #include #define SEC(NAME) __attribute__((section(NAME), used)) struct bpf_map_def { unsigned int type; unsigned int key_size; unsigned int value_size; unsigned int max_entries; }; static int (*trace_printk)(const char *fmt, int fmt_size, ...) = (void *)BPF_FUNC_trace_printk; static int (*get_smp_processor_id)(void) = (void *)BPF_FUNC_get_smp_processor_id; static int (*perf_event_read)(struct bpf_map_def *, int) = (void *)BPF_FUNC_perf_event_read; struct bpf_map_def SEC("maps") pmu_map = { .type = BPF_MAP_TYPE_PERF_EVENT_ARRAY, .key_size = sizeof(int), .value_size = sizeof(int), .max_entries = __NR_CPUS__, }; SEC("func_write=sys_write") int func_write(void *ctx) { unsigned long long val; char fmt[] = "sys_write: pmu=%llu\n"; val = perf_event_read(&pmu_map, get_smp_processor_id()); trace_printk(fmt, sizeof(fmt), val); return 0; } SEC("func_write_return=sys_write%return") int func_write_return(void *ctx) { unsigned long long val = 0; char fmt[] = "sys_write_return: pmu=%llu\n"; val = perf_event_read(&pmu_map, get_smp_processor_id()); trace_printk(fmt, sizeof(fmt), val); return 0; } char _license[] SEC("license") = "GPL"; int _version SEC("version") = LINUX_VERSION_CODE; /************************* END ***************************/ # echo "" > /sys/kernel/debug/tracing/trace # ./perf record -a -e cyc=cycles/no-inherit,period=0x7fffffffffffffff/ \ -e './test_bpf_map_2.c/maps:pmu_map.event=cyc/' ls / [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.755 MB perf.data ] # cat /sys/kernel/debug/tracing/trace | grep ls ls-25328 [002] d... 940138.313178: : sys_write: pmu=4503165 ls-25328 [002] dN.. 940138.313207: : sys_write_return: pmu=4582975 ls-25328 [002] d... 940138.313211: : sys_write: pmu=4599840 ls-25328 [002] dN.. 940138.313220: : sys_write_return: pmu=4633352 # ./perf report --stdio Error: The perf.data file has no samples! ... (This is expected because we set period of cycles to a very large value to period of cycles event because we want to use this event as a counter only, don't need sampling) # ./perf record -e cycles -e './test_bpf_map_2.c/maps:pmu_map.event=cycles/' ls / ERROR: Apply config to BPF failed: Doesn't support inherit event (Hint: use -i or use /no-inherit/ to turn off inherit) Signed-off-by: He Kuang Signed-off-by: Wang Nan Cc: Alexei Starovoitov Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com --- tools/perf/util/bpf-loader.c | 2 +- tools/perf/util/evlist.c | 4 ++-- tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 1 + tools/perf/util/parse-events.c | 26 ++++++++++++++++++++++++++ tools/perf/util/parse-events.h | 4 ++++ tools/perf/util/parse-events.y | 15 ++++++++++++++- 7 files changed, 49 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index 84b4581..2893b4e 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -1448,7 +1448,7 @@ int bpf__strerror_apply_obj_config(int err, char *buf, size_t size) bpf__strerror_entry(BPF_LOADER_ERRNO__OBJCONF_MAP_EVTDIM, "Cannot set event to BPF maps in multi-thread tracing"); bpf__strerror_entry(BPF_LOADER_ERRNO__OBJCONF_MAP_EVTINH, - "%s (Hint: use -i to turn off inherit)", emsg); + "%s (Hint: use -i or use /no-inherit/ to turn off inherit)", emsg); bpf__strerror_entry(BPF_LOADER_ERRNO__OBJCONF_MAP_EVTTYPE, "Can only put raw, hardware and BPF output event into a BPF map"); bpf__strerror_end(buf, size); diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index d0a75c6..b65a941 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1745,9 +1745,9 @@ perf_evlist__find_evsel_by_str(struct perf_evlist *evlist, struct perf_evsel *evsel; evlist__for_each(evlist, evsel) { - if (!evsel->name) + if (!evsel->alias) continue; - if (strcmp(str, evsel->name) == 0) + if (strcmp(str, evsel->alias) == 0) return evsel; } diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 47f0330..8e0e6f4 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1073,6 +1073,7 @@ void perf_evsel__exit(struct perf_evsel *evsel) thread_map__put(evsel->threads); zfree(&evsel->group_name); zfree(&evsel->name); + zfree(&evsel->alias); perf_evsel__object.fini(evsel); } diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 5ded1fc..5f6dd57 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -89,6 +89,7 @@ struct perf_evsel { int idx; u32 ids; char *name; + char *alias; double scale; const char *unit; struct event_format *tp_format; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index a69c871..5d682dd 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1091,6 +1091,30 @@ int parse_events__modifier_group(struct list_head *list, return parse_events__modifier_event(list, event_mod, true); } +int parse_events__set_event_alias(struct parse_events_evlist *data, + struct list_head *list, + const char *str, + void *loc_alias_) +{ + struct perf_evsel *evsel; + YYLTYPE *loc_alias = loc_alias_; + + if (!str) + return 0; + + if (!list_is_singular(list)) { + struct parse_events_error *err = data->error; + + err->idx = loc_alias->first_column; + err->str = strdup("One alias can be applied to one event only"); + return -EINVAL; + } + + evsel = list_first_entry(list, struct perf_evsel, node); + evsel->alias = strdup(str); + return evsel->alias ? 0 : -ENOMEM; +} + void parse_events__set_leader(char *name, struct list_head *list) { struct perf_evsel *leader; @@ -1283,6 +1307,8 @@ int parse_events_name(struct list_head *list, char *name) __evlist__for_each(list, evsel) { if (!evsel->name) evsel->name = strdup(name); + if (!evsel->alias) + evsel->alias = strdup(name); } return 0; diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 2a2b172..20ad3c2 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -172,4 +172,8 @@ extern int is_valid_tracepoint(const char *event_string); int valid_event_mount(const char *eventfs); char *parse_events_formats_error_string(char *additional_terms); +int parse_events__set_event_alias(struct parse_events_evlist *data, + struct list_head *list, + const char *str, + void *loc_alias_); #endif /* __PERF_PARSE_EVENTS_H */ diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 8992d16..c3cbd7a 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -77,6 +77,7 @@ static inc_group_count(struct list_head *list, %type event_bpf_file %type event_def %type event_mod +%type event_alias %type event_name %type event %type events @@ -193,13 +194,25 @@ event_name PE_MODIFIER_EVENT event_name event_name: -PE_EVENT_NAME event_def +PE_EVENT_NAME event_alias { ABORT_ON(parse_events_name($2, $1)); free($1); $$ = $2; } | +event_alias + +event_alias: +PE_NAME '=' event_def +{ + struct list_head *list = $3; + struct parse_events_evlist *data = _data; + + ABORT_ON(parse_events__set_event_alias(data, list, $1, &@1)); + $$ = list; +} +| event_def event_def: event_pmu | -- 1.8.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/