perf tools: filtering events using eBPF programs
Subsystems (3)
Hi Arnaldo and Ingo,
Several small proglems are fixed based on yesterday's pull request. Please see below. Since patch order is changed (original 20/32 and 32/32 are dropped), I decide to send all of them again. Sorry for the noisy.
In addition: I collect a cross-compiling fix I posted yesterday into this cset (the last one).
The following changes since commit 2c07144dfce366e21465cc7b0ada9f0b6dc7b7ed:
perf evlist: Add backpointer for perf_env to evlist (2015-08-28 14:54:14 -0300)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/pi3orama/linux tags/perf-ebpf-for-acme-20150829
for you to fetch changes up to d4a337392b3724899a084170d9ea36a8e2392097:
tools lib traceevent: Support function __get_dynamic_array_len (2015-08-29 02:57:40 +0000)
----------------------------------------------------------------
perf BPF related improvements and bugfix:
- Rebase to Arnaldo's newest perf/core.
- Fix a missing include in builtin-trace.c.
- Drop patch 'perf tools: Fix probe-event.h include' since the problem has been fixed by commit 5a023b57.
- Fix a cross compiling error (introduced by inter pt).
- Drop patch 'bpf: Introduce function for outputing data to perf event' because we want to do better.
----------------------------------------------------------------
He Kuang (4):
perf tools: Move linux/filter.h to tools/include perf tools: Introduce arch_get_reg_info() for x86 perf record: Support custom vmlinux path
tools lib traceevent: Support function __get_dynamic_array_len
Wang Nan (27):
bpf tools: New API to get name from a BPF object
perf tools: Don't set cmdline_group_boundary if no evsel is collected perf tools: Introduce dummy evsel
perf tools: Make perf depend on libbpf
perf ebpf: Add the libbpf glue
perf tools: Enable passing bpf object file to --event
perf probe: Attach trace_probe_event with perf_probe_event
perf record, bpf: Parse and probe eBPF programs probe points
perf bpf: Collect 'struct perf_probe_event' for bpf_program
perf record: Load all eBPF object into kernel
perf tools: Add bpf_fd field to evsel and config it
perf tools: Allow filter option to be applied to bof object
perf tools: Attach eBPF program to perf event
perf tools: Suppress probing messages when probing by BPF loading perf record: Add clang options for compiling BPF scripts
perf tools: Infrastructure for compiling scriptlets when passing '.c' to --event perf tests: Enforce LLVM test for BPF test
perf test: Add 'perf test BPF'
bpf tools: Load a program with different instances using preprocessor perf probe: Reset args and nargs for probe_trace_event when failure perf tools: Add BPF_PROLOGUE config options for further patches perf tools: Add prologue for BPF programs for fetching arguments perf tools: Generate prologue for BPF programs
perf tools: Use same BPF program if arguments are identical
perf probe: Init symbol as kprobe
perf tools: Support attach BPF program on uprobe events
perf tools: Fix cross compiling error
tools/build/Makefile.feature | 6 +- tools/include/linux/filter.h | 237 +++++++ tools/lib/bpf/libbpf.c | 168 ++++- tools/lib/bpf/libbpf.h | 26 +- tools/lib/traceevent/event-parse.c | 56 +- tools/lib/traceevent/event-parse.h | 1 + tools/perf/MANIFEST | 4 + tools/perf/Makefile.perf | 19 +- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/Build | 2 + tools/perf/arch/x86/util/dwarf-regs.c | 104 ++- tools/perf/builtin-probe.c | 4 +- tools/perf/builtin-record.c | 64 +- tools/perf/builtin-stat.c | 9 +- tools/perf/builtin-top.c | 11 +- tools/perf/builtin-trace.c | 7 +- tools/perf/config/Makefile | 31 +- tools/perf/tests/Build | 10 +- tools/perf/tests/bpf-script-example.c | 44 ++ tools/perf/tests/bpf.c | 170 +++++ tools/perf/tests/builtin-test.c | 12 + tools/perf/tests/llvm.c | 125 +++- tools/perf/tests/llvm.h | 15 + tools/perf/tests/make | 4 +- tools/perf/tests/tests.h | 3 + tools/perf/util/Build | 4 +- tools/perf/util/bpf-loader.c | 730 +++++++++++++++++++++ tools/perf/util/bpf-loader.h | 95 +++ tools/perf/util/bpf-prologue.c | 442 +++++++++++++ tools/perf/util/bpf-prologue.h | 34 + tools/perf/util/evlist.c | 107 +++ tools/perf/util/evlist.h | 2 + tools/perf/util/evsel.c | 49 ++ tools/perf/util/evsel.h | 7 + tools/perf/util/include/dwarf-regs.h | 7 + tools/perf/util/parse-events.c | 73 ++- tools/perf/util/parse-events.h | 4 + tools/perf/util/parse-events.l | 6 + tools/perf/util/parse-events.y | 29 +- tools/perf/util/probe-event.c | 79 ++- tools/perf/util/probe-event.h | 7 +- tools/perf/util/probe-file.c | 5 +- tools/perf/util/probe-finder.c | 4 + .../perf/util/scripting-engines/trace-event-perl.c | 1 + .../util/scripting-engines/trace-event-python.c | 1 + 45 files changed, 2698 insertions(+), 121 deletions(-) create mode 100644 tools/include/linux/filter.h create mode 100644 tools/perf/tests/bpf-script-example.c create mode 100644 tools/perf/tests/bpf.c create mode 100644 tools/perf/tests/llvm.h create mode 100644 tools/perf/util/bpf-loader.c create mode 100644 tools/perf/util/bpf-loader.h create mode 100644 tools/perf/util/bpf-prologue.c create mode 100644 tools/perf/util/bpf-prologue.h
Signature · 1 line
2.1.0
PATCH 1/31 bpf tools: New API to get name from a BPF object
Before this patch there's no way to connect a loaded bpf object to its source file. However, during applying perf's '--filter' to BPF object, without this connection makes things harder, because perf loads all programs together, but '--filter' setting is for each object.
API of bpf_object__open_buffer() is changed to allow passing a name. Fortunately, at this time there's only one user of it (perf test LLVM), so we change it together.
--- tools/lib/bpf/libbpf.c | 25 ++++++++++++++++++++++--- tools/lib/bpf/libbpf.h | 4 +++- tools/perf/tests/llvm.c | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-)
tools/lib/bpf/libbpf.c +22 -3
@@ -880,15 +880,26 @@ struct bpf_object *bpf_object__open(const char *path) }struct bpf_object *bpf_object__open_buffer (void *obj_buf, -size_t obj_buf_sz) +size_t obj_buf_sz, +const char *name) { +char tmp_name[64 ]; +/* param validation */ if (!obj_buf || obj_buf_sz <=0 )return NULL ; -pr_debug ("loading object from buffer\n" ); +if (!name) { +snprintf (tmp_name,sizeof (tmp_name),"%lx-%lx" , + (unsigned long )obj_buf, + (unsigned long )obj_buf_sz); + tmp_name[sizeof (tmp_name) -1 ] ='\0' ; + name = tmp_name; + } +pr_debug ("loading object '%s' from buffer\n" , + name); -return __bpf_object__open ("[buffer]" , obj_buf, obj_buf_sz); +return __bpf_object__open (name, obj_buf, obj_buf_sz); }int bpf_object__unload (struct bpf_object *obj)
@@ -975,6 +986,14 @@ bpf_object__next(struct bpf_object *prev)return next; } +const char * +bpf_object__get_name (struct bpf_object *obj) +{ +if (!obj) +return NULL ; +return obj->path; +} +struct bpf_program *bpf_program__next (struct bpf_program *prev,struct bpf_object *obj) {
tools/lib/bpf/libbpf.h +3 -1
@@ -28,12 +28,14 @@ struct bpf_object;struct bpf_object *bpf_object__open (const char *path);struct bpf_object *bpf_object__open_buffer (void *obj_buf, -size_t obj_buf_sz); +size_t obj_buf_sz, +const char *name);void bpf_object__close (struct bpf_object *object);/* Load/unload object into/from kernel */ int bpf_object__load (struct bpf_object *obj);int bpf_object__unload (struct bpf_object *obj); +const char *bpf_object__get_name (struct bpf_object *obj);struct bpf_object *bpf_object__next (struct bpf_object *prev);#define bpf_object__for_each_safe (pos, tmp) \
tools/perf/tests/llvm.c +1 -1
@@ -26,7 +26,7 @@ static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz) {struct bpf_object *obj; - obj =bpf_object__open_buffer (obj_buf, obj_buf_sz); + obj =bpf_object__open_buffer (obj_buf, obj_buf_sz,NULL );if (!obj)return -1 ;bpf_object__close (obj);
Signature · 1 line
2.1.0
PATCH 2/31 perf tools: Don't set cmdline_group_boundary if no evsel is collected
In reply to Wang NanIf parse_events__scanner() collects no entry, perf_evlist__last(evlist) is invalid. Then setting of cmdline_group_boundary touches invalid.
It could happend in currect BPF implementation. See [1]. Although it can be fixed, for safety reason it whould be better to introduce this check.
Instead of checking number of entries, check data.list instead, so we can add dummy evsel here.
[1]: http://lkml.kernel.org/n/[email protected]
--- tools/perf/util/parse-events.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.c +6 -2
@@ -1143,10 +1143,14 @@ int parse_events(struct perf_evlist *evlist, const char *str,int entries = data.idx - evlist->nr_entries;struct perf_evsel *last; +if (!list_empty (&data.list)) { + last =list_entry (data.list.prev, + struct perf_evsel, node); + last->cmdline_group_boundary = true; + } +perf_evlist__splice_list_tail (evlist, &data.list, entries); evlist->nr_groups += data.nr_groups; - last =perf_evlist__last (evlist); - last->cmdline_group_boundary = true;return 0 ; }
Signature · 1 line
2.1.0
Re: [PATCH 02/31] perf tools: Don't set cmdline_group_boundary if no evsel is collected
Em Sat, Aug 29, 2015 at 04:21:36AM +0000, Wang Nan escreveu:
Quoted 9 lines
If
parse_events__scanner()collects no entry,perf_evlist__last(evlist)is invalid. Then setting ofcmdline_group_boundarytouches invalid.It could happend in currect BPF implementation. See [1]. Although it can be fixed, for safety reason it whould be better to introduce this check.
Instead of checking number of entries, check data.list instead, so we can add dummy evsel here.
Event parsing fixes should have Jiri Olsa on the CC list, Jiri, is this ok?
Quoted 1 line
From what I can see it looks Ok, my question, just from looking at this
patch, is if it is valid to get to this point with an empty data.list, i.e. was it ever possible and this is a bug irrespective of eBPF?
- Arnaldo
Quoted 37 lines
[1]: http://lkml.kernel.org/n/[email protected]
Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/util/parse-events.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)tools/perf/util/parse-events.c +6
-2@@ -1143,10 +1143,14 @@ int parse_events(struct perf_evlist *evlist, const char *str,int entries = data.idx - evlist->nr_entries;struct perf_evsel *last; +if (!list_empty (&data.list)) { + last =list_entry (data.list.prev, + struct perf_evsel, node); + last->cmdline_group_boundary = true; + } +perf_evlist__splice_list_tail (evlist, &data.list, entries); evlist->nr_groups += data.nr_groups; - last =perf_evlist__last (evlist); - last->cmdline_group_boundary = true;return 0 ; }Signature · 1 line
2.1.0
Re: [PATCH 02/31] perf tools: Don't set cmdline_group_boundary if no evsel is collected
Quoted 11 lines · Arnaldo Carvalho de Melo
Em Sat, Aug 29, 2015 at 04:21:36AM +0000, Wang Nan escreveu:
Quoted 9 lines
If
parse_events__scanner()collects no entry,perf_evlist__last(evlist)is invalid. Then setting ofcmdline_group_boundarytouches invalid.It could happend in currect BPF implementation. See [1]. Although it can be fixed, for safety reason it whould be better to introduce this check.
Instead of checking number of entries, check data.list instead, so we can add dummy evsel here.
Quoted 6 lines
Event parsing fixes should have Jiri Olsa on the CC list, Jiri, is this ok?
From what I can see it looks Ok, my question, just from looking at this patch, is if it is valid to get to this point with an empty data.list, i.e. was it ever possible and this is a bug irrespective of eBPF?
good point, I believe it's either fail or event(s) added to the list I haven't checked how's eBPF connected with event parsing, is there a git tree I could check?
thanks,
jirka
Re: [PATCH 02/31] perf tools: Don't set cmdline_group_boundary if no evsel is collected
Quoted 14 lines · Jiri Olsa
Quoted 13 lines · Arnaldo Carvalho de Melo
Em Sat, Aug 29, 2015 at 04:21:36AM +0000, Wang Nan escreveu:
Quoted 9 lines
If
parse_events__scanner()collects no entry,perf_evlist__last(evlist)is invalid. Then setting ofcmdline_group_boundarytouches invalid.It could happend in currect BPF implementation. See [1]. Although it can be fixed, for safety reason it whould be better to introduce this check.
Instead of checking number of entries, check data.list instead, so we can add dummy evsel here.
Event parsing fixes should have Jiri Olsa on the CC list, Jiri, is this ok?
Quoted 6 lines
Quoted 3 lines
From what I can see it looks Ok, my question, just from looking at this
patch, is if it is valid to get to this point with an empty data.list, i.e. was it ever possible and this is a bug irrespective of eBPF?good point, I believe it's either fail or event(s) added to the list I haven't checked how's eBPF connected with event parsing, is there a git tree I could check?
Please check:
https://git.kernel.org/cgit/linux/kernel/git/pi3orama/linux.git/log/?h=perf/ebpf
commit d7d91228cad0a78eae5ea9526a8a78debf3cf584
commit 2606fe61219899cb386823eddc1bc231ff5067a6
related to parsing.
Thank you.
Quoted 2 lines
thanks,
jirka
Re: [PATCH 02/31] perf tools: Don't set cmdline_group_boundary if no evsel is collected
In reply to Arnaldo Carvalho de MeloQuoted 8 lines · Arnaldo Carvalho de Melo
Em Sat, Aug 29, 2015 at 04:21:36AM +0000, Wang Nan escreveu:
Quoted 7 lines
If
parse_events__scanner()collects no entry,perf_evlist__last(evlist)is invalid. Then setting ofcmdline_group_boundarytouches invalid.It could happend in currect BPF implementation. See [1]. Although it can be fixed, for safety reason it whould be better to introduce this check.
Quoted 8 lines
Quoted 2 lines
Instead of checking number of entries, check data.list instead, so we can add dummy evsel here.
Event parsing fixes should have Jiri Olsa on the CC list, Jiri, is this ok?
From what I can see it looks Ok, my question, just from looking at this
patch, is if it is valid to get to this point with an empty data.list, i.e. was it ever possible and this is a bug irrespective of eBPF?
It should not be a existing bug in perf. There are other places rely on non-empty of the list. For example, in parse_events__set_leader(). Furtunately, it won't triggered problem because we don't allow a BPF object to be wrapped with "{}" lexically ("{./aaa.o}" will be interpreterd as file '{./aaa.o' and a extra '}').
Quoted 39 lines
- Arnaldo
Quoted 37 lines
[1]: http://lkml.kernel.org/n/[email protected]
Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/util/parse-events.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)tools/perf/util/parse-events.c +6
-2@@ -1143,10 +1143,14 @@ int parse_events(struct perf_evlist *evlist, const char *str,int entries = data.idx - evlist->nr_entries;struct perf_evsel *last; +if (!list_empty (&data.list)) { + last =list_entry (data.list.prev, + struct perf_evsel, node); + last->cmdline_group_boundary = true; + } +perf_evlist__splice_list_tail (evlist, &data.list, entries); evlist->nr_groups += data.nr_groups; - last =perf_evlist__last (evlist); - last->cmdline_group_boundary = true;return 0 ; }Signature · 1 line
2.1.0
PATCH 1/1 perf tools: Don't set leader if parser doesn't collect an evsel
In reply to Wang NanSimilar to patch 'perf tools: Don't set cmdline_group_boundary if no evsel is collected', in case when parser collects no evsel (at this point it shouldn't happen), parse_events__set_leader() is not safe.
This patch checks list_empty becore calling __perf_evlist__set_leader() for safty reason.
---
I'd like to queue this patch into my next pull request. Since it is not a real bug, it may be dropped.
--- tools/perf/util/parse-events.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/util/parse-events.c +3 -0
@@ -793,6 +793,9 @@ void parse_events__set_leader(char *name, struct list_head *list) {struct perf_evsel *leader; +if (list_empty (list)) +return ; +__perf_evlist__set_leader (list); leader = list_entry(list->next, struct perf_evsel, node); leader->group_name = name ?strdup (name) :NULL ;
Signature · 1 line
1.8.3.4
Re: [PATCH] perf tools: Don't set leader if parser doesn't collect an evsel
Quoted 15 lines · Wang Nan
Similar to patch 'perf tools: Don't set
cmdline_group_boundaryif no evsel is collected', in case when parser collects no evsel (at this point it shouldn't happen),parse_events__set_leader()is not safe.This patch checks
list_emptybecore calling__perf_evlist__set_leader()for safty reason.Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Jiri Olsa <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Zefan Li <[email protected]>
Quoted 4 lines
---
I'd like to queue this patch into my next pull request. Since it is not a real bug, it may be dropped.
I think merging this into patch 2/31 should be better. If we decide to drop then only one patch should be considered.
Quoted 18 lines
--- tools/perf/util/parse-events.c | 3 +++ 1 file changed, 3 insertions(+)tools/perf/util/parse-events.c +3
-0@@ -793,6 +793,9 @@ void parse_events__set_leader(char *name, struct list_head *list) {struct perf_evsel *leader; +if (list_empty (list)) +return ; +__perf_evlist__set_leader (list); leader = list_entry(list->next, struct perf_evsel, node); leader->group_name = name ?strdup (name) :NULL ;
RE: [PATCH] perf tools: Don't set leader if parser doesn't collect an evsel
In reply to Wang NanQuoted 31 lines
From: Wang Nan [mailto:[email protected]]
Similar to patch 'perf tools: Don't set
cmdline_group_boundaryif no evsel is collected', in case when parser collects no evsel (at this point it shouldn't happen),parse_events__set_leader()is not safe.This patch checks
list_emptybecore calling__perf_evlist__set_leader()for safty reason.Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Jiri Olsa <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Zefan Li <[email protected]>---
I'd like to queue this patch into my next pull request. Since it is not a real bug, it may be dropped.
--- tools/perf/util/parse-events.c | 3 +++ 1 file changed, 3 insertions(+)tools/perf/util/parse-events.c +0
-0
tools/perf/util/parse-events.c void parse_events__set_leader(char *name, struct list_head *list) · line 796
Quoted 4 lines
tools/perf/util/parse-events.c +1
-0@@ -793,6 +793,9 @@ void parse_events__set_leader(char *name, struct list_head *list) {struct perf_evsel *leader; +if (list_empty (list))
Would we need to warn/debug something here?
Thank you,
Quoted 7 lines
tools/perf/util/parse-events.c +2
-1+return ; +__perf_evlist__set_leader (list); leader = list_entry(list->next, struct perf_evsel, node); leader->group_name = name ?strdup (name) :NULL ; --1.8.3.4
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Re: [PATCH] perf tools: Don't set leader if parser doesn't collect an evsel
Quoted 34 lines · 平松雅巳 / HIRAMATU,MASAMI
Quoted 34 lines
From: Wang Nan [mailto:[email protected]]
Similar to patch 'perf tools: Don't set
cmdline_group_boundaryif no evsel is collected', in case when parser collects no evsel (at this point it shouldn't happen),parse_events__set_leader()is not safe.This patch checks
list_emptybecore calling__perf_evlist__set_leader()for safty reason.Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Jiri Olsa <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Zefan Li <[email protected]>---
I'd like to queue this patch into my next pull request. Since it is not a real bug, it may be dropped.
--- tools/perf/util/parse-events.c | 3 +++ 1 file changed, 3 insertions(+)tools/perf/util/parse-events.c +0
-0@@ -793,6 +793,9 @@ void parse_events__set_leader(char *name, struct list_head *list) {struct perf_evsel *leader;
Quoted 2 lines
tools/perf/util/parse-events.c void parse_events__set_leader(char *name, struct list_head *list) · line 796
Quoted 1 line
tools/perf/util/parse-events.c +1
-0+if (list_empty (list))Would we need to warn/debug something here?
OK, let's add a WARN message here and other 2 places.
Thank you.
Quoted 9 lines
Thank you,
Quoted 7 lines
tools/perf/util/parse-events.c +2
-1+return ; +__perf_evlist__set_leader (list); leader = list_entry(list->next, struct perf_evsel, node); leader->group_name = name ?strdup (name) :NULL ; --1.8.3.4
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH] perf tools: Don't write to evsel if parser doesn't collect evsel
Sorry, forget to CC kernel mailing list...
Quoted 82 lines · Wang Nan
If
parse_events__scanner()collects no entry,perf_evlist__last(evlist)is invalid.Although it shouldn't happen at this point, before calling
perf_evlist__last(), we should ensure the list is not empty for safety reason.There are 3 places need this checking:
1. Before setting
cmdline_group_boundary;
2. Before__perf_evlist__set_leader();
3. Inforeach_evsel_in_last_glob.Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Jiri Olsa <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Zefan Li <[email protected]>---
Merge all 3
list_empty()test together into one patch.Add warning messages.
Improve commit message.
--- tools/perf/util/parse-events.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)tools/perf/util/parse-events.c +19
-3@@ -793,6 +793,11 @@ void parse_events__set_leader(char *name, struct list_head *list) {struct perf_evsel *leader; +if (list_empty (list)) { +__WARN_printf ("WARNING: failed to set leader: empty list" ); +return ; + } +__perf_evlist__set_leader (list); leader = list_entry(list->next, struct perf_evsel, node); leader->group_name = name ?strdup (name) :NULL ;@@ -1143,10 +1148,15 @@ int parse_events(struct perf_evlist *evlist, const char *str,int entries = data.idx - evlist->nr_entries;struct perf_evsel *last; +if (!list_empty (&data.list)) { + last =list_entry (data.list.prev, + struct perf_evsel, node); + last->cmdline_group_boundary = true; + }else +__WARN_printf ("WARNING: event parser found nothing" ); +perf_evlist__splice_list_tail (evlist, &data.list, entries); evlist->nr_groups += data.nr_groups; - last =perf_evlist__last (evlist); - last->cmdline_group_boundary = true;return 0 ; }@@ -1252,7 +1262,13 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist,struct perf_evsel *last =NULL ;int err; -if (evlist->nr_entries >0 ) +/* +* Don't return when list_empty, give func a chance to report +* error when it found last == NULL. +* +* So no need to WARN here, let *func do this. +*/ +if (!list_empty (&evlist->entries)) last =perf_evlist__last (evlist); do {
平松雅巳 / HIRAMATU,MASAMI
Reviewed-byRE: [PATCH] perf tools: Don't write to evsel if parser doesn't collect evsel
Quoted 18 lines
From: Wangnan (F) [mailto:[email protected]]
Sorry, forget to CC kernel mailing list...
Quoted 13 lines · Wang Nan
If
parse_events__scanner()collects no entry,perf_evlist__last(evlist)is invalid.Although it shouldn't happen at this point, before calling
perf_evlist__last(), we should ensure the list is not empty for safety reason.There are 3 places need this checking:
1. Before setting
cmdline_group_boundary;
2. Before__perf_evlist__set_leader();
3. Inforeach_evsel_in_last_glob.
This looks OK to me.
Thanks!
Quoted 68 lines
Quoted 68 lines
Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Jiri Olsa <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Zefan Li <[email protected]>---
Merge all 3
list_empty()test together into one patch.Add warning messages.
Improve commit message.
--- tools/perf/util/parse-events.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)tools/perf/util/parse-events.c +19
-3@@ -793,6 +793,11 @@ void parse_events__set_leader(char *name, struct list_head *list) {struct perf_evsel *leader; +if (list_empty (list)) { +__WARN_printf ("WARNING: failed to set leader: empty list" ); +return ; + } +__perf_evlist__set_leader (list); leader = list_entry(list->next, struct perf_evsel, node); leader->group_name = name ?strdup (name) :NULL ;@@ -1143,10 +1148,15 @@ int parse_events(struct perf_evlist *evlist, const char *str,int entries = data.idx - evlist->nr_entries;struct perf_evsel *last; +if (!list_empty (&data.list)) { + last =list_entry (data.list.prev, + struct perf_evsel, node); + last->cmdline_group_boundary = true; + }else +__WARN_printf ("WARNING: event parser found nothing" ); +perf_evlist__splice_list_tail (evlist, &data.list, entries); evlist->nr_groups += data.nr_groups; - last =perf_evlist__last (evlist); - last->cmdline_group_boundary = true;return 0 ; }@@ -1252,7 +1262,13 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist,struct perf_evsel *last =NULL ;int err; -if (evlist->nr_entries >0 ) +/* +* Don't return when list_empty, give func a chance to report +* error when it found last == NULL. +* +* So no need to WARN here, let *func do this. +*/ +if (!list_empty (&evlist->entries)) last =perf_evlist__last (evlist);
Quoted 2 lines
tools/perf/util/parse-events.c foreach_evsel_in_last_glob(struct perf_evlist *evlist, · line 1274
Quoted 1 line
tools/perf/util/parse-events.c +0
-0do {
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Re: [PATCH] perf tools: Don't write to evsel if parser doesn't collect evsel
In reply to Wangnan (F)Quoted 52 lines · Wangnan (F)
Sorry, forget to CC kernel mailing list...
Quoted 49 lines · Wang Nan
If
parse_events__scanner()collects no entry,perf_evlist__last(evlist)is invalid.Although it shouldn't happen at this point, before calling
perf_evlist__last(), we should ensure the list is not empty for safety reason.There are 3 places need this checking:
1. Before setting
cmdline_group_boundary;
2. Before__perf_evlist__set_leader();
3. Inforeach_evsel_in_last_glob.Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Jiri Olsa <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Zefan Li <[email protected]>---
Merge all 3
list_empty()test together into one patch.Add warning messages.
Improve commit message.
--- tools/perf/util/parse-events.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)tools/perf/util/parse-events.c +5
-0@@ -793,6 +793,11 @@ void parse_events__set_leader(char *name, struct list_head *list) {struct perf_evsel *leader; +if (list_empty (list)) { +__WARN_printf ("WARNING: failed to set leader: empty list" ); +return ; + } +__perf_evlist__set_leader (list); leader = list_entry(list->next, struct perf_evsel, node); leader->group_name = name ?strdup (name) :NULL ;@@ -1143,10 +1148,15 @@ int parse_events(struct perf_evlist *evlist, const char *str,
Quoted 8 lines
tools/perf/util/parse-events.c int parse_events(struct perf_evlist *evlist, const char *str, · line 1155
Quoted 8 lines
tools/perf/util/parse-events.c +6
-0int entries = data.idx - evlist->nr_entries;struct perf_evsel *last; +if (!list_empty (&data.list)) { + last =list_entry (data.list.prev, + struct perf_evsel, node); + last->cmdline_group_boundary = true; + }else +__WARN_printf ("WARNING: event parser found nothing" );
we need to unify error printing in this object ;-) with this one it's 3
__WARN_printf(...
fprintf(stderr,...
printf(...
WARN_ONCE(...
;-)
Quoted 10 lines
Quoted 10 lines
tools/perf/util/parse-events.c +1
-2+perf_evlist__splice_list_tail (evlist, &data.list, entries); evlist->nr_groups += data.nr_groups; - last =perf_evlist__last (evlist); - last->cmdline_group_boundary = true;return 0 ; }@@ -1252,7 +1262,13 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist,struct perf_evsel *last =NULL ;int err;
Quoted 8 lines
tools/perf/util/parse-events.c foreach_evsel_in_last_glob(struct perf_evlist *evlist, · line 1270
Quoted 8 lines
tools/perf/util/parse-events.c +7
-1-if (evlist->nr_entries >0 ) +/* +* Don't return when list_empty, give func a chance to report +* error when it found last == NULL. +* +* So no need to WARN here, let *func do this. +*/ +if (!list_empty (&evlist->entries))
why is it better than to check evlist->nr_entries? evlist->nr_entries is equivalent to !list_empty(&evlist->entries) in here, right?
jirka
Re: [PATCH] perf tools: Don't write to evsel if parser doesn't collect evsel
发自我的 iPhone
Quoted 87 lines · 在 2015年9月2日,下午7:54,Jiri Olsa <[email protected]> 写道:
Quoted 54 lines · Wangnan (F)
Sorry, forget to CC kernel mailing list...
Quoted 50 lines · Wang Nan
If
parse_events__scanner()collects no entry,perf_evlist__last(evlist)is invalid.Although it shouldn't happen at this point, before calling
perf_evlist__last(), we should ensure the list is not empty for safety reason.There are 3 places need this checking:
1. Before setting
cmdline_group_boundary;
2. Before__perf_evlist__set_leader();
3. Inforeach_evsel_in_last_glob.Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Jiri Olsa <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Zefan Li <[email protected]>---
Merge all 3
list_empty()test together into one patch.Add warning messages.
Improve commit message.
---
tools/perf/util/parse-events.c| 22 +++++++++++++++++++---1 file changed, 19 insertions(+), 3 deletions(-)tools/perf/util/parse-events.c +5
-0@@ -793,6 +793,11 @@ void parse_events__set_leader(char *name, struct list_head *list) {struct perf_evsel *leader; +if (list_empty (list)) { +__WARN_printf ("WARNING: failed to set leader: empty list" ); +return ; + } +__perf_evlist__set_leader (list); leader = list_entry(list->next, struct perf_evsel, node); leader->group_name = name ?strdup (name) :NULL ;@@ -1143,10 +1148,15 @@ int parse_events(struct perf_evlist *evlist, const char *str,Quoted 8 lines
tools/perf/util/parse-events.c int parse_events(struct perf_evlist *evlist, const char *str, · line 1155
Quoted 8 lines
tools/perf/util/parse-events.c +6
-0int entries = data.idx - evlist->nr_entries;struct perf_evsel *last; +if (!list_empty (&data.list)) { + last =list_entry (data.list.prev, + struct perf_evsel, node); + last->cmdline_group_boundary = true; + }else +__WARN_printf ("WARNING: event parser found nothing" );we need to unify error printing in this object ;-) with this one it's 3
__WARN_printf(...
fprintf(stderr,...
printf(...
WARN_ONCE(...;-)
Quoted 13 lines
Quoted 13 lines
tools/perf/util/parse-events.c +3
-3+perf_evlist__splice_list_tail (evlist, &data.list, entries); evlist->nr_groups += data.nr_groups; - last =perf_evlist__last (evlist); - last->cmdline_group_boundary = true;return 0 ; }@@ -1252,7 +1262,13 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist,struct perf_evsel *last =NULL ;int err; -if (evlist->nr_entries >0 ) +/* +* Don't return when list_empty, give func a chance to report
Quoted 9 lines
Quoted 5 lines
tools/perf/util/parse-events.c foreach_evsel_in_last_glob(struct perf_evlist *evlist, · line 1270
Quoted 5 lines
tools/perf/util/parse-events.c +5
-0+* error when it found last == NULL. +* +* So no need to WARN here, let *func do this. +*/ +if (!list_empty (&evlist->entries))why is it better than to check
evlist->nr_entries?evlist->nr_entriesis equivalent to !list_empty(&evlist->entries) in here, right?
By checking list we won't rely on the assumption that nr_entries reflects the actual number of elements in that list, makes the logic of this code more compact. Don't you think so?
At this point they are equivalent, but the whole patch is preventive action.
Thank you.
Quoted 2 lines
jirka
Jiri Olsa
Acked-byRe: [PATCH] perf tools: Don't write to evsel if parser doesn't collect evsel
On Wed, Sep 02, 2015 at 08:05:54PM +0800, pi3orama wrote:
SNIP
Quoted 22 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
perf_evlist__splice_list_tail(evlist, &data.list, entries); evlist->nr_groups += data.nr_groups;(quoted diff) +2
-3- last = perf_evlist__last(evlist); - last->cmdline_group_boundary = true; return 0; }@@ -1252,7 +1262,13 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist, struct perf_evsel *last = NULL; int err; - if (evlist->nr_entries > 0) + /* + * Don't return when list_empty, give func a chance to reportQuoted 9 lines
Quoted 5 lines
Review foreach_evsel_in_last_glob(struct perf_evlist *evlist, · line 1270
Quoted 5 lines
(quoted diff) +5
-0+ * error when it found last == NULL. + * + * So no need to WARN here, let *func do this. + */ + if (!list_empty(&evlist->entries))why is it better than to check
evlist->nr_entries?evlist->nr_entriesis equivalent to !list_empty(&evlist->entries) in here, right?
Quoted 5 lines
By checking list we won't rely on the assumption that
nr_entriesreflects the actual number of elements in that list, makes the logic of this code more compact. Don't you think so?At this point they are equivalent, but the whole patch is preventive action.
ok, fair enough ;-)
thanks,
jirka
Re: [PATCH] perf tools: Don't write to evsel if parser doesn't collect evsel
In reply to pi3oramaEm Wed, Sep 02, 2015 at 08:05:54PM +0800, pi3orama escreveu:
Quoted 18 lines
发自我的 iPhone
Quoted 16 lines · 在 2015年9月2日,下午7:54,Jiri Olsa <[email protected]> 写道:
Quoted 12 lines · Wangnan (F)
Review foreach_evsel_in_last_glob(struct perf_evlist *evlist, · line 1270
Quoted 11 lines
(quoted diff) +7
-1@@ -1252,7 +1262,13 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist, struct perf_evsel *last = NULL; int err; - if (evlist->nr_entries > 0) + /* + * Don't return when list_empty, give func a chance to report + * error when it found last == NULL. + * + * So no need to WARN here, let *func do this. + */ + if (!list_empty(&evlist->entries))why is it better than to check
evlist->nr_entries?evlist->nr_entriesis equivalent to !list_empty(&evlist->entries) in here, right?
Quoted 2 lines
By checking list we won't rely on the assumption that
nr_entriesreflects the actual number of elements in that list, makes the logic of this code more compact.
But why would we want to break that assumption?
If I see FOO->entries and FOO->nr_entries, it is reasonable to expect that whatever data structure FOO->entries may be has FOO->nr_entries in it, lets not break that assumption.
- Arnaldo
Quoted 3 lines
Don't you think so?
At this point they are equivalent, but the whole patch is preventive action.
Re: [PATCH] perf tools: Don't write to evsel if parser doesn't collect evsel
发自我的 iPhone
Quoted 21 lines · 在 2015年9月2日,下午9:55,Arnaldo Carvalho de Melo <[email protected]> 写道:
Em Wed, Sep 02, 2015 at 08:05:54PM +0800, pi3orama escreveu:
Quoted 17 lines
发自我的 iPhone
Quoted 16 lines · 在 2015年9月2日,下午7:54,Jiri Olsa <[email protected]> 写道:
Quoted 4 lines
Quoted 4 lines · Wangnan (F)
(quoted diff) +0
-0@@ -1252,7 +1262,13 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist, struct perf_evsel *last = NULL; int err;Quoted 8 lines
Review foreach_evsel_in_last_glob(struct perf_evlist *evlist, · line 1270
Quoted 8 lines
(quoted diff) +7
-1- if (evlist->nr_entries > 0) + /* + * Don't return when list_empty, give func a chance to report + * error when it found last == NULL. + * + * So no need to WARN here, let *func do this. + */ + if (!list_empty(&evlist->entries))why is it better than to check
evlist->nr_entries?evlist->nr_entriesis equivalent to !list_empty(&evlist->entries) in here, right?
Quoted 8 lines
Quoted 2 lines
By checking list we won't rely on the assumption that
nr_entriesreflects the actual number of elements in that list, makes the logic of this code more compact.But why would we want to break that assumption?
If I see
FOO->entriesandFOO->nr_entries, it is reasonable to expect that whatever data structureFOO->entriesmay be hasFOO->nr_entriesin it, lets not break that assumption.
Then we should enforce it. For example, check the list collected by parser, report an error if the list is empty, to avoid someone like me adding nothing on the list but report success. I'm not insistent on this patch. In my newest patch set I use real dummy evsel as placeholder so we won't meet empty list again.
Thank you.
Quoted 6 lines
- Arnaldo
Quoted 3 lines
Don't you think so?
At this point they are equivalent, but the whole patch is preventive action.
Re: [PATCH] perf tools: Don't write to evsel if parser doesn't collect evsel
Em Wed, Sep 02, 2015 at 10:04:21PM +0800, pi3orama escreveu:
Quoted 24 lines
发自我的 iPhone
Quoted 22 lines · 在 2015年9月2日,下午9:55,Arnaldo Carvalho de Melo <[email protected]> 写道:
Em Wed, Sep 02, 2015 at 08:05:54PM +0800, pi3orama escreveu:
Quoted 20 lines
发自我的 iPhone
Quoted 8 lines · 在 2015年9月2日,下午7:54,Jiri Olsa <[email protected]> 写道:
Quoted 7 lines
Quoted 7 lines · Wangnan (F)
(quoted diff) +2
-1@@ -1252,7 +1262,13 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist, struct perf_evsel *last = NULL; int err; - if (evlist->nr_entries > 0) + /* + * Don't return when list_empty, give func a chance to reportQuoted 8 lines
Quoted 5 lines
Review foreach_evsel_in_last_glob(struct perf_evlist *evlist, · line 1270
Quoted 5 lines
(quoted diff) +5
-0+ * error when it found last == NULL. + * + * So no need to WARN here, let *func do this. + */ + if (!list_empty(&evlist->entries))why is it better than to check
evlist->nr_entries?evlist->nr_entriesis equivalent to !list_empty(&evlist->entries) in here, right?By checking list we won't rely on the assumption that
nr_entriesreflects the actual number of elements in that list, makes the logic of this code more compact.
Quoted 7 lines
Quoted 5 lines
But why would we want to break that assumption?
If I see
FOO->entriesandFOO->nr_entries, it is reasonable to expect that whatever data structureFOO->entriesmay be hasFOO->nr_entriesin it, lets not break that assumption.Then we should enforce it.
Agreed, but it is a reasonable expectation, right? Its a general pattern, one that we expect and when it breaks like that, that may lead to bugs :-)
Quoted 5 lines
For example, check the list collected by parser, report an error if the list is empty, to avoid someone like me adding nothing on the list but report success. I'm not insistent on this patch. In my newest patch set I use real dummy evsel as placeholder so we won't meet empty list again.
Ok, I'll look at the new patch then, I keep thinking that if you need to have a separate list for eBPF, that you will do something special on it, etc, then that is not a problem just keep it as a separate list till you can insert it in the evlist to then open the evlist, mmap it, etc.
If in the parsing routines you have access only to a perf_evlist pointer, well, then we can have something like an evlist->pending_entries + evlist->nr_pending_entries. Something like that.
If you have detailed why you need it to be left in the evlist (will some operation be done on all evsels, even the ones that need eBPF specific work before you do this final eBPF specific stuff?), I'll try to find it, if not, describing the sequence of events that justifies this or the "dummy evsel as a placeholder" would help reviewing this, treat us like 7 year old kids (aka use patience + details) :-)
- Arnaldo
Re: [PATCH] perf tools: Don't write to evsel if parser doesn't collect evsel
发自我的 iPhone
Quoted 55 lines · 在 2015年9月2日,下午10:43,Arnaldo Carvalho de Melo <[email protected]> 写道:
Em Wed, Sep 02, 2015 at 10:04:21PM +0800, pi3orama escreveu:
Quoted 24 lines
发自我的 iPhone
Quoted 22 lines · 在 2015年9月2日,下午9:55,Arnaldo Carvalho de Melo <[email protected]> 写道:
Em Wed, Sep 02, 2015 at 08:05:54PM +0800, pi3orama escreveu:
Quoted 20 lines
发自我的 iPhone
Quoted 8 lines · 在 2015年9月2日,下午7:54,Jiri Olsa <[email protected]> 写道:
Quoted 7 lines
Quoted 7 lines · Wangnan (F)
(quoted diff) +2
-1@@ -1252,7 +1262,13 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist, struct perf_evsel *last = NULL; int err; - if (evlist->nr_entries > 0) + /* + * Don't return when list_empty, give func a chance to reportQuoted 8 lines
Quoted 5 lines
Review foreach_evsel_in_last_glob(struct perf_evlist *evlist, · line 1270
Quoted 5 lines
(quoted diff) +5
-0+ * error when it found last == NULL. + * + * So no need to WARN here, let *func do this. + */ + if (!list_empty(&evlist->entries))why is it better than to check
evlist->nr_entries?evlist->nr_entriesis equivalent to !list_empty(&evlist->entries) in here, right?By checking list we won't rely on the assumption that
nr_entriesreflects the actual number of elements in that list, makes the logic of this code more compact.Quoted 7 lines
Quoted 5 lines
But why would we want to break that assumption?
If I see
FOO->entriesandFOO->nr_entries, it is reasonable to expect that whatever data structureFOO->entriesmay be hasFOO->nr_entriesin it, lets not break that assumption.Then we should enforce it.
Agreed, but it is a reasonable expectation, right? Its a general pattern, one that we expect and when it breaks like that, that may lead to bugs :-)
Quoted 5 lines
For example, check the list collected by parser, report an error if the list is empty, to avoid someone like me adding nothing on the list but report success. I'm not insistent on this patch. In my newest patch set I use real dummy evsel as placeholder so we won't meet empty list again.
Ok, I'll look at the new patch then, I keep thinking that if you need to have a separate list for eBPF, that you will do something special on it, etc, then that is not a problem just keep it as a separate list till you can insert it in the evlist to then open the evlist, mmap it, etc.
If in the parsing routines you have access only to a
perf_evlistpointer, well, then we can have something like anevlist->pending_entries+evlist->nr_pending_entries. Something like that.
Quoted 6 lines
If you have detailed why you need it to be left in the evlist (will some operation be done on all evsels, even the ones that need eBPF specific work before you do this final eBPF specific stuff?), I'll try to find it, if not, describing the sequence of events that justifies this or the "dummy evsel as a placeholder" would help reviewing this, treat us like 7 year old kids (aka use patience + details) :-)
Just because adding placeholder make things simpler, because which makes bpf object "events" become compatible with other types of events, so we don't need to maintain a separated mechanism during parsing.
I think you should remember how we sync filters between place holder and real events. Actually, filter is not the only setting can be made to an event after the evsel is collected. We also have config terms, groups and modifiers. Although currently we only support filter, we are planning adding config terms to config bpf objects, so we can use commands like:
# perf record --event abc.o/key=value/ ...
Modifier is also useful:
# perf record --event abc.o:G ...
And also group:
# perf record --event {abc.o,def.o,cycles}/key=value/...Think about how we can do this if we use a separate list for BPF object. Then in all the above processing, we must change current code, detect whether we are dealing with BPF, and treat BPF object and normal events differently.
Instead, with placeholder dummy event, we don't need to modify existing implementation. And we also don't need to consider BPF if we decide to add more settings by new syntax. BPF object "events" would be naturally
compatible with normal dummy events (only thing we should consider is we
need to treat it as TRACEPOINT event, not a SOFTWARE event). We use it to
collect settings, and when real BPF events created, sync settings between them.
I believe the above should be strong enough to support dummy event, do you think so?
And you can review how I do this now from github (sorry I can't send patch because I'm at home and won't be able to access company's SMTP server for 3 days due holiday):
https://github.com/WangNan0/linux/commit/c6fe9842d27ae1d228be2c7bb6c20216ddc49632
https://github.com/WangNan0/linux/commit/802426eddb9ea15386e70063d935d95caa30c045
Thank you.
Quoted 1 line
- Arnaldo
PATCH 3/31 perf tools: Introduce dummy evsel
In reply to Wang NanThis patch allows linking dummy evsel onto evlist as a placeholder. It is for following patch which allows passing BPF object using '--event object.o'.
Doesn't link other event selectors, if passing a BPF object file to '--event', nothing is linked onto evlist. Instead, events described in BPF object file are probed and linked in a delayed manner because we want do all probing work together. Therefore, evsel for events in BPF object would be linked at the end of evlist. Which causes a small problem that, if passing '--filter' setting after object file, the filter option won't be correctly applied to those events.
This patch links dummy onto evlist, so following --filter can be collected by the dummy evsel. For this reason dummy evsels are set to PERF_TYPE_TRACEPOINT.
Due to the possibility of existance of dummy evsel, perf_evlist__purge_dummy() must be called right after parse_options(). This patch adds it to record, top, trace and stat builtin commands. Further patch moves it down after real BPF events are processed with.
--- tools/perf/builtin-record.c | 2 ++ tools/perf/builtin-stat.c | 1 + tools/perf/builtin-top.c | 1 + tools/perf/builtin-trace.c | 1 + tools/perf/util/evlist.c | 19 +++++++++++++++++++ tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.c | 32 ++++++++++++++++++++++++++++++++ tools/perf/util/evsel.h | 6 ++++++ tools/perf/util/parse-events.c | 25 +++++++++++++++++++++---- 9 files changed, 84 insertions(+), 4 deletions(-)
tools/perf/builtin-record.c +2 -0
@@ -1112,6 +1112,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, record_options, record_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (rec->evlist); +if (!argc &&target__none (&rec->opts.target))usage_with_options (record_usage, record_options);
tools/perf/builtin-stat.c +1 -0
@@ -1208,6 +1208,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, options, stat_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (evsel_list); interval = stat_config.interval;
tools/perf/builtin-top.c +1 -0
@@ -1198,6 +1198,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)perf_config (perf_top_config, &top); argc =parse_options (argc, argv, options, top_usage,0 ); +perf_evlist__purge_dummy (top.evlist);if (argc)usage_with_options (top_usage, options);
tools/perf/builtin-trace.c +1 -0
@@ -3099,6 +3099,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options_subcommand (argc, argv, trace_options, trace_subcommands, trace_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (trace.evlist);if (trace.trace_pgfaults) { trace.opts.sample_address = true;
tools/perf/util/evlist.c +19 -0
@@ -1696,3 +1696,22 @@ void perf_evlist__set_tracking_event(struct perf_evlist *evlist, tracking_evsel->tracking = true; } + +void perf_evlist__purge_dummy (struct perf_evlist *evlist) +{ +struct perf_evsel *pos, *n; + +/* +* Remove all dummy events. +* During linking, we don't touch anything except link +* it into evlist. As a result, we don't +* need to adjust evlist->nr_entries during removal. +*/ + +evlist__for_each_safe (evlist, n, pos) { +if (perf_evsel__is_dummy (pos)) { +list_del_init (&pos->node); +perf_evsel__delete (pos); + } + } +}
tools/perf/util/evlist.h +1 -0
@@ -181,6 +181,7 @@ bool perf_evlist__valid_read_format(struct perf_evlist *evlist);void perf_evlist__splice_list_tail (struct perf_evlist *evlist,struct list_head *list,int nr_entries); +void perf_evlist__purge_dummy (struct perf_evlist *evlist);static inline struct perf_evsel *perf_evlist__first (struct perf_evlist *evlist) {
tools/perf/util/evsel.c +32 -0
@@ -213,6 +213,7 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->sample_size =__perf_evsel__sample_size (attr->sample_type);perf_evsel__calc_id_pos (evsel); evsel->cmdline_group_boundary = false; + evsel->is_dummy = false; }struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx)
@@ -225,6 +226,37 @@ struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)return evsel; } +struct perf_evsel *perf_evsel__new_dummy (const char *name) +{ +struct perf_evsel *evsel =zalloc (perf_evsel__object.size); + +if (!evsel) +return NULL ; + +/* +* Don't need call perf_evsel__init() for dummy evsel. +* Keep it simple. +*/ + evsel->name =strdup (name); +if (!evsel->name) + goto out_free; + +INIT_LIST_HEAD (&evsel->node); +INIT_LIST_HEAD (&evsel->config_terms); + + evsel->cmdline_group_boundary = false; +/* +* Set dummy evsel as TRACEPOINT event so it can collect filter +* options. +*/ + evsel->attr.type =PERF_TYPE_TRACEPOINT ; + evsel->is_dummy = true; +return evsel; +out_free: +free (evsel); +return NULL ; +} +struct perf_evsel *perf_evsel__newtp_idx (const char *sys,const char *name,int idx) {struct perf_evsel *evsel =zalloc (perf_evsel__object.size);
tools/perf/util/evsel.h +6 -0
@@ -118,6 +118,7 @@ struct perf_evsel {struct perf_evsel *leader;char *group_name;bool cmdline_group_boundary; +bool is_dummy;struct list_head config_terms; };
@@ -153,6 +154,11 @@ int perf_evsel__object_config(size_t object_size, void (*fini)(struct perf_evsel *evsel));struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx); +struct perf_evsel *perf_evsel__new_dummy (const char *name); +static inline bool perf_evsel__is_dummy (struct perf_evsel *evsel) +{ +return evsel->is_dummy; +}static inline struct perf_evsel *perf_evsel__new (struct perf_event_attr *attr) {
tools/perf/util/parse-events.c +21 -4
@@ -1141,7 +1141,7 @@ int parse_events(struct perf_evlist *evlist, const char *str,perf_pmu__parse_cleanup ();if (!ret) {int entries = data.idx - evlist->nr_entries; -struct perf_evsel *last; +struct perf_evsel *last =NULL ;if (!list_empty (&data.list)) { last = list_entry(data.list.prev,
@@ -1149,8 +1149,25 @@ int parse_events(struct perf_evlist *evlist, const char *str, last->cmdline_group_boundary = true; } -perf_evlist__splice_list_tail (evlist, &data.list, entries); - evlist->nr_groups += data.nr_groups; +if (last &&perf_evsel__is_dummy (last)) { +if (!list_is_singular (&data.list)) { +parse_events_evlist_error (&data,0 , +"Dummy evsel error: not on a singular list" ); +return -1 ; + } +/* +* We are introducing a dummy event. Don't touch +* anything, just link it. +* +* Don't use perf_evlist__splice_list_tail() since +* it alerts evlist->nr_entries, which affect header +* of resulting perf.data. +*/ +list_splice_tail (&data.list, &evlist->entries); + }else { +perf_evlist__splice_list_tail (evlist, &data.list, entries); + evlist->nr_groups += data.nr_groups; + }return 0 ; }
@@ -1256,7 +1273,7 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist,struct perf_evsel *last =NULL ;int err; -if (evlist->nr_entries >0 ) +if (!list_empty (&evlist->entries)) last =perf_evlist__last (evlist); do {
Signature · 1 line
2.1.0
Re: [PATCH 03/31] perf tools: Introduce dummy evsel
Em Sat, Aug 29, 2015 at 04:21:37AM +0000, Wang Nan escreveu:
Quoted 3 lines
This patch allows linking dummy evsel onto evlist as a placeholder. It is for following patch which allows passing BPF object using '--event object.o'.
Summary: this patch ended up adding too many subtle clever tricks to achieve what it needs to accomplish, please try to clearly describe the problem, then describe how you implemented it.
Quoted 2 lines
Doesn't link other event selectors, if passing a BPF object file to '--event', nothing is linked onto evlist.
-ENOPARSE, can you rewrite the above sentence?
You mean you will segregate the events that related to eBPF to process them in a separate step? Like, for instance, putting them in a separate evlist or perhaps flipping a bit like: evsel->process_me_later = true and then avoid those and process them at some later stage?
Quoted 10 lines
Instead, events described in BPF object file are probed and linked in a delayed manner because we want do all probing work together. Therefore, evsel for events in BPF object would be linked at the end of evlist. Which causes a small problem that, if passing '--filter' setting after object file, the filter option won't be correctly applied to those events.
This patch links dummy onto evlist, so following --filter can be collected by the dummy evsel. For this reason dummy evsels are set to
PERF_TYPE_TRACEPOINT.
Looks like a roundabout way of applying the --filter to the eBPF, but I really need to read the patch then... See more below.
Quoted 86 lines
Due to the possibility of existance of dummy evsel,
perf_evlist__purge_dummy()must be called right afterparse_options(). This patch adds it to record, top, trace and stat builtin commands. Further patch moves it down after real BPF events are processed with.Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>--- tools/perf/builtin-record.c | 2 ++ tools/perf/builtin-stat.c | 1 + tools/perf/builtin-top.c | 1 + tools/perf/builtin-trace.c | 1 + tools/perf/util/evlist.c | 19 +++++++++++++++++++ tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.c | 32 ++++++++++++++++++++++++++++++++ tools/perf/util/evsel.h | 6 ++++++ tools/perf/util/parse-events.c | 25 +++++++++++++++++++++---- 9 files changed, 84 insertions(+), 4 deletions(-)tools/perf/builtin-record.c +2
-0@@ -1112,6 +1112,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, record_options, record_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (rec->evlist); +if (!argc &&target__none (&rec->opts.target))usage_with_options (record_usage, record_options);tools/perf/builtin-stat.c +1
-0@@ -1208,6 +1208,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, options, stat_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (evsel_list); interval = stat_config.interval;tools/perf/builtin-top.c +1
-0@@ -1198,6 +1198,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)perf_config (perf_top_config, &top); argc =parse_options (argc, argv, options, top_usage,0 ); +perf_evlist__purge_dummy (top.evlist);if (argc)usage_with_options (top_usage, options);tools/perf/builtin-trace.c +1
-0@@ -3099,6 +3099,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options_subcommand (argc, argv, trace_options, trace_subcommands, trace_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (trace.evlist);if (trace.trace_pgfaults) { trace.opts.sample_address = true;tools/perf/util/evlist.c +0
-0
tools/perf/util/evlist.c void perf_evlist__set_tracking_event(struct perf_evlist *evlist, · line 1700
Quoted 5 lines
tools/perf/util/evlist.c +2
-0@@ -1696,3 +1696,22 @@ void perf_evlist__set_tracking_event(struct perf_evlist *evlist, tracking_evsel->tracking = true; } + +void perf_evlist__purge_dummy (struct perf_evlist *evlist)
If it remove more than one event, then it should be named accordingly, either:
perf_evlist__purge_dummies() or perf_evlist__purge_dummy_events().
I would prefer the former.
But we already have a "dummy" event:
[root@zoo linux]# perf stat -e dummy -a sleep 10s
Performance counter stats for 'system wide':
0 dummy
10.003173114 seconds time elapsed[root@zoo linux]#
It has some specific purpose, but then now, with your patch, we need to figure out which dummy is which, so I think this needs rethinking.
Quoted 121 lines
tools/perf/util/evlist.c +17
-0+{ +struct perf_evsel *pos, *n; + +/* +* Remove all dummy events. +* During linking, we don't touch anything except link +* it into evlist. As a result, we don't +* need to adjust evlist->nr_entries during removal. +*/ + +evlist__for_each_safe (evlist, n, pos) { +if (perf_evsel__is_dummy (pos)) { +list_del_init (&pos->node); +perf_evsel__delete (pos); + } + } +}tools/perf/util/evlist.h +1
-0@@ -181,6 +181,7 @@ bool perf_evlist__valid_read_format(struct perf_evlist *evlist);void perf_evlist__splice_list_tail (struct perf_evlist *evlist,struct list_head *list,int nr_entries); +void perf_evlist__purge_dummy (struct perf_evlist *evlist);static inline struct perf_evsel *perf_evlist__first (struct perf_evlist *evlist) {tools/perf/util/evsel.c +32
-0@@ -213,6 +213,7 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->sample_size =__perf_evsel__sample_size (attr->sample_type);perf_evsel__calc_id_pos (evsel); evsel->cmdline_group_boundary = false; + evsel->is_dummy = false; }struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx)@@ -225,6 +226,37 @@ struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)return evsel; } +struct perf_evsel *perf_evsel__new_dummy (const char *name) +{ +struct perf_evsel *evsel =zalloc (perf_evsel__object.size); + +if (!evsel) +return NULL ; + +/* +* Don't need call perf_evsel__init() for dummy evsel. +* Keep it simple. +*/ + evsel->name =strdup (name); +if (!evsel->name) + goto out_free; + +INIT_LIST_HEAD (&evsel->node); +INIT_LIST_HEAD (&evsel->config_terms); + + evsel->cmdline_group_boundary = false; +/* +* Set dummy evsel as TRACEPOINT event so it can collect filter +* options. +*/ + evsel->attr.type =PERF_TYPE_TRACEPOINT ; + evsel->is_dummy = true; +return evsel; +out_free: +free (evsel); +return NULL ; +} +struct perf_evsel *perf_evsel__newtp_idx (const char *sys,const char *name,int idx) {struct perf_evsel *evsel =zalloc (perf_evsel__object.size);tools/perf/util/evsel.h +6
-0@@ -118,6 +118,7 @@ struct perf_evsel {struct perf_evsel *leader;char *group_name;bool cmdline_group_boundary; +bool is_dummy;struct list_head config_terms; };@@ -153,6 +154,11 @@ int perf_evsel__object_config(size_t object_size, void (*fini)(struct perf_evsel *evsel));struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx); +struct perf_evsel *perf_evsel__new_dummy (const char *name); +static inline bool perf_evsel__is_dummy (struct perf_evsel *evsel) +{ +return evsel->is_dummy; +}static inline struct perf_evsel *perf_evsel__new (struct perf_event_attr *attr) {tools/perf/util/parse-events.c +1
-2@@ -1141,7 +1141,7 @@ int parse_events(struct perf_evlist *evlist, const char *str,perf_pmu__parse_cleanup ();if (!ret) {int entries = data.idx - evlist->nr_entries; -struct perf_evsel *last; +struct perf_evsel *last =NULL ;if (!list_empty (&data.list)) { last = list_entry(data.list.prev,@@ -1149,8 +1149,25 @@ int parse_events(struct perf_evlist *evlist, const char *str, last->cmdline_group_boundary = true; } -perf_evlist__splice_list_tail (evlist, &data.list, entries);
tools/perf/util/parse-events.c int parse_events(struct perf_evlist *evlist, const char *str, · line 1160
Quoted 10 lines
tools/perf/util/parse-events.c +9
-1- evlist->nr_groups += data.nr_groups; +if (last &&perf_evsel__is_dummy (last)) { +if (!list_is_singular (&data.list)) { +parse_events_evlist_error (&data,0 , +"Dummy evsel error: not on a singular list" ); +return -1 ; + } +/* +* We are introducing a dummy event. Don't touch +* anything, just link it.
What is the advantage of "just linking it"? What will we achieve by that, you told what you want to avoid, i.e. "alerting" evlist->nr_entries, but why is that important and what is the part you want to reuse?
Quoted 13 lines
tools/perf/util/parse-events.c +9
-0+* Don't use perf_evlist__splice_list_tail() since +* it alerts evlist->nr_entries, which affect header +* of resulting perf.data. +*/ +list_splice_tail (&data.list, &evlist->entries); + }else { +perf_evlist__splice_list_tail (evlist, &data.list, entries); + evlist->nr_groups += data.nr_groups; + }return 0 ; }
tools/perf/util/parse-events.c foreach_evsel_in_last_glob(struct perf_evlist *evlist, · line 1276
Quoted 5 lines
tools/perf/util/parse-events.c +1
-1@@ -1256,7 +1273,7 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist,struct perf_evsel *last =NULL ;int err; -if (evlist->nr_entries >0 ) +if (!list_empty (&evlist->entries))
So here is part of that clever trick, i.e. evlist->nr_entries, that so far we could rely on being the number of evsels in evlist->entries, can't be trusted for that, argh :-\
Quoted 5 lines
tools/perf/util/parse-events.c +0
-0last =perf_evlist__last (evlist); do {Signature · 1 line
2.1.0
Namhyung Kim
maintainerRe: [PATCH 03/31] perf tools: Introduce dummy evsel
In reply to Wang NanHi,
Quoted 12 lines · Wang Nan
This patch allows linking dummy evsel onto evlist as a placeholder. It is for following patch which allows passing BPF object using '--event object.o'.
Doesn't link other event selectors, if passing a BPF object file to '--event', nothing is linked onto evlist. Instead, events described in BPF object file are probed and linked in a delayed manner because we want do all probing work together. Therefore, evsel for events in BPF object would be linked at the end of evlist. Which causes a small problem that, if passing '--filter' setting after object file, the filter option won't be correctly applied to those events.
Quoted 3 lines
This patch links dummy onto evlist, so following --filter can be collected by the dummy evsel. For this reason dummy evsels are set to
PERF_TYPE_TRACEPOINT.
I understand the need of the dummy event. But we already have dummy event so it's confusing to have similar event IMHO. So what about using existing dummy event instead? You can save a link to a bpf object in the dummy evsel (to check it later) and change to allow setting filter on dummy events IMHO.
Quoted 5 lines
Due to the possibility of existance of dummy evsel,
perf_evlist__purge_dummy()must be called right afterparse_options(). This patch adds it to record, top, trace and stat builtin commands. Further patch moves it down after real BPF events are processed with.
IMHO it'd be better to do this kind of job in a single place - e.g. perf_evlist__config() ? - so that other commands get benefits from it easily.
Thanks,
Namhyung
Quoted 243 lines
Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>--- tools/perf/builtin-record.c | 2 ++ tools/perf/builtin-stat.c | 1 + tools/perf/builtin-top.c | 1 + tools/perf/builtin-trace.c | 1 + tools/perf/util/evlist.c | 19 +++++++++++++++++++ tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.c | 32 ++++++++++++++++++++++++++++++++ tools/perf/util/evsel.h | 6 ++++++ tools/perf/util/parse-events.c | 25 +++++++++++++++++++++---- 9 files changed, 84 insertions(+), 4 deletions(-)tools/perf/builtin-record.c +2
-0@@ -1112,6 +1112,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, record_options, record_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (rec->evlist); +if (!argc &&target__none (&rec->opts.target))usage_with_options (record_usage, record_options);tools/perf/builtin-stat.c +1
-0@@ -1208,6 +1208,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, options, stat_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (evsel_list); interval = stat_config.interval;tools/perf/builtin-top.c +1
-0@@ -1198,6 +1198,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)perf_config (perf_top_config, &top); argc =parse_options (argc, argv, options, top_usage,0 ); +perf_evlist__purge_dummy (top.evlist);if (argc)usage_with_options (top_usage, options);tools/perf/builtin-trace.c +1
-0@@ -3099,6 +3099,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options_subcommand (argc, argv, trace_options, trace_subcommands, trace_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (trace.evlist);if (trace.trace_pgfaults) { trace.opts.sample_address = true;tools/perf/util/evlist.c +19
-0@@ -1696,3 +1696,22 @@ void perf_evlist__set_tracking_event(struct perf_evlist *evlist, tracking_evsel->tracking = true; } + +void perf_evlist__purge_dummy (struct perf_evlist *evlist) +{ +struct perf_evsel *pos, *n; + +/* +* Remove all dummy events. +* During linking, we don't touch anything except link +* it into evlist. As a result, we don't +* need to adjust evlist->nr_entries during removal. +*/ + +evlist__for_each_safe (evlist, n, pos) { +if (perf_evsel__is_dummy (pos)) { +list_del_init (&pos->node); +perf_evsel__delete (pos); + } + } +}tools/perf/util/evlist.h +1
-0@@ -181,6 +181,7 @@ bool perf_evlist__valid_read_format(struct perf_evlist *evlist);void perf_evlist__splice_list_tail (struct perf_evlist *evlist,struct list_head *list,int nr_entries); +void perf_evlist__purge_dummy (struct perf_evlist *evlist);static inline struct perf_evsel *perf_evlist__first (struct perf_evlist *evlist) {tools/perf/util/evsel.c +32
-0@@ -213,6 +213,7 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->sample_size =__perf_evsel__sample_size (attr->sample_type);perf_evsel__calc_id_pos (evsel); evsel->cmdline_group_boundary = false; + evsel->is_dummy = false; }struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx)@@ -225,6 +226,37 @@ struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)return evsel; } +struct perf_evsel *perf_evsel__new_dummy (const char *name) +{ +struct perf_evsel *evsel =zalloc (perf_evsel__object.size); + +if (!evsel) +return NULL ; + +/* +* Don't need call perf_evsel__init() for dummy evsel. +* Keep it simple. +*/ + evsel->name =strdup (name); +if (!evsel->name) + goto out_free; + +INIT_LIST_HEAD (&evsel->node); +INIT_LIST_HEAD (&evsel->config_terms); + + evsel->cmdline_group_boundary = false; +/* +* Set dummy evsel as TRACEPOINT event so it can collect filter +* options. +*/ + evsel->attr.type =PERF_TYPE_TRACEPOINT ; + evsel->is_dummy = true; +return evsel; +out_free: +free (evsel); +return NULL ; +} +struct perf_evsel *perf_evsel__newtp_idx (const char *sys,const char *name,int idx) {struct perf_evsel *evsel =zalloc (perf_evsel__object.size);tools/perf/util/evsel.h +6
-0@@ -118,6 +118,7 @@ struct perf_evsel {struct perf_evsel *leader;char *group_name;bool cmdline_group_boundary; +bool is_dummy;struct list_head config_terms; };@@ -153,6 +154,11 @@ int perf_evsel__object_config(size_t object_size, void (*fini)(struct perf_evsel *evsel));struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx); +struct perf_evsel *perf_evsel__new_dummy (const char *name); +static inline bool perf_evsel__is_dummy (struct perf_evsel *evsel) +{ +return evsel->is_dummy; +}static inline struct perf_evsel *perf_evsel__new (struct perf_event_attr *attr) {tools/perf/util/parse-events.c +21
-4@@ -1141,7 +1141,7 @@ int parse_events(struct perf_evlist *evlist, const char *str,perf_pmu__parse_cleanup ();if (!ret) {int entries = data.idx - evlist->nr_entries; -struct perf_evsel *last; +struct perf_evsel *last =NULL ;if (!list_empty (&data.list)) { last = list_entry(data.list.prev,@@ -1149,8 +1149,25 @@ int parse_events(struct perf_evlist *evlist, const char *str, last->cmdline_group_boundary = true; } -perf_evlist__splice_list_tail (evlist, &data.list, entries); - evlist->nr_groups += data.nr_groups; +if (last &&perf_evsel__is_dummy (last)) { +if (!list_is_singular (&data.list)) { +parse_events_evlist_error (&data,0 , +"Dummy evsel error: not on a singular list" ); +return -1 ; + } +/* +* We are introducing a dummy event. Don't touch +* anything, just link it. +* +* Don't use perf_evlist__splice_list_tail() since +* it alerts evlist->nr_entries, which affect header +* of resulting perf.data. +*/ +list_splice_tail (&data.list, &evlist->entries); + }else { +perf_evlist__splice_list_tail (evlist, &data.list, entries); + evlist->nr_groups += data.nr_groups; + }return 0 ; }@@ -1256,7 +1273,7 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist,struct perf_evsel *last =NULL ;int err; -if (evlist->nr_entries >0 ) +if (!list_empty (&evlist->entries)) last =perf_evlist__last (evlist); do {Signature · 1 line
2.1.0
Re: [PATCH 03/31] perf tools: Introduce dummy evsel
发自我的 iPhone
Quoted 21 lines · 在 2015年9月3日,上午8:11,Namhyung Kim <[email protected]> 写道:
Hi,
Quoted 13 lines · Wang Nan
This patch allows linking dummy evsel onto evlist as a placeholder. It is for following patch which allows passing BPF object using '--event object.o'.
Doesn't link other event selectors, if passing a BPF object file to '--event', nothing is linked onto evlist. Instead, events described in BPF object file are probed and linked in a delayed manner because we want do all probing work together. Therefore, evsel for events in BPF object would be linked at the end of evlist. Which causes a small problem that, if passing '--filter' setting after object file, the filter option won't be correctly applied to those events.
Quoted 3 lines
This patch links dummy onto evlist, so following --filter can be collected by the dummy evsel. For this reason dummy evsels are set to
PERF_TYPE_TRACEPOINT.
Quoted 6 lines
I understand the need of the dummy event. But we already have dummy event so it's confusing to have similar event IMHO. So what about using existing dummy event instead? You can save a link to a bpf object in the dummy evsel (to check it later) and change to allow setting filter on dummy events IMHO.
Yes, in my working-in-progress implement I use existing dummy event. Connect it to the object by setting its name to the name of object.
Thank you.
Quoted 257 lines
Quoted 5 lines
Due to the possibility of existance of dummy evsel,
perf_evlist__purge_dummy()must be called right afterparse_options(). This patch adds it to record, top, trace and stat builtin commands. Further patch moves it down after real BPF events are processed with.IMHO it'd be better to do this kind of job in a single place - e.g.
perf_evlist__config()? - so that other commands get benefits from it easily.Thanks,
NamhyungQuoted 243 lines
Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>---
tools/perf/builtin-record.c | 2 ++ tools/perf/builtin-stat.c | 1 + tools/perf/builtin-top.c | 1 + tools/perf/builtin-trace.c | 1 + tools/perf/util/evlist.c | 19 +++++++++++++++++++ tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.c | 32 ++++++++++++++++++++++++++++++++ tools/perf/util/evsel.h | 6 ++++++ tools/perf/util/parse-events.c | 25 +++++++++++++++++++++---- 9 files changed, 84 insertions(+), 4 deletions(-)tools/perf/builtin-record.c +2
-0@@ -1112,6 +1112,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, record_options, record_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (rec->evlist); +if (!argc &&target__none (&rec->opts.target))usage_with_options (record_usage, record_options);tools/perf/builtin-stat.c +1
-0@@ -1208,6 +1208,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, options, stat_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (evsel_list); interval = stat_config.interval;tools/perf/builtin-top.c +1
-0@@ -1198,6 +1198,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)perf_config (perf_top_config, &top); argc =parse_options (argc, argv, options, top_usage,0 ); +perf_evlist__purge_dummy (top.evlist);if (argc)usage_with_options (top_usage, options);tools/perf/builtin-trace.c +1
-0@@ -3099,6 +3099,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options_subcommand (argc, argv, trace_options, trace_subcommands, trace_usage,PARSE_OPT_STOP_AT_NON_OPTION ); +perf_evlist__purge_dummy (trace.evlist);if (trace.trace_pgfaults) { trace.opts.sample_address = true;tools/perf/util/evlist.c +19
-0@@ -1696,3 +1696,22 @@ void perf_evlist__set_tracking_event(struct perf_evlist *evlist, tracking_evsel->tracking = true; } + +void perf_evlist__purge_dummy (struct perf_evlist *evlist) +{ +struct perf_evsel *pos, *n; + +/* +* Remove all dummy events. +* During linking, we don't touch anything except link +* it into evlist. As a result, we don't +* need to adjust evlist->nr_entries during removal. +*/ + +evlist__for_each_safe (evlist, n, pos) { +if (perf_evsel__is_dummy (pos)) { +list_del_init (&pos->node); +perf_evsel__delete (pos); + } + } +}tools/perf/util/evlist.h +1
-0@@ -181,6 +181,7 @@ bool perf_evlist__valid_read_format(struct perf_evlist *evlist);void perf_evlist__splice_list_tail (struct perf_evlist *evlist,struct list_head *list,int nr_entries); +void perf_evlist__purge_dummy (struct perf_evlist *evlist);static inline struct perf_evsel *perf_evlist__first (struct perf_evlist *evlist) {tools/perf/util/evsel.c +32
-0@@ -213,6 +213,7 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->sample_size =__perf_evsel__sample_size (attr->sample_type);perf_evsel__calc_id_pos (evsel); evsel->cmdline_group_boundary = false; + evsel->is_dummy = false; }struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx)@@ -225,6 +226,37 @@ struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)return evsel; } +struct perf_evsel *perf_evsel__new_dummy (const char *name) +{ +struct perf_evsel *evsel =zalloc (perf_evsel__object.size); + +if (!evsel) +return NULL ; + +/* +* Don't need call perf_evsel__init() for dummy evsel. +* Keep it simple. +*/ + evsel->name =strdup (name); +if (!evsel->name) + goto out_free; + +INIT_LIST_HEAD (&evsel->node); +INIT_LIST_HEAD (&evsel->config_terms); + + evsel->cmdline_group_boundary = false; +/* +* Set dummy evsel as TRACEPOINT event so it can collect filter +* options. +*/ + evsel->attr.type =PERF_TYPE_TRACEPOINT ; + evsel->is_dummy = true; +return evsel; +out_free: +free (evsel); +return NULL ; +} +struct perf_evsel *perf_evsel__newtp_idx (const char *sys,const char *name,int idx) {struct perf_evsel *evsel =zalloc (perf_evsel__object.size);tools/perf/util/evsel.h +6
-0@@ -118,6 +118,7 @@ struct perf_evsel {struct perf_evsel *leader;char *group_name;bool cmdline_group_boundary; +bool is_dummy;struct list_head config_terms; };@@ -153,6 +154,11 @@ int perf_evsel__object_config(size_t object_size, void (*fini)(struct perf_evsel *evsel));struct perf_evsel *perf_evsel__new_idx (struct perf_event_attr *attr,int idx); +struct perf_evsel *perf_evsel__new_dummy (const char *name); +static inline bool perf_evsel__is_dummy (struct perf_evsel *evsel) +{ +return evsel->is_dummy; +}static inline struct perf_evsel *perf_evsel__new (struct perf_event_attr *attr) {tools/perf/util/parse-events.c +21
-4@@ -1141,7 +1141,7 @@ int parse_events(struct perf_evlist *evlist, const char *str,perf_pmu__parse_cleanup ();if (!ret) {int entries = data.idx - evlist->nr_entries; -struct perf_evsel *last; +struct perf_evsel *last =NULL ;if (!list_empty (&data.list)) { last = list_entry(data.list.prev,@@ -1149,8 +1149,25 @@ int parse_events(struct perf_evlist *evlist, const char *str, last->cmdline_group_boundary = true; } -perf_evlist__splice_list_tail (evlist, &data.list, entries); - evlist->nr_groups += data.nr_groups; +if (last &&perf_evsel__is_dummy (last)) { +if (!list_is_singular (&data.list)) { +parse_events_evlist_error (&data,0 , +"Dummy evsel error: not on a singular list" ); +return -1 ; + } +/* +* We are introducing a dummy event. Don't touch +* anything, just link it. +* +* Don't use perf_evlist__splice_list_tail() since +* it alerts evlist->nr_entries, which affect header +* of resulting perf.data. +*/ +list_splice_tail (&data.list, &evlist->entries); + }else { +perf_evlist__splice_list_tail (evlist, &data.list, entries); + evlist->nr_groups += data.nr_groups; + }return 0 ; }@@ -1256,7 +1273,7 @@ foreach_evsel_in_last_glob(struct perf_evlist *evlist,struct perf_evsel *last =NULL ;int err; -if (evlist->nr_entries >0 ) +if (!list_empty (&evlist->entries)) last =perf_evlist__last (evlist); do {Signature · 1 line
2.1.0
PATCH 1/1 perf tools: Allow BPF placeholder dummy events to collect --filter options
In reply to Wang NanThis patch improves collection and setting of filters, allows --filter be set to BPF placeholder events (which is a software dummy event).
perf_evsel__is_dummy(), perf_evsel__is_bpf_placeholder() and perf_evsel__can_filter() are introduced for this.
Test result:
# perf record --event dummy --exclude-perf --exclude-perf option should follow a -e tracepoint option
# perf record --event dummy:u --exclude-perf ls --exclude-perf option should follow a -e tracepoint option
# perf record --event test.o --exclude-perf ls Added new event: perf_bpf_probe:func_vfs_write (on vfs_write) ...
# perf record --event dummy.o --exclude-perf ls Added new event: perf_bpf_probe:func_write (on sys_write) ...
--- tools/perf/util/evlist.c | 7 +++++++ tools/perf/util/evsel.c | 32 ++++++++++++++++++++++++++++++++ tools/perf/util/evsel.h | 23 +++++++++++++++++++++++ tools/perf/util/parse-events.c | 4 ++-- 4 files changed, 64 insertions(+), 2 deletions(-)
tools/perf/util/evlist.c +7 -0
@@ -1223,6 +1223,13 @@ int perf_evlist__apply_filters(struct perf_evlist *evlist, struct perf_evsel **econtinue ;/* +* Filters are allowed to be set to dummy event for BPF object +* placeholder. Don't really apply them. +*/ +if (perf_evsel__is_dummy (evsel)) +continue ; + +/* * filters only work for tracepoint event, which doesn't have cpu limit. * So evlist and evsel should always be same. */
tools/perf/util/evsel.c +32 -0
@@ -2344,3 +2344,35 @@ int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target, err,strerror_r (err, sbuf,sizeof (sbuf)), perf_evsel__name(evsel)); } + +bool perf_evsel__is_bpf_placeholder (struct perf_evsel *evsel) +{ +if (!perf_evsel__is_dummy (evsel)) +return false; +if (!evsel->name) +return false; +/* +* If evsel->name doesn't starts with 'dummy', it must be a BPF +* place holder. +*/ +if (strncmp (evsel->name, perf_evsel__sw_names[PERF_COUNT_SW_DUMMY ], +strlen (perf_evsel__sw_names[PERF_COUNT_SW_DUMMY ]))) +return true; +/* +* Very rare case: evsel->name is 'dummy_crazy.bpf'. +* +* Let's check name suffix. A bpf file should ends with one of: +* '.o', '.c' or '.bpf'. +*/ +#define SUFFIX_CMP (s)\ + strcmp(evsel->name + strlen(evsel->name) - (sizeof(s) - 1), s) + +if (SUFFIX_CMP (".o" ) ==0 ) +return true; +if (SUFFIX_CMP (".c" ) ==0 ) +return true; +if (SUFFIX_CMP (".bpf" ) ==0 ) +return true; +return false; +#undef SUFFIX_CMP +}
tools/perf/util/evsel.h +23 -0
@@ -372,11 +372,34 @@ bool perf_evsel__fallback(struct perf_evsel *evsel, int err,int perf_evsel__open_strerror (struct perf_evsel *evsel,struct target *target,int err,char *msg,size_t size); +bool perf_evsel__is_bpf_placeholder (struct perf_evsel *evsel); +static inline int perf_evsel__group_idx (struct perf_evsel *evsel) {return evsel->idx - evsel->leader->idx; } +static inline bool perf_evsel__is_dummy (struct perf_evsel *evsel) +{ +if (!evsel) +return false; +if (evsel->attr.type !=PERF_TYPE_SOFTWARE ) +return false; +if (evsel->attr.config !=PERF_COUNT_SW_DUMMY ) +return false; +return true; +} + +static inline int perf_evsel__can_filter (struct perf_evsel *evsel) +{ +if (!evsel) +return false; +if (evsel->attr.type ==PERF_TYPE_TRACEPOINT ) +return true; + +return perf_evsel__is_bpf_placeholder (evsel); +} +#define for_each_group_member (_evsel, _leader) \ for ((_evsel) = list_entry((_leader)->node.next, struct perf_evsel, node); \ (_evsel) && (_evsel)->leader == (_leader); \
tools/perf/util/parse-events.c +2 -2
@@ -1346,7 +1346,7 @@ static int set_filter(struct perf_evsel *evsel, const void *arg) {const char *str = arg; -if (evsel ==NULL || evsel->attr.type !=PERF_TYPE_TRACEPOINT ) { +if (!perf_evsel__can_filter (evsel)) {fprintf (stderr,"--filter option should follow a -e tracepoint option\n" );return -1 ;
@@ -1375,7 +1375,7 @@ static int add_exclude_perf_filter(struct perf_evsel *evsel, {char new_filter[64 ]; -if (evsel ==NULL || evsel->attr.type !=PERF_TYPE_TRACEPOINT ) { +if (!perf_evsel__can_filter (evsel)) {fprintf (stderr,"--exclude-perf option should follow a -e tracepoint option\n" );return -1 ;
Signature · 1 line
1.8.3.4
PATCH 1/1 perf tools: Sync setting of real bpf events with placeholder
In this patch, when adding real events described in BPF objects, sync filter and tracking settings with previous dummy placeholder. After this patch, command like:
# perf record --test-filter.o --exclude-perf ls
work as we expect.
After all settings are synced, we remove those placeholder from evlist so they won't appear in the final perf.data.
--- tools/perf/util/bpf-loader.c | 8 ++++- tools/perf/util/bpf-loader.h | 1 + tools/perf/util/evlist.c | 75 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 79 insertions(+), 5 deletions(-)
tools/perf/util/bpf-loader.c +7 -1
@@ -325,6 +325,12 @@ int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg)int err;bpf_object__for_each_safe (obj, tmp) { +const char *obj_name; + + obj_name =bpf_object__get_name (obj); +if (!obj_name) + obj_name ="[unknown].o" ; +bpf_object__for_each_program (prog, obj) {struct probe_trace_event *tev;struct perf_probe_event *pev;
@@ -348,7 +354,7 @@ int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg)return fd; } - err = (*func)(tev, fd, arg); + err = (*func)(tev, obj_name, fd, arg);if (err) {pr_debug ("bpf: call back failed, stop iterate\n" );return err;
tools/perf/util/bpf-loader.h +1 -0
@@ -13,6 +13,7 @@#define PERF_BPF_PROBE_GROUP "perf_bpf_probe"typedef int (*bpf_prog_iter_callback_t )(struct probe_trace_event *tev, +const char *obj_name,int fd,void *arg);#ifdef HAVE_LIBBPF_SUPPORT
tools/perf/util/evlist.c +71 -4
99 lines not on this page · raw message
Signature · 1 line
1.8.3.4
PATCH 4/31 perf tools: Make perf depend on libbpf
In reply to Wang NanBy adding libbpf into perf's Makefile, this patch enables perf to build libbpf during building if libelf is found and neither NO_LIBELF nor NO_LIBBPF is set. The newly introduced code is similar to libapi and libtraceevent building in Makefile.perf.
MANIFEST is also updated for 'make perf-*-src-pkg'.
Append make_no_libbpf to tools/perf/tests/make.
'bpf' feature check is appended into default FEATURE_TESTS and FEATURE_DISPLAY, so perf will check API version of bpf in /path/to/kernel/include/uapi/linux/bpf.h. Which should not fail except when we are trying to port this code to an old kernel.
Error messages are also updated to notify users about the disable of BPF support of 'perf record' if libelf is missed or BPF API check failed.
tools/lib/bpf is added into TAG_FOLDERS to allow us to navigate on libbpf files when working on perf using tools/perf/tags.
--- tools/build/Makefile.feature | 6 ++++-- tools/perf/MANIFEST | 3 +++ tools/perf/Makefile.perf | 19 +++++++++++++++++-- tools/perf/config/Makefile | 19 ++++++++++++++++++- tools/perf/tests/make | 4 +++- 5 files changed, 45 insertions(+), 6 deletions(-)
tools/build/Makefile.feature +4 -2
@@ -51,7 +51,8 @@ FEATURE_TESTS ?= \ timerfd \ libdw-dwarf-unwind \ zlib \ - lzma + lzma \ + bpf FEATURE_DISPLAY ?= \ dwarf \
@@ -67,7 +68,8 @@ FEATURE_DISPLAY ?= \ libunwind \ libdw-dwarf-unwind \ zlib \ - lzma + lzma \ + bpf # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features. # If in the future we need per-feature checks/flags for features not
tools/perf/MANIFEST +3 -0
@@ -17,6 +17,7 @@ tools/build tools/arch/x86/include/asm/atomic.h tools/arch/x86/include/asm/rmwcc.h tools/lib/traceevent +tools/lib/bpf tools/lib/api tools/lib/bpf tools/lib/hweight.c
@@ -67,6 +68,8 @@ arch/*/lib/memset*.S include/linux/poison.h include/linux/hw_breakpoint.h include/uapi/linux/perf_event.h +include/uapi/linux/bpf.h +include/uapi/linux/bpf_common.h include/uapi/linux/const.h include/uapi/linux/swab.h include/uapi/linux/hw_breakpoint.h
tools/perf/Makefile.perf +17 -2
@@ -145,6 +145,7 @@ AWK = awk LIB_DIR = $(srctree)/tools/lib/api/ TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/ +BPF_DIR = $(srctree)/tools/lib/bpf/ # include config/Makefile by default and rule out # non-config cases
@@ -180,6 +181,7 @@ strip-libs = $(filter-out -l%,$(1)) ifneq ($(OUTPUT),) TE_PATH=$(OUTPUT) + BPF_PATH=$(OUTPUT) ifneq ($(subdir),) LIB_PATH=$(OUTPUT)/../lib/api/ else
@@ -188,6 +190,7 @@ endif else TE_PATH=$(TRACE_EVENT_DIR) LIB_PATH=$(LIB_DIR) + BPF_PATH=$(BPF_DIR) endif LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
@@ -199,6 +202,8 @@ LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS = -Xlinker --dynamic-list=$(LIBTRACEEVENT_DYN LIBAPI = $(LIB_PATH)libapi.a export LIBAPI +LIBBPF = $(BPF_PATH)libbpf.a + # python extension build directories PYTHON_EXTBUILD := $(OUTPUT)python_ext_build/ PYTHON_EXTBUILD_LIB := $(PYTHON_EXTBUILD)lib/
@@ -251,6 +256,9 @@ export PERL_PATH LIB_FILE=$(OUTPUT)libperf.a PERFLIBS = $(LIB_FILE) $(LIBAPI) $(LIBTRACEEVENT) +ifndef NO_LIBBPF + PERFLIBS += $(LIBBPF) +endif # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If
@@ -420,6 +428,13 @@ $(LIBAPI)-clean: $(call QUIET_CLEAN, libapi) $(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null +$(LIBBPF): FORCE + $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a + +$(LIBBPF)-clean: + $(call QUIET_CLEAN, libbpf) + $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) clean >/dev/null + help: @echo 'Perf make targets:' @echo ' doc - make *all* documentation (see below)'
@@ -459,7 +474,7 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html $(DOC_TARGETS): $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:doc=all) -TAG_FOLDERS= . ../lib/traceevent ../lib/api ../lib/symbol +TAG_FOLDERS= . ../lib/traceevent ../lib/api ../lib/symbol ../lib/bpf TAG_FILES= ../../include/uapi/linux/perf_event.h TAGS:
@@ -567,7 +582,7 @@ config-clean: $(call QUIET_CLEAN, config) $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null -clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean +clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete $(Q)$(RM) $(OUTPUT).config-detected
tools/perf/config/Makefile +18 -1
@@ -106,6 +106,7 @@ ifdef LIBBABELTRACE FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf endif +FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/arch/$(ARCH)/include/uapi -I$(srctree)/include/uapi # include ARCH specific config -include $(src-perf)/arch/$(ARCH)/Makefile
@@ -233,6 +234,7 @@ ifdef NO_LIBELF NO_DEMANGLE := 1 NO_LIBUNWIND := 1 NO_LIBDW_DWARF_UNWIND := 1 + NO_LIBBPF := 1 else ifeq ($(feature-libelf), 0) ifeq ($(feature-glibc), 1)
@@ -242,13 +244,14 @@ else LIBC_SUPPORT := 1 endif ifeq ($(LIBC_SUPPORT),1) - msg := $(warning No libelf found, disables 'probe' tool, please install elfutils-libelf-devel/libelf-dev); + msg := $(warning No libelf found, disables 'probe' tool and BPF support in 'perf record', please install elfutils-libelf-devel/libelf-dev); NO_LIBELF := 1 NO_DWARF := 1 NO_DEMANGLE := 1 NO_LIBUNWIND := 1 NO_LIBDW_DWARF_UNWIND := 1 + NO_LIBBPF := 1 else ifneq ($(filter s% -static%,$(LDFLAGS),),) msg := $(error No static glibc found, please install glibc-static);
@@ -305,6 +308,13 @@ ifndef NO_LIBELF $(call detected,CONFIG_DWARF) endif # PERF_HAVE_DWARF_REGS endif # NO_DWARF + + ifndef NO_LIBBPF + ifeq ($(feature-bpf), 1) + CFLAGS += -DHAVE_LIBBPF_SUPPORT + $(call detected,CONFIG_LIBBPF) + endif + endif # NO_LIBBPF endif # NO_LIBELF ifeq ($(ARCH),powerpc)
@@ -320,6 +330,13 @@ ifndef NO_LIBUNWIND endif endif +ifndef NO_LIBBPF + ifneq ($(feature-bpf), 1) + msg := $(warning BPF API too old. Please install recent kernel headers. BPF support in 'perf record' is disabled.) + NO_LIBBPF := 1 + endif +endif + dwarf-post-unwind := 1 dwarf-post-unwind-text := BUG
tools/perf/tests/make +3 -1
@@ -44,6 +44,7 @@ make_no_libnuma := NO_LIBNUMA=1 make_no_libaudit := NO_LIBAUDIT=1 make_no_libbionic := NO_LIBBIONIC=1 make_no_auxtrace := NO_AUXTRACE=1 +make_no_libbpf := NO_LIBBPF=1 make_tags := tags make_cscope := cscope make_help := help
@@ -66,7 +67,7 @@ make_static := LDFLAGS=-static make_minimal := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1 make_minimal += NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1 make_minimal += NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1 -make_minimal += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 +make_minimal += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1 # $(run) contains all available tests run := make_pure
@@ -94,6 +95,7 @@ run += make_no_libnuma run += make_no_libaudit run += make_no_libbionic run += make_no_auxtrace +run += make_no_libbpf run += make_help run += make_doc run += make_perf_o
Signature · 1 line
2.1.0
PATCH 5/31 perf ebpf: Add the libbpf glue
In reply to Wang NanThe 'bpf-loader.[ch]' files are introduced in this patch. Which will be the interface between perf and libbpf. bpf__prepare_load() resides in bpf-loader.c. Dummy functions should be used because bpf-loader.c is available only when CONFIG_LIBBPF is on.
Functions in bpf-loader.c should not report error explicitly. Instead, strerror style error reporting should be used.
--- tools/perf/util/bpf-loader.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.h | 47 ++++++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 tools/perf/util/bpf-loader.c create mode 100644 tools/perf/util/bpf-loader.h
tools/perf/util/bpf-loader.c new file +92 -0
@@ -0,0 +1,92 @@ +/* +* bpf-loader.c +* +* Copyright (C) 2015 Wang Nan <[email protected]> +* Copyright (C) 2015 Huawei Inc. +*/ + +#include <bpf/libbpf.h> +#include "perf.h" +#include "debug.h" +#include "bpf-loader.h" + +#define DEFINE_PRINT_FN (name, level) \ +static int libbpf_##name(const char *fmt, ...) \ +{ \ + va_list args; \ + int ret; \ + \ + va_start(args, fmt); \ + ret = veprintf(level, verbose, pr_fmt(fmt), args);\ + va_end(args); \ + return ret; \ +} + +DEFINE_PRINT_FN(warning, 0) +DEFINE_PRINT_FN(info, 0) +DEFINE_PRINT_FN(debug, 1) + +static bool libbpf_initialized; + +int bpf__prepare_load (const char *filename) +{ +struct bpf_object *obj; + +if (!libbpf_initialized) +libbpf_set_print (libbpf_warning, + libbpf_info, + libbpf_debug); + + obj =bpf_object__open (filename); +if (!obj) { +pr_debug ("bpf: failed to load %s\n" , filename); +return -EINVAL ; + } + +/* +* Throw object pointer away: it will be retrived using +* bpf_objects iterater. +*/ + +return 0 ; +} + +void bpf__clear (void ) +{ +struct bpf_object *obj, *tmp; + +bpf_object__for_each_safe (obj, tmp) +bpf_object__close (obj); +} + +#define bpf__strerror_head (err, buf, size) \ + char sbuf[STRERR_BUFSIZE], *emsg;\ + if (!size)\ + return 0;\ + if (err < 0)\ + err = -err;\ + emsg = strerror_r(err, sbuf, sizeof(sbuf));\ + switch (err) {\ + default:\ + scnprintf(buf, size, "%s", emsg);\ + break; + +#define bpf__strerror_entry(val, fmt...)\ + case val: {\ + scnprintf(buf, size, fmt);\ + break;\ + } + +#define bpf__strerror_end (buf, size)\ + }\ + buf[size - 1] = '\0'; + +int bpf__strerror_prepare_load (const char *filename,int err, +char *buf,size_t size) +{ +bpf__strerror_head (err, buf, size); +bpf__strerror_entry (EINVAL ,"%s: BPF object file '%s' is invalid" , + emsg, filename) +bpf__strerror_end (buf, size); +return 0 ; +}
tools/perf/util/bpf-loader.h new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 6/31 perf tools: Enable passing bpf object file to --event
In reply to Wang NanBy introducing new rules in tools/perf/util/parse-events.[ly], this patch enables 'perf record --event bpf_file.o' to select events by an eBPF object file. It calls parse_events_load_bpf() to load that file, which uses bpf__prepare_load() and finally calls bpf_object__open() for the object files.
Instead of introducing evsel to evlist during parsing, events selected by eBPF object files are appended separately. The reason is:
1. During parsing, the probing points have not been initialized.
2. Currently we are unable to call add_perf_probe_events() twice, therefore we have to wait until all such events are collected, then probe all points by one call.
The real probing and selecting is reside in following patches.
To collect '--filter' events, add a dummy evsel during parsing.
Since bpf__prepare_load() is possible to be called during cmdline parsing, all builtin commands which are possible to call parse_events_option() should release bpf resources during cleanup. Add bpf__clear() to stat, record, top and trace commands, although currently we are going to support 'perf record' only.
Commiter note:
Testing if the event parsing changes indeed call the BPF loading routines:
[root@felicio ~]# ls -la foo.o
ls: cannot access foo.o: No such file or directory [root@felicio ~]# perf record --event foo.o sleep
libbpf: failed to open foo.o: No such file or directory
bpf: failed to load foo.o
invalid or unsupported event: 'foo.o'
Run 'perf list' for a list of valid events
usage: perf record [<options>] [<command>]
or: perf record [<options>] -- <command> [<options>]
-e, --event <event> event selector. use 'perf list' to list available events
[root@felicio ~]#
Yes, it does this time around.
[ The veprintf() and bpf loader parts were split from this one;
Add bpf__clear() into stat, record, top and trace commands. Add dummy evsel when parsing.
]
--- tools/perf/builtin-record.c | 7 +++++-- tools/perf/builtin-stat.c | 8 ++++++-- tools/perf/builtin-top.c | 10 +++++++--- tools/perf/builtin-trace.c | 6 +++++- tools/perf/util/Build | 1 + tools/perf/util/parse-events.c | 40 ++++++++++++++++++++++++++++++++++++++++ tools/perf/util/parse-events.h | 3 +++ tools/perf/util/parse-events.l | 3 +++ tools/perf/util/parse-events.y | 18 +++++++++++++++++- 9 files changed, 87 insertions(+), 9 deletions(-)
tools/perf/builtin-record.c +5 -2
@@ -29,6 +29,7 @@#include "util/data.h" #include "util/auxtrace.h" #include "util/parse-branch-options.h" +#include "util/bpf-loader.h" #include <unistd.h> #include <sched.h>
@@ -1131,13 +1132,13 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)if (!rec->itr) { rec->itr =auxtrace_record__init (rec->evlist, &err);if (err) -return err; + goto out_bpf_clear; } err =auxtrace_parse_snapshot_options (rec->itr, &rec->opts, rec->opts.auxtrace_snapshot_opts);if (err) -return err; + goto out_bpf_clear; err = -ENOMEM ;
@@ -1200,6 +1201,8 @@ out_symbol_exit:perf_evlist__delete (rec->evlist);symbol__exit ();auxtrace_record__free (rec->itr); +out_bpf_clear: +bpf__clear ();return err; }
tools/perf/builtin-stat.c +6 -2
@@ -59,6 +59,7 @@#include "util/thread.h" #include "util/thread_map.h" #include "util/counts.h" +#include "util/bpf-loader.h" #include <stdlib.h> #include <sys/prctl.h>
@@ -1235,7 +1236,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) output =fopen (output_name, mode);if (!output) {perror ("failed to create output file" ); -return -1 ; + status =-1 ; + goto out; }clock_gettime (CLOCK_REALTIME , &tm);fprintf (output,"# started on %s\n" ,ctime (&tm.tv_sec));
@@ -1244,7 +1246,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) output =fdopen (output_fd, mode);if (!output) {perror ("Failed opening logfd" ); -return -errno; + status = -errno; + goto out; } }
@@ -1377,5 +1380,6 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)perf_evlist__free_stats (evsel_list); out:perf_evlist__delete (evsel_list); +bpf__clear ();return status; }
tools/perf/builtin-top.c +7 -3
@@ -41,6 +41,7 @@#include "util/sort.h" #include "util/intlist.h" #include "util/parse-branch-options.h" +#include "util/bpf-loader.h" #include "arch/common.h" #include "util/debug.h"
@@ -1271,8 +1272,10 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) symbol_conf.priv_size =sizeof (struct annotation ); symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name ==NULL ); -if (symbol__init (NULL ) <0 ) -return -1 ; +if (symbol__init (NULL ) <0 ) { + status =-1 ; + goto out_bpf_clear; + }sort__setup_elide (stdout);
@@ -1290,6 +1293,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) out_delete_evlist:perf_evlist__delete (top.evlist); - +out_bpf_clear: +bpf__clear ();return status; }
tools/perf/builtin-trace.c +5 -1
@@ -30,6 +30,7 @@#include "util/intlist.h" #include "util/thread_map.h" #include "util/stat.h" +#include "util/bpf-loader.h" #include "trace-event.h" #include "util/parse-events.h"
@@ -3109,6 +3110,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)if (trace.evlist->nr_entries >0 )evlist__set_evsel_handler (trace.evlist, trace__event_handler); +/* trace__record calls cmd_record, which calls bpf__clear() */ if ((argc >=1 ) && (strcmp (argv[0 ],"record" ) ==0 ))return trace__record (&trace, argc-1 , &argv[1 ]);
@@ -3119,7 +3121,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)if (!trace.trace_syscalls && !trace.trace_pgfaults && trace.evlist->nr_entries ==0 /* Was --events used? */ ) {pr_err ("Please specify something to trace.\n" ); -return -1 ; + err =-1 ; + goto out; }if (output_name !=NULL ) {
@@ -3178,5 +3181,6 @@ out_close:if (output_name !=NULL )fclose (trace.output); out: +bpf__clear ();return err; }
tools/perf/util/Build +1 -0
@@ -83,6 +83,7 @@ libperf-$(CONFIG_AUXTRACE) += intel-pt.o libperf-$(CONFIG_AUXTRACE) += intel-bts.o libperf-y += parse-branch-options.o +libperf-$(CONFIG_LIBBPF) += bpf-loader.o libperf-$(CONFIG_LIBELF) += symbol-elf.o libperf-$(CONFIG_LIBELF) += probe-file.o libperf-$(CONFIG_LIBELF) += probe-event.o
tools/perf/util/parse-events.c +40 -0
@@ -19,6 +19,7 @@#include "thread_map.h" #include "cpumap.h" #include "asm/bug.h" +#include "bpf-loader.h" #define MAX_NAME_LEN 100
@@ -481,6 +482,45 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx,return add_tracepoint_event (list, idx, sys, event); } +int parse_events_load_bpf (struct parse_events_evlist *data, +struct list_head *list, +char *bpf_file_name) +{ +int err; +char errbuf[BUFSIZ ]; +struct perf_evsel *evsel; + +/* +* Currently don't link useful event to list. BPF object files +* should be saved to a seprated list and processed together. +* +* A dummy event is added here to collect '--filter' option. +* +* Things could be changed if we solve perf probe reentering +* problem. After that probe events file by file is possible. +* However, probing cost is still need to be considered. +*/ + err =bpf__prepare_load (bpf_file_name); +if (err) { +bpf__strerror_prepare_load (bpf_file_name, err, + errbuf,sizeof (errbuf)); + data->error->str =strdup (errbuf); + data->error->help =strdup ("(add -v to see detail)" ); +return err; + } + +/* +* Don't need call perf_evsel__init() for dummy evsel. +* Also, don't increase data->idx. +* data->idx affects other evsel's tracking field. +*/ + evsel =perf_evsel__new_dummy (bpf_file_name); +if (!evsel) +return -ENOMEM ; +list_add_tail (&evsel->node, list); +return 0 ; +} +static int parse_breakpoint_type (const char *type,struct perf_event_attr *attr) {
tools/perf/util/parse-events.h +3 -0
@@ -119,6 +119,9 @@ int parse_events__modifier_group(struct list_head *list, char *event_mod);int parse_events_name (struct list_head *list,char *name);int parse_events_add_tracepoint (struct list_head *list,int *idx,char *sys,char *event); +int parse_events_load_bpf (struct parse_events_evlist *data, +struct list_head *list, +char *bpf_file_name); int parse_events_add_numeric(struct parse_events_evlist *data, struct list_head *list, u32 type, u64 config,
tools/perf/util/parse-events.l +3 -0
@@ -115,6 +115,7 @@ do { \ group [^,{}/]*[{][^}]*[}][^,{}/]* event_pmu [^,{}/]+[/][^/]*[/][^,{}/]* event [^,{}/]+ +bpf_object .*\.(o|bpf) num_dec [0-9]+ num_hex 0x[a-fA-F0-9]+
@@ -159,6 +160,7 @@ modifier_bp [rwx]{1,3} } {event_pmu} | +{bpf_object} | {event} { BEGIN(INITIAL); REWIND(1);
@@ -264,6 +266,7 @@ r{num_raw_hex} { return raw(yyscanner); } {num_hex} { return value(yyscanner, 16); } {modifier_event} { return str(yyscanner, PE_MODIFIER_EVENT); } +{bpf_object} { return str(yyscanner, PE_BPF_OBJECT); } {name} { return pmu_str_check(yyscanner); } "/" { BEGIN(config); return '/'; } - { return '-'; }
tools/perf/util/parse-events.y +17 -1
@@ -42,6 +42,7 @@ static inc_group_count(struct list_head *list, %token PE_VALUE PE_VALUE_SYM_HW PE_VALUE_SYM_SW PE_RAW PE_TERM %token PE_EVENT_NAME %token PE_NAME +%token PE_BPF_OBJECT %token PE_MODIFIER_EVENT PE_MODIFIER_BP %token PE_NAME_CACHE_TYPE PE_NAME_CACHE_OP_RESULT %token PE_PREFIX_MEM PE_PREFIX_RAW PE_PREFIX_GROUP
@@ -53,6 +54,7 @@ static inc_group_count(struct list_head *list, %type <num> PE_RAW %type <num> PE_TERM %type <str> PE_NAME +%type <str> PE_BPF_OBJECT %type <str> PE_NAME_CACHE_TYPE %type <str> PE_NAME_CACHE_OP_RESULT %type <str> PE_MODIFIER_EVENT
@@ -69,6 +71,7 @@ static inc_group_count(struct list_head *list, %type <head> event_legacy_tracepoint %type <head> event_legacy_numeric %type <head> event_legacy_raw +%type <head> event_bpf_file %type <head> event_def %type <head> event_mod %type <head> event_name
@@ -198,7 +201,8 @@ event_def: event_pmu | event_legacy_mem | event_legacy_tracepoint sep_dc | event_legacy_numeric sep_dc | - event_legacy_raw sep_dc + event_legacy_raw sep_dc | + event_bpf_file event_pmu: PE_NAME '/' event_config '/'
@@ -420,6 +424,18 @@ PE_RAW $$ = list; } +event_bpf_file: +PE_BPF_OBJECT +{ + struct parse_events_evlist *data = _data; + struct list_head *list; + + ALLOC_LIST(list); + ABORT_ON(parse_events_load_bpf(data, list, $1)); + $$ = list; +} + + start_terms: event_config { struct parse_events_terms *data = _data;
Signature · 1 line
2.1.0
PATCH 7/31 perf probe: Attach trace_probe_event with perf_probe_event
In reply to Wang NanThis patch drops struct __event_package structure. Instead, it adds trace_probe_event into 'struct perf_probe_event'.
trace_probe_event information gives further patches a chance to access actual probe points and actual arguments. Using them, bpf_loader will be able to attach one bpf program to different probing points of a inline functions (which has multiple probing points) and glob functions. Moreover, by reading arguments information, bpf code for reading those arguments can be generated.
--- tools/perf/builtin-probe.c | 4 ++- tools/perf/util/probe-event.c | 60 +++++++++++++++++++++---------------------- tools/perf/util/probe-event.h | 6 ++++- 3 files changed, 38 insertions(+), 32 deletions(-)
tools/perf/builtin-probe.c +3 -1
@@ -496,7 +496,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)usage_with_options (probe_usage, options); } - ret =add_perf_probe_events (params.events, params.nevents); + ret =add_perf_probe_events (params.events, + params.nevents, + true);if (ret <0 ) {pr_err_with_code (" Error: Failed to add events." , ret);return ret;
tools/perf/util/probe-event.c +30 -30
97 lines not on this page · raw message
tools/perf/util/probe-event.h +5 -1
@@ -87,6 +87,8 @@ struct perf_probe_event {bool uprobes;/* Uprobe event flag */ char *target;/* Target binary */ struct perf_probe_arg *args;/* Arguments */ +struct probe_trace_event *tevs; +int ntevs; };/* Line range */
@@ -137,8 +139,10 @@ extern void line_range__clear(struct line_range *lr);/* Initialize line range */ extern int line_range__init (struct line_range *lr); -extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs); +extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +bool cleanup);extern int del_perf_probe_events (struct strfilter *filter); +extern int cleanup_perf_probe_event (struct perf_probe_event *pev);extern int show_perf_probe_events (struct strfilter *filter);extern int show_line_range (struct line_range *lr,const char *module,bool user);
Signature · 1 line
2.1.0
Namhyung Kim
maintainerRe: [PATCH 07/31] perf probe: Attach trace_probe_event with perf_probe_event
Hi,
Quoted 27 lines · Wang Nan
This patch drops struct
__event_packagestructure. Instead, it addstrace_probe_eventinto 'structperf_probe_event'.
trace_probe_eventinformation gives further patches a chance to access actual probe points and actual arguments. Using them,bpf_loaderwill be able to attach one bpf program to different probing points of a inline functions (which has multiple probing points) and glob functions. Moreover, by reading arguments information, bpf code for reading those arguments can be generated.Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>---
[SNIP]
Quoted 8 lines
tools/perf/util/probe-event.c +4
-2+int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +bool cleanup) +{ +int i, ret; ret =init_symbol_maps (pevs->uprobes); -if (ret <0 ) { -free (pkgs);
tools/perf/util/probe-event.c static int convert_to_probe_trace_events(struct perf_probe_event *pev, · line 2792
Quoted 10 lines
tools/perf/util/probe-event.c +2
-3+if (ret <0 )return ret; - }/* Loop 1: convert all events */ for (i =0 ; i < npevs; i++) { - pkgs[i].pev = &pevs[i];/* Init kprobe blacklist if needed */ -if (!pkgs[i].pev->uprobes) +if (pevs[i].uprobes)
Missing '!'.
Thanks,
Namhyung
Quoted 39 lines
tools/perf/util/probe-event.c +9
-12kprobe_blacklist__init ();/* Convert with or without debuginfo */ - ret =convert_to_probe_trace_events (pkgs[i].pev, - &pkgs[i].tevs); -if (ret <0 ) + ret =convert_to_probe_trace_events (&pevs[i], &pevs[i].tevs); +if (ret <0 ) { + cleanup = true; goto end; - pkgs[i].ntevs = ret; + } + pevs[i].ntevs = ret; }/* This just release blacklist only if allocated */ kprobe_blacklist__release ();/* Loop 2: add all events */ for (i =0 ; i < npevs; i++) { - ret =__add_probe_trace_events (pkgs[i].pev, pkgs[i].tevs, - pkgs[i].ntevs, + ret =__add_probe_trace_events (&pevs[i], pevs[i].tevs, + pevs[i].ntevs, probe_conf.force_add);if (ret <0 )break ; } end:/* Loop 3: cleanup and free trace events */ -for (i =0 ; i < npevs; i++) { -for (j =0 ; j < pkgs[i].ntevs; j++) -clear_probe_trace_event (&pkgs[i].tevs[j]); -zfree (&pkgs[i].tevs); - } -free (pkgs); +for (i =0 ; cleanup && (i < npevs); i++) +cleanup_perf_probe_event (&pevs[i]);exit_symbol_maps ();return ret;
Re: [PATCH 07/31] perf probe: Attach trace_probe_event with perf_probe_event
Quoted 44 lines · Namhyung Kim
Hi,
Quoted 27 lines · Wang Nan
This patch drops struct
__event_packagestructure. Instead, it addstrace_probe_eventinto 'structperf_probe_event'.
trace_probe_eventinformation gives further patches a chance to access actual probe points and actual arguments. Using them,bpf_loaderwill be able to attach one bpf program to different probing points of a inline functions (which has multiple probing points) and glob functions. Moreover, by reading arguments information, bpf code for reading those arguments can be generated.Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>---
[SNIP]
Quoted 12 lines
tools/perf/util/probe-event.c +5
-3+int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +bool cleanup) +{ +int i, ret; ret =init_symbol_maps (pevs->uprobes); -if (ret <0 ) { -free (pkgs); +if (ret <0 )return ret; - }
Quoted 7 lines
tools/perf/util/probe-event.c static int convert_to_probe_trace_events(struct perf_probe_event *pev, · line 2792
Quoted 6 lines
/* Loop 1: convert all events */ for (i = 0; i < npevs; i++) {tools/perf/util/probe-event.c +1
-2- pkgs[i].pev = &pevs[i];/* Init kprobe blacklist if needed */ -if (!pkgs[i].pev->uprobes) +if (pevs[i].uprobes)Missing '!'.
It's my fault. Already fixed in my local tree.
Thank you for your review!
Quoted 43 lines
Thanks,
NamhyungQuoted 39 lines
kprobe_blacklist__init();
/* Convert with or without debuginfo */tools/perf/util/probe-event.c +9
-12- ret =convert_to_probe_trace_events (pkgs[i].pev, - &pkgs[i].tevs); -if (ret <0 ) + ret =convert_to_probe_trace_events (&pevs[i], &pevs[i].tevs); +if (ret <0 ) { + cleanup = true; goto end; - pkgs[i].ntevs = ret; + } + pevs[i].ntevs = ret; }/* This just release blacklist only if allocated */ kprobe_blacklist__release ();/* Loop 2: add all events */ for (i =0 ; i < npevs; i++) { - ret =__add_probe_trace_events (pkgs[i].pev, pkgs[i].tevs, - pkgs[i].ntevs, + ret =__add_probe_trace_events (&pevs[i], pevs[i].tevs, + pevs[i].ntevs, probe_conf.force_add);if (ret <0 )break ; } end:/* Loop 3: cleanup and free trace events */ -for (i =0 ; i < npevs; i++) { -for (j =0 ; j < pkgs[i].ntevs; j++) -clear_probe_trace_event (&pkgs[i].tevs[j]); -zfree (&pkgs[i].tevs); - } -free (pkgs); +for (i =0 ; cleanup && (i < npevs); i++) +cleanup_perf_probe_event (&pevs[i]);exit_symbol_maps ();return ret;
PATCH 8/31 perf record, bpf: Parse and probe eBPF programs probe points
In reply to Wang NanThis patch introduces bpf__{un,}probe() functions to enable callers to create kprobe points based on section names of BPF programs. It parses the section names of each eBPF program and creates corresponding 'struct perf_probe_event' structures. The parse_perf_probe_command() function is used to do the main parsing work.
Parsing result is stored into an array to satisify add_perf_probe_events(). It accepts an array of 'struct perf_probe_event' and do all the work in one call.
Define PERF_BPF_PROBE_GROUP as "perf_bpf_probe", which will be used as the group name of all eBPF probing points.
probe_conf.max_probes is set to MAX_PROBES to support glob matching.
Before ending of bpf__probe(), data in each 'struct perf_probe_event' is cleaned. Things will be changed by following patches because they need 'struct probe_trace_event' in them,
--- tools/perf/builtin-record.c | 19 ++++++- tools/perf/util/bpf-loader.c | 133 +++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.h | 13 +++++ 3 files changed, 164 insertions(+), 1 deletion(-)
tools/perf/builtin-record.c +18 -1
@@ -1140,7 +1140,23 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)if (err) goto out_bpf_clear; - err = -ENOMEM ; +/* +* bpf__probe must be called before symbol__init() because we +* need init_symbol_maps. If called after symbol__init, +* symbol_conf.sort_by_name won't take effect. +* +* bpf__unprobe() is safe even if bpf__probe() failed, and it +* also calls symbol__init. Therefore, goto out_symbol_exit +* is safe when probe failed. +*/ + err =bpf__probe (); +if (err) { +bpf__strerror_probe (err, errbuf,sizeof (errbuf)); + +pr_err ("Probing at events in BPF object failed.\n" ); +pr_err ("\t%s\n" , errbuf); + goto out_symbol_exit; + }symbol__init (NULL );
@@ -1201,6 +1217,7 @@ out_symbol_exit:perf_evlist__delete (rec->evlist);symbol__exit ();auxtrace_record__free (rec->itr); +bpf__unprobe (); out_bpf_clear:bpf__clear ();return err;
tools/perf/util/bpf-loader.c +133 -0
154 lines not on this page · raw message
tools/perf/util/bpf-loader.h +13 -0
@@ -9,10 +9,15 @@#include <string.h> #include "debug.h" +#define PERF_BPF_PROBE_GROUP "perf_bpf_probe" +#ifdef HAVE_LIBBPF_SUPPORT int bpf__prepare_load (const char *filename);int bpf__strerror_prepare_load (const char *filename,int err,char *buf,size_t size); +int bpf__probe (void ); +int bpf__unprobe (void ); +int bpf__strerror_probe (int err,char *buf,size_t size);void bpf__clear (void );#else
@@ -22,6 +27,8 @@ static inline int bpf__prepare_load(const char *filename __maybe_unused)return -1 ; } +static inline int bpf__probe (void ) {return 0 ; } +static inline int bpf__unprobe (void ) {return 0 ; }static inline void bpf__clear (void ) { } static inline int
@@ -43,5 +50,11 @@ bpf__strerror_prepare_load(const char *filename __maybe_unused, {return __bpf_strerror (buf, size); } + +static inline int bpf__strerror_probe (int err__maybe_unused , +char *buf,size_t size) +{ +return __bpf_strerror (buf, size); +}#endif #endif
Signature · 1 line
2.1.0
PATCH 9/31 perf bpf: Collect 'struct perf_probe_event' for bpf_program
In reply to Wang NanThis patch utilizes bpf_program__set_private(), binding perf_probe_event with bpf program by private field.
Saving those information so 'perf record' knows which kprobe point a program should be attached.
Since data in 'struct perf_probe_event' is build by 2 stages, tev_ready is used to mark whether the information (especially tevs) in 'struct perf_probe_event' is valid or not. It is false at first, and set to true by sync_bpf_program_pev(), which copy all pointers in original pev into a program specific memory region. sync_bpf_program_pev() is called after add_perf_probe_events() to make sure ready of data.
Remove code which clean 'struct perf_probe_event' after bpf__probe() because pointers in pevs are copied to program's private field, calling clear_perf_probe_event() becomes unsafe.
--- tools/perf/util/bpf-loader.c | 90 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 2 deletions(-)
tools/perf/util/bpf-loader.c +88 -2
@@ -30,9 +30,35 @@ DEFINE_PRINT_FN(debug, 1)static bool libbpf_initialized; +struct bpf_prog_priv { +/* +* If pev_ready is false, ppev pointes to a local memory which +* is only valid inside bpf__probe(). +* pev is valid only when pev_ready. +*/ +bool pev_ready; +union { +struct perf_probe_event *ppev; +struct perf_probe_event pev; + }; +}; + +static void +bpf_prog_priv__clear (struct bpf_program *prog__maybe_unused , +void *_priv) +{ +struct bpf_prog_priv *priv = _priv; + +/* check if pev is initialized */ +if (priv && priv->pev_ready) +clear_perf_probe_event (&priv->pev); +free (priv); +} +static int config_bpf_program (struct bpf_program *prog,struct perf_probe_event *pev) { +struct bpf_prog_priv *priv =NULL ;const char *config_str;int err;
@@ -74,14 +100,58 @@ config_bpf_program(struct bpf_program *prog, struct perf_probe_event *pev)pr_debug ("bpf: config '%s' is ok\n" , config_str); + priv =calloc (1 ,sizeof (*priv)); +if (!priv) { +pr_debug ("bpf: failed to alloc memory\n" ); + err = -ENOMEM ; + goto errout; + } + +/* +* At this very early stage, tevs inside pev are not ready. +* It becomes usable after add_perf_probe_events() is called. +* set pev_ready to false so further access read priv->ppev +* only. +*/ + priv->pev_ready = false; + priv->ppev = pev; + + err =bpf_program__set_private (prog, priv, + bpf_prog_priv__clear); +if (err) { +pr_debug ("bpf: set program private failed\n" ); + err = -ENOMEM ; + goto errout; + }return 0 ; errout:if (pev)clear_perf_probe_event (pev); +if (priv) +free (priv);return err; } +static int +sync_bpf_program_pev (struct bpf_program *prog) +{ +int err; +struct bpf_prog_priv *priv; +struct perf_probe_event *ppev; + + err =bpf_program__get_private (prog, (void **)&priv); +if (err || !priv || priv->pev_ready) { +pr_debug ("Internal error: sync_bpf_program_pev\n" ); +return -EINVAL ; + } + + ppev = priv->ppev; +memcpy (&priv->pev, ppev,sizeof (*ppev)); + priv->pev_ready = true; +return 0 ; +} +int bpf__prepare_load (const char *filename) {struct bpf_object *obj;
@@ -172,11 +242,27 @@ int bpf__probe(void)/* add_perf_probe_events return negative when fail */ if (err <0 ) {pr_debug ("bpf probe: failed to probe events\n" ); + goto out; }else is_probed = true; + +/* +* After add_perf_probe_events, 'struct perf_probe_event' is ready. +* Until now copying program's priv->pev field and freeing +* the big array allocated before become safe. +*/ +bpf_object__for_each_safe (obj, tmp) { +bpf_object__for_each_program (prog, obj) { + err =sync_bpf_program_pev (prog); +if (err) + goto out; + } + } out: -while (nr_events >0 ) -clear_perf_probe_event (&pevs[--nr_events]); +/* +* Don't call clear_perf_probe_event() for entries of pevs: +* they are used by prog's private field. +*/ free (pevs);return err <0 ? err :0 ; }
Signature · 1 line
2.1.0
PATCH 10/31 perf record: Load all eBPF object into kernel
In reply to Wang NanThis patch utilizes bpf_object__load() provided by libbpf to load all objects into kernel.
--- tools/perf/builtin-record.c | 15 +++++++++++++++ tools/perf/util/bpf-loader.c | 28 ++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.h | 10 ++++++++++ 3 files changed, 53 insertions(+)
tools/perf/builtin-record.c +15 -0
@@ -1158,6 +1158,21 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) goto out_symbol_exit; } +/* +* bpf__probe() also calls symbol__init() if there are probe +* events in bpf objects, so calling symbol_exit when failure +* is safe. If there is no probe event, bpf__load() always +* success. +*/ + err =bpf__load (); +if (err) { +pr_err ("Loading BPF programs failed:\n" ); + +bpf__strerror_load (err, errbuf,sizeof (errbuf)); +pr_err ("\t%s\n" , errbuf); + goto out_symbol_exit; + } +symbol__init (NULL );if (symbol_conf.kptr_restrict)
tools/perf/util/bpf-loader.c +28 -0
@@ -267,6 +267,25 @@ out:return err <0 ? err :0 ; } +int bpf__load (void ) +{ +struct bpf_object *obj, *tmp; +int err =0 ; + +bpf_object__for_each_safe (obj, tmp) { + err =bpf_object__load (obj); +if (err) { +pr_debug ("bpf: load objects failed\n" ); + goto errout; + } + } +return 0 ; +errout: +bpf_object__for_each_safe (obj, tmp) +bpf_object__unload (obj); +return err; +} +#define bpf__strerror_head (err, buf, size) \ char sbuf[STRERR_BUFSIZE], *emsg;\ if (!size)\
@@ -309,3 +328,12 @@ int bpf__strerror_probe(int err, char *buf, size_t size)bpf__strerror_end (buf, size);return 0 ; } + +int bpf__strerror_load (int err,char *buf,size_t size) +{ +bpf__strerror_head (err, buf, size); +bpf__strerror_entry (EINVAL ,"%s: add -v to see detail. Run a CONFIG_BPF_SYSCALL kernel?" , + emsg) +bpf__strerror_end (buf, size); +return 0 ; +}
tools/perf/util/bpf-loader.h +10 -0
@@ -19,6 +19,9 @@ int bpf__probe(void);int bpf__unprobe (void );int bpf__strerror_probe (int err,char *buf,size_t size); +int bpf__load (void ); +int bpf__strerror_load (int err,char *buf,size_t size); +void bpf__clear (void );#else static inline int bpf__prepare_load (const char *filename__maybe_unused )
@@ -29,6 +32,7 @@ static inline int bpf__prepare_load(const char *filename __maybe_unused)static inline int bpf__probe (void ) {return 0 ; }static inline int bpf__unprobe (void ) {return 0 ; } +static inline int bpf__load (void ) {return 0 ; }static inline void bpf__clear (void ) { } static inline int
@@ -56,5 +60,11 @@ static inline int bpf__strerror_probe(int err __maybe_unused, {return __bpf_strerror (buf, size); } + +static inline int bpf__strerror_load (int err__maybe_unused , +char *buf,size_t size) +{ +return __bpf_strerror (buf, size); +}#endif #endif
Signature · 1 line
2.1.0
PATCH 11/31 perf tools: Add bpf_fd field to evsel and config it
In reply to Wang NanThis patch adds a bpf_fd field to 'struct evsel' then introduces method to config it. In bpf-loader, a bpf__foreach_tev() function is added, which calls the callback function for each 'struct probe_trace_event' events for each bpf program with their file descriptors. In evlist.c, perf_evlist__add_bpf() is introduced to add all bpf events into evlist. The event names are found from probe_trace_event structure. 'perf record' calls perf_evlist__add_bpf().
Since bpf-loader.c will not be built if libbpf is turned off, an empty bpf__foreach_tev() is defined in bpf-loader.h to avoid compiling error.
This patch iterates over 'struct probe_trace_event' instead of 'struct probe_trace_event' during the loop for further patches, which will generate multiple instances form one BPF program and install then onto different 'struct probe_trace_event'.
--- tools/perf/builtin-record.c | 6 ++++++ tools/perf/util/bpf-loader.c | 41 +++++++++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.h | 13 +++++++++++++ tools/perf/util/evlist.c | 41 +++++++++++++++++++++++++++++++++++++++++ tools/perf/util/evlist.h | 1 + tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 1 + 7 files changed, 104 insertions(+)
tools/perf/builtin-record.c +6 -0
@@ -1173,6 +1173,12 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) goto out_symbol_exit; } + err =perf_evlist__add_bpf (rec->evlist); +if (err <0 ) { +pr_err ("Failed to add events from BPF object(s)\n" ); + goto out_symbol_exit; + } +symbol__init (NULL );if (symbol_conf.kptr_restrict)
tools/perf/util/bpf-loader.c +41 -0
47 lines not on this page · raw message
tools/perf/util/bpf-loader.h +13 -0
@@ -7,10 +7,14 @@#include <linux/compiler.h> #include <string.h> +#include "probe-event.h" #include "debug.h" #define PERF_BPF_PROBE_GROUP "perf_bpf_probe" +typedef int (*bpf_prog_iter_callback_t )(struct probe_trace_event *tev, +int fd,void *arg); +#ifdef HAVE_LIBBPF_SUPPORT int bpf__prepare_load (const char *filename); int bpf__strerror_prepare_load(const char *filename, int err,
@@ -23,6 +27,8 @@ int bpf__load(void);int bpf__strerror_load (int err,char *buf,size_t size);void bpf__clear (void ); + +int bpf__foreach_tev (bpf_prog_iter_callback_t func,void *arg);#else static inline int bpf__prepare_load (const char *filename__maybe_unused ) {
@@ -36,6 +42,13 @@ static inline int bpf__load(void) { return 0; }static inline void bpf__clear (void ) { }static inline int +bpf__foreach_tev (bpf_prog_iter_callback_t func__maybe_unused , +void *arg__maybe_unused ) +{ +return 0 ; +} + +static inline int __bpf_strerror (char *buf,size_t size) {if (!size)
tools/perf/util/evlist.c +41 -0
53 lines not on this page · raw message
tools/perf/util/evlist.h +1 -0
@@ -73,6 +73,7 @@ void perf_evlist__delete(struct perf_evlist *evlist);void perf_evlist__add (struct perf_evlist *evlist,struct perf_evsel *entry);int perf_evlist__add_default (struct perf_evlist *evlist); +int perf_evlist__add_bpf (struct perf_evlist *evlist);int __perf_evlist__add_default_attrs (struct perf_evlist *evlist,struct perf_event_attr *attrs,size_t nr_attrs);
tools/perf/util/evsel.c +1 -0
@@ -207,6 +207,7 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->unit ="" ; evsel->scale =1.0 ; evsel->evlist =NULL ; + evsel->bpf_fd =-1 ;INIT_LIST_HEAD (&evsel->node);INIT_LIST_HEAD (&evsel->config_terms); perf_evsel__object.init (evsel);
tools/perf/util/evsel.h +1 -0
@@ -120,6 +120,7 @@ struct perf_evsel {bool cmdline_group_boundary;bool is_dummy;struct list_head config_terms; +int bpf_fd; };union u64_swap {
Signature · 1 line
2.1.0
PATCH 12/31 perf tools: Allow filter option to be applied to bof object
In reply to Wang NanBefore this patch, --filter options can't be applied to BPF object 'events'. For example, the following command:
# perf record -e cycles -e test_bpf.o --exclude-perf -a sleep 1
doesn't apply '--exclude-perf' to events in test_bpf.o. Instead, the filter will be applied to 'cycles' event. This is caused by the delay manner of adding real BPF events. Because all BPF probing points are probed by one call, we can't add real events until all BPF objects are collected. In previous patch (perf tools: Enable passing bpf object file to --event), nothing is appended to evlist.
This patch fixes this by utilizing the dummy event linked during parse_events(). Filter settings goes to dummy event, and be synced with real events in add_bpf_event().
--- tools/perf/builtin-record.c | 6 ++++- tools/perf/util/bpf-loader.c | 8 ++++++- tools/perf/util/bpf-loader.h | 2 ++ tools/perf/util/evlist.c | 53 +++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 64 insertions(+), 5 deletions(-)
tools/perf/builtin-record.c +5 -1
@@ -1113,7 +1113,6 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) argc =parse_options (argc, argv, record_options, record_usage,PARSE_OPT_STOP_AT_NON_OPTION ); -perf_evlist__purge_dummy (rec->evlist);if (!argc &&target__none (&rec->opts.target))usage_with_options (record_usage, record_options);
@@ -1178,6 +1177,11 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)pr_err ("Failed to add events from BPF object(s)\n" ); goto out_symbol_exit; } +/* +* Until now let's purge dummy event. Filter options should +* have been attached to real events by perf_evlist__add_bpf(). +*/ +perf_evlist__purge_dummy (rec->evlist);symbol__init (NULL );
tools/perf/util/bpf-loader.c +7 -1
@@ -293,6 +293,12 @@ int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg)int err;bpf_object__for_each_safe (obj, tmp) { +const char *obj_name; + + obj_name =bpf_object__get_name (obj); +if (!obj_name) + obj_name ="[unknown]" ; +bpf_object__for_each_program (prog, obj) {struct probe_trace_event *tev;struct perf_probe_event *pev;
@@ -316,7 +322,7 @@ int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg)return fd; } - err =func (tev, fd, arg); + err =func (tev, obj_name, fd, arg);if (err) {pr_debug ("bpf: call back failed, stop iterate\n" );return err;
tools/perf/util/bpf-loader.h +2 -0
@@ -6,6 +6,7 @@#define __BPF_LOADER_H#include <linux/compiler.h> +#include <linux/perf_event.h> #include <string.h> #include "probe-event.h" #include "debug.h"
@@ -13,6 +14,7 @@#define PERF_BPF_PROBE_GROUP "perf_bpf_probe"typedef int (*bpf_prog_iter_callback_t )(struct probe_trace_event *tev, +const char *obj_name,int fd,void *arg);#ifdef HAVE_LIBBPF_SUPPORT
tools/perf/util/evlist.c +50 -3
71 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH 13/31 perf tools: Attach eBPF program to perf event
In reply to Wang NanThis is the final patch which makes basic BPF filter work. After applying this patch, users are allowed to use BPF filter like:
# perf record --event ./hello_world.c ls
In this patch PERF_EVENT_IOC_SET_BPF ioctl is used to attach eBPF program to a newly created perf event. The file descriptor of the eBPF program is passed to perf record using previous patches, and stored into evsel->bpf_fd.
It is possible that different perf event are created for one kprobe events for different CPUs. In this case, when trying to call the ioctl, EEXIST will be return. This patch doesn't treat it as an error.
--- tools/perf/util/evsel.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
tools/perf/util/evsel.c +16 -0
@@ -1365,6 +1365,22 @@ retry_open: err); goto try_fallback; } + +if (evsel->bpf_fd >=0 ) { +int evt_fd =FD (evsel, cpu, thread); +int bpf_fd = evsel->bpf_fd; + + err =ioctl (evt_fd, +PERF_EVENT_IOC_SET_BPF , + bpf_fd); +if (err && errno !=EEXIST ) { +pr_err ("failed to attach bpf fd %d: %s\n" , + bpf_fd,strerror (errno)); + err = -EINVAL ; + goto out_close; + } + } + set_rlimit =NO_CHANGE ;/*
Signature · 1 line
2.1.0
PATCH 14/31 perf tools: Suppress probing messages when probing by BPF loading
In reply to Wang NanThis patch suppresses message output by add_perf_probe_events() and del_perf_probe_events() if they are triggered by BPF loading. Before this patch, when using 'perf record' with BPF object/source as event selector, following message will be output:
Added new event:
perf_bpf_probe:lock_page_ret (on __lock_page%return)
You can now use it in all perf tools, such as:
perf record -e perf_bpf_probe:lock_page_ret -aR sleep 1
...
Removed event: perf_bpf_probe:lock_page_ret
Which is misleading, especially 'use it in all perf tools' because they will be removed after 'pref record' exit.
In this patch, a 'silent' field is appended into probe_conf to control output. bpf__{,un}probe() set it to true when calling {add,del}_perf_probe_events().
--- tools/perf/util/bpf-loader.c | 6 ++++++ tools/perf/util/probe-event.c | 17 ++++++++++++----- tools/perf/util/probe-event.h | 1 + tools/perf/util/probe-file.c | 5 ++++- 4 files changed, 23 insertions(+), 6 deletions(-)
tools/perf/util/bpf-loader.c +6 -0
@@ -188,6 +188,7 @@ static bool is_probed;int bpf__unprobe (void ) {struct strfilter *delfilter; +bool old_silent = probe_conf.silent;int ret;if (!is_probed)
@@ -199,7 +200,9 @@ int bpf__unprobe(void)return -ENOMEM ; } + probe_conf.silent = true; ret =del_perf_probe_events (delfilter); + probe_conf.silent = old_silent;strfilter__delete (delfilter);if (ret <0 && is_probed) pr_debug("Error: failed to delete events: %s\n",
@@ -215,6 +218,7 @@ int bpf__probe(void)struct bpf_object *obj, *tmp;struct bpf_program *prog;struct perf_probe_event *pevs; +bool old_silent = probe_conf.silent; pevs =calloc (MAX_PROBES ,sizeof (pevs[0 ]));if (!pevs)
@@ -235,9 +239,11 @@ int bpf__probe(void) } } + probe_conf.silent = true; probe_conf.max_probes =MAX_PROBES ;/* Let add_perf_probe_events generates probe_trace_event (tevs) */ err =add_perf_probe_events (pevs, nr_events, false); + probe_conf.silent = old_silent;/* add_perf_probe_events return negative when fail */ if (err <0 ) {
tools/perf/util/probe-event.c +12 -5
@@ -52,7 +52,9 @@#define PERFPROBE_GROUP "probe"bool probe_event_dry_run;/* Dry run flag */ -struct probe_conf probe_conf; +struct probe_conf probe_conf = { + .silent = false, +}; #define semantic_error(msg ...) pr_err("Semantic error :" msg)
@@ -2192,10 +2194,12 @@ static int show_perf_probe_event(const char *group, const char *event, ret =perf_probe_event__sprintf (group, event, pev, module, &buf);if (ret >=0 ) { -if (use_stdout) +if (use_stdout && !probe_conf.silent)printf ("%s\n" , buf.buf); -else +else if (!probe_conf.silent)pr_info ("%s\n" , buf.buf); +else +pr_debug ("%s\n" , buf.buf); }strbuf_release (&buf);
@@ -2418,7 +2422,10 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, } ret =0 ; -pr_info ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" ); +if (!probe_conf.silent) +pr_info ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" ); +else +pr_debug ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" );for (i =0 ; i < ntevs; i++) { tev = &tevs[i];/* Skip if the symbol is out of .text or blacklisted */
@@ -2454,7 +2461,7 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,warn_uprobe_event_compat (tev);/* Note that it is possible to skip all events because of blacklist */ -if (ret >=0 && event) { +if (ret >=0 && event && !probe_conf.silent) {/* Show how to use the event. */ pr_info ("\nYou can now use it in all perf tools, such as:\n\n" );pr_info ("\tperf record -e %s:%s -aR sleep 1\n\n" , group, event);
tools/perf/util/probe-event.h +1 -0
@@ -13,6 +13,7 @@ struct probe_conf {bool force_add;bool no_inlines;int max_probes; +bool silent; };extern struct probe_conf probe_conf;extern bool probe_event_dry_run;
tools/perf/util/probe-file.c +4 -1
@@ -267,7 +267,10 @@ static int __del_trace_probe_event(int fd, struct str_node *ent) goto error; } -pr_info ("Removed event: %s\n" , ent->s); +if (!probe_conf.silent) +pr_info ("Removed event: %s\n" , ent->s); +else +pr_debug ("Removed event: %s\n" , ent->s);return 0 ; error: pr_warning("Failed to delete event: %s\n",
Signature · 1 line
2.1.0
Namhyung Kim
maintainerRe: [PATCH 14/31] perf tools: Suppress probing messages when probing by BPF loading
Quoted 12 lines · Wang Nan
This patch suppresses message output by
add_perf_probe_events()anddel_perf_probe_events()if they are triggered by BPF loading. Before this patch, when using 'perf record' with BPF object/source as event selector, following message will be output:Added new event:
perf_bpf_probe:lock_page_ret (on __lock_page%return)
You can now use it in all perf tools, such as:
perf record -e perf_bpf_probe:lock_page_ret -aR sleep 1
...
Removed event: perf_bpf_probe:lock_page_ret
Quoted 6 lines
Which is misleading, especially 'use it in all perf tools' because they will be removed after 'pref record' exit.
In this patch, a 'silent' field is appended into
probe_confto control output. bpf__{,un}probe() set it to true when calling {add,del}_perf_probe_events().
I think that printing those messages should be done in cmd_probe() rather than add/del_perf_probe_events()..
Thanks,
Namhyung
Quoted 147 lines
Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>--- tools/perf/util/bpf-loader.c | 6 ++++++ tools/perf/util/probe-event.c | 17 ++++++++++++----- tools/perf/util/probe-event.h | 1 + tools/perf/util/probe-file.c | 5 ++++- 4 files changed, 23 insertions(+), 6 deletions(-)tools/perf/util/bpf-loader.c +6
-0@@ -188,6 +188,7 @@ static bool is_probed;int bpf__unprobe (void ) {struct strfilter *delfilter; +bool old_silent = probe_conf.silent;int ret;if (!is_probed)@@ -199,7 +200,9 @@ int bpf__unprobe(void)return -ENOMEM ; } + probe_conf.silent = true; ret =del_perf_probe_events (delfilter); + probe_conf.silent = old_silent;strfilter__delete (delfilter);if (ret <0 && is_probed) pr_debug("Error: failed to delete events: %s\n",@@ -215,6 +218,7 @@ int bpf__probe(void)struct bpf_object *obj, *tmp;struct bpf_program *prog;struct perf_probe_event *pevs; +bool old_silent = probe_conf.silent; pevs =calloc (MAX_PROBES ,sizeof (pevs[0 ]));if (!pevs)@@ -235,9 +239,11 @@ int bpf__probe(void) } } + probe_conf.silent = true; probe_conf.max_probes =MAX_PROBES ;/* Let add_perf_probe_events generates probe_trace_event (tevs) */ err =add_perf_probe_events (pevs, nr_events, false); + probe_conf.silent = old_silent;/* add_perf_probe_events return negative when fail */ if (err <0 ) {tools/perf/util/probe-event.c +12
-5@@ -52,7 +52,9 @@#define PERFPROBE_GROUP "probe"bool probe_event_dry_run;/* Dry run flag */ -struct probe_conf probe_conf; +struct probe_conf probe_conf = { + .silent = false, +}; #define semantic_error(msg ...) pr_err("Semantic error :" msg)@@ -2192,10 +2194,12 @@ static int show_perf_probe_event(const char *group, const char *event, ret =perf_probe_event__sprintf (group, event, pev, module, &buf);if (ret >=0 ) { -if (use_stdout) +if (use_stdout && !probe_conf.silent)printf ("%s\n" , buf.buf); -else +else if (!probe_conf.silent)pr_info ("%s\n" , buf.buf); +else +pr_debug ("%s\n" , buf.buf); }strbuf_release (&buf);@@ -2418,7 +2422,10 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, } ret =0 ; -pr_info ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" ); +if (!probe_conf.silent) +pr_info ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" ); +else +pr_debug ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" );for (i =0 ; i < ntevs; i++) { tev = &tevs[i];/* Skip if the symbol is out of .text or blacklisted */ @@ -2454,7 +2461,7 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,warn_uprobe_event_compat (tev);/* Note that it is possible to skip all events because of blacklist */ -if (ret >=0 && event) { +if (ret >=0 && event && !probe_conf.silent) {/* Show how to use the event. */ pr_info ("\nYou can now use it in all perf tools, such as:\n\n" );pr_info ("\tperf record -e %s:%s -aR sleep 1\n\n" , group, event);tools/perf/util/probe-event.h +1
-0@@ -13,6 +13,7 @@ struct probe_conf {bool force_add;bool no_inlines;int max_probes; +bool silent; };extern struct probe_conf probe_conf;extern bool probe_event_dry_run;tools/perf/util/probe-file.c +4
-1@@ -267,7 +267,10 @@ static int __del_trace_probe_event(int fd, struct str_node *ent) goto error; } -pr_info ("Removed event: %s\n" , ent->s); +if (!probe_conf.silent) +pr_info ("Removed event: %s\n" , ent->s); +else +pr_debug ("Removed event: %s\n" , ent->s);return 0 ; error: pr_warning("Failed to delete event: %s\n",Signature · 1 line
2.1.0
RE: Re: [PATCH 14/31] perf tools: Suppress probing messages when probing by BPF loading
Quoted 18 lines
From: Namhyung Kim [mailto:[email protected]] On Behalf Of Namhyung Kim
Quoted 15 lines · Wang Nan
This patch suppresses message output by
add_perf_probe_events()anddel_perf_probe_events()if they are triggered by BPF loading. Before this patch, when using 'perf record' with BPF object/source as event selector, following message will be output:Added new event:
perf_bpf_probe:lock_page_ret (on __lock_page%return)
You can now use it in all perf tools, such as:
perf record -e perf_bpf_probe:lock_page_ret -aR sleep 1
...
Removed event: perf_bpf_probe:lock_page_retWhich is misleading, especially 'use it in all perf tools' because they will be removed after 'pref record' exit.
Quoted 6 lines
Quoted 3 lines
In this patch, a 'silent' field is appended into
probe_confto control output. bpf__{,un}probe() set it to true when calling {add,del}_perf_probe_events().I think that printing those messages should be done in
cmd_probe()rather than add/del_perf_probe_events()..
Well... try to cleanup the messages.
Thanks!
Quoted 1 line
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
PATCH 1/1 perf-probe: Output the result of adding/deleting probe in buildin-probe
In reply to Namhyung KimOutput the normal result of adding/deleting probe in buildin-probe instead of showing it by add/del_perf_probe_events.
All the result string is stored into "result" strbuf parameter. If you want to ignore the result string, pass a NULL to the "result". Note that all warning/debug strings are still in the add/del_perf_probe_events.
--- tools/perf/builtin-probe.c | 9 +++++++-- tools/perf/util/probe-event.c | 33 ++++++++++++++++++++------------- tools/perf/util/probe-event.h | 6 ++++-- tools/perf/util/probe-file.c | 5 +++-- tools/perf/util/probe-file.h | 4 +++- 5 files changed, 37 insertions(+), 20 deletions(-)
tools/perf/builtin-probe.c +7 -2
@@ -402,6 +402,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) "Enable kernel symbol demangling"), OPT_END() }; +struct strbuf buf =STRBUF_INIT ;int ret;set_option_flag (options,'a' ,"add" ,PARSE_OPT_EXCLUSIVE );
@@ -483,7 +484,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)return ret;#endif case 'd' : - ret =del_perf_probe_events (params.filter); + ret =del_perf_probe_events (params.filter, &buf); +/* Even if failed, we should show the result first */ +pr_info ("%s" , buf.buf);if (ret <0 ) {pr_err_with_code (" Error: Failed to delete events." , ret);return ret;
@@ -496,7 +499,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)usage_with_options (probe_usage, options); } - ret =add_perf_probe_events (params.events, params.nevents); + ret =add_perf_probe_events (params.events, params.nevents, &buf); +/* Even if failed, we should show the result first */ +pr_info ("%s" , buf.buf);if (ret <0 ) {pr_err_with_code (" Error: Failed to add events." , ret);return ret;
tools/perf/util/probe-event.c +20 -13
@@ -2395,7 +2395,8 @@ static int probe_trace_event__set_name(struct probe_trace_event *tev,static int __add_probe_trace_events (struct perf_probe_event *pev,struct probe_trace_event *tevs, -int ntevs,bool allow_suffix) +int ntevs,bool allow_suffix, +struct strbuf *buf) {int i, fd, ret;struct probe_trace_event *tev =NULL ;
@@ -2415,7 +2416,9 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, } ret =0 ; -pr_info ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" ); +if (buf) +strbuf_addf (buf,"Added new event%s\n" , + (ntevs >1 ) ?"s:" :":" );for (i =0 ; i < ntevs; i++) { tev = &tevs[i];/* Skip if the symbol is out of .text or blacklisted */
@@ -2432,9 +2435,12 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,if (ret <0 )break ; -/* We use tev's name for showing new events */ -show_perf_probe_event (tev->group, tev->event, pev, - tev->point.module, false); +if (buf) { +/* We use tev's name for showing new events */ +perf_probe_event__sprintf (tev->group, tev->event, + pev, tev->point.module, buf); +strbuf_addch (buf,'\n' ); + }/* Save the last valid name */ event = tev->event; group = tev->group;
@@ -2451,10 +2457,10 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,warn_uprobe_event_compat (tev);/* Note that it is possible to skip all events because of blacklist */ -if (ret >=0 && event) { +if (ret >=0 && event && buf) {/* Show how to use the event. */ -pr_info ("\nYou can now use it in all perf tools, such as:\n\n" ); -pr_info ("\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); +strbuf_addf (buf,"\nYou can now use it in all perf tools, such as:\n\n" ); +strbuf_addf (buf,"\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); }strlist__delete (namelist);
@@ -2765,7 +2771,8 @@ struct __event_package {int ntevs; }; -int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) +int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct strbuf *result) {int i, j, ret;struct __event_package *pkgs;
@@ -2802,7 +2809,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)for (i =0 ; i < npevs; i++) { ret =__add_probe_trace_events (pkgs[i].pev, pkgs[i].tevs, pkgs[i].ntevs, - probe_conf.force_add); + probe_conf.force_add, result);if (ret <0 )break ; }
@@ -2819,7 +2826,7 @@ end:return ret; } -int del_perf_probe_events (struct strfilter *filter) +int del_perf_probe_events (struct strfilter *filter,struct strbuf *result) {int ret, ret2, ufd =-1 , kfd =-1 ;char *str =strfilter__string (filter);
@@ -2834,11 +2841,11 @@ int del_perf_probe_events(struct strfilter *filter)if (ret <0 ) goto out; - ret =probe_file__del_events (kfd, filter); + ret =probe_file__del_events (kfd, filter, result);if (ret <0 && ret != -ENOENT ) goto error; - ret2 =probe_file__del_events (ufd, filter); + ret2 =probe_file__del_events (ufd, filter, result);if (ret2 <0 && ret2 != -ENOENT ) { ret = ret2; goto error;
tools/perf/util/probe-event.h +4 -2
@@ -137,8 +137,10 @@ extern void line_range__clear(struct line_range *lr);/* Initialize line range */ extern int line_range__init (struct line_range *lr); -extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs); -extern int del_perf_probe_events (struct strfilter *filter); +extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct strbuf *result); +extern int del_perf_probe_events (struct strfilter *filter, +struct strbuf *result);extern int show_perf_probe_events (struct strfilter *filter);extern int show_line_range (struct line_range *lr,const char *module,bool user);
tools/perf/util/probe-file.c +3 -2
@@ -267,7 +267,6 @@ static int __del_trace_probe_event(int fd, struct str_node *ent) goto error; } -pr_info ("Removed event: %s\n" , ent->s);return 0 ; error: pr_warning("Failed to delete event: %s\n",
@@ -275,7 +274,7 @@ error:return ret; } -int probe_file__del_events (int fd,struct strfilter *filter) +int probe_file__del_events (int fd,struct strfilter *filter,struct strbuf *buf) {struct strlist *namelist;struct str_node *ent;
@@ -293,6 +292,8 @@ int probe_file__del_events(int fd, struct strfilter *filter) ret =__del_trace_probe_event (fd, ent);if (ret <0 )break ; +if (buf) +strbuf_addf (buf,"Removed event: %s\n" , ent->s); } }strlist__delete (namelist);
tools/perf/util/probe-file.h +3 -1
@@ -1,6 +1,7 @@#ifndef __PROBE_FILE_H#define __PROBE_FILE_H +#include "strbuf.h" #include "strlist.h" #include "strfilter.h" #include "probe-event.h"
@@ -13,6 +14,7 @@ int probe_file__open_both(int *kfd, int *ufd, int flag);struct strlist *probe_file__get_namelist (int fd);struct strlist *probe_file__get_rawlist (int fd);int probe_file__add_event (int fd,struct probe_trace_event *tev); -int probe_file__del_events (int fd,struct strfilter *filter); +int probe_file__del_events (int fd,struct strfilter *filter, +struct strbuf *buf);#endif
RE: [PATCH perf/core ] perf-probe: Output the result of adding/deleting probe in buildin-probe
Hi Namhyung,
So, I hope this would be what you've suggested.
Thank you,
Signature · 5 lines
Masami HIRAMATSU Linux Technology Research Center, System Productivity Research Dept. Center for Technology Innovation - Systems Engineering Hitachi, Ltd., Research & Development Group E-mail: [email protected]
Quoted 217 lines
-----Original Message-----
From: Masami Hiramatsu [mailto:[email protected]]
Sent: Thursday, September 03, 2015 9:11 PM
To: Namhyung Kim; Arnaldo Carvalho de Melo
Cc: Wang Nan; Kaixu Xia; Peter Zijlstra; Daniel Borkmann; [email protected]; He Kuang; [email protected]; Jiri Olsa; David Ahern; Brendan Gregg; [email protected]; [email protected]
Subject: [PATCH perf/core ] perf-probe: Output the result of adding/deleting probe in buildin-probeOutput the normal result of adding/deleting probe in buildin-probe instead of showing it by add/del_perf_probe_events.
All the result string is stored into "result" strbuf parameter. If you want to ignore the result string, pass a NULL to the "result". Note that all warning/debug strings are still in the add/del_perf_probe_events.Suggested-by Namhyung Kim <[email protected]>Signed-off-by Masami Hiramatsu <[email protected]>--- tools/perf/builtin-probe.c | 9 +++++++-- tools/perf/util/probe-event.c | 33 ++++++++++++++++++++------------- tools/perf/util/probe-event.h | 6 ++++-- tools/perf/util/probe-file.c | 5 +++-- tools/perf/util/probe-file.h | 4 +++- 5 files changed, 37 insertions(+), 20 deletions(-)tools/perf/builtin-probe.c +7
-2@@ -402,6 +402,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) "Enable kernel symbol demangling"), OPT_END() }; +struct strbuf buf =STRBUF_INIT ;int ret;set_option_flag (options,'a' ,"add" ,PARSE_OPT_EXCLUSIVE );@@ -483,7 +484,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)return ret;#endif case 'd' : - ret =del_perf_probe_events (params.filter); + ret =del_perf_probe_events (params.filter, &buf); +/* Even if failed, we should show the result first */ +pr_info ("%s" , buf.buf);if (ret <0 ) {pr_err_with_code (" Error: Failed to delete events." , ret);return ret;@@ -496,7 +499,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)usage_with_options (probe_usage, options); } - ret =add_perf_probe_events (params.events, params.nevents); + ret =add_perf_probe_events (params.events, params.nevents, &buf); +/* Even if failed, we should show the result first */ +pr_info ("%s" , buf.buf);if (ret <0 ) {pr_err_with_code (" Error: Failed to add events." , ret);return ret;tools/perf/util/probe-event.c +20
-13@@ -2395,7 +2395,8 @@ static int probe_trace_event__set_name(struct probe_trace_event *tev,static int __add_probe_trace_events (struct perf_probe_event *pev,struct probe_trace_event *tevs, -int ntevs,bool allow_suffix) +int ntevs,bool allow_suffix, +struct strbuf *buf) {int i, fd, ret;struct probe_trace_event *tev =NULL ;@@ -2415,7 +2416,9 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, } ret =0 ; -pr_info ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" ); +if (buf) +strbuf_addf (buf,"Added new event%s\n" , + (ntevs >1 ) ?"s:" :":" );for (i =0 ; i < ntevs; i++) { tev = &tevs[i];/* Skip if the symbol is out of .text or blacklisted */ @@ -2432,9 +2435,12 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,if (ret <0 )break ; -/* We use tev's name for showing new events */ -show_perf_probe_event (tev->group, tev->event, pev, - tev->point.module, false); +if (buf) { +/* We use tev's name for showing new events */ +perf_probe_event__sprintf (tev->group, tev->event, + pev, tev->point.module, buf); +strbuf_addch (buf,'\n' ); + }/* Save the last valid name */ event = tev->event; group = tev->group;@@ -2451,10 +2457,10 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,warn_uprobe_event_compat (tev);/* Note that it is possible to skip all events because of blacklist */ -if (ret >=0 && event) { +if (ret >=0 && event && buf) {/* Show how to use the event. */ -pr_info ("\nYou can now use it in all perf tools, such as:\n\n" ); -pr_info ("\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); +strbuf_addf (buf,"\nYou can now use it in all perf tools, such as:\n\n" ); +strbuf_addf (buf,"\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); }strlist__delete (namelist);@@ -2765,7 +2771,8 @@ struct __event_package {int ntevs; }; -int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) +int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct strbuf *result) {int i, j, ret;struct __event_package *pkgs;@@ -2802,7 +2809,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)for (i =0 ; i < npevs; i++) { ret =__add_probe_trace_events (pkgs[i].pev, pkgs[i].tevs, pkgs[i].ntevs, - probe_conf.force_add); + probe_conf.force_add, result);if (ret <0 )break ; }@@ -2819,7 +2826,7 @@ end:return ret; } -int del_perf_probe_events (struct strfilter *filter) +int del_perf_probe_events (struct strfilter *filter,struct strbuf *result) {int ret, ret2, ufd =-1 , kfd =-1 ;char *str =strfilter__string (filter);@@ -2834,11 +2841,11 @@ int del_perf_probe_events(struct strfilter *filter)if (ret <0 ) goto out; - ret =probe_file__del_events (kfd, filter); + ret =probe_file__del_events (kfd, filter, result);if (ret <0 && ret != -ENOENT ) goto error; - ret2 =probe_file__del_events (ufd, filter); + ret2 =probe_file__del_events (ufd, filter, result);if (ret2 <0 && ret2 != -ENOENT ) { ret = ret2; goto error;tools/perf/util/probe-event.h +4
-2@@ -137,8 +137,10 @@ extern void line_range__clear(struct line_range *lr);/* Initialize line range */ extern int line_range__init (struct line_range *lr); -extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs); -extern int del_perf_probe_events (struct strfilter *filter); +extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct strbuf *result); +extern int del_perf_probe_events (struct strfilter *filter, +struct strbuf *result);extern int show_perf_probe_events (struct strfilter *filter);extern int show_line_range (struct line_range *lr,const char *module,bool user);tools/perf/util/probe-file.c +3
-2@@ -267,7 +267,6 @@ static int __del_trace_probe_event(int fd, struct str_node *ent) goto error; } -pr_info ("Removed event: %s\n" , ent->s);return 0 ; error: pr_warning("Failed to delete event: %s\n",@@ -275,7 +274,7 @@ error:return ret; } -int probe_file__del_events (int fd,struct strfilter *filter) +int probe_file__del_events (int fd,struct strfilter *filter,struct strbuf *buf) {struct strlist *namelist;struct str_node *ent;@@ -293,6 +292,8 @@ int probe_file__del_events(int fd, struct strfilter *filter) ret =__del_trace_probe_event (fd, ent);if (ret <0 )break ; +if (buf) +strbuf_addf (buf,"Removed event: %s\n" , ent->s); } }strlist__delete (namelist);tools/perf/util/probe-file.h +1
-0@@ -1,6 +1,7 @@#ifndef __PROBE_FILE_H#define __PROBE_FILE_H +#include "strbuf.h" #include "strlist.h" #include "strfilter.h" #include "probe-event.h"
tools/perf/util/probe-file.h int probe_file__open_both(int *kfd, int *ufd, int flag); · line 20
Quoted 8 lines
tools/perf/util/probe-file.h +2
-1@@ -13,6 +14,7 @@ int probe_file__open_both(int *kfd, int *ufd, int flag);struct strlist *probe_file__get_namelist (int fd);struct strlist *probe_file__get_rawlist (int fd);int probe_file__add_event (int fd,struct probe_trace_event *tev); -int probe_file__del_events (int fd,struct strfilter *filter); +int probe_file__del_events (int fd,struct strfilter *filter, +struct strbuf *buf);#endif
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Namhyung Kim
maintainerRe: [PATCH perf/core ] perf-probe: Output the result of adding/deleting probe in buildin-probe
Quoted 5 lines · 平松雅巳 / HIRAMATU,MASAMI
Hi Namhyung,
So, I hope this would be what you've suggested.
Thank you,
Hi Masami,
I think something different, but this can be ok. Anyway, I'll send my idea soon..
Thanks,
Namhyung
Quoted 235 lines
Signature · 6 lines
-- Masami HIRAMATSU Linux Technology Research Center, System Productivity Research Dept. Center for Technology Innovation - Systems Engineering Hitachi, Ltd., Research & Development Group E-mail: [email protected]Quoted 225 lines
-----Original Message-----
From: Masami Hiramatsu [mailto:[email protected]]
Sent: Thursday, September 03, 2015 9:11 PM
To: Namhyung Kim; Arnaldo Carvalho de Melo
Cc: Wang Nan; Kaixu Xia; Peter Zijlstra; Daniel Borkmann; [email protected]; He Kuang; [email protected]; Jiri Olsa; David Ahern; Brendan Gregg; [email protected]; [email protected]
Subject: [PATCH perf/core ] perf-probe: Output the result of adding/deleting probe in buildin-probeOutput the normal result of adding/deleting probe in buildin-probe instead of showing it by add/del_perf_probe_events.
All the result string is stored into "result" strbuf parameter. If you want to ignore the result string, pass a NULL to the "result". Note that all warning/debug strings are still in the add/del_perf_probe_events.Suggested-by Namhyung Kim <[email protected]>Signed-off-by Masami Hiramatsu <[email protected]>--- tools/perf/builtin-probe.c | 9 +++++++-- tools/perf/util/probe-event.c | 33 ++++++++++++++++++++------------- tools/perf/util/probe-event.h | 6 ++++-- tools/perf/util/probe-file.c | 5 +++-- tools/perf/util/probe-file.h | 4 +++- 5 files changed, 37 insertions(+), 20 deletions(-)tools/perf/builtin-probe.c +7
-2@@ -402,6 +402,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) "Enable kernel symbol demangling"), OPT_END() }; +struct strbuf buf =STRBUF_INIT ;int ret;set_option_flag (options,'a' ,"add" ,PARSE_OPT_EXCLUSIVE );@@ -483,7 +484,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)return ret;#endif case 'd' : - ret =del_perf_probe_events (params.filter); + ret =del_perf_probe_events (params.filter, &buf); +/* Even if failed, we should show the result first */ +pr_info ("%s" , buf.buf);if (ret <0 ) {pr_err_with_code (" Error: Failed to delete events." , ret);return ret;@@ -496,7 +499,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)usage_with_options (probe_usage, options); } - ret =add_perf_probe_events (params.events, params.nevents); + ret =add_perf_probe_events (params.events, params.nevents, &buf); +/* Even if failed, we should show the result first */ +pr_info ("%s" , buf.buf);if (ret <0 ) {pr_err_with_code (" Error: Failed to add events." , ret);return ret;tools/perf/util/probe-event.c +20
-13@@ -2395,7 +2395,8 @@ static int probe_trace_event__set_name(struct probe_trace_event *tev,static int __add_probe_trace_events (struct perf_probe_event *pev,struct probe_trace_event *tevs, -int ntevs,bool allow_suffix) +int ntevs,bool allow_suffix, +struct strbuf *buf) {int i, fd, ret;struct probe_trace_event *tev =NULL ;@@ -2415,7 +2416,9 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, } ret =0 ; -pr_info ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" ); +if (buf) +strbuf_addf (buf,"Added new event%s\n" , + (ntevs >1 ) ?"s:" :":" );for (i =0 ; i < ntevs; i++) { tev = &tevs[i];/* Skip if the symbol is out of .text or blacklisted */ @@ -2432,9 +2435,12 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,if (ret <0 )break ; -/* We use tev's name for showing new events */ -show_perf_probe_event (tev->group, tev->event, pev, - tev->point.module, false); +if (buf) { +/* We use tev's name for showing new events */ +perf_probe_event__sprintf (tev->group, tev->event, + pev, tev->point.module, buf); +strbuf_addch (buf,'\n' ); + }/* Save the last valid name */ event = tev->event; group = tev->group;@@ -2451,10 +2457,10 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,warn_uprobe_event_compat (tev);/* Note that it is possible to skip all events because of blacklist */ -if (ret >=0 && event) { +if (ret >=0 && event && buf) {/* Show how to use the event. */ -pr_info ("\nYou can now use it in all perf tools, such as:\n\n" ); -pr_info ("\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); +strbuf_addf (buf,"\nYou can now use it in all perf tools, such as:\n\n" ); +strbuf_addf (buf,"\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); }strlist__delete (namelist);@@ -2765,7 +2771,8 @@ struct __event_package {int ntevs; }; -int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) +int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct strbuf *result) {int i, j, ret;struct __event_package *pkgs;@@ -2802,7 +2809,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)for (i =0 ; i < npevs; i++) { ret =__add_probe_trace_events (pkgs[i].pev, pkgs[i].tevs, pkgs[i].ntevs, - probe_conf.force_add); + probe_conf.force_add, result);if (ret <0 )break ; }@@ -2819,7 +2826,7 @@ end:return ret; } -int del_perf_probe_events (struct strfilter *filter) +int del_perf_probe_events (struct strfilter *filter,struct strbuf *result) {int ret, ret2, ufd =-1 , kfd =-1 ;char *str =strfilter__string (filter);@@ -2834,11 +2841,11 @@ int del_perf_probe_events(struct strfilter *filter)if (ret <0 ) goto out; - ret =probe_file__del_events (kfd, filter); + ret =probe_file__del_events (kfd, filter, result);if (ret <0 && ret != -ENOENT ) goto error; - ret2 =probe_file__del_events (ufd, filter); + ret2 =probe_file__del_events (ufd, filter, result);if (ret2 <0 && ret2 != -ENOENT ) { ret = ret2; goto error;tools/perf/util/probe-event.h +4
-2@@ -137,8 +137,10 @@ extern void line_range__clear(struct line_range *lr);/* Initialize line range */ extern int line_range__init (struct line_range *lr); -extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs); -extern int del_perf_probe_events (struct strfilter *filter); +extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct strbuf *result); +extern int del_perf_probe_events (struct strfilter *filter, +struct strbuf *result);extern int show_perf_probe_events (struct strfilter *filter);extern int show_line_range (struct line_range *lr,const char *module,bool user);tools/perf/util/probe-file.c +3
-2@@ -267,7 +267,6 @@ static int __del_trace_probe_event(int fd, struct str_node *ent) goto error; } -pr_info ("Removed event: %s\n" , ent->s);return 0 ; error: pr_warning("Failed to delete event: %s\n",@@ -275,7 +274,7 @@ error:return ret; } -int probe_file__del_events (int fd,struct strfilter *filter) +int probe_file__del_events (int fd,struct strfilter *filter,struct strbuf *buf) {struct strlist *namelist;struct str_node *ent;@@ -293,6 +292,8 @@ int probe_file__del_events(int fd, struct strfilter *filter) ret =__del_trace_probe_event (fd, ent);if (ret <0 )break ; +if (buf) +strbuf_addf (buf,"Removed event: %s\n" , ent->s); } }strlist__delete (namelist);tools/perf/util/probe-file.h +3
-1@@ -1,6 +1,7 @@#ifndef __PROBE_FILE_H#define __PROBE_FILE_H +#include "strbuf.h" #include "strlist.h" #include "strfilter.h" #include "probe-event.h" @@ -13,6 +14,7 @@ int probe_file__open_both(int *kfd, int *ufd, int flag);struct strlist *probe_file__get_namelist (int fd);struct strlist *probe_file__get_rawlist (int fd);int probe_file__add_event (int fd,struct probe_trace_event *tev); -int probe_file__del_events (int fd,struct strfilter *filter); +int probe_file__del_events (int fd,struct strfilter *filter, +struct strbuf *buf);#endif
Arnaldo Carvalho de Melo
maintainerRe: [PATCH perf/core ] perf-probe: Output the result of adding/deleting probe in buildin-probe
In reply to Masami HiramatsuEm Thu, Sep 03, 2015 at 09:10:35PM +0900, Masami Hiramatsu escreveu:
Quoted 6 lines
Output the normal result of adding/deleting probe in buildin-probe instead of showing it by add/del_perf_probe_events.
All the result string is stored into "result" strbuf parameter. If you want to ignore the result string, pass a NULL to the "result". Note that all warning/debug strings are still in the add/del_perf_probe_events.
Please provide the before and after output of the affected tools.
But I'll wait for you to react to Namyung's RFC.
- Arnaldo
Quoted 210 lines
Suggested-by Namhyung Kim <[email protected]>Signed-off-by Masami Hiramatsu <[email protected]>--- tools/perf/builtin-probe.c | 9 +++++++-- tools/perf/util/probe-event.c | 33 ++++++++++++++++++++------------- tools/perf/util/probe-event.h | 6 ++++-- tools/perf/util/probe-file.c | 5 +++-- tools/perf/util/probe-file.h | 4 +++- 5 files changed, 37 insertions(+), 20 deletions(-)tools/perf/builtin-probe.c +7
-2@@ -402,6 +402,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) "Enable kernel symbol demangling"), OPT_END() }; +struct strbuf buf =STRBUF_INIT ;int ret;set_option_flag (options,'a' ,"add" ,PARSE_OPT_EXCLUSIVE );@@ -483,7 +484,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)return ret;#endif case 'd' : - ret =del_perf_probe_events (params.filter); + ret =del_perf_probe_events (params.filter, &buf); +/* Even if failed, we should show the result first */ +pr_info ("%s" , buf.buf);if (ret <0 ) {pr_err_with_code (" Error: Failed to delete events." , ret);return ret;@@ -496,7 +499,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)usage_with_options (probe_usage, options); } - ret =add_perf_probe_events (params.events, params.nevents); + ret =add_perf_probe_events (params.events, params.nevents, &buf); +/* Even if failed, we should show the result first */ +pr_info ("%s" , buf.buf);if (ret <0 ) {pr_err_with_code (" Error: Failed to add events." , ret);return ret;tools/perf/util/probe-event.c +20
-13@@ -2395,7 +2395,8 @@ static int probe_trace_event__set_name(struct probe_trace_event *tev,static int __add_probe_trace_events (struct perf_probe_event *pev,struct probe_trace_event *tevs, -int ntevs,bool allow_suffix) +int ntevs,bool allow_suffix, +struct strbuf *buf) {int i, fd, ret;struct probe_trace_event *tev =NULL ;@@ -2415,7 +2416,9 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, } ret =0 ; -pr_info ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" ); +if (buf) +strbuf_addf (buf,"Added new event%s\n" , + (ntevs >1 ) ?"s:" :":" );for (i =0 ; i < ntevs; i++) { tev = &tevs[i];/* Skip if the symbol is out of .text or blacklisted */ @@ -2432,9 +2435,12 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,if (ret <0 )break ; -/* We use tev's name for showing new events */ -show_perf_probe_event (tev->group, tev->event, pev, - tev->point.module, false); +if (buf) { +/* We use tev's name for showing new events */ +perf_probe_event__sprintf (tev->group, tev->event, + pev, tev->point.module, buf); +strbuf_addch (buf,'\n' ); + }/* Save the last valid name */ event = tev->event; group = tev->group;@@ -2451,10 +2457,10 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,warn_uprobe_event_compat (tev);/* Note that it is possible to skip all events because of blacklist */ -if (ret >=0 && event) { +if (ret >=0 && event && buf) {/* Show how to use the event. */ -pr_info ("\nYou can now use it in all perf tools, such as:\n\n" ); -pr_info ("\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); +strbuf_addf (buf,"\nYou can now use it in all perf tools, such as:\n\n" ); +strbuf_addf (buf,"\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); }strlist__delete (namelist);@@ -2765,7 +2771,8 @@ struct __event_package {int ntevs; }; -int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) +int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct strbuf *result) {int i, j, ret;struct __event_package *pkgs;@@ -2802,7 +2809,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)for (i =0 ; i < npevs; i++) { ret =__add_probe_trace_events (pkgs[i].pev, pkgs[i].tevs, pkgs[i].ntevs, - probe_conf.force_add); + probe_conf.force_add, result);if (ret <0 )break ; }@@ -2819,7 +2826,7 @@ end:return ret; } -int del_perf_probe_events (struct strfilter *filter) +int del_perf_probe_events (struct strfilter *filter,struct strbuf *result) {int ret, ret2, ufd =-1 , kfd =-1 ;char *str =strfilter__string (filter);@@ -2834,11 +2841,11 @@ int del_perf_probe_events(struct strfilter *filter)if (ret <0 ) goto out; - ret =probe_file__del_events (kfd, filter); + ret =probe_file__del_events (kfd, filter, result);if (ret <0 && ret != -ENOENT ) goto error; - ret2 =probe_file__del_events (ufd, filter); + ret2 =probe_file__del_events (ufd, filter, result);if (ret2 <0 && ret2 != -ENOENT ) { ret = ret2; goto error;tools/perf/util/probe-event.h +4
-2@@ -137,8 +137,10 @@ extern void line_range__clear(struct line_range *lr);/* Initialize line range */ extern int line_range__init (struct line_range *lr); -extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs); -extern int del_perf_probe_events (struct strfilter *filter); +extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct strbuf *result); +extern int del_perf_probe_events (struct strfilter *filter, +struct strbuf *result);extern int show_perf_probe_events (struct strfilter *filter);extern int show_line_range (struct line_range *lr,const char *module,bool user);tools/perf/util/probe-file.c +3
-2@@ -267,7 +267,6 @@ static int __del_trace_probe_event(int fd, struct str_node *ent) goto error; } -pr_info ("Removed event: %s\n" , ent->s);return 0 ; error: pr_warning("Failed to delete event: %s\n",@@ -275,7 +274,7 @@ error:return ret; } -int probe_file__del_events (int fd,struct strfilter *filter) +int probe_file__del_events (int fd,struct strfilter *filter,struct strbuf *buf) {struct strlist *namelist;struct str_node *ent;@@ -293,6 +292,8 @@ int probe_file__del_events(int fd, struct strfilter *filter) ret =__del_trace_probe_event (fd, ent);if (ret <0 )break ; +if (buf) +strbuf_addf (buf,"Removed event: %s\n" , ent->s); } }strlist__delete (namelist);tools/perf/util/probe-file.h +3
-1@@ -1,6 +1,7 @@#ifndef __PROBE_FILE_H#define __PROBE_FILE_H +#include "strbuf.h" #include "strlist.h" #include "strfilter.h" #include "probe-event.h" @@ -13,6 +14,7 @@ int probe_file__open_both(int *kfd, int *ufd, int flag);struct strlist *probe_file__get_namelist (int fd);struct strlist *probe_file__get_rawlist (int fd);int probe_file__add_event (int fd,struct probe_trace_event *tev); -int probe_file__del_events (int fd,struct strfilter *filter); +int probe_file__del_events (int fd,struct strfilter *filter, +struct strbuf *buf);#endif
RE: [PATCH perf/core ] perf-probe: Output the result of adding/deleting probe in buildin-probe
Quoted 10 lines
From: Arnaldo Carvalho de Melo [mailto:[email protected]]
Em Thu, Sep 03, 2015 at 09:10:35PM +0900, Masami Hiramatsu escreveu:
Quoted 6 lines
Output the normal result of adding/deleting probe in buildin-probe instead of showing it by add/del_perf_probe_events.
All the result string is stored into "result" strbuf parameter. If you want to ignore the result string, pass a NULL to the "result". Note that all warning/debug strings are still in the add/del_perf_probe_events.
Quoted 3 lines
Please provide the before and after output of the affected tools.
But I'll wait for you to react to Namyung's RFC.
Yeah, I think his series is much better than this add-hoc fix :) I'll reply him asap.
Thanks!
Quoted 213 lines
- Arnaldo
Quoted 210 lines
Suggested-by Namhyung Kim <[email protected]>Signed-off-by Masami Hiramatsu <[email protected]>--- tools/perf/builtin-probe.c | 9 +++++++-- tools/perf/util/probe-event.c | 33 ++++++++++++++++++++------------- tools/perf/util/probe-event.h | 6 ++++-- tools/perf/util/probe-file.c | 5 +++-- tools/perf/util/probe-file.h | 4 +++- 5 files changed, 37 insertions(+), 20 deletions(-)tools/perf/builtin-probe.c +7
-2@@ -402,6 +402,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) "Enable kernel symbol demangling"), OPT_END() }; +struct strbuf buf =STRBUF_INIT ;int ret;set_option_flag (options,'a' ,"add" ,PARSE_OPT_EXCLUSIVE );@@ -483,7 +484,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)return ret;#endif case 'd' : - ret =del_perf_probe_events (params.filter); + ret =del_perf_probe_events (params.filter, &buf); +/* Even if failed, we should show the result first */ +pr_info ("%s" , buf.buf);if (ret <0 ) {pr_err_with_code (" Error: Failed to delete events." , ret);return ret;@@ -496,7 +499,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)usage_with_options (probe_usage, options); } - ret =add_perf_probe_events (params.events, params.nevents); + ret =add_perf_probe_events (params.events, params.nevents, &buf); +/* Even if failed, we should show the result first */ +pr_info ("%s" , buf.buf);if (ret <0 ) {pr_err_with_code (" Error: Failed to add events." , ret);return ret;tools/perf/util/probe-event.c +20
-13@@ -2395,7 +2395,8 @@ static int probe_trace_event__set_name(struct probe_trace_event *tev,static int __add_probe_trace_events (struct perf_probe_event *pev,struct probe_trace_event *tevs, -int ntevs,bool allow_suffix) +int ntevs,bool allow_suffix, +struct strbuf *buf) {int i, fd, ret;struct probe_trace_event *tev =NULL ;@@ -2415,7 +2416,9 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, } ret =0 ; -pr_info ("Added new event%s\n" , (ntevs >1 ) ?"s:" :":" ); +if (buf) +strbuf_addf (buf,"Added new event%s\n" , + (ntevs >1 ) ?"s:" :":" );for (i =0 ; i < ntevs; i++) { tev = &tevs[i];/* Skip if the symbol is out of .text or blacklisted */ @@ -2432,9 +2435,12 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,if (ret <0 )break ; -/* We use tev's name for showing new events */ -show_perf_probe_event (tev->group, tev->event, pev, - tev->point.module, false); +if (buf) { +/* We use tev's name for showing new events */ +perf_probe_event__sprintf (tev->group, tev->event, + pev, tev->point.module, buf); +strbuf_addch (buf,'\n' ); + }/* Save the last valid name */ event = tev->event; group = tev->group;@@ -2451,10 +2457,10 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,warn_uprobe_event_compat (tev);/* Note that it is possible to skip all events because of blacklist */ -if (ret >=0 && event) { +if (ret >=0 && event && buf) {/* Show how to use the event. */ -pr_info ("\nYou can now use it in all perf tools, such as:\n\n" ); -pr_info ("\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); +strbuf_addf (buf,"\nYou can now use it in all perf tools, such as:\n\n" ); +strbuf_addf (buf,"\tperf record -e %s:%s -aR sleep 1\n\n" , group, event); }strlist__delete (namelist);@@ -2765,7 +2771,8 @@ struct __event_package {int ntevs; }; -int add_perf_probe_events (struct perf_probe_event *pevs,int npevs) +int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct strbuf *result) {int i, j, ret;struct __event_package *pkgs;@@ -2802,7 +2809,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs)for (i =0 ; i < npevs; i++) { ret =__add_probe_trace_events (pkgs[i].pev, pkgs[i].tevs, pkgs[i].ntevs, - probe_conf.force_add); + probe_conf.force_add, result);if (ret <0 )break ; }@@ -2819,7 +2826,7 @@ end:return ret; } -int del_perf_probe_events (struct strfilter *filter) +int del_perf_probe_events (struct strfilter *filter,struct strbuf *result) {int ret, ret2, ufd =-1 , kfd =-1 ;char *str =strfilter__string (filter);@@ -2834,11 +2841,11 @@ int del_perf_probe_events(struct strfilter *filter)if (ret <0 ) goto out; - ret =probe_file__del_events (kfd, filter); + ret =probe_file__del_events (kfd, filter, result);if (ret <0 && ret != -ENOENT ) goto error; - ret2 =probe_file__del_events (ufd, filter); + ret2 =probe_file__del_events (ufd, filter, result);if (ret2 <0 && ret2 != -ENOENT ) { ret = ret2; goto error;tools/perf/util/probe-event.h +4
-2@@ -137,8 +137,10 @@ extern void line_range__clear(struct line_range *lr);/* Initialize line range */ extern int line_range__init (struct line_range *lr); -extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs); -extern int del_perf_probe_events (struct strfilter *filter); +extern int add_perf_probe_events (struct perf_probe_event *pevs,int npevs, +struct strbuf *result); +extern int del_perf_probe_events (struct strfilter *filter, +struct strbuf *result);extern int show_perf_probe_events (struct strfilter *filter);extern int show_line_range (struct line_range *lr,const char *module,bool user);tools/perf/util/probe-file.c +3
-2@@ -267,7 +267,6 @@ static int __del_trace_probe_event(int fd, struct str_node *ent) goto error; } -pr_info ("Removed event: %s\n" , ent->s);return 0 ; error: pr_warning("Failed to delete event: %s\n",@@ -275,7 +274,7 @@ error:return ret; } -int probe_file__del_events (int fd,struct strfilter *filter) +int probe_file__del_events (int fd,struct strfilter *filter,struct strbuf *buf) {struct strlist *namelist;struct str_node *ent;@@ -293,6 +292,8 @@ int probe_file__del_events(int fd, struct strfilter *filter) ret =__del_trace_probe_event (fd, ent);if (ret <0 )break ; +if (buf) +strbuf_addf (buf,"Removed event: %s\n" , ent->s); } }strlist__delete (namelist);tools/perf/util/probe-file.h +3
-1@@ -1,6 +1,7 @@#ifndef __PROBE_FILE_H#define __PROBE_FILE_H +#include "strbuf.h" #include "strlist.h" #include "strfilter.h" #include "probe-event.h" @@ -13,6 +14,7 @@ int probe_file__open_both(int *kfd, int *ufd, int flag);struct strlist *probe_file__get_namelist (int fd);struct strlist *probe_file__get_rawlist (int fd);int probe_file__add_event (int fd,struct probe_trace_event *tev); -int probe_file__del_events (int fd,struct strfilter *filter); +int probe_file__del_events (int fd,struct strfilter *filter, +struct strbuf *buf);#endif
PATCH 15/31 perf record: Add clang options for compiling BPF scripts
In reply to Wang NanAlthough previous patch allows setting BPF compiler related options in perfconfig, on some ad-hoc situation it still requires passing options through cmdline. This patch introduces 2 options to 'perf record' for this propose: --clang-path and --clang-opt.
--- tools/perf/builtin-record.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/builtin-record.c +7 -0
@@ -30,6 +30,7 @@#include "util/auxtrace.h" #include "util/parse-branch-options.h" #include "util/bpf-loader.h" +#include "util/llvm-utils.h" #include <unistd.h> #include <sched.h>
@@ -1094,6 +1095,12 @@ struct option __record_options[] = { "per thread proc mmap processing timeout in ms"),OPT_BOOLEAN (0 ,"switch-events" , &record.opts.record_switch_events,"Record context switch events" ), +#ifdef HAVE_LIBBPF_SUPPORT +OPT_STRING (0 ,"clang-path" , &llvm_param.clang_path,"clang path" , +"clang binary to use for compiling BPF scriptlets" ), +OPT_STRING (0 ,"clang-opt" , &llvm_param.clang_opt,"clang options" , +"options passed to clang when compiling BPF scriptlets" ), +#endif OPT_END() };
Signature · 1 line
2.1.0
PATCH 16/31 perf tools: Infrastructure for compiling scriptlets when passing '.c' to --event
In reply to Wang NanThis patch provides infrastructure for passing source files to --event directly using:
# perf record --event bpf-file.c command
This patch does following works:
1) Allow passing '.c' file to '--event'. parse_events_load_bpf() is expanded to allow caller tell it whether the passed file is source file or object.
2) llvm__compile_bpf() is called to compile the '.c' file, the result is saved into memory. Use bpf_object__open_buffer() to load the in-memory object.
Introduces a bpf-script-example.c so we can manually test it:
# perf record --clang-opt "-DLINUX_VERSION_CODE=0x40200" --event ./bpf-script-example.c sleep 1
Note that '--clang-opt' must put before '--event'.
Futher patches will merge it into a testcase so can be tested automatically.
--- tools/perf/tests/bpf-script-example.c | 44 +++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.c | 25 +++++++++++++++----- tools/perf/util/bpf-loader.h | 10 ++++---- tools/perf/util/parse-events.c | 8 +++---- tools/perf/util/parse-events.h | 3 ++- tools/perf/util/parse-events.l | 3 +++ tools/perf/util/parse-events.y | 15 ++++++++++-- 7 files changed, 91 insertions(+), 17 deletions(-) create mode 100644 tools/perf/tests/bpf-script-example.c
tools/perf/tests/bpf-script-example.c new file +44 -0
@@ -0,0 +1,44 @@ +#ifndef LINUX_VERSION_CODE +# error Need LINUX_VERSION_CODE +# error Example: for 4.2 kernel, put 'clang-opt="-DLINUX_VERSION_CODE=0x40200" into llvm section of ~/.perfconfig' +#endif +#define BPF_ANY 0 +#define BPF_MAP_TYPE_ARRAY 2 +#define BPF_FUNC_map_lookup_elem 1 +#define BPF_FUNC_map_update_elem 2 + +static void *(*bpf_map_lookup_elem)(void *map,void *key) = + (void *) BPF_FUNC_map_lookup_elem; +static void *(*bpf_map_update_elem)(void *map,void *key,void *value,int flags) = + (void *) BPF_FUNC_map_update_elem; + +struct bpf_map_def { +unsigned int type; +unsigned int key_size; +unsigned int value_size; +unsigned int max_entries; +}; + +#define SEC (NAME ) __attribute__((section(NAME), used)) +struct bpf_map_def SEC("maps") flip_table = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(int), + .value_size = sizeof(int), + .max_entries = 1, +}; + +SEC("func=sys_epoll_pwait") +int bpf_func__sys_epoll_pwait (void *ctx) +{ +int ind =0 ; +int *flag =bpf_map_lookup_elem (&flip_table, &ind); +int new_flag; +if (!flag) +return 0 ; +/* flip flag and store back */ + new_flag = !*flag; +bpf_map_update_elem (&flip_table, &ind, &new_flag,BPF_ANY ); +return new_flag; +} +char _license[] SEC("license") = "GPL"; +int _version SEC("version") = LINUX_VERSION_CODE;
tools/perf/util/bpf-loader.c +19 -6
@@ -11,6 +11,7 @@#include "bpf-loader.h" #include "probe-event.h" #include "probe-finder.h" +#include "llvm-utils.h" #define DEFINE_PRINT_FN (name, level) \ static int libbpf_##name(const char *fmt, ...) \
@@ -152,16 +153,28 @@ sync_bpf_program_pev(struct bpf_program *prog)return 0 ; } -int bpf__prepare_load (const char *filename) +int bpf__prepare_load (const char *filename,bool source) {struct bpf_object *obj; +int err;if (!libbpf_initialized)libbpf_set_print (libbpf_warning, libbpf_info, libbpf_debug); - obj =bpf_object__open (filename); +if (source) { +void *obj_buf; +size_t obj_buf_sz; + + err =llvm__compile_bpf (filename, &obj_buf, &obj_buf_sz); +if (err) +return err; + obj =bpf_object__open_buffer (obj_buf, obj_buf_sz, filename); +free (obj_buf); + }else + obj =bpf_object__open (filename); +if (!obj) {pr_debug ("bpf: failed to load %s\n" , filename);return -EINVAL ;
@@ -361,12 +374,12 @@ int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg) }\ buf[size -1 ] ='\0' ; -int bpf__strerror_prepare_load (const char *filename,int err, -char *buf,size_t size) +int bpf__strerror_prepare_load (const char *filename,bool source, +int err,char *buf,size_t size) {bpf__strerror_head (err, buf, size); -bpf__strerror_entry (EINVAL ,"%s: BPF object file '%s' is invalid" , - emsg, filename) +bpf__strerror_entry (EINVAL ,"%s: BPF %s file '%s' is invalid" , + emsg, source ?"source" :"object" , filename);bpf__strerror_end (buf, size);return 0 ; }
tools/perf/util/bpf-loader.h +6 -4
@@ -18,9 +18,9 @@ typedef int (*bpf_prog_iter_callback_t)(struct probe_trace_event *tev, int fd, void *arg);#ifdef HAVE_LIBBPF_SUPPORT -int bpf__prepare_load (const char *filename); -int bpf__strerror_prepare_load (const char *filename,int err, -char *buf,size_t size); +int bpf__prepare_load (const char *filename,bool source); +int bpf__strerror_prepare_load (const char *filename,bool source, +int err,char *buf,size_t size);int bpf__probe (void );int bpf__unprobe (void );int bpf__strerror_probe (int err,char *buf,size_t size);
@@ -32,7 +32,8 @@ void bpf__clear(void);int bpf__foreach_tev (bpf_prog_iter_callback_t func,void *arg);#else -static inline int bpf__prepare_load (const char *filename__maybe_unused ) +static inline int bpf__prepare_load (const char *filename__maybe_unused , +bool source__maybe_unused ) {pr_debug ("ERROR: eBPF object loading is disabled during compiling.\n" );return -1 ;
@@ -64,6 +65,7 @@ __bpf_strerror(char *buf, size_t size)static inline int bpf__strerror_prepare_load (const char *filename__maybe_unused , +bool source__maybe_unused ,int err__maybe_unused ,char *buf,size_t size) {
tools/perf/util/parse-events.c +4 -4
@@ -483,8 +483,8 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx, }int parse_events_load_bpf (struct parse_events_evlist *data, -struct list_head *list, -char *bpf_file_name) +struct list_head *list__maybe_unused , +char *bpf_file_name,bool source) {int err;char errbuf[BUFSIZ ];
@@ -500,9 +500,9 @@ int parse_events_load_bpf(struct parse_events_evlist *data,* problem. After that probe events file by file is possible. * However, probing cost is still need to be considered. */ - err =bpf__prepare_load (bpf_file_name); + err =bpf__prepare_load (bpf_file_name, source);if (err) { -bpf__strerror_prepare_load (bpf_file_name, err, +bpf__strerror_prepare_load (bpf_file_name, source, err, errbuf,sizeof (errbuf)); data->error->str =strdup (errbuf); data->error->help =strdup ("(add -v to see detail)" );
tools/perf/util/parse-events.h +2 -1
@@ -121,7 +121,8 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx, char *sys, char *event);int parse_events_load_bpf (struct parse_events_evlist *data,struct list_head *list, -char *bpf_file_name); +char *bpf_file_name, +bool source); int parse_events_add_numeric(struct parse_events_evlist *data, struct list_head *list, u32 type, u64 config,
tools/perf/util/parse-events.l +3 -0
@@ -116,6 +116,7 @@ group [^,{}/]*[{][^}]*[}][^,{}/]* event_pmu [^,{}/]+[/][^/]*[/][^,{}/]* event [^,{}/]+ bpf_object .*\.(o|bpf) +bpf_source .*\.c num_dec [0-9]+ num_hex 0x[a-fA-F0-9]+
@@ -161,6 +162,7 @@ modifier_bp [rwx]{1,3} {event_pmu} | {bpf_object} | +{bpf_source} | {event} { BEGIN(INITIAL); REWIND(1);
@@ -267,6 +269,7 @@ r{num_raw_hex} { return raw(yyscanner); } {modifier_event} { return str(yyscanner, PE_MODIFIER_EVENT); } {bpf_object} { return str(yyscanner, PE_BPF_OBJECT); } +{bpf_source} { return str(yyscanner, PE_BPF_SOURCE); } {name} { return pmu_str_check(yyscanner); } "/" { BEGIN(config); return '/'; } - { return '-'; }
tools/perf/util/parse-events.y +13 -2
@@ -42,7 +42,7 @@ static inc_group_count(struct list_head *list, %token PE_VALUE PE_VALUE_SYM_HW PE_VALUE_SYM_SW PE_RAW PE_TERM %token PE_EVENT_NAME %token PE_NAME -%token PE_BPF_OBJECT +%token PE_BPF_OBJECT PE_BPF_SOURCE %token PE_MODIFIER_EVENT PE_MODIFIER_BP %token PE_NAME_CACHE_TYPE PE_NAME_CACHE_OP_RESULT %token PE_PREFIX_MEM PE_PREFIX_RAW PE_PREFIX_GROUP
@@ -55,6 +55,7 @@ static inc_group_count(struct list_head *list, %type <num> PE_TERM %type <str> PE_NAME %type <str> PE_BPF_OBJECT +%type <str> PE_BPF_SOURCE %type <str> PE_NAME_CACHE_TYPE %type <str> PE_NAME_CACHE_OP_RESULT %type <str> PE_MODIFIER_EVENT
@@ -431,7 +432,17 @@ PE_BPF_OBJECT struct list_head *list; ALLOC_LIST(list); - ABORT_ON(parse_events_load_bpf(data, list, $1)); + ABORT_ON(parse_events_load_bpf(data, list, $1, false)); + $$ = list; +} +| +PE_BPF_SOURCE +{ + struct parse_events_evlist *data = _data; + struct list_head *list; + + ALLOC_LIST(list); + ABORT_ON(parse_events_load_bpf(data, list, $1, true)); $$ = list; }
Signature · 1 line
2.1.0
PATCH 17/31 perf tests: Enforce LLVM test for BPF test
In reply to Wang NanThis patch replaces the original toy BPF program with previous introduced bpf-script-example.c. Dynamically embedded it into 'llvm-src.c'.
The newly introduced BPF program attaches a BPF program at 'sys_epoll_pwait()', and collect half samples from it. perf itself never use that syscall, so further test can verify their result with it.
Since BPF program require LINUX_VERSION_CODE of runtime kernel, this patch computes that code from uname.
Since the resuling BPF object is useful for further testcases, this patch introduces 'prepare' and 'cleanup' method to tests, and makes test__llvm() create a MAP_SHARED memory array to hold the resulting object.
--- tools/perf/tests/Build | 9 +++- tools/perf/tests/builtin-test.c | 8 ++++ tools/perf/tests/llvm.c | 104 +++++++++++++++++++++++++++++++++++----- tools/perf/tests/llvm.h | 14 ++++++ tools/perf/tests/tests.h | 2 + 5 files changed, 123 insertions(+), 14 deletions(-) create mode 100644 tools/perf/tests/llvm.h
tools/perf/tests/Build +8 -1
@@ -32,7 +32,14 @@ perf-y += sample-parsing.o perf-y += parse-no-sample-id-all.o perf-y += kmod-path.o perf-y += thread-map.o -perf-y += llvm.o +perf-y += llvm.o llvm-src.o + +$(OUTPUT)tests/llvm-src.c: tests/bpf-script-example.c + $(Q)echo '#include <tests/llvm.h>' > $@ + $(Q)echo 'const char test_llvm__bpf_prog[] =' >> $@ + $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ + $(Q)echo ';' >> $@ + perf-$(CONFIG_X86) += perf-time-to-tsc.o
tools/perf/tests/builtin-test.c +8 -0
@@ -17,6 +17,8 @@static struct test {const char *desc;int (*func)(void ); +void (*prepare)(void ); +void (*cleanup)(void ); } tests[] = { { .desc ="vmlinux symtab matches kallsyms" ,
@@ -177,6 +179,8 @@ static struct test { { .desc = "Test LLVM searching and compiling", .func = test__llvm, + .prepare = test__llvm_prepare, + .cleanup = test__llvm_cleanup, }, { .func = NULL,
@@ -265,7 +269,11 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) }pr_debug ("\n--- start ---\n" ); +if (tests[curr].prepare) + tests[curr].prepare (); err =run_test (&tests[curr]); +if (tests[curr].cleanup) + tests[curr].cleanup ();pr_debug ("---- end ----\n%s:" , tests[curr].desc);switch (err) {
tools/perf/tests/llvm.c +91 -13
144 lines not on this page · raw message
tools/perf/tests/llvm.h new file +14 -0
@@ -0,0 +1,14 @@ +#ifndef PERF_TEST_LLVM_H +#define PERF_TEST_LLVM_H + +#include <stddef.h> /* for size_t */ + +struct test_llvm__bpf_result { +size_t size; +char object[]; +}; + +extern struct test_llvm__bpf_result *p_test_llvm__bpf_result; +extern const char test_llvm__bpf_prog[]; + +#endif
tools/perf/tests/tests.h +2 -0
@@ -63,6 +63,8 @@ int test__fdarray__add(void);int test__kmod_path__parse (void );int test__thread_map (void );int test__llvm (void ); +void test__llvm_prepare (void ); +void test__llvm_cleanup (void );#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)#ifdef HAVE_DWARF_UNWIND_SUPPORT
Signature · 1 line
2.1.0
Re: [PATCH 17/31] perf tests: Enforce LLVM test for BPF test
tools/perf/tests/Build perf-y += sample-parsing.o · line 37
Quoted 12 lines · Wang Nan
tools/perf/tests/Build +3
-1@@ -32,7 +32,14 @@ perf-y += sample-parsing.o perf-y += parse-no-sample-id-all.o perf-y += kmod-path.o perf-y += thread-map.o -perf-y += llvm.o +perf-y += llvm.o llvm-src.o + +$(OUTPUT)tests/llvm-src.c: tests/bpf-script-example.c
This rule requires a $(call rule_mkdir). Will be fixed in next pull request.
Quoted 9 lines
tools/perf/tests/Build +5
-0+ $(Q)echo '#include <tests/llvm.h>' > $@ + $(Q)echo 'const char test_llvm__bpf_prog[] =' >> $@ + $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ + $(Q)echo ';' >> $@ + perf-$(CONFIG_X86) += perf-time-to-tsc.o
PATCH 18/31 perf test: Add 'perf test BPF'
In reply to Wang NanThis patch adds BPF testcase for testing BPF event filtering.
By utilizing the result of 'perf test LLVM', this patch compiles the eBPF sample program then test it ability. The BPF script in 'perf test LLVM' collects half of execution of epoll_pwait(). This patch runs 111 times of it, so the resule should contains 56 samples.
--- tools/perf/tests/Build | 1 + tools/perf/tests/bpf.c | 170 ++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/builtin-test.c | 4 + tools/perf/tests/llvm.c | 19 +++++ tools/perf/tests/llvm.h | 1 + tools/perf/tests/tests.h | 1 + tools/perf/util/bpf-loader.c | 14 ++++ tools/perf/util/bpf-loader.h | 8 ++ 8 files changed, 218 insertions(+) create mode 100644 tools/perf/tests/bpf.c
tools/perf/tests/Build +1 -0
@@ -33,6 +33,7 @@ perf-y += parse-no-sample-id-all.o perf-y += kmod-path.o perf-y += thread-map.o perf-y += llvm.o llvm-src.o +perf-y += bpf.o $(OUTPUT)tests/llvm-src.c: tests/bpf-script-example.c $(Q)echo '#include <tests/llvm.h>' > $@
tools/perf/tests/bpf.c new file +170 -0
170 lines not on this page · raw message
tools/perf/tests/builtin-test.c +4 -0
@@ -183,6 +183,10 @@ static struct test { .cleanup = test__llvm_cleanup, }, { + .desc = "Test BPF filter", + .func = test__bpf, + }, + { .func = NULL, }, };
tools/perf/tests/llvm.c +19 -0
@@ -174,3 +174,22 @@ void test__llvm_cleanup(void) (~((unsigned long )page_size -1 ));munmap ((void *)boundary, buf_end - boundary); } + +void +test_llvm__fetch_bpf_obj (void **p_obj_buf,size_t *p_obj_buf_sz) +{ + *p_obj_buf =NULL ; + *p_obj_buf_sz =0 ; + +if (!p_test_llvm__bpf_result) { +test__llvm_prepare (); +test__llvm (); +test__llvm_cleanup (); + } + +if (!p_test_llvm__bpf_result) +return ; + + *p_obj_buf = p_test_llvm__bpf_result->object; + *p_obj_buf_sz = p_test_llvm__bpf_result->size; +}
tools/perf/tests/llvm.h +1 -0
@@ -10,5 +10,6 @@ struct test_llvm__bpf_result {extern struct test_llvm__bpf_result *p_test_llvm__bpf_result;extern const char test_llvm__bpf_prog[]; +void test_llvm__fetch_bpf_obj (void **p_obj_buf,size_t *p_obj_buf_sz);#endif
tools/perf/tests/tests.h +1 -0
@@ -65,6 +65,7 @@ int test__thread_map(void);int test__llvm (void );void test__llvm_prepare (void );void test__llvm_cleanup (void ); +int test__bpf (void );#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)#ifdef HAVE_DWARF_UNWIND_SUPPORT
tools/perf/util/bpf-loader.c +14 -0
@@ -153,6 +153,20 @@ sync_bpf_program_pev(struct bpf_program *prog)return 0 ; } +int bpf__prepare_load_buffer (void *obj_buf,size_t obj_buf_sz, +const char *name) +{ +struct bpf_object *obj; + + obj =bpf_object__open_buffer (obj_buf, obj_buf_sz, name); +if (!obj) { +pr_debug ("bpf: failed to load buffer\n" ); +return -EINVAL ; + } + +return 0 ; +} +int bpf__prepare_load (const char *filename,bool source) {struct bpf_object *obj;
tools/perf/util/bpf-loader.h +8 -0
@@ -19,6 +19,8 @@ typedef int (*bpf_prog_iter_callback_t)(struct probe_trace_event *tev,#ifdef HAVE_LIBBPF_SUPPORT int bpf__prepare_load (const char *filename,bool source); +int bpf__prepare_load_buffer (void *obj_buf,size_t obj_buf_sz, +const char *name);int bpf__strerror_prepare_load (const char *filename,bool source,int err,char *buf,size_t size);int bpf__probe (void );
@@ -39,6 +41,12 @@ static inline int bpf__prepare_load(const char *filename __maybe_unused,return -1 ; } +static inline int bpf__prepare_load_buffer (void *obj_buf__maybe_unused , +size_t obj_buf_sz__maybe_unused ) +{ +return bpf__prepare_load (NULL , false); +} +static inline int bpf__probe (void ) {return 0 ; }static inline int bpf__unprobe (void ) {return 0 ; }static inline int bpf__load (void ) {return 0 ; }
Signature · 1 line
2.1.0
Namhyung Kim
maintainerRe: [PATCH 18/31] perf test: Add 'perf test BPF'
Quoted 23 lines · Wang Nan
This patch adds BPF testcase for testing BPF event filtering.
By utilizing the result of 'perf test LLVM', this patch compiles the eBPF sample program then test it ability. The BPF script in 'perf test LLVM' collects half of execution of
epoll_pwait(). This patch runs 111 times of it, so the resule should contains 56 samples.Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>---
[SNIP]
Quoted 8 lines
tools/perf/tests/bpf.c new file +8
-0+static int prepare_bpf (void *obj_buf,size_t obj_buf_sz) +{ +int err; +char errbuf[BUFSIZ ]; + + err =bpf__prepare_load_buffer (obj_buf, obj_buf_sz,NULL ); +if (err) { + bpf__strerror_prepare_load("[buffer]", false, err, errbuf,
tools/perf/tests/bpf.c line 39
Quoted 10 lines
tools/perf/tests/bpf.c new file +10
-0+ sizeof(errbuf)); +fprintf (stderr," (%s)" , errbuf); +return TEST_FAIL ; + } + + err =bpf__probe (); +if (err) { +bpf__strerror_load (err, errbuf,sizeof (errbuf)); +fprintf (stderr," (%s)" , errbuf); +if (getuid () !=0 )
geteuid() ?
Thanks,
Namhyung
Quoted 13 lines
tools/perf/tests/bpf.c new file +13
-0+fprintf (stderr," (try run as root)" ); +return TEST_FAIL ; + } + + err =bpf__load (); +if (err) { +bpf__strerror_load (err, errbuf,sizeof (errbuf)); +fprintf (stderr," (%s)" , errbuf); +return TEST_FAIL ; + } + +return 0 ; +}
Re: [PATCH 18/31] perf test: Add 'perf test BPF'
Quoted 48 lines · Namhyung Kim
Quoted 23 lines · Wang Nan
This patch adds BPF testcase for testing BPF event filtering.
By utilizing the result of 'perf test LLVM', this patch compiles the eBPF sample program then test it ability. The BPF script in 'perf test LLVM' collects half of execution of
epoll_pwait(). This patch runs 111 times of it, so the resule should contains 56 samples.Signed-off-by Wang Nan <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>---
[SNIP]
Quoted 8 lines
tools/perf/tests/bpf.c new file +8
-0+static int prepare_bpf (void *obj_buf,size_t obj_buf_sz) +{ +int err; +char errbuf[BUFSIZ ]; + + err =bpf__prepare_load_buffer (obj_buf, obj_buf_sz,NULL ); +if (err) { + bpf__strerror_prepare_load("[buffer]", false, err, errbuf,tools/perf/tests/bpf.c line 39
Quoted 10 lines
tools/perf/tests/bpf.c new file +10
-0+ sizeof(errbuf)); +fprintf (stderr," (%s)" , errbuf); +return TEST_FAIL ; + } + + err =bpf__probe (); +if (err) { +bpf__strerror_load (err, errbuf,sizeof (errbuf)); +fprintf (stderr," (%s)" , errbuf); +if (getuid () !=0 )
geteuid()?
Quoted 3 lines
Thanks,
Namhyung
Already changed.
Thank you.
Quoted 14 lines
Quoted 14 lines
tools/perf/tests/bpf.c new file +13
-0+fprintf (stderr," (try run as root)" ); +return TEST_FAIL ; + } + + err =bpf__load (); +if (err) { +bpf__strerror_load (err, errbuf,sizeof (errbuf)); +fprintf (stderr," (%s)" , errbuf); +return TEST_FAIL ; + } + +return 0 ; +}
PATCH 19/31 bpf tools: Load a program with different instances using preprocessor
In reply to Wang NanIn this patch, caller of libbpf is able to control the loaded programs by installing a preprocessor callback for a BPF program. With preprocessor, different instances can be created from one BPF program.
This patch will be used by perf to generate different prologue for different 'struct probe_trace_event' instances matched by one 'struct perf_probe_event'.
bpf_program__set_prep() is added to support this feature. Caller should pass libbpf the number of instances should be created and a preprocessor function which will be called when doing real loading. The callback should return instructions arrays for each instances.
fd field in bpf_programs is replaced by instance, which has an nr field and fds array. bpf_program__nth_fd() is introduced for read fd of instances. Old interface bpf_program__fd() is reimplemented by returning the first fd.
[wangnan: Add missing '!',
allows bpf_program__unload() when prog->instance.nr == -1 ] --- tools/lib/bpf/libbpf.c | 143 +++++++++++++++++++++++++++++++++++++++++++++---- tools/lib/bpf/libbpf.h | 22 ++++++++ 2 files changed, 156 insertions(+), 9 deletions(-)
tools/lib/bpf/libbpf.c +134 -9
@@ -98,7 +98,11 @@ struct bpf_program { } *reloc_desc;int nr_reloc; -int fd; +struct { +int nr; +int *fds; + } instance; +bpf_program_prep_t preprocessor;struct bpf_object *obj;void *priv;
@@ -152,10 +156,24 @@ struct bpf_object {static void bpf_program__unload (struct bpf_program *prog) { +int i; +if (!prog)return ; -zclose (prog->fd); +/* +* If the object is opened but the program is never loaded, +* it is possible that prog->instance.nr == -1. +*/ +if (prog->instance.nr >0 ) { +for (i =0 ; i < prog->instance.nr; i++) +zclose (prog->instance.fds[i]); + }else if (prog->instance.nr !=-1 ) +pr_warning ("Internal error: instance.nr is %d\n" , + prog->instance.nr); + + prog->instance.nr =-1 ; +zfree (&prog->instance.fds); }static void bpf_program__exit (struct bpf_program *prog)
@@ -206,7 +224,8 @@ bpf_program__init(void *data, size_t size, char *name, int idx,memcpy (prog->insns, data, prog->insns_cnt *sizeof (struct bpf_insn )); prog->idx = idx; - prog->fd =-1 ; + prog->instance.fds =NULL ; + prog->instance.nr =-1 ;return 0 ; errout:
@@ -795,13 +814,71 @@ static int bpf_program__load(struct bpf_program *prog, char *license, u32 kern_version) { - int err, fd; + int err = 0, fd, i; + +if (prog->instance.nr <0 || !prog->instance.fds) { +if (prog->preprocessor) { +pr_warning ("Internal error: can't load program '%s'\n" , + prog->section_name); +return -EINVAL ; + } + + prog->instance.fds =malloc (sizeof (int )); +if (!prog->instance.fds) { +pr_warning ("No enough memory for fds\n" ); +return -ENOMEM ; + } + prog->instance.nr =1 ; + prog->instance.fds[0 ] =-1 ; + } + +if (!prog->preprocessor) { +if (prog->instance.nr !=1 ) +pr_warning ("Program '%s' inconsistent: nr(%d) not 1\n" , + prog->section_name, prog->instance.nr); - err =load_program (prog->insns, prog->insns_cnt, - license, kern_version, &fd); -if (!err) - prog->fd = fd; + err =load_program (prog->insns, prog->insns_cnt, + license, kern_version, &fd); +if (!err) + prog->instance.fds[0 ] = fd; + goto out; + } + +for (i =0 ; i < prog->instance.nr; i++) { +struct bpf_prog_prep_result result; +bpf_program_prep_t preprocessor = prog->preprocessor; + +bzero (&result,sizeof (result)); + err =preprocessor (prog, i, prog->insns, + prog->insns_cnt, &result); +if (err) { +pr_warning ("Preprocessing %dth instance of program '%s' failed\n" , + i, prog->section_name); + goto out; + } + +if (!result.new_insn_ptr || !result.new_insn_cnt) { +pr_debug ("Skip loading %dth instance of program '%s'\n" , + i, prog->section_name); + prog->instance.fds[i] =-1 ; +continue ; + } + + err =load_program (result.new_insn_ptr, + result.new_insn_cnt, + license, kern_version, &fd); + +if (err) { +pr_warning ("Loading %dth instance of program '%s' failed\n" , + i, prog->section_name); + goto out; + } +if (result.pfd) + *result.pfd = fd; + prog->instance.fds[i] = fd; + } +out:if (err)pr_warning ("failed to load program '%s'\n" , prog->section_name);
@@ -1052,5 +1129,53 @@ const char *bpf_program__title(struct bpf_program *prog, bool dup)int bpf_program__fd (struct bpf_program *prog) { -return prog->fd; +return bpf_program__nth_fd (prog,0 ); +} + +int bpf_program__set_prep (struct bpf_program *prog,int nr_instance, +bpf_program_prep_t prep) +{ +int *instance_fds; + +if (nr_instance <=0 || !prep) +return -EINVAL ; + +if (prog->instance.nr >0 || prog->instance.fds) { +pr_warning ("Can't set pre-processor after loading\n" ); +return -EINVAL ; + } + + instance_fds =malloc (sizeof (int ) * nr_instance); +if (!instance_fds) { +pr_warning ("alloc memory failed for instance of fds\n" ); +return -ENOMEM ; + } + +/* fill all fd with -1 */ +memset (instance_fds,0xff ,sizeof (int ) * nr_instance); + + prog->instance.nr = nr_instance; + prog->instance.fds = instance_fds; + prog->preprocessor = prep; +return 0 ; +} + +int bpf_program__nth_fd (struct bpf_program *prog,int n) +{ +int fd; + +if (n >= prog->instance.nr || n <0 ) { +pr_warning ("Can't get the %dth fd from program %s: only %d instances\n" , + n, prog->section_name, prog->instance.nr); +return -EINVAL ; + } + + fd = prog->instance.fds[n]; +if (fd <0 ) { +pr_warning ("%dth instance of program '%s' is invalid\n" , + n, prog->section_name); +return -ENOENT ; + } + +return fd; }
tools/lib/bpf/libbpf.h +22 -0
@@ -67,6 +67,28 @@ const char *bpf_program__title(struct bpf_program *prog, bool dup);int bpf_program__fd (struct bpf_program *prog); +struct bpf_insn ; +struct bpf_prog_prep_result { +/* +* If not NULL, load new instruction array. +* If set to NULL, don't load this instance. +*/ +struct bpf_insn *new_insn_ptr; +int new_insn_cnt; + +/* If not NULL, result fd is set to it */ +int *pfd; +}; + +typedef int (*bpf_program_prep_t )(struct bpf_program *,int n, +struct bpf_insn *,int insn_cnt, +struct bpf_prog_prep_result *res); + +int bpf_program__set_prep (struct bpf_program *prog,int nr_instance, +bpf_program_prep_t prep); + +int bpf_program__nth_fd (struct bpf_program *prog,int n); +/* * We don't need __attribute__((packed)) now since it is * unnecessary for 'bpf_map_def' because they are all aligned.
Signature · 1 line
2.1.0
PATCH 20/31 perf probe: Reset args and nargs for probe_trace_event when failure
In reply to Wang NanWhen failure occures in add_probe_trace_event(), args in probe_trace_event is incomplete. Since information in it may be used in further, this patch frees the allocated memory and set it to NULL to avoid dangling pointer.
--- tools/perf/util/probe-finder.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/perf/util/probe-finder.c +4 -0
@@ -1228,6 +1228,10 @@ static int add_probe_trace_event(Dwarf_Die *sc_die, struct probe_finder *pf) end:free (args); +if (ret) { + tev->nargs =0 ; +zfree (&tev->args); + }return ret; }
Signature · 1 line
2.1.0
PATCH 21/31 perf tools: Move linux/filter.h to tools/include
In reply to Wang NanFrom: He Kuang <[email protected]>
This patch moves filter.h from include/linux/kernel.h to tools/include/linux/filter.h to enable other libraries use macros in it, like libbpf which will be introduced by further patches. Currenty, the moved filter.h only contains the useful macros needed by libbpf for not introducing too much dependence.
MANIFEST is also updated for 'make perf-*-src-pkg'.
One change:
imm field of BPF_EMIT_CALL becomes ((FUNC) - BPF_FUNC_unspec) to suit user space code generator.
--- tools/include/linux/filter.h | 237 +++++++++++++++++++++++++++++++++++++++++++ tools/perf/MANIFEST | 1 + 2 files changed, 238 insertions(+) create mode 100644 tools/include/linux/filter.h
tools/include/linux/filter.h new file +237 -0
@@ -0,0 +1,237 @@ +/* +* Linux Socket Filter Data Structures +*/ +#ifndef __TOOLS_LINUX_FILTER_H +#define __TOOLS_LINUX_FILTER_H + +#include <linux/bpf.h> + +/* ArgX, context and stack frame pointer register positions. Note, +* Arg1, Arg2, Arg3, etc are used as argument mappings of function +* calls in BPF_CALL instruction. +*/ +#define BPF_REG_ARG1 BPF_REG_1 +#define BPF_REG_ARG2 BPF_REG_2 +#define BPF_REG_ARG3 BPF_REG_3 +#define BPF_REG_ARG4 BPF_REG_4 +#define BPF_REG_ARG5 BPF_REG_5 +#define BPF_REG_CTX BPF_REG_6 +#define BPF_REG_FP BPF_REG_10 + +/* Additional register mappings for converted user programs. */ +#define BPF_REG_A BPF_REG_0 +#define BPF_REG_X BPF_REG_7 +#define BPF_REG_TMP BPF_REG_8 + +/* BPF program can access up to 512 bytes of stack space. */ +#define MAX_BPF_STACK 512 + +/* Helper macros for filter block array initializers. */ + +/* ALU ops on registers, bpf_add|sub|...: dst_reg += src_reg */ + +#define BPF_ALU64_REG (OP ,DST ,SRC ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_OP(OP) | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = 0 }) + +#define BPF_ALU32_REG (OP ,DST ,SRC ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_OP(OP) | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = 0 }) + +/* ALU ops on immediates, bpf_add|sub|...: dst_reg += imm32 */ + +#define BPF_ALU64_IMM (OP ,DST ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_OP(OP) | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = IMM }) + +#define BPF_ALU32_IMM (OP ,DST ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_OP(OP) | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = IMM }) + +/* Endianness conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */ + +#define BPF_ENDIAN (TYPE ,DST ,LEN ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_END | BPF_SRC(TYPE), \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = LEN }) + +/* Short form of mov, dst_reg = src_reg */ + +#define BPF_MOV64_REG (DST ,SRC ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_MOV | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = 0 }) + +#define BPF_MOV32_REG (DST ,SRC ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_MOV | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = 0 }) + +/* Short form of mov, dst_reg = imm32 */ + +#define BPF_MOV64_IMM (DST ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_MOV | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = IMM }) + +#define BPF_MOV32_IMM (DST ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_MOV | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = IMM }) + +/* Short form of mov based on type, +* BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 +*/ + +#define BPF_MOV64_RAW (TYPE ,DST ,SRC ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_MOV | BPF_SRC(TYPE), \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = IMM }) + +#define BPF_MOV32_RAW (TYPE ,DST ,SRC ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_MOV | BPF_SRC(TYPE), \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = IMM }) + +/* Direct packet access, R0 = *(uint *) (skb->data + imm32) */ + +#define BPF_LD_ABS (SIZE ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_LD | BPF_SIZE(SIZE) | BPF_ABS, \ + .dst_reg = 0, \ + .src_reg = 0, \ + .off = 0, \ + .imm = IMM }) + +/* Indirect packet access, R0 = *(uint *) (skb->data + src_reg + imm32) */ + +#define BPF_LD_IND (SIZE ,SRC ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_LD | BPF_SIZE(SIZE) | BPF_IND, \ + .dst_reg = 0, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = IMM }) + +/* Memory load, dst_reg = *(uint *) (src_reg + off16) */ + +#define BPF_LDX_MEM (SIZE ,DST ,SRC ,OFF ) \ + ((struct bpf_insn) { \ + .code = BPF_LDX | BPF_SIZE(SIZE) | BPF_MEM, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = OFF, \ + .imm = 0 }) + +/* Memory store, *(uint *) (dst_reg + off16) = src_reg */ + +#define BPF_STX_MEM (SIZE ,DST ,SRC ,OFF ) \ + ((struct bpf_insn) { \ + .code = BPF_STX | BPF_SIZE(SIZE) | BPF_MEM, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = OFF, \ + .imm = 0 }) + +/* Memory store, *(uint *) (dst_reg + off16) = imm32 */ + +#define BPF_ST_MEM (SIZE ,DST ,OFF ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ST | BPF_SIZE(SIZE) | BPF_MEM, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = OFF, \ + .imm = IMM }) + +/* Conditional jumps against registers, +* if (dst_reg 'op' src_reg) goto pc + off16 +*/ + +#define BPF_JMP_REG (OP ,DST ,SRC ,OFF ) \ + ((struct bpf_insn) { \ + .code = BPF_JMP | BPF_OP(OP) | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = OFF, \ + .imm = 0 }) + +/* Conditional jumps against immediates, +* if (dst_reg 'op' imm32) goto pc + off16 +*/ + +#define BPF_JMP_IMM (OP ,DST ,IMM ,OFF ) \ + ((struct bpf_insn) { \ + .code = BPF_JMP | BPF_OP(OP) | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = OFF, \ + .imm = IMM }) + +/* Function call */ + +#define BPF_EMIT_CALL (FUNC ) \ + ((struct bpf_insn) { \ + .code = BPF_JMP | BPF_CALL, \ + .dst_reg = 0, \ + .src_reg = 0, \ + .off = 0, \ + .imm = ((FUNC) - BPF_FUNC_unspec) }) + +/* Raw code statement block */ + +#define BPF_RAW_INSN (CODE ,DST ,SRC ,OFF ,IMM ) \ + ((struct bpf_insn) { \ + .code = CODE, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = OFF, \ + .imm = IMM }) + +/* Program exit */ + +#define BPF_EXIT_INSN () \ + ((struct bpf_insn) { \ + .code = BPF_JMP | BPF_EXIT, \ + .dst_reg = 0, \ + .src_reg = 0, \ + .off = 0, \ + .imm = 0 }) + +#endif /* __TOOLS_LINUX_FILTER_H */
tools/perf/MANIFEST +1 -0
@@ -42,6 +42,7 @@ tools/include/asm-generic/bitops.h tools/include/linux/atomic.h tools/include/linux/bitops.h tools/include/linux/compiler.h +tools/include/linux/filter.h tools/include/linux/hash.h tools/include/linux/kernel.h tools/include/linux/list.h
Signature · 1 line
2.1.0
Re: [PATCH 21/31] perf tools: Move linux/filter.h to tools/include
Em Sat, Aug 29, 2015 at 04:21:55AM +0000, Wang Nan escreveu:
Quoted 3 lines
From: He Kuang <[email protected]>
This patch moves
filter.hfrominclude/linux/kernel.hto
Does this really _move_ a file from include/linux/kernel.h to some other place? Isn't there any other users for such file in the kernel sources? :-)
Looking at the patch I see that it doesn't move anything, it _copies_ the file, right?
- Arnaldo
Quoted 291 lines
tools/include/linux/filter.hto enable other libraries use macros in it, like libbpf which will be introduced by further patches. Currenty, the movedfilter.honly contains the useful macros needed by libbpf for not introducing too much dependence.MANIFEST is also updated for 'make perf-*-src-pkg'.
One change:
imm field ofBPF_EMIT_CALLbecomes ((FUNC) -BPF_FUNC_unspec) to suit user space code generator.Signed-off-by He Kuang <[email protected]>Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/include/linux/filter.h | 237 +++++++++++++++++++++++++++++++++++++++++++ tools/perf/MANIFEST | 1 + 2 files changed, 238 insertions(+) create mode 100644 tools/include/linux/filter.htools/include/linux/filter.h new file +237
-0@@ -0,0 +1,237 @@ +/* +* Linux Socket Filter Data Structures +*/ +#ifndef __TOOLS_LINUX_FILTER_H +#define __TOOLS_LINUX_FILTER_H + +#include <linux/bpf.h> + +/* ArgX, context and stack frame pointer register positions. Note, +* Arg1, Arg2, Arg3, etc are used as argument mappings of function +* calls in BPF_CALL instruction. +*/ +#define BPF_REG_ARG1 BPF_REG_1 +#define BPF_REG_ARG2 BPF_REG_2 +#define BPF_REG_ARG3 BPF_REG_3 +#define BPF_REG_ARG4 BPF_REG_4 +#define BPF_REG_ARG5 BPF_REG_5 +#define BPF_REG_CTX BPF_REG_6 +#define BPF_REG_FP BPF_REG_10 + +/* Additional register mappings for converted user programs. */ +#define BPF_REG_A BPF_REG_0 +#define BPF_REG_X BPF_REG_7 +#define BPF_REG_TMP BPF_REG_8 + +/* BPF program can access up to 512 bytes of stack space. */ +#define MAX_BPF_STACK 512 + +/* Helper macros for filter block array initializers. */ + +/* ALU ops on registers, bpf_add|sub|...: dst_reg += src_reg */ + +#define BPF_ALU64_REG (OP ,DST ,SRC ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_OP(OP) | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = 0 }) + +#define BPF_ALU32_REG (OP ,DST ,SRC ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_OP(OP) | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = 0 }) + +/* ALU ops on immediates, bpf_add|sub|...: dst_reg += imm32 */ + +#define BPF_ALU64_IMM (OP ,DST ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_OP(OP) | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = IMM }) + +#define BPF_ALU32_IMM (OP ,DST ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_OP(OP) | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = IMM }) + +/* Endianness conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */ + +#define BPF_ENDIAN (TYPE ,DST ,LEN ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_END | BPF_SRC(TYPE), \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = LEN }) + +/* Short form of mov, dst_reg = src_reg */ + +#define BPF_MOV64_REG (DST ,SRC ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_MOV | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = 0 }) + +#define BPF_MOV32_REG (DST ,SRC ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_MOV | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = 0 }) + +/* Short form of mov, dst_reg = imm32 */ + +#define BPF_MOV64_IMM (DST ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_MOV | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = IMM }) + +#define BPF_MOV32_IMM (DST ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_MOV | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = IMM }) + +/* Short form of mov based on type, +* BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 +*/ + +#define BPF_MOV64_RAW (TYPE ,DST ,SRC ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_MOV | BPF_SRC(TYPE), \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = IMM }) + +#define BPF_MOV32_RAW (TYPE ,DST ,SRC ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_MOV | BPF_SRC(TYPE), \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = IMM }) + +/* Direct packet access, R0 = *(uint *) (skb->data + imm32) */ + +#define BPF_LD_ABS (SIZE ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_LD | BPF_SIZE(SIZE) | BPF_ABS, \ + .dst_reg = 0, \ + .src_reg = 0, \ + .off = 0, \ + .imm = IMM }) + +/* Indirect packet access, R0 = *(uint *) (skb->data + src_reg + imm32) */ + +#define BPF_LD_IND (SIZE ,SRC ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_LD | BPF_SIZE(SIZE) | BPF_IND, \ + .dst_reg = 0, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = IMM }) + +/* Memory load, dst_reg = *(uint *) (src_reg + off16) */ + +#define BPF_LDX_MEM (SIZE ,DST ,SRC ,OFF ) \ + ((struct bpf_insn) { \ + .code = BPF_LDX | BPF_SIZE(SIZE) | BPF_MEM, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = OFF, \ + .imm = 0 }) + +/* Memory store, *(uint *) (dst_reg + off16) = src_reg */ + +#define BPF_STX_MEM (SIZE ,DST ,SRC ,OFF ) \ + ((struct bpf_insn) { \ + .code = BPF_STX | BPF_SIZE(SIZE) | BPF_MEM, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = OFF, \ + .imm = 0 }) + +/* Memory store, *(uint *) (dst_reg + off16) = imm32 */ + +#define BPF_ST_MEM (SIZE ,DST ,OFF ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ST | BPF_SIZE(SIZE) | BPF_MEM, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = OFF, \ + .imm = IMM }) + +/* Conditional jumps against registers, +* if (dst_reg 'op' src_reg) goto pc + off16 +*/ + +#define BPF_JMP_REG (OP ,DST ,SRC ,OFF ) \ + ((struct bpf_insn) { \ + .code = BPF_JMP | BPF_OP(OP) | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = OFF, \ + .imm = 0 }) + +/* Conditional jumps against immediates, +* if (dst_reg 'op' imm32) goto pc + off16 +*/ + +#define BPF_JMP_IMM (OP ,DST ,IMM ,OFF ) \ + ((struct bpf_insn) { \ + .code = BPF_JMP | BPF_OP(OP) | BPF_K, \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = OFF, \ + .imm = IMM }) + +/* Function call */ + +#define BPF_EMIT_CALL (FUNC ) \ + ((struct bpf_insn) { \ + .code = BPF_JMP | BPF_CALL, \ + .dst_reg = 0, \ + .src_reg = 0, \ + .off = 0, \ + .imm = ((FUNC) - BPF_FUNC_unspec) }) + +/* Raw code statement block */ + +#define BPF_RAW_INSN (CODE ,DST ,SRC ,OFF ,IMM ) \ + ((struct bpf_insn) { \ + .code = CODE, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = OFF, \ + .imm = IMM }) + +/* Program exit */ + +#define BPF_EXIT_INSN () \ + ((struct bpf_insn) { \ + .code = BPF_JMP | BPF_EXIT, \ + .dst_reg = 0, \ + .src_reg = 0, \ + .off = 0, \ + .imm = 0 }) + +#endif /* __TOOLS_LINUX_FILTER_H */ tools/perf/MANIFEST +1
-0@@ -42,6 +42,7 @@ tools/include/asm-generic/bitops.h tools/include/linux/atomic.h tools/include/linux/bitops.h tools/include/linux/compiler.h +tools/include/linux/filter.h tools/include/linux/hash.h tools/include/linux/kernel.h tools/include/linux/list.hSignature · 1 line
2.1.0
Re: [PATCH 21/31] perf tools: Move linux/filter.h to tools/include
In reply to Wang NanEm Sat, Aug 29, 2015 at 04:21:55AM +0000, Wang Nan escreveu:
Quoted 3 lines
From: He Kuang <[email protected]>
This patch moves
filter.hfrominclude/linux/kernel.hto
I said that before: this is not moving anything, it is copying :-)
Quoted 6 lines
tools/include/linux/filter.hto enable other libraries use macros in it, like libbpf which will be introduced by further patches. Currenty, the movedfilter.honly contains the useful macros needed by libbpf for not introducing too much dependence.MANIFEST is also updated for 'make perf-*-src-pkg'.
So, I did a:
$ diff -u include/linux/filter.h tools/include/linux/filter.h
And noticed these:
-/* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */ +/* Endianness conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */
-/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */ +/* Short form of mov based on type,
+ * BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32
+ */
-/* Conditional jumps against registers, if (dst_reg 'op' src_reg) goto pc + off16 */ +/* Conditional jumps against registers,
+ * if (dst_reg 'op' src_reg) goto pc + off16
+ */
-/* Conditional jumps against immediates, if (dst_reg 'op' imm32) goto pc + off16 */ +/* Conditional jumps against immediates,
+ * if (dst_reg 'op' imm32) goto pc + off16
+ */
------------------------------------------------------------------
Please refrain from doing that... I.e. spell checking is kinda useful, introducing gratuitous further drift from include/linux/FOO.h to tools/include/linux/FOO.h is not.
So either resist the urge to do these stylistic changes or do those changes in include/linux/FOO.h and _then_ copy it to tools/include/linux/FOO.h.
If the copy was already done, fix both, so that when we do that diff again, we can see what is really different in kernel and userspace copies and that maybe will help us spot things that aren't diverging over time.
- Arnaldo
Re: [PATCH 21/31] perf tools: Move linux/filter.h to tools/include
Em Tue, Sep 01, 2015 at 04:39:59PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 10 lines
Em Sat, Aug 29, 2015 at 04:21:55AM +0000, Wang Nan escreveu:
Quoted 1 line
From: He Kuang <[email protected]>
tools/include/linux/filter.h new file +3
-1-/* Conditional jumps against immediates, if (dst_reg 'op' imm32) goto pc + off16 */ +/* Conditional jumps against immediates, +* if (dst_reg 'op' imm32) goto pc + off16 +*/ Please refrain from doing that... I.e. spell checking is kinda useful, introducing gratuitous further drift from
include/linux/FOO.htotools/include/linux/FOO.his not.
I've done it this time. I.e. left it as a strict copy, modulo the unused parts that were purposefuly removed in the original patch. Trying to cherry pick as many patches from this series as possible, to help in getting the eBPF patchkit in.
- Arnaldo
Re: [PATCH 21/31] perf tools: Move linux/filter.h to tools/include
In reply to Arnaldo Carvalho de Melo发自我的 iPhone
Quoted 32 lines · 在 2015年9月2日,上午3:39,Arnaldo Carvalho de Melo <[email protected]> 写道:
Em Sat, Aug 29, 2015 at 04:21:55AM +0000, Wang Nan escreveu:
Quoted 3 lines
From: He Kuang <[email protected]>
This patch moves
filter.hfrominclude/linux/kernel.htoI said that before: this is not moving anything, it is copying :-)
Quoted 6 lines
tools/include/linux/filter.hto enable other libraries use macros in it, like libbpf which will be introduced by further patches. Currenty, the movedfilter.honly contains the useful macros needed by libbpf for not introducing too much dependence.MANIFEST is also updated for 'make perf-*-src-pkg'.
So, I did a:
$ diff -u include/linux/filter.h tools/include/linux/filter.hAnd noticed these:
(quoted diff) +4
-3-/* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */ +/* Endianness conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */ -/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */ +/* Short form of mov based on type, + * BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 + */ -/* Conditional jumps against registers, if (dst_reg 'op' src_reg) goto pc + off16 */
Review
Quoted 10 lines
(quoted diff) +6
-2+/* Conditional jumps against registers, + * if (dst_reg 'op' src_reg) goto pc + off16 + */ -/* Conditional jumps against immediates, if (dst_reg 'op' imm32) goto pc + off16 */ +/* Conditional jumps against immediates, + * if (dst_reg 'op' imm32) goto pc + off16 + */ ------------------------------------------------------------------
I think these changes are made after we made this patch.
Thank you for checking it.
Quoted 12 lines
Please refrain from doing that... I.e. spell checking is kinda useful, introducing gratuitous further drift from
include/linux/FOO.htotools/include/linux/FOO.his not.So either resist the urge to do these stylistic changes or do those changes in
include/linux/FOO.hand _then_ copy it totools/include/linux/FOO.h.If the copy was already done, fix both, so that when we do that diff again, we can see what is really different in kernel and userspace copies and that maybe will help us spot things that aren't diverging over time.
- Arnaldo
Re: [PATCH 21/31] perf tools: Move linux/filter.h to tools/include
Em Wed, Sep 02, 2015 at 05:08:27AM +0800, pi3orama escreveu:
Quoted 40 lines
发自我的 iPhone
Quoted 39 lines · 在 2015年9月2日,上午3:39,Arnaldo Carvalho de Melo <[email protected]> 写道:
Em Sat, Aug 29, 2015 at 04:21:55AM +0000, Wang Nan escreveu:
Quoted 2 lines
From: He Kuang <[email protected]>
This patch movesfilter.hfrominclude/linux/kernel.htoI said that before: this is not moving anything, it is copying :-)
Quoted 6 lines
tools/include/linux/filter.hto enable other libraries use macros in it, like libbpf which will be introduced by further patches. Currenty, the movedfilter.honly contains the useful macros needed by libbpf for not introducing too much dependence.MANIFEST is also updated for 'make perf-*-src-pkg'.
So, I did a:
$ diff -u include/linux/filter.h tools/include/linux/filter.hAnd noticed these:
(quoted diff) +10
-4-/* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */ +/* Endianness conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */ -/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */ +/* Short form of mov based on type, + * BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 + */ -/* Conditional jumps against registers, if (dst_reg 'op' src_reg) goto pc + off16 */ +/* Conditional jumps against registers, + * if (dst_reg 'op' src_reg) goto pc + off16 + */ -/* Conditional jumps against immediates, if (dst_reg 'op' imm32) goto pc + off16 */ +/* Conditional jumps against immediates, + * if (dst_reg 'op' imm32) goto pc + off16 + */
Quoted 4 lines
Quoted 2 lines
------------------------------------------------------------------
I think these changes are made after we made this patch.
Don't think so, for instance, this one:
/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
[acme@zoo linux]$ git log -p include/linux/filter.h | grep 'Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32'
/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
+/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */
[acme@zoo linux]$
Was introduced, in just one line, and never again touched, just appearing as context in subsequent patches.
I bet this was related to checkpatch.pl complaining it has more than 80 lines ;-\
Ditto for:
[acme@zoo linux]$ git log -p include/linux/filter.h | grep 'Endiann\?ess conversion'
/* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */
/* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */
+/* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */ [acme@zoo linux]$
Quoted 1 line
Thank you for checking it.
np.
- Arnaldo
tip-bot for He Kuang
merge bot[tip:perf/core] perf tools: Copy linux/filter.h to tools/include
In reply to Wang Nanperf tools: Copy linux/filter.h to tools/include
Commit-ID: dabf626f7f0e5cbef0d1cfb5143e40213f079bb8 Gitweb: http://git.kernel.org/tip/dabf626f7f0e5cbef0d1cfb5143e40213f079bb8 Author: He Kuang <[email protected]> AuthorDate: Sat, 29 Aug 2015 04:21:55 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 2 Sep 2015 16:30:46 -0300
perf tools: Copy linux/filter.h to tools/include
This patch copies filter.h from include/linux/kernel.h to tools/include/linux/filter.h to enable other libraries to use macros in it, like libbpf which will be introduced by further patches.
Currently, the filter.h copy only contains the useful macros needed by libbpf for not introducing too much dependence.
tools/perf/MANIFEST is also updated for 'make perf-*-src-pkg'.
One change:
The 'imm' field of BPF_EMIT_CALL becomes ((FUNC) - BPF_FUNC_unspec) to suit user space code generator.
--- .../bpf/libbpf.h => tools/include/linux/filter.h | 131 ++++++++++++++------- tools/perf/MANIFEST | 1 + 2 files changed, 87 insertions(+), 45 deletions(-)
tools/include/linux/filter.h renamed from samples/bpf/libbpf.h +86 -45
@@ -1,22 +1,32 @@ -/* eBPF mini library */ -#ifndef __LIBBPF_H -#define __LIBBPF_H - -struct bpf_insn ; - -int bpf_create_map (enum bpf_map_type map_type,int key_size,int value_size, -int max_entries); -int bpf_update_elem (int fd,void *key,void *value,unsigned long long flags); -int bpf_lookup_elem (int fd,void *key,void *value); -int bpf_delete_elem (int fd,void *key); -int bpf_get_next_key (int fd,void *key,void *next_key); - -int bpf_prog_load (enum bpf_prog_type prog_type, -const struct bpf_insn *insns,int insn_len, -const char *license,int kern_version); - -#define LOG_BUF_SIZE 65536 -extern char bpf_log_buf[LOG_BUF_SIZE ]; +/* +* Linux Socket Filter Data Structures +*/ +#ifndef __TOOLS_LINUX_FILTER_H +#define __TOOLS_LINUX_FILTER_H + +#include <linux/bpf.h> + +/* ArgX, context and stack frame pointer register positions. Note, +* Arg1, Arg2, Arg3, etc are used as argument mappings of function +* calls in BPF_CALL instruction. +*/ +#define BPF_REG_ARG1 BPF_REG_1 +#define BPF_REG_ARG2 BPF_REG_2 +#define BPF_REG_ARG3 BPF_REG_3 +#define BPF_REG_ARG4 BPF_REG_4 +#define BPF_REG_ARG5 BPF_REG_5 +#define BPF_REG_CTX BPF_REG_6 +#define BPF_REG_FP BPF_REG_10 + +/* Additional register mappings for converted user programs. */ +#define BPF_REG_A BPF_REG_0 +#define BPF_REG_X BPF_REG_7 +#define BPF_REG_TMP BPF_REG_8 + +/* BPF program can access up to 512 bytes of stack space. */ +#define MAX_BPF_STACK 512 + +/* Helper macros for filter block array initializers. */ /* ALU ops on registers, bpf_add|sub|...: dst_reg += src_reg */
@@ -54,6 +64,16 @@ extern char bpf_log_buf[LOG_BUF_SIZE]; .off = 0, \ .imm = IMM }) +/* Endianess conversion, cpu_to_{l,b}e(), {l,b}e_to_cpu() */ + +#define BPF_ENDIAN (TYPE ,DST ,LEN ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_END | BPF_SRC(TYPE), \ + .dst_reg = DST, \ + .src_reg = 0, \ + .off = 0, \ + .imm = LEN }) +/* Short form of mov, dst_reg = src_reg */ #define BPF_MOV64_REG (DST ,SRC ) \
@@ -64,6 +84,14 @@ extern char bpf_log_buf[LOG_BUF_SIZE]; .off = 0, \ .imm = 0 }) +#define BPF_MOV32_REG (DST ,SRC ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_MOV | BPF_X, \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = 0 }) +/* Short form of mov, dst_reg = imm32 */ #define BPF_MOV64_IMM (DST ,IMM ) \
@@ -74,32 +102,31 @@ extern char bpf_log_buf[LOG_BUF_SIZE]; .off = 0, \ .imm = IMM }) -/* BPF_LD_IMM64 macro encodes single 'load 64-bit immediate' insn */ -#define BPF_LD_IMM64 (DST ,IMM ) \ - BPF_LD_IMM64_RAW(DST, 0, IMM) - -#define BPF_LD_IMM64_RAW(DST, SRC, IMM) \ +#define BPF_MOV32_IMM (DST ,IMM ) \ ((struct bpf_insn) { \ - .code = BPF_LD | BPF_DW | BPF_IMM, \ + .code = BPF_ALU | BPF_MOV | BPF_K, \ .dst_reg = DST, \ - .src_reg = SRC, \ - .off = 0, \ - .imm = (__u32) (IMM) }), \ - ((struct bpf_insn) { \ - .code = 0, /* zero is reserved opcode */ \ - .dst_reg = 0, \ .src_reg = 0, \ .off = 0, \ - .imm = ((__u64) (IMM)) >> 32 }) + .imm = IMM }) -#ifndef BPF_PSEUDO_MAP_FD -# define BPF_PSEUDO_MAP_FD 1 -#endif +/* Short form of mov based on type, BPF_X: dst_reg = src_reg, BPF_K: dst_reg = imm32 */ -/* pseudo BPF_LD_IMM64 insn used to refer to process-local map_fd */ -#define BPF_LD_MAP_FD (DST ,MAP_FD ) \ - BPF_LD_IMM64_RAW(DST, BPF_PSEUDO_MAP_FD, MAP_FD) +#define BPF_MOV64_RAW (TYPE ,DST ,SRC ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU64 | BPF_MOV | BPF_SRC(TYPE), \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = IMM }) +#define BPF_MOV32_RAW (TYPE ,DST ,SRC ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_ALU | BPF_MOV | BPF_SRC(TYPE), \ + .dst_reg = DST, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = IMM })/* Direct packet access, R0 = *(uint *) (skb->data + imm32) */
@@ -111,6 +138,16 @@ extern char bpf_log_buf[LOG_BUF_SIZE]; .off = 0, \ .imm = IMM }) +/* Indirect packet access, R0 = *(uint *) (skb->data + src_reg + imm32) */ + +#define BPF_LD_IND (SIZE ,SRC ,IMM ) \ + ((struct bpf_insn) { \ + .code = BPF_LD | BPF_SIZE(SIZE) | BPF_IND, \ + .dst_reg = 0, \ + .src_reg = SRC, \ + .off = 0, \ + .imm = IMM }) +/* Memory load, dst_reg = *(uint *) (src_reg + off16) */ #define BPF_LDX_MEM (SIZE ,DST ,SRC ,OFF ) \
@@ -161,6 +198,16 @@ extern char bpf_log_buf[LOG_BUF_SIZE]; .off = OFF, \ .imm = IMM }) +/* Function call */ + +#define BPF_EMIT_CALL (FUNC ) \ + ((struct bpf_insn) { \ + .code = BPF_JMP | BPF_CALL, \ + .dst_reg = 0, \ + .src_reg = 0, \ + .off = 0, \ + .imm = ((FUNC) - BPF_FUNC_unspec) }) +/* Raw code statement block */ #define BPF_RAW_INSN (CODE ,DST ,SRC ,OFF ,IMM ) \
@@ -181,10 +228,4 @@ extern char bpf_log_buf[LOG_BUF_SIZE]; .off = 0, \ .imm = 0 }) -/* create RAW socket and bind to interface 'name' */ -int open_raw_sock (const char *name); - -struct perf_event_attr ; -int perf_event_open (struct perf_event_attr *attr,int pid,int cpu, -int group_fd,unsigned long flags); -#endif +#endif /* __TOOLS_LINUX_FILTER_H */
tools/perf/MANIFEST +1 -0
@@ -41,6 +41,7 @@ tools/include/asm-generic/bitops.h tools/include/linux/atomic.h tools/include/linux/bitops.h tools/include/linux/compiler.h +tools/include/linux/filter.h tools/include/linux/hash.h tools/include/linux/kernel.h tools/include/linux/list.h
PATCH 22/31 perf tools: Add BPF_PROLOGUE config options for further patches
In reply to Wang NanIf both LIBBPF and DWARF are detected, it is possible to create prologue for eBPF programs to help them accessing kernel data. HAVE_BPF_PROLOGUE and CONFIG_BPF_PROLOGUE is added as flags for this feature.
PERF_HAVE_ARCH_GET_REG_OFFSET indicates an architecture supports converting name of a register to its offset in 'struct pt_regs'. Without this support, BPF_PROLOGUE should be turned off.
--- tools/perf/config/Makefile | 12 ++++++++++++ tools/perf/util/include/dwarf-regs.h | 7 +++++++ 2 files changed, 19 insertions(+)
tools/perf/config/Makefile +12 -0
@@ -314,6 +314,18 @@ ifndef NO_LIBELF CFLAGS += -DHAVE_LIBBPF_SUPPORT $(call detected,CONFIG_LIBBPF) endif + + ifndef NO_DWARF + ifneq ($(origin PERF_HAVE_ARCH_GET_REG_INFO), undefined) + CFLAGS += -DHAVE_BPF_PROLOGUE + $(call detected,CONFIG_BPF_PROLOGUE) + else + msg := $(warning BPF prologue is not supported by architecture $(ARCH)); + endif + else + msg := $(warning DWARF support is off, BPF prologue is disabled); + endif + endif # NO_LIBBPF endif # NO_LIBELF
tools/perf/util/include/dwarf-regs.h +7 -0
@@ -5,4 +5,11 @@const char *get_arch_regstr (unsigned int n);#endif +#ifdef HAVE_BPF_PROLOGUE +/* +* Arch should support fetching the offset of a register in pt_regs +* by its name. +*/ +int arch_get_reg_info (const char *name,int *offset); +#endif #endif
Signature · 1 line
2.1.0
Re: [PATCH 22/31] perf tools: Add BPF_PROLOGUE config options for further patches
Em Sat, Aug 29, 2015 at 04:21:56AM +0000, Wang Nan escreveu:
Quoted 34 lines
If both LIBBPF and DWARF are detected, it is possible to create prologue for eBPF programs to help them accessing kernel data.
HAVE_BPF_PROLOGUEandCONFIG_BPF_PROLOGUEis added as flags for this feature.
PERF_HAVE_ARCH_GET_REG_OFFSETindicates an architecture supports converting name of a register to its offset in 'structpt_regs'. Without this support,BPF_PROLOGUEshould be turned off.Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/config/Makefile | 12 ++++++++++++ tools/perf/util/include/dwarf-regs.h | 7 +++++++ 2 files changed, 19 insertions(+)tools/perf/config/Makefile +0
-0
tools/perf/config/Makefile ifndef NO_LIBELF · line 323
Quoted 10 lines
tools/perf/config/Makefile +7
-0@@ -314,6 +314,18 @@ ifndef NO_LIBELF CFLAGS += -DHAVE_LIBBPF_SUPPORT $(call detected,CONFIG_LIBBPF) endif + + ifndef NO_DWARF + ifneq ($(origin PERF_HAVE_ARCH_GET_REG_INFO), undefined) + CFLAGS += -DHAVE_BPF_PROLOGUE + $(call detected,CONFIG_BPF_PROLOGUE) + else + msg := $(warning BPF prologue is not supported by architecture $(ARCH));
Shouldn't this be replace to something like:
msg := $(warning BPF prologue is not supported by architecture $(ARCH), missing ARCH_GET_REG_INFO);
Or even in lowercase?
Quoted 13 lines
tools/perf/config/Makefile +5
-0+ endif + else + msg := $(warning DWARF support is off, BPF prologue is disabled); + endif + endif # NO_LIBBPF endif # NO_LIBELFtools/perf/util/include/dwarf-regs.h +0
-0
tools/perf/util/include/dwarf-regs.h line 6
Quoted 2 lines
tools/perf/util/include/dwarf-regs.h +0
-0@@ -5,4 +5,11 @@const char *get_arch_regstr (unsigned int n);#endif
Shouldn't this test against PERF_HAVE_ARCH_GET_REG_INFO instead? I.e. is arch_get_reg_info() only allowed to work with eBPF? I guess not, right?
Quoted 10 lines
tools/perf/util/include/dwarf-regs.h +7
-0+#ifdef HAVE_BPF_PROLOGUE +/* +* Arch should support fetching the offset of a register in pt_regs +* by its name. +*/ +int arch_get_reg_info (const char *name,int *offset); +#endif #endif Signature · 1 line
2.1.0
PATCH 22/31 perf tools: Add BPF_PROLOGUE config options for further patches
In reply to Wang NanIf both LIBBPF and DWARF are detected, it is possible to create prologue for eBPF programs to help them accessing kernel data. HAVE_BPF_PROLOGUE and CONFIG_BPF_PROLOGUE is added as flags for this feature.
PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET indicates an architecture supports converting name of a register to its offset in 'struct pt_regs'. Without this support, BPF_PROLOGUE should be turned off.
HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET is introduced as the corresponding CFLAGS of PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET.
[wawngnan:
- Introduce new CFLAGS to control BPF prologue and arch_get_reg_info() separately.
- Rename ARCH_GET_REG_INFO to ARCH_REGS_QUERY_REGISTER_OFFSET, arch_get_reg_info() to regs_query_register_offset(), change its API accordingly to make it similar to kernel's regs_query_register_offset().
]
--- tools/perf/config/Makefile | 17 +++++++++++++++++ tools/perf/util/include/dwarf-regs.h | 8 ++++++++ 2 files changed, 25 insertions(+)
tools/perf/config/Makefile +17 -0
@@ -110,6 +110,11 @@ FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/arch/$(AR # include ARCH specific config -include $(src-perf)/arch/$(ARCH)/Makefile +ifneq ($(origin PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET), undefined) + CFLAGS += -DHAVE_ARCH_REGS_QUERY_REGISTER_OFFSET +endif + + include $(src-perf)/config/utilities.mak ifeq ($(call get-executable,$(FLEX)),)
@@ -314,6 +319,18 @@ ifndef NO_LIBELF CFLAGS += -DHAVE_LIBBPF_SUPPORT $(call detected,CONFIG_LIBBPF) endif + + ifndef NO_DWARF + ifneq ($(origin PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET), undefined) + CFLAGS += -DHAVE_BPF_PROLOGUE + $(call detected,CONFIG_BPF_PROLOGUE) + else + msg := $(warning BPF prologue is not supported by architecture $(ARCH), missing regs_query_register_offset()); + endif + else + msg := $(warning DWARF support is off, BPF prologue is disabled); + endif + endif # NO_LIBBPF endif # NO_LIBELF
tools/perf/util/include/dwarf-regs.h +8 -0
@@ -5,4 +5,12 @@const char *get_arch_regstr (unsigned int n);#endif +#ifdef HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET +/* +* Arch should support fetching the offset of a register in pt_regs +* by its name. See kernel's regs_query_register_offset in +* arch/xxx/kernel/ptrace.c. +*/ +int regs_query_register_offset (const char *name); +#endif #endif
Signature · 1 line
1.8.3.4
PATCH 23/31 perf tools: Introduce regs_query_register_offset() for x86
regs_query_register_offset() is a helper function which converts register name like "%rax" to offset of a register in 'struct pt_regs', which is required by BPF prologue generator. Since the function is identical, try to reuse the code in arch/x86/kernel/ptrace.c.
Comment inside dwarf-regs.c list the differences between this implementation and kernel code.
get_arch_regstr() switches to regoffset_table and the old string table is dropped.
--- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/Build | 1 + tools/perf/arch/x86/util/dwarf-regs.c | 122 ++++++++++++++++++++++++---------- 3 files changed, 90 insertions(+), 34 deletions(-)
tools/perf/arch/x86/Makefile +1 -0
@@ -2,3 +2,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 +PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
tools/perf/arch/x86/util/Build +1 -0
@@ -4,6 +4,7 @@ libperf-y += pmu.o libperf-y += kvm-stat.o libperf-$(CONFIG_DWARF) += dwarf-regs.o +libperf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/x86/util/dwarf-regs.c +88 -34
143 lines not on this page · raw message
Signature · 1 line
1.8.3.4
RE: [PATCH 23/31] perf tools: Introduce regs_query_register_offset() for x86
Quoted 9 lines
From: Wang Nan [mailto:[email protected]]
regs_query_register_offset()is a helper function which converts register name like "%rax" to offset of a register in 'structpt_regs', which is required by BPF prologue generator. Since the function is identical, try to reuse the code inarch/x86/kernel/ptrace.c.Comment inside
dwarf-regs.clist the differences between this implementation and kernel code.
Hmm, this also introduce a duplication of the code... It might be a good time to move them into arch/x86/lib/ and reuse it directly from perf code.
Thank you,
Quoted 196 lines
get_arch_regstr()switches toregoffset_tableand the old string table is dropped.Signed-off-by Wang Nan <[email protected]>Signed-off-by He Kuang <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/Build | 1 + tools/perf/arch/x86/util/dwarf-regs.c | 122 ++++++++++++++++++++++++---------- 3 files changed, 90 insertions(+), 34 deletions(-)tools/perf/arch/x86/Makefile +1
-0@@ -2,3 +2,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 +PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1tools/perf/arch/x86/util/Build +1
-0@@ -4,6 +4,7 @@ libperf-y += pmu.o libperf-y += kvm-stat.o libperf-$(CONFIG_DWARF) += dwarf-regs.o +libperf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/arch/x86/util/dwarf-regs.c +88
-35@@ -21,55 +21,109 @@*/ #include <stddef.h> +#include <errno.h> /* for EINVAL */ +#include <string.h> /* for strcmp */ +#include <linux/ptrace.h> /* for struct pt_regs */ +#include <linux/kernel.h> /* for offsetof */ #include <dwarf-regs.h> /* -* Generic dwarf analysis helpers +* See arch/x86/kernel/ptrace.c. +* Different from it: +* +* - Since struct pt_regs is defined differently for user and kernel, +* but we want to use 'ax, bx' instead of 'rax, rbx' (which is struct +* field name of user's pt_regs), we make REG_OFFSET_NAME to accept +* both string name and reg field name. +* +* - Since accessing x86_32's pt_regs from x86_64 building is difficult +* and vise versa, we simply fill offset with -1, so +* get_arch_regstr() still works but regs_query_register_offset() +* returns error. +* The only inconvenience caused by it now is that we are not allowed +* to generate BPF prologue for a x86_64 kernel if perf is built for +* x86_32. This is really a rare usecase. +* +* - Order is different from kernel's ptrace.c for get_arch_regstr(), which +* is defined by dwarf. */ -#define X86_32_MAX_REGS 8 -const char *x86_32_regs_table[X86_32_MAX_REGS ] = { -"%ax" , -"%cx" , -"%dx" , -"%bx" , -"$stack" ,/* Stack address instead of %sp */ -"%bp" , -"%si" , -"%di" , +struct pt_regs_offset { +const char *name; +int offset; +}; + +#define REG_OFFSET_END {.name = NULL, .offset = 0} + +#ifdef __x86_64__ +# define REG_OFFSET_NAME_64 (n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} +# define REG_OFFSET_NAME_32 (n, r) {.name = n, .offset = -1} +#else +# define REG_OFFSET_NAME_64 (n, r) {.name = n, .offset = -1} +# define REG_OFFSET_NAME_32 (n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} +#endif + +static const struct pt_regs_offset x86_32_regoffset_table[] = { +REG_OFFSET_NAME_32 ("%ax" , eax), +REG_OFFSET_NAME_32 ("%cx" , ecx), +REG_OFFSET_NAME_32 ("%dx" , edx), +REG_OFFSET_NAME_32 ("%bx" , ebx), +REG_OFFSET_NAME_32 ("$stack" , esp),/* Stack address instead of %sp */ +REG_OFFSET_NAME_32 ("%bp" , ebp), +REG_OFFSET_NAME_32 ("%si" , esi), +REG_OFFSET_NAME_32 ("%di" , edi), +REG_OFFSET_END , }; -#define X86_64_MAX_REGS 16 -const char *x86_64_regs_table[X86_64_MAX_REGS ] = { -"%ax" , -"%dx" , -"%cx" , -"%bx" , -"%si" , -"%di" , -"%bp" , -"%sp" , -"%r8" , -"%r9" , -"%r10" , -"%r11" , -"%r12" , -"%r13" , -"%r14" , -"%r15" , +static const struct pt_regs_offset x86_64_regoffset_table[] = { +REG_OFFSET_NAME_64 ("%ax" , rax), +REG_OFFSET_NAME_64 ("%dx" , rdx), +REG_OFFSET_NAME_64 ("%cx" , rcx), +REG_OFFSET_NAME_64 ("%bx" , rbx), +REG_OFFSET_NAME_64 ("%si" , rsi), +REG_OFFSET_NAME_64 ("%di" , rdi), +REG_OFFSET_NAME_64 ("%bp" , rbp), +REG_OFFSET_NAME_64 ("%sp" , rsp), +REG_OFFSET_NAME_64 ("%r8" , r8), +REG_OFFSET_NAME_64 ("%r9" , r9), +REG_OFFSET_NAME_64 ("%r10" , r10), +REG_OFFSET_NAME_64 ("%r11" , r11), +REG_OFFSET_NAME_64 ("%r12" , r12), +REG_OFFSET_NAME_64 ("%r13" , r13), +REG_OFFSET_NAME_64 ("%r14" , r14), +REG_OFFSET_NAME_64 ("%r15" , r15), +REG_OFFSET_END , };/* TODO: switching by dwarf address size */ #ifdef __x86_64__ -#define ARCH_MAX_REGS X86_64_MAX_REGS -#define arch_regs_table x86_64_regs_table +#define regoffset_table x86_64_regoffset_table#else -#define ARCH_MAX_REGS X86_32_MAX_REGS -#define arch_regs_table x86_32_regs_table +#define regoffset_table x86_32_regoffset_table#endif +/* Minus 1 for the ending REG_OFFSET_END */ +#define ARCH_MAX_REGS ((sizeof(regoffset_table) / sizeof(regoffset_table[0])) - 1) +/* Return architecture dependent register string (for kprobe-tracer) */ const char *get_arch_regstr (unsigned int n) { -return (n <ARCH_MAX_REGS ) ? arch_regs_table[n] :NULL ; +return (n <ARCH_MAX_REGS ) ? regoffset_table[n].name :NULL ; +} + +/* Reuse code from arch/x86/kernel/ptrace.c */ +/** +* regs_query_register_offset() - query register offset from its name +* @name: the name of a register +* +* regs_query_register_offset() returns the offset of a register in struct +* pt_regs from its name. If the name is invalid, this returns -EINVAL; +*/ +int regs_query_register_offset (const char *name) +{ +const struct pt_regs_offset *roff; +for (roff = regoffset_table; roff->name !=NULL ; roff++) +if (!strcmp (roff->name, name)) +return roff->offset; +return -EINVAL ; } --
Quoted 1 line
1.8.3.4
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Re: [PATCH 23/31] perf tools: Introduce regs_query_register_offset() for x86
Quoted 7 lines · 平松雅巳 / HIRAMATU,MASAMI
Quoted 7 lines
From: Wang Nan [mailto:[email protected]]
regs_query_register_offset()is a helper function which converts register name like "%rax" to offset of a register in 'structpt_regs', which is required by BPF prologue generator. Since the function is identical, try to reuse the code inarch/x86/kernel/ptrace.c.
Quoted 5 lines
Quoted 2 lines
Comment inside
dwarf-regs.clist the differences between this implementation and kernel code.Hmm, this also introduce a duplication of the code... It might be a good time to move them into
arch/x86/lib/and reuse it directly from perf code.
So you want to move it from ./arch/x86/kernel/ptrace.c to arch/x86/lib and let perf link against arch/x86/lib/lib.a to use it?
I think it worth a specific work to do it. Currently we lake scaffold to compile and link against the kernel side library. Moreover, we should also consider other archs. Seems not very easy.
This is not the only one file which can benifite from kernel's arch/x86/lib Newly introduced tools/perf/util/intel-pt-decoder/insn.c, and I believe there's more. Therefore I think it should be a separated work from perf BPF patches. So how about keep this patch at this time? Or do you have some idea?
Thank you.
Quoted 198 lines
Thank you,
Quoted 196 lines
get_arch_regstr()switches toregoffset_tableand the old string table is dropped.Signed-off-by Wang Nan <[email protected]>Signed-off-by He Kuang <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/Build | 1 + tools/perf/arch/x86/util/dwarf-regs.c | 122 ++++++++++++++++++++++++---------- 3 files changed, 90 insertions(+), 34 deletions(-)tools/perf/arch/x86/Makefile +1
-0@@ -2,3 +2,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 +PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1tools/perf/arch/x86/util/Build +1
-0@@ -4,6 +4,7 @@ libperf-y += pmu.o libperf-y += kvm-stat.o libperf-$(CONFIG_DWARF) += dwarf-regs.o +libperf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/arch/x86/util/dwarf-regs.c +88
-35@@ -21,55 +21,109 @@*/ #include <stddef.h> +#include <errno.h> /* for EINVAL */ +#include <string.h> /* for strcmp */ +#include <linux/ptrace.h> /* for struct pt_regs */ +#include <linux/kernel.h> /* for offsetof */ #include <dwarf-regs.h> /* -* Generic dwarf analysis helpers +* See arch/x86/kernel/ptrace.c. +* Different from it: +* +* - Since struct pt_regs is defined differently for user and kernel, +* but we want to use 'ax, bx' instead of 'rax, rbx' (which is struct +* field name of user's pt_regs), we make REG_OFFSET_NAME to accept +* both string name and reg field name. +* +* - Since accessing x86_32's pt_regs from x86_64 building is difficult +* and vise versa, we simply fill offset with -1, so +* get_arch_regstr() still works but regs_query_register_offset() +* returns error. +* The only inconvenience caused by it now is that we are not allowed +* to generate BPF prologue for a x86_64 kernel if perf is built for +* x86_32. This is really a rare usecase. +* +* - Order is different from kernel's ptrace.c for get_arch_regstr(), which +* is defined by dwarf. */ -#define X86_32_MAX_REGS 8 -const char *x86_32_regs_table[X86_32_MAX_REGS ] = { -"%ax" , -"%cx" , -"%dx" , -"%bx" , -"$stack" ,/* Stack address instead of %sp */ -"%bp" , -"%si" , -"%di" , +struct pt_regs_offset { +const char *name; +int offset; +}; + +#define REG_OFFSET_END {.name = NULL, .offset = 0} + +#ifdef __x86_64__ +# define REG_OFFSET_NAME_64 (n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} +# define REG_OFFSET_NAME_32 (n, r) {.name = n, .offset = -1} +#else +# define REG_OFFSET_NAME_64 (n, r) {.name = n, .offset = -1} +# define REG_OFFSET_NAME_32 (n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} +#endif + +static const struct pt_regs_offset x86_32_regoffset_table[] = { +REG_OFFSET_NAME_32 ("%ax" , eax), +REG_OFFSET_NAME_32 ("%cx" , ecx), +REG_OFFSET_NAME_32 ("%dx" , edx), +REG_OFFSET_NAME_32 ("%bx" , ebx), +REG_OFFSET_NAME_32 ("$stack" , esp),/* Stack address instead of %sp */ +REG_OFFSET_NAME_32 ("%bp" , ebp), +REG_OFFSET_NAME_32 ("%si" , esi), +REG_OFFSET_NAME_32 ("%di" , edi), +REG_OFFSET_END , }; -#define X86_64_MAX_REGS 16 -const char *x86_64_regs_table[X86_64_MAX_REGS ] = { -"%ax" , -"%dx" , -"%cx" , -"%bx" , -"%si" , -"%di" , -"%bp" , -"%sp" , -"%r8" , -"%r9" , -"%r10" , -"%r11" , -"%r12" , -"%r13" , -"%r14" , -"%r15" , +static const struct pt_regs_offset x86_64_regoffset_table[] = { +REG_OFFSET_NAME_64 ("%ax" , rax), +REG_OFFSET_NAME_64 ("%dx" , rdx), +REG_OFFSET_NAME_64 ("%cx" , rcx), +REG_OFFSET_NAME_64 ("%bx" , rbx), +REG_OFFSET_NAME_64 ("%si" , rsi), +REG_OFFSET_NAME_64 ("%di" , rdi), +REG_OFFSET_NAME_64 ("%bp" , rbp), +REG_OFFSET_NAME_64 ("%sp" , rsp), +REG_OFFSET_NAME_64 ("%r8" , r8), +REG_OFFSET_NAME_64 ("%r9" , r9), +REG_OFFSET_NAME_64 ("%r10" , r10), +REG_OFFSET_NAME_64 ("%r11" , r11), +REG_OFFSET_NAME_64 ("%r12" , r12), +REG_OFFSET_NAME_64 ("%r13" , r13), +REG_OFFSET_NAME_64 ("%r14" , r14), +REG_OFFSET_NAME_64 ("%r15" , r15), +REG_OFFSET_END , };/* TODO: switching by dwarf address size */ #ifdef __x86_64__ -#define ARCH_MAX_REGS X86_64_MAX_REGS -#define arch_regs_table x86_64_regs_table +#define regoffset_table x86_64_regoffset_table#else -#define ARCH_MAX_REGS X86_32_MAX_REGS -#define arch_regs_table x86_32_regs_table +#define regoffset_table x86_32_regoffset_table#endif +/* Minus 1 for the ending REG_OFFSET_END */ +#define ARCH_MAX_REGS ((sizeof(regoffset_table) / sizeof(regoffset_table[0])) - 1) +/* Return architecture dependent register string (for kprobe-tracer) */ const char *get_arch_regstr (unsigned int n) { -return (n <ARCH_MAX_REGS ) ? arch_regs_table[n] :NULL ; +return (n <ARCH_MAX_REGS ) ? regoffset_table[n].name :NULL ; +} + +/* Reuse code from arch/x86/kernel/ptrace.c */ +/** +* regs_query_register_offset() - query register offset from its name +* @name: the name of a register +* +* regs_query_register_offset() returns the offset of a register in struct +* pt_regs from its name. If the name is invalid, this returns -EINVAL; +*/ +int regs_query_register_offset (const char *name) +{ +const struct pt_regs_offset *roff; +for (roff = regoffset_table; roff->name !=NULL ; roff++) +if (!strcmp (roff->name, name)) +return roff->offset; +return -EINVAL ; } --1.8.3.4
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 23/31] perf tools: Introduce regs_query_register_offset() for x86
Em Tue, Sep 01, 2015 at 09:52:30PM +0800, Wangnan (F) escreveu:
Quoted 20 lines · 平松雅巳 / HIRAMATU,MASAMI
Quoted 11 lines
Quoted 8 lines
From: Wang Nan [mailto:[email protected]]
regs_query_register_offset()is a helper function which converts register name like "%rax" to offset of a register in 'structpt_regs', which is required by BPF prologue generator. Since the function is identical, try to reuse the code inarch/x86/kernel/ptrace.c.Comment inside
dwarf-regs.clist the differences between this implementation and kernel code.Hmm, this also introduce a duplication of the code... It might be a good time to move them into
arch/x86/lib/and reuse it directly from perf code.So you want to move it from
./arch/x86/kernel/ptrace.ctoarch/x86/liband let perf link againstarch/x86/lib/lib.ato use it?I think it worth a specific work to do it. Currently we lake scaffold to compile and link against the kernel side library. Moreover, we should also consider other archs. Seems not very easy.
Quoted 5 lines
This is not the only one file which can benifite from kernel's
arch/x86/libNewly introducedtools/perf/util/intel-pt-decoder/insn.c, and I believe there's
more. Therefore I think it should be a separated work from perf BPF patches. So how about keep this patch at this time? Or do you have some idea?
I would go with what Wang did at this time, its a step in the right direction in the sense that we're trying to use the same function names and semantics, and, as much as possible, possibly in verbatim form, using the same implementation.
Doing the work to fully share it is something being discussed, but that should not get in the way of eBPF work, IMHO.
- Arnaldo
Re: [PATCH 23/31] perf tools: Introduce regs_query_register_offset() for x86
In reply to 平松雅巳 / HIRAMATU,MASAMIEm Tue, Sep 01, 2015 at 11:47:41AM +0000, 平松雅巳 / HIRAMATU,MASAMI escreveu:
Quoted 7 lines
Quoted 7 lines
From: Wang Nan [mailto:[email protected]]
regs_query_register_offset()is a helper function which converts register name like "%rax" to offset of a register in 'structpt_regs', which is required by BPF prologue generator. Since the function is identical, try to reuse the code inarch/x86/kernel/ptrace.c.
Quoted 6 lines
Quoted 2 lines
Comment inside
dwarf-regs.clist the differences between this implementation and kernel code.Hmm, this also introduce a duplication of the code... It might be a good time to move them into
arch/x86/lib/and reuse it directly from perf code.
It is strange to, having tried sharing stuff directly from the kernel, to be now in a position where I advocate against it...
Copy'n'pasting what I said in another message:
-----
We would go back to sharing stuff with the kernel, but this time around we would be using something that everybody knows is being shared, which doesn't elliminates the possibility that at some point changes made with the kernel in mind would break the tools/ using code.
Perhaps it is better to keep copying what we want and introduce infrastructure to check for differences and warn us as soon as possible so that we would do the copy, test if it doesn't break what we use, etc.
I.e. we wouldn't be putting any new burden on the "kernel people", i.e. the burden of having to check that changes they make don't break tools/ living code, nor any out of the blue breakage on tools/ for tools/ developers to fix when changes are made on the kernel "side" -----
---
The "stop sharing directly stuff with the kernel" stance was taken after a report from Linus about breakage due to tools/ using kernel files directly and then a change made in some RCU files broke the tools/perf/ build, even with tools/perf/ not using anything RCU related so far.
Looking at tools/perf/MANIFEST, the file used to create a detached tarball so that perf can be built outside the kernel sources there are still some kernel source files listed, but those probably need to be copied too...
- Arnaldo
Quoted 200 lines
Thank you,
Quoted 197 lines
get_arch_regstr()switches toregoffset_tableand the old string table is dropped.Signed-off-by Wang Nan <[email protected]>Signed-off-by He Kuang <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/Build | 1 + tools/perf/arch/x86/util/dwarf-regs.c | 122 ++++++++++++++++++++++++---------- 3 files changed, 90 insertions(+), 34 deletions(-)tools/perf/arch/x86/Makefile +1
-0@@ -2,3 +2,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 +PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1tools/perf/arch/x86/util/Build +1
-0@@ -4,6 +4,7 @@ libperf-y += pmu.o libperf-y += kvm-stat.o libperf-$(CONFIG_DWARF) += dwarf-regs.o +libperf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/arch/x86/util/dwarf-regs.c +88
-35@@ -21,55 +21,109 @@*/ #include <stddef.h> +#include <errno.h> /* for EINVAL */ +#include <string.h> /* for strcmp */ +#include <linux/ptrace.h> /* for struct pt_regs */ +#include <linux/kernel.h> /* for offsetof */ #include <dwarf-regs.h> /* -* Generic dwarf analysis helpers +* See arch/x86/kernel/ptrace.c. +* Different from it: +* +* - Since struct pt_regs is defined differently for user and kernel, +* but we want to use 'ax, bx' instead of 'rax, rbx' (which is struct +* field name of user's pt_regs), we make REG_OFFSET_NAME to accept +* both string name and reg field name. +* +* - Since accessing x86_32's pt_regs from x86_64 building is difficult +* and vise versa, we simply fill offset with -1, so +* get_arch_regstr() still works but regs_query_register_offset() +* returns error. +* The only inconvenience caused by it now is that we are not allowed +* to generate BPF prologue for a x86_64 kernel if perf is built for +* x86_32. This is really a rare usecase. +* +* - Order is different from kernel's ptrace.c for get_arch_regstr(), which +* is defined by dwarf. */ -#define X86_32_MAX_REGS 8 -const char *x86_32_regs_table[X86_32_MAX_REGS ] = { -"%ax" , -"%cx" , -"%dx" , -"%bx" , -"$stack" ,/* Stack address instead of %sp */ -"%bp" , -"%si" , -"%di" , +struct pt_regs_offset { +const char *name; +int offset; +}; + +#define REG_OFFSET_END {.name = NULL, .offset = 0} + +#ifdef __x86_64__ +# define REG_OFFSET_NAME_64 (n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} +# define REG_OFFSET_NAME_32 (n, r) {.name = n, .offset = -1} +#else +# define REG_OFFSET_NAME_64 (n, r) {.name = n, .offset = -1} +# define REG_OFFSET_NAME_32 (n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} +#endif + +static const struct pt_regs_offset x86_32_regoffset_table[] = { +REG_OFFSET_NAME_32 ("%ax" , eax), +REG_OFFSET_NAME_32 ("%cx" , ecx), +REG_OFFSET_NAME_32 ("%dx" , edx), +REG_OFFSET_NAME_32 ("%bx" , ebx), +REG_OFFSET_NAME_32 ("$stack" , esp),/* Stack address instead of %sp */ +REG_OFFSET_NAME_32 ("%bp" , ebp), +REG_OFFSET_NAME_32 ("%si" , esi), +REG_OFFSET_NAME_32 ("%di" , edi), +REG_OFFSET_END , }; -#define X86_64_MAX_REGS 16 -const char *x86_64_regs_table[X86_64_MAX_REGS ] = { -"%ax" , -"%dx" , -"%cx" , -"%bx" , -"%si" , -"%di" , -"%bp" , -"%sp" , -"%r8" , -"%r9" , -"%r10" , -"%r11" , -"%r12" , -"%r13" , -"%r14" , -"%r15" , +static const struct pt_regs_offset x86_64_regoffset_table[] = { +REG_OFFSET_NAME_64 ("%ax" , rax), +REG_OFFSET_NAME_64 ("%dx" , rdx), +REG_OFFSET_NAME_64 ("%cx" , rcx), +REG_OFFSET_NAME_64 ("%bx" , rbx), +REG_OFFSET_NAME_64 ("%si" , rsi), +REG_OFFSET_NAME_64 ("%di" , rdi), +REG_OFFSET_NAME_64 ("%bp" , rbp), +REG_OFFSET_NAME_64 ("%sp" , rsp), +REG_OFFSET_NAME_64 ("%r8" , r8), +REG_OFFSET_NAME_64 ("%r9" , r9), +REG_OFFSET_NAME_64 ("%r10" , r10), +REG_OFFSET_NAME_64 ("%r11" , r11), +REG_OFFSET_NAME_64 ("%r12" , r12), +REG_OFFSET_NAME_64 ("%r13" , r13), +REG_OFFSET_NAME_64 ("%r14" , r14), +REG_OFFSET_NAME_64 ("%r15" , r15), +REG_OFFSET_END , };/* TODO: switching by dwarf address size */ #ifdef __x86_64__ -#define ARCH_MAX_REGS X86_64_MAX_REGS -#define arch_regs_table x86_64_regs_table +#define regoffset_table x86_64_regoffset_table#else -#define ARCH_MAX_REGS X86_32_MAX_REGS -#define arch_regs_table x86_32_regs_table +#define regoffset_table x86_32_regoffset_table#endif +/* Minus 1 for the ending REG_OFFSET_END */ +#define ARCH_MAX_REGS ((sizeof(regoffset_table) / sizeof(regoffset_table[0])) - 1) +/* Return architecture dependent register string (for kprobe-tracer) */ const char *get_arch_regstr (unsigned int n) { -return (n <ARCH_MAX_REGS ) ? arch_regs_table[n] :NULL ; +return (n <ARCH_MAX_REGS ) ? regoffset_table[n].name :NULL ; +} + +/* Reuse code from arch/x86/kernel/ptrace.c */ +/** +* regs_query_register_offset() - query register offset from its name +* @name: the name of a register +* +* regs_query_register_offset() returns the offset of a register in struct +* pt_regs from its name. If the name is invalid, this returns -EINVAL; +*/ +int regs_query_register_offset (const char *name) +{ +const struct pt_regs_offset *roff; +for (roff = regoffset_table; roff->name !=NULL ; roff++) +if (!strcmp (roff->name, name)) +return roff->offset; +return -EINVAL ; } --1.8.3.4
平松雅巳 / HIRAMATU,MASAMI
Acked-byRE: [PATCH 23/31] perf tools: Introduce regs_query_register_offset() for x86
Quoted 43 lines
From: Arnaldo Carvalho de Melo [mailto:[email protected]]
Em Tue, Sep 01, 2015 at 11:47:41AM +0000, 平松雅巳 / HIRAMATU,MASAMI escreveu:
Quoted 7 lines
Quoted 7 lines
From: Wang Nan [mailto:[email protected]]
regs_query_register_offset()is a helper function which converts register name like "%rax" to offset of a register in 'structpt_regs', which is required by BPF prologue generator. Since the function is identical, try to reuse the code inarch/x86/kernel/ptrace.c.Quoted 6 lines
Quoted 2 lines
Comment inside
dwarf-regs.clist the differences between this implementation and kernel code.Hmm, this also introduce a duplication of the code... It might be a good time to move them into
arch/x86/lib/and reuse it directly from perf code.It is strange to, having tried sharing stuff directly from the kernel, to be now in a position where I advocate against it...
Copy'n'pasting what I said in another message:
-----
We would go back to sharing stuff with the kernel, but this time around we would be using something that everybody knows is being shared, which doesn't elliminates the possibility that at some point changes made with the kernel in mind would break thetools/using code.Perhaps it is better to keep copying what we want and introduce infrastructure to check for differences and warn us as soon as possible so that we would do the copy, test if it doesn't break what we use, etc.
I.e. we wouldn't be putting any new burden on the "kernel people", i.e. the burden of having to check that changes they make don't break
tools/living code, nor any out of the blue breakage ontools/fortools/developers to fix when changes are made on the kernel "side" -----
---The "stop sharing directly stuff with the kernel" stance was taken after a report from Linus about breakage due to
tools/using kernel files directly and then a change made in some RCU files broke thetools/perf/build, even withtools/perf/not using anything RCU related so far.
Quoted 4 lines
Looking at
tools/perf/MANIFEST, the file used to create a detached tarball so that perf can be built outside the kernel sources there are still some kernel source files listed, but those probably need to be copied too...
OK, so let this apply.
And also we'll need a testcase for this.
Thank you,
Quoted 203 lines
- Arnaldo
Quoted 200 lines
Thank you,
Quoted 197 lines
get_arch_regstr()switches toregoffset_tableand the old string table is dropped.Signed-off-by Wang Nan <[email protected]>Signed-off-by He Kuang <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/Build | 1 + tools/perf/arch/x86/util/dwarf-regs.c | 122 ++++++++++++++++++++++++---------- 3 files changed, 90 insertions(+), 34 deletions(-)tools/perf/arch/x86/Makefile +1
-0@@ -2,3 +2,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 +PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1tools/perf/arch/x86/util/Build +1
-0@@ -4,6 +4,7 @@ libperf-y += pmu.o libperf-y += kvm-stat.o libperf-$(CONFIG_DWARF) += dwarf-regs.o +libperf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/arch/x86/util/dwarf-regs.c +88
-35@@ -21,55 +21,109 @@*/ #include <stddef.h> +#include <errno.h> /* for EINVAL */ +#include <string.h> /* for strcmp */ +#include <linux/ptrace.h> /* for struct pt_regs */ +#include <linux/kernel.h> /* for offsetof */ #include <dwarf-regs.h> /* -* Generic dwarf analysis helpers +* See arch/x86/kernel/ptrace.c. +* Different from it: +* +* - Since struct pt_regs is defined differently for user and kernel, +* but we want to use 'ax, bx' instead of 'rax, rbx' (which is struct +* field name of user's pt_regs), we make REG_OFFSET_NAME to accept +* both string name and reg field name. +* +* - Since accessing x86_32's pt_regs from x86_64 building is difficult +* and vise versa, we simply fill offset with -1, so +* get_arch_regstr() still works but regs_query_register_offset() +* returns error. +* The only inconvenience caused by it now is that we are not allowed +* to generate BPF prologue for a x86_64 kernel if perf is built for +* x86_32. This is really a rare usecase. +* +* - Order is different from kernel's ptrace.c for get_arch_regstr(), which +* is defined by dwarf. */ -#define X86_32_MAX_REGS 8 -const char *x86_32_regs_table[X86_32_MAX_REGS ] = { -"%ax" , -"%cx" , -"%dx" , -"%bx" , -"$stack" ,/* Stack address instead of %sp */ -"%bp" , -"%si" , -"%di" , +struct pt_regs_offset { +const char *name; +int offset; +}; + +#define REG_OFFSET_END {.name = NULL, .offset = 0} + +#ifdef __x86_64__ +# define REG_OFFSET_NAME_64 (n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} +# define REG_OFFSET_NAME_32 (n, r) {.name = n, .offset = -1} +#else +# define REG_OFFSET_NAME_64 (n, r) {.name = n, .offset = -1} +# define REG_OFFSET_NAME_32 (n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} +#endif + +static const struct pt_regs_offset x86_32_regoffset_table[] = { +REG_OFFSET_NAME_32 ("%ax" , eax), +REG_OFFSET_NAME_32 ("%cx" , ecx), +REG_OFFSET_NAME_32 ("%dx" , edx), +REG_OFFSET_NAME_32 ("%bx" , ebx), +REG_OFFSET_NAME_32 ("$stack" , esp),/* Stack address instead of %sp */ +REG_OFFSET_NAME_32 ("%bp" , ebp), +REG_OFFSET_NAME_32 ("%si" , esi), +REG_OFFSET_NAME_32 ("%di" , edi), +REG_OFFSET_END , }; -#define X86_64_MAX_REGS 16 -const char *x86_64_regs_table[X86_64_MAX_REGS ] = { -"%ax" , -"%dx" , -"%cx" , -"%bx" , -"%si" , -"%di" , -"%bp" , -"%sp" , -"%r8" , -"%r9" , -"%r10" , -"%r11" , -"%r12" , -"%r13" , -"%r14" , -"%r15" , +static const struct pt_regs_offset x86_64_regoffset_table[] = { +REG_OFFSET_NAME_64 ("%ax" , rax), +REG_OFFSET_NAME_64 ("%dx" , rdx), +REG_OFFSET_NAME_64 ("%cx" , rcx), +REG_OFFSET_NAME_64 ("%bx" , rbx), +REG_OFFSET_NAME_64 ("%si" , rsi), +REG_OFFSET_NAME_64 ("%di" , rdi), +REG_OFFSET_NAME_64 ("%bp" , rbp), +REG_OFFSET_NAME_64 ("%sp" , rsp), +REG_OFFSET_NAME_64 ("%r8" , r8), +REG_OFFSET_NAME_64 ("%r9" , r9), +REG_OFFSET_NAME_64 ("%r10" , r10), +REG_OFFSET_NAME_64 ("%r11" , r11), +REG_OFFSET_NAME_64 ("%r12" , r12), +REG_OFFSET_NAME_64 ("%r13" , r13), +REG_OFFSET_NAME_64 ("%r14" , r14), +REG_OFFSET_NAME_64 ("%r15" , r15), +REG_OFFSET_END , };/* TODO: switching by dwarf address size */ #ifdef __x86_64__ -#define ARCH_MAX_REGS X86_64_MAX_REGS -#define arch_regs_table x86_64_regs_table +#define regoffset_table x86_64_regoffset_table#else -#define ARCH_MAX_REGS X86_32_MAX_REGS -#define arch_regs_table x86_32_regs_table +#define regoffset_table x86_32_regoffset_table#endif +/* Minus 1 for the ending REG_OFFSET_END */ +#define ARCH_MAX_REGS ((sizeof(regoffset_table) / sizeof(regoffset_table[0])) - 1) +/* Return architecture dependent register string (for kprobe-tracer) */ const char *get_arch_regstr (unsigned int n) { -return (n <ARCH_MAX_REGS ) ? arch_regs_table[n] :NULL ; +return (n <ARCH_MAX_REGS ) ? regoffset_table[n].name :NULL ; +} + +/* Reuse code from arch/x86/kernel/ptrace.c */ +/** +* regs_query_register_offset() - query register offset from its name +* @name: the name of a register +* +* regs_query_register_offset() returns the offset of a register in struct +* pt_regs from its name. If the name is invalid, this returns -EINVAL; +*/ +int regs_query_register_offset (const char *name) +{ +const struct pt_regs_offset *roff; +for (roff = regoffset_table; roff->name !=NULL ; roff++) +if (!strcmp (roff->name, name)) +return roff->offset; +return -EINVAL ; } --1.8.3.4
���{.n�+�������+%�����ݶ��w��{.n�+����{��G�����{ay�ʇڙ�,j��f���h��������z_�(�階�ݢj"���m������G������?����&���~��iO��z��v�^�m����������?�I�
Re: [PATCH 23/31] perf tools: Introduce regs_query_register_offset() for x86
Quoted 45 lines · 平松雅巳 / HIRAMATU,MASAMI
Quoted 41 lines
From: Arnaldo Carvalho de Melo [mailto:[email protected]]
Em Tue, Sep 01, 2015 at 11:47:41AM +0000, 平松雅巳 / HIRAMATU,MASAMI escreveu:
Quoted 7 lines
Quoted 7 lines
From: Wang Nan [mailto:[email protected]]
regs_query_register_offset()is a helper function which converts register name like "%rax" to offset of a register in 'structpt_regs', which is required by BPF prologue generator. Since the function is identical, try to reuse the code inarch/x86/kernel/ptrace.c.Quoted 5 lines
Quoted 2 lines
Comment inside
dwarf-regs.clist the differences between this implementation and kernel code.Hmm, this also introduce a duplication of the code... It might be a good time to move them into
arch/x86/lib/and reuse it directly from perf code.It is strange to, having tried sharing stuff directly from the kernel, to be now in a position where I advocate against it...
Copy'n'pasting what I said in another message:
-----
We would go back to sharing stuff with the kernel, but this time around we would be using something that everybody knows is being shared, which doesn't elliminates the possibility that at some point changes made with the kernel in mind would break thetools/using code.Perhaps it is better to keep copying what we want and introduce infrastructure to check for differences and warn us as soon as possible so that we would do the copy, test if it doesn't break what we use, etc.
I.e. we wouldn't be putting any new burden on the "kernel people", i.e. the burden of having to check that changes they make don't break
tools/living code, nor any out of the blue breakage ontools/fortools/developers to fix when changes are made on the kernel "side" -----
---The "stop sharing directly stuff with the kernel" stance was taken after a report from Linus about breakage due to
tools/using kernel files directly and then a change made in some RCU files broke thetools/perf/build, even withtools/perf/not using anything RCU related so far.Quoted 4 lines
Looking at
tools/perf/MANIFEST, the file used to create a detached tarball so that perf can be built outside the kernel sources there are still some kernel source files listed, but those probably need to be copied too...
Quoted 5 lines
OK, so let this apply.
Acked-by Masami Hiramatsu <[email protected]>And also we'll need a testcase for this.
I created a testcase for the whole BPF prologue, so I think this can be covered?
I'll post them by replying this mail.
Thank you.
Quoted 202 lines
Thank you,
Quoted 200 lines
- Arnaldo
Quoted 198 lines
Thank you,
Quoted 196 lines
get_arch_regstr()switches toregoffset_tableand the old string table is dropped.Signed-off-by Wang Nan <[email protected]>Signed-off-by He Kuang <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/Build | 1 + tools/perf/arch/x86/util/dwarf-regs.c | 122 ++++++++++++++++++++++++---------- 3 files changed, 90 insertions(+), 34 deletions(-)tools/perf/arch/x86/Makefile +1
-0@@ -2,3 +2,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 +PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1tools/perf/arch/x86/util/Build +1
-0@@ -4,6 +4,7 @@ libperf-y += pmu.o libperf-y += kvm-stat.o libperf-$(CONFIG_DWARF) += dwarf-regs.o +libperf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.otools/perf/arch/x86/util/dwarf-regs.c +88
-35@@ -21,55 +21,109 @@*/ #include <stddef.h> +#include <errno.h> /* for EINVAL */ +#include <string.h> /* for strcmp */ +#include <linux/ptrace.h> /* for struct pt_regs */ +#include <linux/kernel.h> /* for offsetof */ #include <dwarf-regs.h> /* -* Generic dwarf analysis helpers +* See arch/x86/kernel/ptrace.c. +* Different from it: +* +* - Since struct pt_regs is defined differently for user and kernel, +* but we want to use 'ax, bx' instead of 'rax, rbx' (which is struct +* field name of user's pt_regs), we make REG_OFFSET_NAME to accept +* both string name and reg field name. +* +* - Since accessing x86_32's pt_regs from x86_64 building is difficult +* and vise versa, we simply fill offset with -1, so +* get_arch_regstr() still works but regs_query_register_offset() +* returns error. +* The only inconvenience caused by it now is that we are not allowed +* to generate BPF prologue for a x86_64 kernel if perf is built for +* x86_32. This is really a rare usecase. +* +* - Order is different from kernel's ptrace.c for get_arch_regstr(), which +* is defined by dwarf. */ -#define X86_32_MAX_REGS 8 -const char *x86_32_regs_table[X86_32_MAX_REGS ] = { -"%ax" , -"%cx" , -"%dx" , -"%bx" , -"$stack" ,/* Stack address instead of %sp */ -"%bp" , -"%si" , -"%di" , +struct pt_regs_offset { +const char *name; +int offset; +}; + +#define REG_OFFSET_END {.name = NULL, .offset = 0} + +#ifdef __x86_64__ +# define REG_OFFSET_NAME_64 (n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} +# define REG_OFFSET_NAME_32 (n, r) {.name = n, .offset = -1} +#else +# define REG_OFFSET_NAME_64 (n, r) {.name = n, .offset = -1} +# define REG_OFFSET_NAME_32 (n, r) {.name = n, .offset = offsetof(struct pt_regs, r)} +#endif + +static const struct pt_regs_offset x86_32_regoffset_table[] = { +REG_OFFSET_NAME_32 ("%ax" , eax), +REG_OFFSET_NAME_32 ("%cx" , ecx), +REG_OFFSET_NAME_32 ("%dx" , edx), +REG_OFFSET_NAME_32 ("%bx" , ebx), +REG_OFFSET_NAME_32 ("$stack" , esp),/* Stack address instead of %sp */ +REG_OFFSET_NAME_32 ("%bp" , ebp), +REG_OFFSET_NAME_32 ("%si" , esi), +REG_OFFSET_NAME_32 ("%di" , edi), +REG_OFFSET_END , }; -#define X86_64_MAX_REGS 16 -const char *x86_64_regs_table[X86_64_MAX_REGS ] = { -"%ax" , -"%dx" , -"%cx" , -"%bx" , -"%si" , -"%di" , -"%bp" , -"%sp" , -"%r8" , -"%r9" , -"%r10" , -"%r11" , -"%r12" , -"%r13" , -"%r14" , -"%r15" , +static const struct pt_regs_offset x86_64_regoffset_table[] = { +REG_OFFSET_NAME_64 ("%ax" , rax), +REG_OFFSET_NAME_64 ("%dx" , rdx), +REG_OFFSET_NAME_64 ("%cx" , rcx), +REG_OFFSET_NAME_64 ("%bx" , rbx), +REG_OFFSET_NAME_64 ("%si" , rsi), +REG_OFFSET_NAME_64 ("%di" , rdi), +REG_OFFSET_NAME_64 ("%bp" , rbp), +REG_OFFSET_NAME_64 ("%sp" , rsp), +REG_OFFSET_NAME_64 ("%r8" , r8), +REG_OFFSET_NAME_64 ("%r9" , r9), +REG_OFFSET_NAME_64 ("%r10" , r10), +REG_OFFSET_NAME_64 ("%r11" , r11), +REG_OFFSET_NAME_64 ("%r12" , r12), +REG_OFFSET_NAME_64 ("%r13" , r13), +REG_OFFSET_NAME_64 ("%r14" , r14), +REG_OFFSET_NAME_64 ("%r15" , r15), +REG_OFFSET_END , };/* TODO: switching by dwarf address size */ #ifdef __x86_64__ -#define ARCH_MAX_REGS X86_64_MAX_REGS -#define arch_regs_table x86_64_regs_table +#define regoffset_table x86_64_regoffset_table#else -#define ARCH_MAX_REGS X86_32_MAX_REGS -#define arch_regs_table x86_32_regs_table +#define regoffset_table x86_32_regoffset_table#endif +/* Minus 1 for the ending REG_OFFSET_END */ +#define ARCH_MAX_REGS ((sizeof(regoffset_table) / sizeof(regoffset_table[0])) - 1) +/* Return architecture dependent register string (for kprobe-tracer) */ const char *get_arch_regstr (unsigned int n) { -return (n <ARCH_MAX_REGS ) ? arch_regs_table[n] :NULL ; +return (n <ARCH_MAX_REGS ) ? regoffset_table[n].name :NULL ; +} + +/* Reuse code from arch/x86/kernel/ptrace.c */ +/** +* regs_query_register_offset() - query register offset from its name +* @name: the name of a register +* +* regs_query_register_offset() returns the offset of a register in struct +* pt_regs from its name. If the name is invalid, this returns -EINVAL; +*/ +int regs_query_register_offset (const char *name) +{ +const struct pt_regs_offset *roff; +for (roff = regoffset_table; roff->name !=NULL ; roff++) +if (!strcmp (roff->name, name)) +return roff->offset; +return -EINVAL ; } --1.8.3.4
PATCH 1/1 perf test: Enforce LLVM test, add kbuild test
This patch enforces existing LLVM test, makes it compile more than one BPF source file. The compiled results are stored, can be used for other testcases. Except the first testcase (named LLVM_TESTCASE_BASE), failures of other test cases are not considered as failure of the whole test.
Adds a kbuild testcase to check whether kernel headers can be correctly found.
For example:
# perf test LLVM
38: Test LLVM searching and compiling : (llvm.kbuild-dir can be fixed) Ok
--- tools/perf/tests/Build | 11 ++- tools/perf/tests/bpf-script-example.c | 4 + tools/perf/tests/bpf-script-test-kbuild.c | 21 ++++ tools/perf/tests/bpf.c | 3 +- tools/perf/tests/llvm.c | 154 ++++++++++++++++++++++-------- tools/perf/tests/llvm.h | 10 +- 6 files changed, 156 insertions(+), 47 deletions(-) create mode 100644 tools/perf/tests/bpf-script-test-kbuild.c
tools/perf/tests/Build +9 -2
@@ -32,17 +32,24 @@ perf-y += sample-parsing.o perf-y += parse-no-sample-id-all.o perf-y += kmod-path.o perf-y += thread-map.o -perf-y += llvm.o llvm-src.o +perf-y += llvm.o llvm-src-base.o llvm-src-kbuild.o perf-y += bpf.o perf-y += topology.o -$(OUTPUT)tests/llvm-src.c: tests/bpf-script-example.c +$(OUTPUT)tests/llvm-src-base.c: tests/bpf-script-example.c $(call rule_mkdir) $(Q)echo '#include <tests/llvm.h>' > $@ $(Q)echo 'const char test_llvm__bpf_prog[] =' >> $@ $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ $(Q)echo ';' >> $@ +$(OUTPUT)tests/llvm-src-kbuild.c: tests/bpf-script-test-kbuild.c + $(call rule_mkdir) + $(Q)echo '#include <tests/llvm.h>' > $@ + $(Q)echo 'const char test_llvm__bpf_test_kbuild_prog[] =' >> $@ + $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ + $(Q)echo ';' >> $@ + perf-$(CONFIG_X86) += perf-time-to-tsc.o ifdef CONFIG_AUXTRACE perf-$(CONFIG_X86) += insn-x86.o
tools/perf/tests/bpf-script-example.c +4 -0
@@ -1,3 +1,7 @@ +/* +* bpf-script-example.c +* Test basic LLVM building +*/ #ifndef LINUX_VERSION_CODE # error Need LINUX_VERSION_CODE# error Example: for 4.2 kernel, put 'clang-opt="-DLINUX_VERSION_CODE=0x40200" into llvm section of ~/.perfconfig'
tools/perf/tests/bpf-script-test-kbuild.c new file +21 -0
@@ -0,0 +1,21 @@ +/* +* bpf-script-test-kbuild.c +* Test include from kernel header +*/ +#ifndef LINUX_VERSION_CODE +# error Need LINUX_VERSION_CODE +# error Example: for 4.2 kernel, put 'clang-opt="-DLINUX_VERSION_CODE=0x40200" into llvm section of ~/.perfconfig' +#endif +#define SEC (NAME ) __attribute__((section(NAME), used)) + +#include <uapi/linux/fs.h> +#include <uapi/asm/ptrace.h> + +SEC("func=vfs_llseek") +int bpf_func__vfs_llseek (struct pt_regs *ctx) +{ +return 0 ; +} + +char _license[] SEC("license") = "GPL"; +int _version SEC("version") = LINUX_VERSION_CODE;
tools/perf/tests/bpf.c +2 -1
@@ -143,7 +143,8 @@ int test__bpf(void)return TEST_SKIP ; } -test_llvm__fetch_bpf_obj (&obj_buf, &obj_buf_sz); +test_llvm__fetch_bpf_obj (&obj_buf, &obj_buf_sz,LLVM_TESTCASE_BASE ); +if (!obj_buf || !obj_buf_sz) {if (verbose ==0 )fprintf (stderr," (fix 'perf test LLVM' first)" );
tools/perf/tests/llvm.c +112 -42
238 lines not on this page · raw message
tools/perf/tests/llvm.h +8 -2
@@ -8,8 +8,14 @@ struct test_llvm__bpf_result { char object[]; }; -extern struct test_llvm__bpf_result *p_test_llvm__bpf_result;extern const char test_llvm__bpf_prog[]; -void test_llvm__fetch_bpf_obj (void **p_obj_buf,size_t *p_obj_buf_sz); +extern const char test_llvm__bpf_test_kbuild_prog[]; + +enum test_llvm__testcase { +LLVM_TESTCASE_BASE , +LLVM_TESTCASE_KBUILD , +NR_LLVM_TESTCASES , +}; +void test_llvm__fetch_bpf_obj (void **p_obj_buf,size_t *p_obj_buf_sz,int index);#endif
Signature · 1 line
1.8.3.4
PATCH 1/1 perf test: Test BPF prologue
This patch introduces a new BPF script to test BPF prologue. The new script probes at null_lseek, which is the function pointer when we try to lseek on '/dev/null'.
null_lseek is chosen because it is a function pointer, so we don't need to consider inlining and LTP.
By extracting file->f_mode, bpf-script-test-prologue.c should know whether the file is writable or readonly. According to llseek_loop() and bpf-script-test-prologue.c, one forth of total lseeks should be collected.
This patch improve test__bpf so it can run multiple BPF programs on different test functions.
--- tools/perf/tests/Build | 9 ++- tools/perf/tests/bpf-script-test-prologue.c | 35 +++++++++++ tools/perf/tests/bpf.c | 93 +++++++++++++++++++++++------ tools/perf/tests/llvm.c | 5 ++ tools/perf/tests/llvm.h | 8 +++ 5 files changed, 130 insertions(+), 20 deletions(-) create mode 100644 tools/perf/tests/bpf-script-test-prologue.c
tools/perf/tests/Build +8 -1
@@ -32,7 +32,7 @@ perf-y += sample-parsing.o perf-y += parse-no-sample-id-all.o perf-y += kmod-path.o perf-y += thread-map.o -perf-y += llvm.o llvm-src-base.o llvm-src-kbuild.o +perf-y += llvm.o llvm-src-base.o llvm-src-kbuild.o llvm-src-prologue.o perf-y += bpf.o perf-y += topology.o
@@ -50,6 +50,13 @@ $(OUTPUT)tests/llvm-src-kbuild.c: tests/bpf-script-test-kbuild.c $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ $(Q)echo ';' >> $@ +$(OUTPUT)tests/llvm-src-prologue.c: tests/bpf-script-test-prologue.c + $(call rule_mkdir) + $(Q)echo '#include <tests/llvm.h>' > $@ + $(Q)echo 'const char test_llvm__bpf_test_prologue_prog[] =' >> $@ + $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ + $(Q)echo ';' >> $@ + perf-$(CONFIG_X86) += perf-time-to-tsc.o ifdef CONFIG_AUXTRACE perf-$(CONFIG_X86) += insn-x86.o
tools/perf/tests/bpf-script-test-prologue.c new file +35 -0
@@ -0,0 +1,35 @@ +/* +* bpf-script-test-prologue.c +* Test BPF prologue +*/ +#ifndef LINUX_VERSION_CODE +# error Need LINUX_VERSION_CODE +# error Example: for 4.2 kernel, put 'clang-opt="-DLINUX_VERSION_CODE=0x40200" into llvm section of ~/.perfconfig' +#endif +#define SEC (NAME ) __attribute__((section(NAME), used)) + +#include <uapi/linux/fs.h> + +#define FMODE_READ 0x1 +#define FMODE_WRITE 0x2 + +static void (*bpf_trace_printk)(const char *fmt,int fmt_size, ...) = + (void *)6 ; + +SEC("func=null_lseek file->f_mode offset orig") +int bpf_func__null_lseek (void *ctx,int err,unsigned long f_mode, +unsigned long offset,unsigned long orig) +{ +if (err) +return 0 ; +if (f_mode &FMODE_WRITE ) +return 0 ; +if (offset &1 ) +return 0 ; +if (orig ==SEEK_CUR ) +return 0 ; +return 1 ; +} + +char _license[] SEC("license") = "GPL"; +int _version SEC("version") = LINUX_VERSION_CODE;
tools/perf/tests/bpf.c +74 -19
146 lines not on this page · raw message
tools/perf/tests/llvm.c +5 -0
@@ -22,6 +22,11 @@ struct llvm_testcase { [LLVM_TESTCASE_KBUILD ] = {.source = test_llvm__bpf_test_kbuild_prog, .errmsg ="llvm.kbuild-dir can be fixed" , .tried = false}, + /* Don't output if this one fail. */ + [LLVM_TESTCASE_BPF_PROLOGUE ] = { + .source = test_llvm__bpf_test_prologue_prog, + .errmsg ="failed for unknown reason" , + .tried = false}, {.source = NULL} };
tools/perf/tests/llvm.h +8 -0
@@ -10,10 +10,18 @@ struct test_llvm__bpf_result {extern const char test_llvm__bpf_prog[];extern const char test_llvm__bpf_test_kbuild_prog[]; +extern const char test_llvm__bpf_test_prologue_prog[];enum test_llvm__testcase {LLVM_TESTCASE_BASE ,LLVM_TESTCASE_KBUILD , +/* +* We must put LLVM_TESTCASE_BPF_PROLOGUE after +* LLVM_TESTCASE_KBUILD, so if kbuild test failed, +* don't need to try this one, because it depend on +* kernel header. +*/ +LLVM_TESTCASE_BPF_PROLOGUE ,NR_LLVM_TESTCASES , };void test_llvm__fetch_bpf_obj (void **p_obj_buf,size_t *p_obj_buf_sz,int index);
Signature · 1 line
1.8.3.4
Namhyung Kim
maintainerRe: [PATCH 22/31] perf tools: Add BPF_PROLOGUE config options for further patches
In reply to Wang NanQuoted 44 lines · Wang Nan
If both LIBBPF and DWARF are detected, it is possible to create prologue for eBPF programs to help them accessing kernel data.
HAVE_BPF_PROLOGUEandCONFIG_BPF_PROLOGUEis added as flags for this feature.
PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSETindicates an architecture supports converting name of a register to its offset in 'structpt_regs'. Without this support,BPF_PROLOGUEshould be turned off.
HAVE_ARCH_REGS_QUERY_REGISTER_OFFSETis introduced as the corresponding CFLAGS ofPERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET.Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>[wawngnan:
- Introduce new CFLAGS to control BPF prologue andarch_get_reg_info()separately.
- RenameARCH_GET_REG_INFOtoARCH_REGS_QUERY_REGISTER_OFFSET,arch_get_reg_info()toregs_query_register_offset(), change its API accordingly to make it similar to kernel'sregs_query_register_offset().
]--- tools/perf/config/Makefile | 17 +++++++++++++++++ tools/perf/util/include/dwarf-regs.h | 8 ++++++++ 2 files changed, 25 insertions(+)tools/perf/config/Makefile +0
-0
tools/perf/config/Makefile FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/arch/$(AR · line 113
Quoted 4 lines
tools/perf/config/Makefile +1
-0@@ -110,6 +110,11 @@ FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/arch/$(AR # include ARCH specific config -include $(src-perf)/arch/$(ARCH)/Makefile +ifneq ($(origin PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET), undefined)
Why not just using
ifdef PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET
?
Quoted 8 lines
tools/perf/config/Makefile +4
-0+ CFLAGS += -DHAVE_ARCH_REGS_QUERY_REGISTER_OFFSET +endif + + include $(src-perf)/config/utilities.mak ifeq ($(call get-executable,$(FLEX)),)
tools/perf/config/Makefile ifndef NO_LIBELF · line 324
Quoted 6 lines
tools/perf/config/Makefile +3
-0@@ -314,6 +319,18 @@ ifndef NO_LIBELF CFLAGS += -DHAVE_LIBBPF_SUPPORT $(call detected,CONFIG_LIBBPF) endif + + ifndef NO_DWARF + ifneq ($(origin PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET), undefined)
Ditto.
Thanks,
Namhyung
Quoted 32 lines
tools/perf/config/Makefile +9
-0+ CFLAGS += -DHAVE_BPF_PROLOGUE + $(call detected,CONFIG_BPF_PROLOGUE) + else + msg := $(warning BPF prologue is not supported by architecture $(ARCH), missing regs_query_register_offset()); + endif + else + msg := $(warning DWARF support is off, BPF prologue is disabled); + endif + endif # NO_LIBBPF endif # NO_LIBELFtools/perf/util/include/dwarf-regs.h +8
-0@@ -5,4 +5,12 @@const char *get_arch_regstr (unsigned int n);#endif +#ifdef HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET +/* +* Arch should support fetching the offset of a register in pt_regs +* by its name. See kernel's regs_query_register_offset in +* arch/xxx/kernel/ptrace.c. +*/ +int regs_query_register_offset (const char *name); +#endif #endif Signature · 1 line
1.8.3.4
PATCH 23/31 perf tools: Introduce arch_get_reg_info() for x86
In reply to Wang NanFrom: He Kuang <[email protected]>
arch_get_reg_info() is a helper function which converts register name like "%rax" to offset of a register in 'struct pt_regs', which is required by BPF prologue generator.
This patch replaces original string table by a 'struct reg_info' table, which records offset of registers according to its name.
For x86, since there are two sub-archs (x86_32 and x86_64) but we can only get pt_regs for the arch we are currently on, this patch fills offset with '-1' for another sub-arch. This introduces a limitation to perf prologue that, we are unable to generate prologue on a x86_32 compiled perf for BPF programs targeted on x86_64 kernel. This limitation is acceptable, because this is a very rare usecase.
--- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/Build | 2 + tools/perf/arch/x86/util/dwarf-regs.c | 104 ++++++++++++++++++++++++---------- 3 files changed, 78 insertions(+), 29 deletions(-)
tools/perf/arch/x86/Makefile +1 -0
@@ -2,3 +2,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 +PERF_HAVE_ARCH_GET_REG_INFO := 1
tools/perf/arch/x86/util/Build +2 -0
@@ -3,6 +3,8 @@ libperf-y += tsc.o libperf-y += pmu.o libperf-y += kvm-stat.o +# BPF_PROLOGUE also need dwarf-regs.o. However, if CONFIG_BPF_PROLOGUE +# is true, CONFIG_DWARF must true. libperf-$(CONFIG_DWARF) += dwarf-regs.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o
tools/perf/arch/x86/util/dwarf-regs.c +75 -29
124 lines not on this page · raw message
Signature · 1 line
2.1.0
Re: [PATCH 23/31] perf tools: Introduce arch_get_reg_info() for x86
Em Sat, Aug 29, 2015 at 04:21:57AM +0000, Wang Nan escreveu:
Quoted 5 lines
From: He Kuang <[email protected]>
arch_get_reg_info()is a helper function which converts register name like "%rax" to offset of a register in 'structpt_regs', which is required by BPF prologue generator.
Is this something like:
/* Query offset/name of register from its name/offset */ extern int regs_query_register_offset(const char *name);
in ptrace? Can't we reuse that name and even code?
Was this that was done and only a rename was made?
- Arnaldo
Quoted 187 lines
This patch replaces original string table by a 'struct
reg_info' table, which records offset of registers according to its name.For x86, since there are two sub-archs (
x86_32andx86_64) but we can only getpt_regsfor the arch we are currently on, this patch fills offset with '-1' for another sub-arch. This introduces a limitation to perf prologue that, we are unable to generate prologue on ax86_32compiled perf for BPF programs targeted onx86_64kernel. This limitation is acceptable, because this is a very rare usecase.Signed-off-by Wang Nan <[email protected]>Signed-off-by He Kuang <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/Build | 2 + tools/perf/arch/x86/util/dwarf-regs.c | 104 ++++++++++++++++++++++++---------- 3 files changed, 78 insertions(+), 29 deletions(-)tools/perf/arch/x86/Makefile +1
-0@@ -2,3 +2,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 +PERF_HAVE_ARCH_GET_REG_INFO := 1tools/perf/arch/x86/util/Build +2
-0@@ -3,6 +3,8 @@ libperf-y += tsc.o libperf-y += pmu.o libperf-y += kvm-stat.o +# BPF_PROLOGUE also need dwarf-regs.o. However, if CONFIG_BPF_PROLOGUE +# is true, CONFIG_DWARF must true. libperf-$(CONFIG_DWARF) += dwarf-regs.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.otools/perf/arch/x86/util/dwarf-regs.c +75
-29@@ -22,44 +22,67 @@#include <stddef.h> #include <dwarf-regs.h> +#include <string.h> +#include <linux/ptrace.h> +#include <linux/kernel.h> /* for offsetof */ +#include <util/bpf-loader.h> + +struct reg_info { +const char *name;/* Reg string in debuginfo */ +int offset;/* Reg offset in struct pt_regs */ +};/* * Generic dwarf analysis helpers */ - +/* +* x86_64 compiling can't access pt_regs for x86_32, so fill offset +* with -1. +*/ +#ifdef __x86_64__ +# define REG_INFO (n, f) { .name = n, .offset = -1, } +#else +# define REG_INFO (n, f) { .name = n, .offset = offsetof(struct pt_regs, f), } +#endif #define X86_32_MAX_REGS 8 -const char *x86_32_regs_table[X86_32_MAX_REGS ] = { -"%ax" , -"%cx" , -"%dx" , -"%bx" , -"$stack" ,/* Stack address instead of %sp */ -"%bp" , -"%si" , -"%di" , + +struct reg_info x86_32_regs_table[X86_32_MAX_REGS ] = { +REG_INFO ("%ax" , eax), +REG_INFO ("%cx" , ecx), +REG_INFO ("%dx" , edx), +REG_INFO ("%bx" , ebx), +REG_INFO ("$stack" , esp),/* Stack address instead of %sp */ +REG_INFO ("%bp" , ebp), +REG_INFO ("%si" , esi), +REG_INFO ("%di" , edi), }; +#undef REG_INFO +#ifdef __x86_64__ +# define REG_INFO (n, f) { .name = n, .offset = offsetof(struct pt_regs, f), } +#else +# define REG_INFO (n, f) { .name = n, .offset = -1, } +#endif #define X86_64_MAX_REGS 16 -const char *x86_64_regs_table[X86_64_MAX_REGS ] = { -"%ax" , -"%dx" , -"%cx" , -"%bx" , -"%si" , -"%di" , -"%bp" , -"%sp" , -"%r8" , -"%r9" , -"%r10" , -"%r11" , -"%r12" , -"%r13" , -"%r14" , -"%r15" , +struct reg_info x86_64_regs_table[X86_64_MAX_REGS ] = { +REG_INFO ("%ax" , rax), +REG_INFO ("%dx" , rdx), +REG_INFO ("%cx" , rcx), +REG_INFO ("%bx" , rbx), +REG_INFO ("%si" , rsi), +REG_INFO ("%di" , rdi), +REG_INFO ("%bp" , rbp), +REG_INFO ("%sp" , rsp), +REG_INFO ("%r8" , r8), +REG_INFO ("%r9" , r9), +REG_INFO ("%r10" , r10), +REG_INFO ("%r11" , r11), +REG_INFO ("%r12" , r12), +REG_INFO ("%r13" , r13), +REG_INFO ("%r14" , r14), +REG_INFO ("%r15" , r15), }; -/* TODO: switching by dwarf address size */ #ifdef __x86_64__#define ARCH_MAX_REGS X86_64_MAX_REGS#define arch_regs_table x86_64_regs_table@@ -71,5 +94,28 @@ const char *x86_64_regs_table[X86_64_MAX_REGS] = {/* Return architecture dependent register string (for kprobe-tracer) */ const char *get_arch_regstr (unsigned int n) { -return (n <=ARCH_MAX_REGS ) ? arch_regs_table[n] :NULL ; +return (n <=ARCH_MAX_REGS ) ? arch_regs_table[n].name :NULL ; } + +#ifdef HAVE_BPF_PROLOGUE +int arch_get_reg_info (const char *name,int *offset) +{ +int i; +struct reg_info *info; + +if (!name || !offset) +return -1 ; + +for (i =0 ; i <ARCH_MAX_REGS ; i++) { + info = &arch_regs_table[i]; +if (strcmp (info->name, name) ==0 ) { +if (info->offset <0 ) +return -1 ; + *offset = info->offset; +return 0 ; + } + } + +return -1 ; +} +#endif Signature · 1 line
2.1.0
Re: [PATCH 23/31] perf tools: Introduce arch_get_reg_info() for x86
Quoted 6 lines · Arnaldo Carvalho de Melo
Em Sat, Aug 29, 2015 at 04:21:57AM +0000, Wang Nan escreveu:
Quoted 5 lines
From: He Kuang <[email protected]>
arch_get_reg_info()is a helper function which converts register name like "%rax" to offset of a register in 'structpt_regs', which is required by BPF prologue generator.
Quoted 6 lines
Is this something like:
/* Query offset/name of register from its name/offset */ extern int
regs_query_register_offset(const char *name);in ptrace? Can't we reuse that name and even code?
Unfortunately we can't reuse its code, because pt_regs is defined differently in user and kernel side.
In arch/x86/kernel/ptrace.c we have:
struct pt_regs_offset {
const char *name;
int offset;
};#define REG_OFFSET_NAME(r) {.name = #r, .offset = offsetof(struct pt_regs, r)} #define REG_OFFSET_END {.name = NULL, .offset = 0}
static const struct pt_regs_offset regoffset_table[] = { #ifdef CONFIG_X86_64
...
REG_OFFSET_NAME(r15),
REG_OFFSET_NAME(r14),
REG_OFFSET_NAME(r13),...
The definition of REG_OFFSET_NAME relys on the field name and the string name of a register are identical. This is true for kernel, but not true for userspace.
For example, for x86_64, 'struct pt_regs' is defined in arch/x86/include/asm/ptrace.h for kernel, and the reigster name is 'ax, cx, dx, si, di ...'. In contract, which is defined in arch/x86/include/uapi/asm/ptrace.h for user, and the register name becomes 'rax, rcx, rdx, rsi, rdi ...'.
Since logical of regs_query_register_offset() is very simple, changing REG_OFFSET_NAME() makes it a totally different function.
But yes, let's reuse its name. And it may worth considering to reuse its code for other archs.
Thank you.
Quoted 191 lines
Was this that was done and only a rename was made?
- Arnaldo
Quoted 187 lines
This patch replaces original string table by a 'struct
reg_info' table, which records offset of registers according to its name.For x86, since there are two sub-archs (
x86_32andx86_64) but we can only getpt_regsfor the arch we are currently on, this patch fills offset with '-1' for another sub-arch. This introduces a limitation to perf prologue that, we are unable to generate prologue on ax86_32compiled perf for BPF programs targeted onx86_64kernel. This limitation is acceptable, because this is a very rare usecase.Signed-off-by Wang Nan <[email protected]>Signed-off-by He Kuang <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/Build | 2 + tools/perf/arch/x86/util/dwarf-regs.c | 104 ++++++++++++++++++++++++---------- 3 files changed, 78 insertions(+), 29 deletions(-)tools/perf/arch/x86/Makefile +1
-0@@ -2,3 +2,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 endif HAVE_KVM_STAT_SUPPORT := 1 +PERF_HAVE_ARCH_GET_REG_INFO := 1tools/perf/arch/x86/util/Build +2
-0@@ -3,6 +3,8 @@ libperf-y += tsc.o libperf-y += pmu.o libperf-y += kvm-stat.o +# BPF_PROLOGUE also need dwarf-regs.o. However, if CONFIG_BPF_PROLOGUE +# is true, CONFIG_DWARF must true. libperf-$(CONFIG_DWARF) += dwarf-regs.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.otools/perf/arch/x86/util/dwarf-regs.c +75
-29@@ -22,44 +22,67 @@#include <stddef.h> #include <dwarf-regs.h> +#include <string.h> +#include <linux/ptrace.h> +#include <linux/kernel.h> /* for offsetof */ +#include <util/bpf-loader.h> + +struct reg_info { +const char *name;/* Reg string in debuginfo */ +int offset;/* Reg offset in struct pt_regs */ +};/* * Generic dwarf analysis helpers */ - +/* +* x86_64 compiling can't access pt_regs for x86_32, so fill offset +* with -1. +*/ +#ifdef __x86_64__ +# define REG_INFO (n, f) { .name = n, .offset = -1, } +#else +# define REG_INFO (n, f) { .name = n, .offset = offsetof(struct pt_regs, f), } +#endif #define X86_32_MAX_REGS 8 -const char *x86_32_regs_table[X86_32_MAX_REGS ] = { -"%ax" , -"%cx" , -"%dx" , -"%bx" , -"$stack" ,/* Stack address instead of %sp */ -"%bp" , -"%si" , -"%di" , + +struct reg_info x86_32_regs_table[X86_32_MAX_REGS ] = { +REG_INFO ("%ax" , eax), +REG_INFO ("%cx" , ecx), +REG_INFO ("%dx" , edx), +REG_INFO ("%bx" , ebx), +REG_INFO ("$stack" , esp),/* Stack address instead of %sp */ +REG_INFO ("%bp" , ebp), +REG_INFO ("%si" , esi), +REG_INFO ("%di" , edi), }; +#undef REG_INFO +#ifdef __x86_64__ +# define REG_INFO (n, f) { .name = n, .offset = offsetof(struct pt_regs, f), } +#else +# define REG_INFO (n, f) { .name = n, .offset = -1, } +#endif #define X86_64_MAX_REGS 16 -const char *x86_64_regs_table[X86_64_MAX_REGS ] = { -"%ax" , -"%dx" , -"%cx" , -"%bx" , -"%si" , -"%di" , -"%bp" , -"%sp" , -"%r8" , -"%r9" , -"%r10" , -"%r11" , -"%r12" , -"%r13" , -"%r14" , -"%r15" , +struct reg_info x86_64_regs_table[X86_64_MAX_REGS ] = { +REG_INFO ("%ax" , rax), +REG_INFO ("%dx" , rdx), +REG_INFO ("%cx" , rcx), +REG_INFO ("%bx" , rbx), +REG_INFO ("%si" , rsi), +REG_INFO ("%di" , rdi), +REG_INFO ("%bp" , rbp), +REG_INFO ("%sp" , rsp), +REG_INFO ("%r8" , r8), +REG_INFO ("%r9" , r9), +REG_INFO ("%r10" , r10), +REG_INFO ("%r11" , r11), +REG_INFO ("%r12" , r12), +REG_INFO ("%r13" , r13), +REG_INFO ("%r14" , r14), +REG_INFO ("%r15" , r15), }; -/* TODO: switching by dwarf address size */ #ifdef __x86_64__#define ARCH_MAX_REGS X86_64_MAX_REGS#define arch_regs_table x86_64_regs_table@@ -71,5 +94,28 @@ const char *x86_64_regs_table[X86_64_MAX_REGS] = {/* Return architecture dependent register string (for kprobe-tracer) */ const char *get_arch_regstr (unsigned int n) { -return (n <=ARCH_MAX_REGS ) ? arch_regs_table[n] :NULL ; +return (n <=ARCH_MAX_REGS ) ? arch_regs_table[n].name :NULL ; } + +#ifdef HAVE_BPF_PROLOGUE +int arch_get_reg_info (const char *name,int *offset) +{ +int i; +struct reg_info *info; + +if (!name || !offset) +return -1 ; + +for (i =0 ; i <ARCH_MAX_REGS ; i++) { + info = &arch_regs_table[i]; +if (strcmp (info->name, name) ==0 ) { +if (info->offset <0 ) +return -1 ; + *offset = info->offset; +return 0 ; + } + } + +return -1 ; +} +#endif Signature · 1 line
2.1.0
PATCH 24/31 perf tools: Add prologue for BPF programs for fetching arguments
In reply to Wang NanThis patch generates prologue for a BPF program which fetch arguments for it. With this patch, the program can have arguments as follow:
SEC("lock_page=__lock_page page->flags")
int lock_page(struct pt_regs *ctx, int err, unsigned long flags)
{
return 1;}
This patch passes at most 3 arguments from r3, r4 and r5. r1 is still the ctx pointer. r2 is used to indicate the successfulness of dereferencing.
This patch uses r6 to hold ctx (struct pt_regs) and r7 to hold stack pointer for result. Result of each arguments first store on stack:
low address
BPF_REG_FP - 24 ARG3 BPF_REG_FP - 16 ARG2 BPF_REG_FP - 8 ARG1
BPF_REG_FP
high address
Then loaded into r3, r4 and r5.
The output prologue for offn(...off2(off1(reg)))) should be:
r6 <- r1 // save ctx into a callee saved register
r7 <- fp
r7 <- r7 - stack_offset // pointer to result slot
/* load r3 with the offset in pt_regs of 'reg' */
(r7) <- r3 // make slot valid
r3 <- r3 + off1 // prepare to read unsafe pointer
r2 <- 8
r1 <- r7 // result put onto stack
call probe_read // read unsafe pointer
jnei r0, 0, err // error checking
r3 <- (r7) // read result
r3 <- r3 + off2 // prepare to read unsafe pointer
r2 <- 8
r1 <- r7
call probe_read
jnei r0, 0, err
...
/* load r2, r3, r4 from stack */
goto success
err:
r2 <- 1
/* load r3, r4, r5 with 0 */
goto usercode
success:
r2 <- 0
usercode:
r1 <- r6 // restore ctx
// original user codeIf all of arguments reside in register (dereferencing is not required), gen_prologue_fastpath() will be used to create fast prologue:
r3 <- (r1 + offset of reg1)
r4 <- (r1 + offset of reg2)
r5 <- (r1 + offset of reg3)
r2 <- 0P.S.
eBPF calling convention is defined as:
* r0 - return value from in-kernel function, and exit value
for eBPF program
* r1 - r5 - arguments from eBPF program to in-kernel function
* r6 - r9 - callee saved registers that in-kernel function will
preserve
* r10 - read-only frame pointer to access stack
--- tools/perf/util/Build | 1 + tools/perf/util/bpf-prologue.c | 442 +++++++++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-prologue.h | 34 ++++ 3 files changed, 477 insertions(+) create mode 100644 tools/perf/util/bpf-prologue.c create mode 100644 tools/perf/util/bpf-prologue.h
tools/perf/util/Build +1 -0
@@ -84,6 +84,7 @@ libperf-$(CONFIG_AUXTRACE) += intel-bts.o libperf-y += parse-branch-options.o libperf-$(CONFIG_LIBBPF) += bpf-loader.o +libperf-$(CONFIG_BPF_PROLOGUE) += bpf-prologue.o libperf-$(CONFIG_LIBELF) += symbol-elf.o libperf-$(CONFIG_LIBELF) += probe-file.o libperf-$(CONFIG_LIBELF) += probe-event.o
tools/perf/util/bpf-prologue.c new file +442 -0
442 lines not on this page · raw message
tools/perf/util/bpf-prologue.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Copyright (C) 2015, He Kuang <[email protected]> +* Copyright (C) 2015, Huawei Inc. +*/ +#ifndef __BPF_PROLOGUE_H +#define __BPF_PROLOGUE_H + +#include <linux/compiler.h> +#include <linux/filter.h> +#include "probe-event.h" + +#define BPF_PROLOGUE_MAX_ARGS 3 +#define BPF_PROLOGUE_START_ARG_REG BPF_REG_3 +#define BPF_PROLOGUE_FETCH_RESULT_REG BPF_REG_2 + +#ifdef HAVE_BPF_PROLOGUE +int bpf__gen_prologue (struct probe_trace_arg *args,int nargs, +struct bpf_insn *new_prog,size_t *new_cnt, +size_t cnt_space); +#else +static inline int +bpf__gen_prologue (struct probe_trace_arg *args__maybe_unused , +int nargs__maybe_unused , +struct bpf_insn *new_prog__maybe_unused , +size_t *new_cnt, +size_t cnt_space__maybe_unused ) +{ +if (!new_cnt) +return -EINVAL ; + *new_cnt =0 ; +return 0 ; +} +#endif +#endif /* __BPF_PROLOGUE_H */
Signature · 1 line
2.1.0
PATCH 25/31 perf tools: Generate prologue for BPF programs
In reply to Wang NanThis patch generates prologue for each 'struct probe_trace_event' for fetching arguments for BPF programs.
After bpf__probe(), iterate over each programs to check whether prologue is required. If none of 'struct perf_probe_event' a program will attach to has at least one argument, simply skip preprocessor hooking. For those who prologue is required, calls bpf__gen_prologue() and paste original instruction after prologue.
--- tools/perf/util/bpf-loader.c | 120 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 119 insertions(+), 1 deletion(-)
tools/perf/util/bpf-loader.c +119 -1
@@ -5,10 +5,13 @@* Copyright (C) 2015 Huawei Inc. */ +#include <linux/bpf.h> #include <bpf/libbpf.h> #include "perf.h" #include "debug.h" #include "bpf-loader.h" +#include "bpf-prologue.h" +#include "llvm-utils.h" #include "probe-event.h" #include "probe-finder.h" #include "llvm-utils.h"
@@ -42,6 +45,8 @@ struct bpf_prog_priv {struct perf_probe_event *ppev;struct perf_probe_event pev; }; +bool need_prologue; +struct bpf_insn *insns_buf; }; static void
@@ -53,6 +58,7 @@ bpf_prog_priv__clear(struct bpf_program *prog __maybe_unused,/* check if pev is initialized */ if (priv && priv->pev_ready)clear_perf_probe_event (&priv->pev); +zfree (&priv->insns_buf);free (priv); }
@@ -239,6 +245,103 @@ int bpf__unprobe(void)return ret <0 ? ret :0 ; } +static int +preproc_gen_prologue (struct bpf_program *prog,int n, +struct bpf_insn *orig_insns,int orig_insns_cnt, +struct bpf_prog_prep_result *res) +{ +struct probe_trace_event *tev; +struct perf_probe_event *pev; +struct bpf_prog_priv *priv; +struct bpf_insn *buf; +size_t prologue_cnt =0 ; +int err; + + err =bpf_program__get_private (prog, (void **)&priv); +if (err || !priv || !priv->pev_ready) + goto errout; + + pev = &priv->pev; + +if (n <0 || n >= pev->ntevs) + goto errout; + + tev = &pev->tevs[n]; + + buf = priv->insns_buf; + err =bpf__gen_prologue (tev->args, tev->nargs, + buf, &prologue_cnt, +BPF_MAXINSNS - orig_insns_cnt); +if (err) { +const char *title; + + title =bpf_program__title (prog, false); +if (!title) + title ="??" ; + +pr_debug ("Failed to generate prologue for program %s\n" , + title); +return err; + } + +memcpy (&buf[prologue_cnt], orig_insns, +sizeof (struct bpf_insn ) * orig_insns_cnt); + + res->new_insn_ptr = buf; + res->new_insn_cnt = prologue_cnt + orig_insns_cnt; + res->pfd =NULL ; +return 0 ; + +errout: +pr_debug ("Internal error in preproc_gen_prologue\n" ); +return -EINVAL ; +} + +static int hook_load_preprocessor (struct bpf_program *prog) +{ +struct perf_probe_event *pev; +struct bpf_prog_priv *priv; +bool need_prologue = false; +int err, i; + + err =bpf_program__get_private (prog, (void **)&priv); +if (err || !priv) { +pr_debug ("Internal error when hook preprocessor\n" ); +return -EINVAL ; + } + + pev = &priv->pev; +for (i =0 ; i < pev->ntevs; i++) { +struct probe_trace_event *tev = &pev->tevs[i]; + +if (tev->nargs >0 ) { + need_prologue = true; +break ; + } + } + +/* +* Since all tev doesn't have argument, we don't need generate +* prologue. +*/ +if (!need_prologue) { + priv->need_prologue = false; +return 0 ; + } + + priv->need_prologue = true; + priv->insns_buf =malloc (sizeof (struct bpf_insn ) * +BPF_MAXINSNS ); +if (!priv->insns_buf) { +pr_debug ("No enough memory: alloc insns_buf failed\n" ); +return -ENOMEM ; + } + + err =bpf_program__set_prep (prog, pev->ntevs, + preproc_gen_prologue); +return err; +} +int bpf__probe (void ) {int err, nr_events =0 ;
@@ -289,6 +392,17 @@ int bpf__probe(void) err =sync_bpf_program_pev (prog);if (err) goto out; +/* +* After probing, let's consider prologue, which +* adds program fetcher to BPF programs. +* +* hook_load_preprocessorr() hooks pre-processor +* to bpf_program, let it generate prologue +* dynamically during loading. +*/ + err =hook_load_preprocessor (prog); +if (err) + goto out; } } out:
@@ -349,7 +463,11 @@ int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg)for (i =0 ; i < pev->ntevs; i++) { tev = &pev->tevs[i]; - fd =bpf_program__fd (prog); +if (priv->need_prologue) + fd =bpf_program__nth_fd (prog, i); +else + fd =bpf_program__fd (prog); +if (fd <0 ) {pr_debug ("bpf: failed to get file descriptor\n" );return fd;
Signature · 1 line
2.1.0
PATCH 26/31 perf tools: Use same BPF program if arguments are identical
In reply to Wang NanThis patch allows creating only one BPF program for different 'probe_trace_event'(tev) generated by one 'perf_probe_event'(pev), if their prologues are identical.
This is done by comparing argument list of different tev, and maps type of prologue and tev using a mapping array. This patch utilizes qsort to sort tevs. After sorting, tevs with identical argument list will group together.
--- tools/perf/util/bpf-loader.c | 133 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 126 insertions(+), 7 deletions(-)
tools/perf/util/bpf-loader.c +126 -7
@@ -47,6 +47,8 @@ struct bpf_prog_priv { };bool need_prologue;struct bpf_insn *insns_buf; +int nr_types; +int *type_mapping; }; static void
@@ -59,6 +61,7 @@ bpf_prog_priv__clear(struct bpf_program *prog __maybe_unused,if (priv && priv->pev_ready)clear_perf_probe_event (&priv->pev);zfree (&priv->insns_buf); +zfree (&priv->type_mapping);free (priv); }
@@ -255,7 +258,7 @@ preproc_gen_prologue(struct bpf_program *prog, int n,struct bpf_prog_priv *priv;struct bpf_insn *buf;size_t prologue_cnt =0 ; -int err; +int i, err; err =bpf_program__get_private (prog, (void **)&priv);if (err || !priv || !priv->pev_ready)
@@ -263,10 +266,20 @@ preproc_gen_prologue(struct bpf_program *prog, int n, pev = &priv->pev; -if (n <0 || n >= pev->ntevs) +if (n <0 || n >= priv->nr_types) goto errout; - tev = &pev->tevs[n]; +/* Find a tev belongs to that type */ +for (i =0 ; i < pev->ntevs; i++) +if (priv->type_mapping[i] == n) +break ; + +if (i >= pev->ntevs) { +pr_debug ("Internal error: prologue type %d not found\n" , n); +return -ENOENT ; + } + + tev = &pev->tevs[i]; buf = priv->insns_buf; err = bpf__gen_prologue(tev->args, tev->nargs,
@@ -297,6 +310,98 @@ errout:return -EINVAL ; } +/* +* compare_tev_args is reflexive, transitive and antisymmetric. +* I can show that but this margin is too narrow to contain. +*/ +static int compare_tev_args (const void *ptev1,const void *ptev2) +{ +int i, ret; +const struct probe_trace_event *tev1 = + *(const struct probe_trace_event **)ptev1; +const struct probe_trace_event *tev2 = + *(const struct probe_trace_event **)ptev2; + + ret = tev2->nargs - tev1->nargs; +if (ret) +return ret; + +for (i =0 ; i < tev1->nargs; i++) { +struct probe_trace_arg *arg1, *arg2; +struct probe_trace_arg_ref *ref1, *ref2; + + arg1 = &tev1->args[i]; + arg2 = &tev2->args[i]; + + ret =strcmp (arg1->value, arg2->value); +if (ret) +return ret; + + ref1 = arg1->ref; + ref2 = arg2->ref; + +while (ref1 && ref2) { + ret = ref2->offset - ref1->offset; +if (ret) +return ret; + + ref1 = ref1->next; + ref2 = ref2->next; + } + +if (ref1 || ref2) +return ref2 ?1 :-1 ; + } + +return 0 ; +} + +static int map_prologue (struct perf_probe_event *pev,int *mapping, +int *nr_types) +{ +int i, type =0 ; +struct { +struct probe_trace_event *tev; +int idx; + } *stevs; +size_t array_sz =sizeof (*stevs) * pev->ntevs; + + stevs =malloc (array_sz); +if (!stevs) { +pr_debug ("No ehough memory: alloc stevs failed\n" ); +return -ENOMEM ; + } + +pr_debug ("In map_prologue, ntevs=%d\n" , pev->ntevs); +for (i =0 ; i < pev->ntevs; i++) { + stevs[i].tev = &pev->tevs[i]; + stevs[i].idx = i; + } +qsort (stevs, pev->ntevs,sizeof (*stevs), + compare_tev_args); + +for (i =0 ; i < pev->ntevs; i++) { +if (i ==0 ) { + mapping[stevs[i].idx] = type; +pr_debug ("mapping[%d]=%d\n" , stevs[i].idx, + type); +continue ; + } + +if (compare_tev_args (stevs + i, stevs + i -1 ) ==0 ) + mapping[stevs[i].idx] = type; +else + mapping[stevs[i].idx] = ++type; + +pr_debug ("mapping[%d]=%d\n" , stevs[i].idx, + mapping[stevs[i].idx]); + } +free (stevs); + *nr_types = type +1 ; + +return 0 ; +} +static int hook_load_preprocessor (struct bpf_program *prog) {struct perf_probe_event *pev;
@@ -337,7 +442,19 @@ static int hook_load_preprocessor(struct bpf_program *prog)return -ENOMEM ; } - err =bpf_program__set_prep (prog, pev->ntevs, + priv->type_mapping =malloc (sizeof (int ) * pev->ntevs); +if (!priv->type_mapping) { +pr_debug ("No enough memory: alloc type_mapping failed\n" ); +return -ENOMEM ; + } +memset (priv->type_mapping,0xff , +sizeof (int ) * pev->ntevs); + + err =map_prologue (pev, priv->type_mapping, &priv->nr_types); +if (err) +return err; + + err =bpf_program__set_prep (prog, priv->nr_types, preproc_gen_prologue);return err; }
@@ -463,9 +580,11 @@ int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg)for (i =0 ; i < pev->ntevs; i++) { tev = &pev->tevs[i]; -if (priv->need_prologue) - fd =bpf_program__nth_fd (prog, i); -else +if (priv->need_prologue) { +int type = priv->type_mapping[i]; + + fd =bpf_program__nth_fd (prog, type); + }else fd =bpf_program__fd (prog);if (fd <0 ) {
Signature · 1 line
2.1.0
PATCH 27/31 perf record: Support custom vmlinux path
In reply to Wang NanFrom: He Kuang <[email protected]>
Make perf-record command support --vmlinux option if BPF_PROLOGUE is on.
'perf record' needs vmlinux as the source of DWARF info to generate prologue for BPF programs, so path of vmlinux should be specified.
Short name 'k' has been taken by 'clockid'. This patch skips the short option name and use '--vmlinux' for vmlinux path.
--- tools/perf/builtin-record.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/perf/builtin-record.c +4 -0
@@ -1100,6 +1100,10 @@ struct option __record_options[] = { "clang binary to use for compiling BPF scriptlets"),OPT_STRING (0 ,"clang-opt" , &llvm_param.clang_opt,"clang options" ,"options passed to clang when compiling BPF scriptlets" ), +#ifdef HAVE_BPF_PROLOGUE +OPT_STRING (0 ,"vmlinux" , &symbol_conf.vmlinux_name, +"file" ,"vmlinux pathname" ), +#endif #endifOPT_END () };
Signature · 1 line
2.1.0
Re: [PATCH 27/31] perf record: Support custom vmlinux path
Em Sat, Aug 29, 2015 at 04:22:01AM +0000, Wang Nan escreveu:
Quoted 3 lines
From: He Kuang <[email protected]>
Make perf-record command support --vmlinux option if
BPF_PROLOGUEis on.
Ok, this should be supported, i.e. letting the user specify a vmlinux path to use.
But it shouldn't be _required_, i.e. we have things like vmlinux_path to try to find it in well known places.
Right now it will search for it in the process of trying to load its symtab, but I think we should have a function that tries to find a vmlinux that matches the build-id of the running kernel, for things that want to have access directly to the ELF file with debuginfo without having to load the symtab in a struct dso, etc.
I'll look at the next patches to check how you make use of this info...
- Arnaldo
Quoted 44 lines
'perf record' needs vmlinux as the source of DWARF info to generate prologue for BPF programs, so path of vmlinux should be specified.
Short name 'k' has been taken by 'clockid'. This patch skips the short option name and use '--vmlinux' for vmlinux path.
Signed-off-by He Kuang <[email protected]>Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/builtin-record.c | 4 ++++ 1 file changed, 4 insertions(+)tools/perf/builtin-record.c +4
-0@@ -1100,6 +1100,10 @@ struct option __record_options[] = { "clang binary to use for compiling BPF scriptlets"),OPT_STRING (0 ,"clang-opt" , &llvm_param.clang_opt,"clang options" ,"options passed to clang when compiling BPF scriptlets" ), +#ifdef HAVE_BPF_PROLOGUE +OPT_STRING (0 ,"vmlinux" , &symbol_conf.vmlinux_name, +"file" ,"vmlinux pathname" ), +#endif #endifOPT_END () };Signature · 1 line
2.1.0
Re: [PATCH 27/31] perf record: Support custom vmlinux path
Em Tue, Sep 01, 2015 at 05:19:17PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 11 lines
Em Sat, Aug 29, 2015 at 04:22:01AM +0000, Wang Nan escreveu:
Quoted 3 lines
From: He Kuang <[email protected]>
Make perf-record command support --vmlinux option if
BPF_PROLOGUEis on.Ok, this should be supported, i.e. letting the user specify a vmlinux path to use.
But it shouldn't be _required_, i.e. we have things like
vmlinux_pathto try to find it in well known places.
Quoted 7 lines
Right now it will search for it in the process of trying to load its symtab, but I think we should have a function that tries to find a vmlinux that matches the build-id of the running kernel, for things that want to have access directly to the ELF file with debuginfo without having to load the symtab in a struct dso, etc.
I'll look at the next patches to check how you make use of this info...
So, the do it all from 'perf record' is in not yet in this patchkit, right? At least not in [ N/31 ] with N > 27, can you point me to it?
- Arnaldo
Quoted 46 lines
- Arnaldo
Quoted 44 lines
'perf record' needs vmlinux as the source of DWARF info to generate prologue for BPF programs, so path of vmlinux should be specified.
Short name 'k' has been taken by 'clockid'. This patch skips the short option name and use '--vmlinux' for vmlinux path.
Signed-off-by He Kuang <[email protected]>Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/builtin-record.c | 4 ++++ 1 file changed, 4 insertions(+)tools/perf/builtin-record.c +4
-0@@ -1100,6 +1100,10 @@ struct option __record_options[] = { "clang binary to use for compiling BPF scriptlets"),OPT_STRING (0 ,"clang-opt" , &llvm_param.clang_opt,"clang options" ,"options passed to clang when compiling BPF scriptlets" ), +#ifdef HAVE_BPF_PROLOGUE +OPT_STRING (0 ,"vmlinux" , &symbol_conf.vmlinux_name, +"file" ,"vmlinux pathname" ), +#endif #endifOPT_END () };Signature · 1 line
2.1.0
Re: [PATCH 27/31] perf record: Support custom vmlinux path
发自我的 iPhone
Quoted 20 lines · 在 2015年9月2日,上午4:21,Arnaldo Carvalho de Melo <[email protected]> 写道:
Em Tue, Sep 01, 2015 at 05:19:17PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 17 lines
Em Sat, Aug 29, 2015 at 04:22:01AM +0000, Wang Nan escreveu:
Quoted 3 lines
From: He Kuang <[email protected]>
Make perf-record command support --vmlinux option if
BPF_PROLOGUEis on.Ok, this should be supported, i.e. letting the user specify a vmlinux path to use.
But it shouldn't be _required_, i.e. we have things like
vmlinux_pathto try to find it in well known places.Right now it will search for it in the process of trying to load its symtab, but I think we should have a function that tries to find a vmlinux that matches the build-id of the running kernel, for things that want to have access directly to the ELF file with debuginfo without having to load the symtab in a struct dso, etc.
Quoted 5 lines
Quoted 1 line
I'll look at the next patches to check how you make use of this info...
So, the do it all from 'perf record' is in not yet in this patchkit, right? At least not in [ N/31 ] with N > 27, can you point me to it?
It is for patch 8/31, which create kprobe points using add_perf_probe_events().
Before this patch it won't search debug info, prevent us use argument like this:
SEC("lock_page=lock_page page->flags")
or probe at line number, expect it finds a valid vmlinux from the default path.
Thank you.
Quoted 48 lines
- Arnaldo
Quoted 46 lines
- Arnaldo
Quoted 44 lines
'perf record' needs vmlinux as the source of DWARF info to generate prologue for BPF programs, so path of vmlinux should be specified.
Short name 'k' has been taken by 'clockid'. This patch skips the short option name and use '--vmlinux' for vmlinux path.
Signed-off-by He Kuang <[email protected]>Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>---
tools/perf/builtin-record.c| 4 ++++1 file changed, 4 insertions(+)tools/perf/builtin-record.c +4
-0@@ -1100,6 +1100,10 @@ struct option __record_options[] = { "clang binary to use for compiling BPF scriptlets"),OPT_STRING (0 ,"clang-opt" , &llvm_param.clang_opt,"clang options" ,"options passed to clang when compiling BPF scriptlets" ), +#ifdef HAVE_BPF_PROLOGUE +OPT_STRING (0 ,"vmlinux" , &symbol_conf.vmlinux_name, +"file" ,"vmlinux pathname" ), +#endif #endifOPT_END () };Signature · 1 line
2.1.0
Re: [PATCH 27/31] perf record: Support custom vmlinux path
Em Wed, Sep 02, 2015 at 05:00:39AM +0800, pi3orama escreveu:
Quoted 25 lines
发自我的 iPhone
Quoted 19 lines · 在 2015年9月2日,上午4:21,Arnaldo Carvalho de Melo <[email protected]> 写道:
Em Tue, Sep 01, 2015 at 05:19:17PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 16 lines
Em Sat, Aug 29, 2015 at 04:22:01AM +0000, Wang Nan escreveu:
Quoted 3 lines
From: He Kuang <[email protected]>
Make perf-record command support --vmlinux option if
BPF_PROLOGUEis on.Ok, this should be supported, i.e. letting the user specify a vmlinux path to use.
But it shouldn't be _required_, i.e. we have things like
vmlinux_pathto try to find it in well known places.Right now it will search for it in the process of trying to load its symtab, but I think we should have a function that tries to find a vmlinux that matches the build-id of the running kernel, for things that want to have access directly to the ELF file with debuginfo without having to load the symtab in a struct dso, etc.
Quoted 4 lines
Quoted 1 line
I'll look at the next patches to check how you make use of this info...
So, the do it all from 'perf record' is in not yet in this patchkit, right? At least not in [ N/31 ] with N > 27, can you point me to it?
Quoted 7 lines
It is for patch 8/31, which create kprobe points using
add_perf_probe_events().Before this patch it won't search debug info, prevent us use argument like this:
SEC("lock_page=lock_page page->flags")or probe at line number, expect it finds a valid vmlinux from the default path.
Argh, that is because init_symbol_maps() uses symbol__init() that is also being used in 'perf record' by now... I.e. it was designed to be called just once, at tool start :-\
Will have to get my head around how this is being used to try to untangle this mess...
- Arnaldo
PATCH 28/31 perf probe: Init symbol as kprobe
In reply to Wang NanBefore this patch, add_perf_probe_events() init symbol maps only for uprobe if the first 'struct perf_probe_event' passed to it is a uprobe event. This is a trick because 'perf probe''s command line syntax constrains the first elements of the probe_event arrays must be kprobes if there is one kprobe there.
However, with the incoming BPF uprobe support, that constrain is not hold since 'perf record' will also probe on k/u probes through BPF object, and is possible to pass an array with kprobe but the first element is uprobe.
This patch init symbol maps for kprobes even if all of events are uprobes, because the extra cost should be small enough.
--- tools/perf/util/probe-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/probe-event.c +1 -1
@@ -2789,7 +2789,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs, {int i, ret; - ret =init_symbol_maps (pevs->uprobes); + ret =init_symbol_maps (false);if (ret <0 )return ret;
Signature · 1 line
2.1.0
Re: [PATCH 28/31] perf probe: Init symbol as kprobe
Em Sat, Aug 29, 2015 at 04:22:02AM +0000, Wang Nan escreveu:
Quoted 6 lines
Before this patch,
add_perf_probe_events()init symbol maps only for uprobe if the first 'structperf_probe_event' passed to it is a uprobe event. This is a trick because 'perf probe''s command line syntax constrains the first elements of theprobe_eventarrays must be kprobes if there is one kprobe there.
Quoted 7 lines
However, with the incoming BPF uprobe support, that constrain is not hold since 'perf record' will also probe on k/u probes through BPF object, and is possible to pass an array with kprobe but the first element is uprobe.
This patch init symbol maps for kprobes even if all of events are uprobes, because the extra cost should be small enough.
Masami, are you Ok with this one?
- Arnaldo
Quoted 35 lines
Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/util/probe-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/probe-event.c +1
-1@@ -2789,7 +2789,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs, {int i, ret; - ret =init_symbol_maps (pevs->uprobes); + ret =init_symbol_maps (false);if (ret <0 )return ret;Signature · 1 line
2.1.0
Re: [PATCH 28/31] perf probe: Init symbol as kprobe
Quoted 7 lines · Arnaldo Carvalho de Melo
Em Sat, Aug 29, 2015 at 04:22:02AM +0000, Wang Nan escreveu:
Quoted 6 lines
Before this patch,
add_perf_probe_events()init symbol maps only for uprobe if the first 'structperf_probe_event' passed to it is a uprobe event. This is a trick because 'perf probe''s command line syntax constrains the first elements of theprobe_eventarrays must be kprobes if there is one kprobe there.
Quoted 8 lines
Quoted 7 lines
However, with the incoming BPF uprobe support, that constrain is not hold since 'perf record' will also probe on k/u probes through BPF object, and is possible to pass an array with kprobe but the first element is uprobe.
This patch init symbol maps for kprobes even if all of events are uprobes, because the extra cost should be small enough.
Masami, are you Ok with this one?
I think he would be okay with it because it is his idea :)
Please refer to: http://lkml.kernel.org/n/[email protected]
Thank you.
Quoted 37 lines
- Arnaldo
Quoted 35 lines
Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/util/probe-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/probe-event.c +1
-1@@ -2789,7 +2789,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs, {int i, ret; - ret =init_symbol_maps (pevs->uprobes); + ret =init_symbol_maps (false);if (ret <0 )return ret;Signature · 1 line
2.1.0
平松雅巳 / HIRAMATU,MASAMI
Acked-byRE: Re: [PATCH 28/31] perf probe: Init symbol as kprobe
In reply to Arnaldo Carvalho de MeloQuoted 14 lines
From: Arnaldo Carvalho de Melo [mailto:[email protected]]
Em Sat, Aug 29, 2015 at 04:22:02AM +0000, Wang Nan escreveu:
Quoted 11 lines
Before this patch,
add_perf_probe_events()init symbol maps only for uprobe if the first 'structperf_probe_event' passed to it is a uprobe event. This is a trick because 'perf probe''s command line syntax constrains the first elements of theprobe_eventarrays must be kprobes if there is one kprobe there.However, with the incoming BPF uprobe support, that constrain is not hold since 'perf record' will also probe on k/u probes through BPF object, and is possible to pass an array with kprobe but the first element is uprobe.
Quoted 4 lines
Quoted 2 lines
This patch init symbol maps for kprobes even if all of events are uprobes, because the extra cost should be small enough.
Masami, are you Ok with this one?
Yeah, looks OK for me ! :)
Thanks!
Quoted 38 lines
- Arnaldo
Quoted 35 lines
Signed-off-by Wang Nan <[email protected]>Cc Alexei Starovoitov <[email protected]>Cc Brendan Gregg <[email protected]>Cc Daniel Borkmann <[email protected]>Cc David Ahern <[email protected]>Cc He Kuang <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kaixu Xia <[email protected]>Cc Masami Hiramatsu <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Zefan Li <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/util/probe-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/probe-event.c +1
-2@@ -2789,7 +2789,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs, {int i, ret; - ret =init_symbol_maps (pevs->uprobes); + ret =init_symbol_maps (false);if (ret <0 )return ret; --2.1.0
PATCH 29/31 perf tools: Support attach BPF program on uprobe events
In reply to Wang NanThis patch appends new syntax to BPF object section name to support probing at uprobe event. Now we can use BPF program like this:
SEC(
"target=/lib64/libc.so.6\n"
"libcwrite=__write"
)
int libcwrite(void *ctx)
{
return 1;}
Where, in section name of a program, before the main config string, we can use 'key=value' style options. Now the only option key "target" is for uprobe probing.
--- tools/perf/util/bpf-loader.c | 88 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 7 deletions(-)
tools/perf/util/bpf-loader.c +81 -7
@@ -66,6 +66,84 @@ bpf_prog_priv__clear(struct bpf_program *prog __maybe_unused, }static int +do_config (const char *key,const char *value, +struct perf_probe_event *pev) +{ +pr_debug ("config bpf program: %s=%s\n" , key, value); +if (strcmp (key,"target" ) ==0 ) { + pev->uprobes = true; + pev->target =strdup (value); +return 0 ; + } + +pr_warning ("BPF: WARNING: invalid config option in object: %s=%s\n" , + key, value); +pr_warning ("\tHint: Currently only valid option is 'target=<file>'\n" ); +return 0 ; +} + +static const char * +parse_config_kvpair (const char *config_str,struct perf_probe_event *pev) +{ +char *text =strdup (config_str); +char *sep, *line; +const char *main_str =NULL ; +int err =0 ; + +if (!text) { +pr_debug ("No enough memory: dup config_str failed\n" ); +return NULL ; + } + + line = text; +while ((sep =strchr (line,'\n' ))) { +char *equ; + + *sep ='\0' ; + equ =strchr (line,'=' ); +if (!equ) { +pr_warning ("WARNING: invalid config in BPF object: %s\n" , + line); +pr_warning ("\tShould be 'key=value'.\n" ); + goto nextline; + } + *equ ='\0' ; + + err =do_config (line, equ +1 , pev); +if (err) +break ; +nextline: + line = sep +1 ; + } + +if (!err) + main_str = config_str + (line - text); +free (text); + +return main_str; +} + +static int +parse_config (const char *config_str,struct perf_probe_event *pev) +{ +const char *main_str; +int err; + + main_str =parse_config_kvpair (config_str, pev); +if (!main_str) +return -EINVAL ; + + err =parse_perf_probe_command (main_str, pev); +if (err <0 ) { +pr_debug ("bpf: '%s' is not a valid config string\n" , + config_str); +/* parse failed, don't need clear pev. */ +return -EINVAL ; + } +return 0 ; +} + +static int config_bpf_program (struct bpf_program *prog,struct perf_probe_event *pev) {struct bpf_prog_priv *priv =NULL ;
@@ -79,13 +157,9 @@ config_bpf_program(struct bpf_program *prog, struct perf_probe_event *pev) }pr_debug ("bpf: config program '%s'\n" , config_str); - err =parse_perf_probe_command (config_str, pev); -if (err <0 ) { -pr_debug ("bpf: '%s' is not a valid config string\n" , - config_str); -/* parse failed, don't need clear pev. */ -return -EINVAL ; - } + err =parse_config (config_str, pev); +if (err) +return err;if (pev->group &&strcmp (pev->group,PERF_BPF_PROBE_GROUP )) { pr_debug("bpf: '%s': group for event is set and not '%s'.\n",
Signature · 1 line
2.1.0
PATCH 30/31 perf tools: Fix cross compiling error
In reply to Wang NanCross compiling perf to other platform failed due to missing symbol:
...
AR /pathofperf/libperf.a LD /pathofperf/tests/perf-in.o LD /pathofperf/perf-in.o LINK /pathofperf/perf
/pathofperf/libperf.a(libperf-in.o): In function `intel_pt_synth_branch_sample':/usr/src/kernel/tools/perf/util/intel-pt.c:899: undefined reference to tsc_to_perf_time' /pathofperf/libperf.a(libperf-in.o): In function intel_pt_synth_transaction_sample':/usr/src/kernel/tools/perf/util/intel-pt.c:992: undefined reference to tsc_to_perf_time' /pathofperf/libperf.a(libperf-in.o): In function intel_pt_synth_instruction_sample':/usr/src/kernel/tools/perf/util/intel-pt.c:943: undefined reference to `tsc_to_perf_time'
...
This is because we allow newly introduced intel-pt-decoder to be compiled to not only X86, but tsc.c which required by it is compiled for x86 only.
This patch fix the compiling error by allow tsc.c to be compiled if CONFIG_AUXTRACE is set, no matter the target platform.
--- tools/perf/util/Build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/Build +1 -1
@@ -74,7 +74,7 @@ libperf-y += stat-shadow.o libperf-y += record.o libperf-y += srcline.o libperf-y += data.o -libperf-$(CONFIG_X86) += tsc.o +libperf-$(CONFIG_AUXTRACE) += tsc.o libperf-y += cloexec.o libperf-y += thread-stack.o libperf-$(CONFIG_AUXTRACE) += auxtrace.o
Signature · 1 line
2.1.0
PATCH 31/31 tools lib traceevent: Support function __get_dynamic_array_len
In reply to Wang NanFrom: He Kuang <[email protected]>
Support helper function __get_dynamic_array_len() in libtraceevent, this function is used accompany with __print_array() or __print_hex(), but currently it is not an available function in the function list of process_function().
The total allocated length of the dynamic array is embedded in the top half of __data_loc_##item field. This patch adds new arg type PRINT_DYNAMIC_ARRAY_LEN to return the length to eval_num_arg(),
--- tools/lib/traceevent/event-parse.c | 56 +++++++++++++++++++++- tools/lib/traceevent/event-parse.h | 1 + .../perf/util/scripting-engines/trace-event-perl.c | 1 + .../util/scripting-engines/trace-event-python.c | 1 + 4 files changed, 57 insertions(+), 2 deletions(-)
tools/lib/traceevent/event-parse.c +54 -2
@@ -848,6 +848,7 @@ static void free_arg(struct print_arg *arg)free (arg->bitmask.bitmask);break ;case PRINT_DYNAMIC_ARRAY : +case PRINT_DYNAMIC_ARRAY_LEN :free (arg->dynarray.index);break ;case PRINT_OP :
@@ -2729,6 +2730,42 @@ process_dynamic_array(struct event_format *event, struct print_arg *arg, char ** }static enum event_type +process_dynamic_array_len (struct event_format *event,struct print_arg *arg, +char **tok) +{ +struct format_field *field; +enum event_type type; +char *token; + +if (read_expect_type (EVENT_ITEM , &token) <0 ) + goto out_free; + + arg->type =PRINT_DYNAMIC_ARRAY_LEN ; + +/* Find the field */ + field =pevent_find_field (event, token); +if (!field) + goto out_free; + + arg->dynarray.field = field; + arg->dynarray.index =0 ; + +if (read_expected (EVENT_DELIM ,")" ) <0 ) + goto out_err; + + type =read_token (&token); + *tok = token; + +return type; + + out_free: +free_token (token); + out_err: + *tok =NULL ; +return EVENT_ERROR ; +} + +static enum event_type process_paren (struct event_format *event,struct print_arg *arg,char **tok) {struct print_arg *item_arg;
@@ -2975,6 +3012,10 @@ process_function(struct event_format *event, struct print_arg *arg,free_token (token);return process_dynamic_array (event, arg, tok); } +if (strcmp (token,"__get_dynamic_array_len" ) ==0 ) { +free_token (token); +return process_dynamic_array_len (event, arg, tok); + } func =find_func_handler (event->pevent, token);if (func) {
@@ -3655,14 +3696,25 @@ eval_num_arg(void *data, int size, struct event_format *event, struct print_arg goto out_warning_op; }break ; +case PRINT_DYNAMIC_ARRAY_LEN : + offset =pevent_read_number (pevent, + data + arg->dynarray.field->offset, + arg->dynarray.field->size); +/* +* The total allocated length of the dynamic array is +* stored in the top half of the field, and the offset +* is in the bottom half of the 32 bit field. +*/ + val = (unsigned long long )(offset >>16 ); +break ;case PRINT_DYNAMIC_ARRAY :/* Without [], we pass the address to the dynamic data */ offset =pevent_read_number (pevent, data + arg->dynarray.field->offset, arg->dynarray.field->size);/* -* The actual length of the dynamic array is stored -* in the top half of the field, and the offset +* The total allocated length of the dynamic array is +* stored in the top half of the field, and the offset * is in the bottom half of the 32 bit field. */ offset &=0xffff ;
tools/lib/traceevent/event-parse.h +1 -0
@@ -294,6 +294,7 @@ enum print_arg_type {PRINT_OP ,PRINT_FUNC ,PRINT_BITMASK , + PRINT_DYNAMIC_ARRAY_LEN, }; struct print_arg {
tools/perf/util/scripting-engines/trace-event-perl.c +1 -0
@@ -221,6 +221,7 @@ static void define_event_symbols(struct event_format *event,break ;case PRINT_BSTRING :case PRINT_DYNAMIC_ARRAY : +case PRINT_DYNAMIC_ARRAY_LEN :case PRINT_STRING :case PRINT_BITMASK :break ;
tools/perf/util/scripting-engines/trace-event-python.c +1 -0
@@ -251,6 +251,7 @@ static void define_event_symbols(struct event_format *event,/* gcc warns for these? */ case PRINT_BSTRING :case PRINT_DYNAMIC_ARRAY : +case PRINT_DYNAMIC_ARRAY_LEN :case PRINT_FUNC :case PRINT_BITMASK :/* we should warn... */
Signature · 1 line
2.1.0
tip-bot for He Kuang
merge bot[tip:perf/core] tools lib traceevent: Support function __get_dynamic_array_len
tools lib traceevent: Support function __get_dynamic_array_len
Commit-ID: 76055940c1afc8d445992fb0278b80cf205bbf97 Gitweb: http://git.kernel.org/tip/76055940c1afc8d445992fb0278b80cf205bbf97 Author: He Kuang <[email protected]> AuthorDate: Sat, 29 Aug 2015 04:22:05 +0000 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 2 Sep 2015 16:30:46 -0300
tools lib traceevent: Support function __get_dynamic_array_len
Support helper function __get_dynamic_array_len() in libtraceevent, this function is used accompany with __print_array() or __print_hex(), but currently it is not an available function in the function list of process_function().
The total allocated length of the dynamic array is embedded in the top half of __data_loc_##item field. This patch adds new arg type PRINT_DYNAMIC_ARRAY_LEN to return the length to eval_num_arg(),
--- tools/lib/traceevent/event-parse.c | 56 +++++++++++++++++++++- tools/lib/traceevent/event-parse.h | 1 + .../perf/util/scripting-engines/trace-event-perl.c | 1 + .../util/scripting-engines/trace-event-python.c | 1 + 4 files changed, 57 insertions(+), 2 deletions(-)
tools/lib/traceevent/event-parse.c +54 -2
@@ -848,6 +848,7 @@ static void free_arg(struct print_arg *arg)free (arg->bitmask.bitmask);break ;case PRINT_DYNAMIC_ARRAY : +case PRINT_DYNAMIC_ARRAY_LEN :free (arg->dynarray.index);break ;case PRINT_OP :
@@ -2729,6 +2730,42 @@ process_dynamic_array(struct event_format *event, struct print_arg *arg, char ** }static enum event_type +process_dynamic_array_len (struct event_format *event,struct print_arg *arg, +char **tok) +{ +struct format_field *field; +enum event_type type; +char *token; + +if (read_expect_type (EVENT_ITEM , &token) <0 ) + goto out_free; + + arg->type =PRINT_DYNAMIC_ARRAY_LEN ; + +/* Find the field */ + field =pevent_find_field (event, token); +if (!field) + goto out_free; + + arg->dynarray.field = field; + arg->dynarray.index =0 ; + +if (read_expected (EVENT_DELIM ,")" ) <0 ) + goto out_err; + + type =read_token (&token); + *tok = token; + +return type; + + out_free: +free_token (token); + out_err: + *tok =NULL ; +return EVENT_ERROR ; +} + +static enum event_type process_paren (struct event_format *event,struct print_arg *arg,char **tok) {struct print_arg *item_arg;
@@ -2975,6 +3012,10 @@ process_function(struct event_format *event, struct print_arg *arg,free_token (token);return process_dynamic_array (event, arg, tok); } +if (strcmp (token,"__get_dynamic_array_len" ) ==0 ) { +free_token (token); +return process_dynamic_array_len (event, arg, tok); + } func =find_func_handler (event->pevent, token);if (func) {
@@ -3655,14 +3696,25 @@ eval_num_arg(void *data, int size, struct event_format *event, struct print_arg goto out_warning_op; }break ; +case PRINT_DYNAMIC_ARRAY_LEN : + offset =pevent_read_number (pevent, + data + arg->dynarray.field->offset, + arg->dynarray.field->size); +/* +* The total allocated length of the dynamic array is +* stored in the top half of the field, and the offset +* is in the bottom half of the 32 bit field. +*/ + val = (unsigned long long )(offset >>16 ); +break ;case PRINT_DYNAMIC_ARRAY :/* Without [], we pass the address to the dynamic data */ offset =pevent_read_number (pevent, data + arg->dynarray.field->offset, arg->dynarray.field->size);/* -* The actual length of the dynamic array is stored -* in the top half of the field, and the offset +* The total allocated length of the dynamic array is +* stored in the top half of the field, and the offset * is in the bottom half of the 32 bit field. */ offset &=0xffff ;
tools/lib/traceevent/event-parse.h +1 -0
@@ -294,6 +294,7 @@ enum print_arg_type {PRINT_OP ,PRINT_FUNC ,PRINT_BITMASK , + PRINT_DYNAMIC_ARRAY_LEN, }; struct print_arg {
tools/perf/util/scripting-engines/trace-event-perl.c +1 -0
@@ -221,6 +221,7 @@ static void define_event_symbols(struct event_format *event,break ;case PRINT_BSTRING :case PRINT_DYNAMIC_ARRAY : +case PRINT_DYNAMIC_ARRAY_LEN :case PRINT_STRING :case PRINT_BITMASK :break ;
tools/perf/util/scripting-engines/trace-event-python.c +1 -0
@@ -251,6 +251,7 @@ static void define_event_symbols(struct event_format *event,/* gcc warns for these? */ case PRINT_BSTRING :case PRINT_DYNAMIC_ARRAY : +case PRINT_DYNAMIC_ARRAY_LEN :case PRINT_FUNC :case PRINT_BITMASK :/* we should warn... */