Re: [PATCH v6] Allow user probes on versioned symbols
On 04/24/2017 11:34 AM, Arnaldo Carvalho de Melo wrote: > Em Thu, Apr 13, 2017 at 12:03:13PM -0500, Paul Clarke escreveu: >> v4: >> - rebased to acme/perf/core > > Are you sure? > > [acme@jouet linux]$ patch -p1 < /wb/1.patch > patching file tools/perf/arch/powerpc/util/sym-handling.c > Hunk #1 FAILED at 52. > 1 out of 1 hunk FAILED -- saving rejects to file > tools/perf/arch/powerpc/util/sym-handling.c.rej > patching file tools/perf/util/map.c > Hunk #1 FAILED at 325. > 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/map.c.rej > patching file tools/perf/util/map.h > Hunk #1 FAILED at 130. > 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/map.h.rej > patching file tools/perf/util/symbol.c > Hunk #1 FAILED at 87. > Hunk #2 FAILED at 396. > Hunk #3 FAILED at 411. > Hunk #4 FAILED at 424. > Hunk #5 FAILED at 500. > 5 out of 5 hunks FAILED -- saving rejects to file tools/perf/util/symbol.c.rej > patching file tools/perf/util/symbol.h > Hunk #1 FAILED at 348. > 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/symbol.h.rej > [acme@jouet linux]$ Sigh. It worked for me, with some offsets. It's very likely I'm doing something wrong, but I don't know what. (Apologies, if so.) I generated a new patch (with new offsets, attached), and it works here; -- ~$ git clone -b perf/core https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux Cloning into 'linux'... remote: Counting objects: 5284773, done. remote: Compressing objects: 100% (805895/805895), done. remote: Total 5284773 (delta 4438260), reused 5284366 (delta 4437981) Receiving objects: 100% (5284773/5284773), 927.01 MiB | 993.00 KiB/s, done. Resolving deltas: 100% (4438260/4438260), done. Checking connectivity... done. Checking out files: 100% (58023/58023), done. ~$ cd linux ~/linux$ patch -p1 < ../0001-Allow-user-probes-on-versioned-symbols.patch patching file tools/perf/arch/powerpc/util/sym-handling.c patching file tools/perf/util/map.c patching file tools/perf/util/map.h patching file tools/perf/util/symbol.c patching file tools/perf/util/symbol.h -- -- >8 -- Symbol versioning, as in glibc, results in symbols being defined as: @[@] (Note that "@@" identifies a default symbol, if the symbol name is repeated.) perf is currently unable to deal with this, and is unable to create user probes at such symbols: -- $ nm /lib/powerpc64le-linux-gnu/libpthread.so.0 | grep pthread_create 8d30 t __pthread_create_2_1 8d30 T pthread_create@@GLIBC_2.17 $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create probe-definition(0): pthread_create symbol:pthread_create file:(null) line:0 offset:0 return:0 lazy:(null) 0 arguments Open Debuginfo file: /usr/lib/debug/lib/powerpc64le-linux-gnu/libpthread-2.19.so Try to find probe point from debuginfo. Probe point 'pthread_create' not found. Error: Failed to add events. Reason: No such file or directory (Code: -2) -- One is not able to specify the fully versioned symbol, either, due to syntactic conflicts with other uses of "@" by perf: -- $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create@@GLIBC_2.17 probe-definition(0): pthread_create@@GLIBC_2.17 Semantic error :SRC@SRC is not allowed. 0 arguments Error: Command Parse Error. Reason: Invalid argument (Code: -22) -- This patch ignores versioning for default symbols, thus allowing probes to be created for these symbols: -- $ /usr/bin/sudo ./perf probe -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create Added new event: probe_libpthread:pthread_create (on pthread_create in /lib/powerpc64le-linux-gnu/libpthread-2.19.so) You can now use it in all perf tools, such as: perf record -e probe_libpthread:pthread_create -aR sleep 1 $ /usr/bin/sudo ./perf record -e probe_libpthread:pthread_create -aR ./test 2 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.052 MB perf.data (2 samples) ] $ /usr/bin/sudo ./perf script test 2915 [000] 19124.260729: probe_libpthread:pthread_create: (3fff99248d38) test 2916 [000] 19124.260962: probe_libpthread:pthread_create: (3fff99248d38) $ /usr/bin/sudo ./perf probe --del=probe_libpthread:pthread_create Removed event: probe_libpthread:pthread_create -- Signed-off-by: Paul A. Clarke--- tools/perf/arch/powerpc/util/sym-handling.c | 12 ++ tools/perf/util/map.c | 5 --- tools/perf/util/map.h | 5 ++- tools/perf/util/symbol.c| 61 +++-- tools/perf/util/symbol.h| 11 ++ 5 files changed, 74 insertions(+), 20 deletions(-) diff --git a/tools/perf/arch/powerpc/util/sym-handling.c b/tools/perf/arch/powerpc/util/sym-handling.c index 39dbe51..bf9a259 100644 --- a/tools/perf/arch/powerpc/util/sym-handling.c +++ b/tools/perf/arch/powerpc/util/sym-handling.c @@ -52,6 +52,18 @@
Re: [PATCH v6] Allow user probes on versioned symbols
On 04/24/2017 11:34 AM, Arnaldo Carvalho de Melo wrote: > Em Thu, Apr 13, 2017 at 12:03:13PM -0500, Paul Clarke escreveu: >> v4: >> - rebased to acme/perf/core > > Are you sure? > > [acme@jouet linux]$ patch -p1 < /wb/1.patch > patching file tools/perf/arch/powerpc/util/sym-handling.c > Hunk #1 FAILED at 52. > 1 out of 1 hunk FAILED -- saving rejects to file > tools/perf/arch/powerpc/util/sym-handling.c.rej > patching file tools/perf/util/map.c > Hunk #1 FAILED at 325. > 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/map.c.rej > patching file tools/perf/util/map.h > Hunk #1 FAILED at 130. > 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/map.h.rej > patching file tools/perf/util/symbol.c > Hunk #1 FAILED at 87. > Hunk #2 FAILED at 396. > Hunk #3 FAILED at 411. > Hunk #4 FAILED at 424. > Hunk #5 FAILED at 500. > 5 out of 5 hunks FAILED -- saving rejects to file tools/perf/util/symbol.c.rej > patching file tools/perf/util/symbol.h > Hunk #1 FAILED at 348. > 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/symbol.h.rej > [acme@jouet linux]$ Sigh. It worked for me, with some offsets. It's very likely I'm doing something wrong, but I don't know what. (Apologies, if so.) I generated a new patch (with new offsets, attached), and it works here; -- ~$ git clone -b perf/core https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux Cloning into 'linux'... remote: Counting objects: 5284773, done. remote: Compressing objects: 100% (805895/805895), done. remote: Total 5284773 (delta 4438260), reused 5284366 (delta 4437981) Receiving objects: 100% (5284773/5284773), 927.01 MiB | 993.00 KiB/s, done. Resolving deltas: 100% (4438260/4438260), done. Checking connectivity... done. Checking out files: 100% (58023/58023), done. ~$ cd linux ~/linux$ patch -p1 < ../0001-Allow-user-probes-on-versioned-symbols.patch patching file tools/perf/arch/powerpc/util/sym-handling.c patching file tools/perf/util/map.c patching file tools/perf/util/map.h patching file tools/perf/util/symbol.c patching file tools/perf/util/symbol.h -- -- >8 -- Symbol versioning, as in glibc, results in symbols being defined as: @[@] (Note that "@@" identifies a default symbol, if the symbol name is repeated.) perf is currently unable to deal with this, and is unable to create user probes at such symbols: -- $ nm /lib/powerpc64le-linux-gnu/libpthread.so.0 | grep pthread_create 8d30 t __pthread_create_2_1 8d30 T pthread_create@@GLIBC_2.17 $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create probe-definition(0): pthread_create symbol:pthread_create file:(null) line:0 offset:0 return:0 lazy:(null) 0 arguments Open Debuginfo file: /usr/lib/debug/lib/powerpc64le-linux-gnu/libpthread-2.19.so Try to find probe point from debuginfo. Probe point 'pthread_create' not found. Error: Failed to add events. Reason: No such file or directory (Code: -2) -- One is not able to specify the fully versioned symbol, either, due to syntactic conflicts with other uses of "@" by perf: -- $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create@@GLIBC_2.17 probe-definition(0): pthread_create@@GLIBC_2.17 Semantic error :SRC@SRC is not allowed. 0 arguments Error: Command Parse Error. Reason: Invalid argument (Code: -22) -- This patch ignores versioning for default symbols, thus allowing probes to be created for these symbols: -- $ /usr/bin/sudo ./perf probe -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create Added new event: probe_libpthread:pthread_create (on pthread_create in /lib/powerpc64le-linux-gnu/libpthread-2.19.so) You can now use it in all perf tools, such as: perf record -e probe_libpthread:pthread_create -aR sleep 1 $ /usr/bin/sudo ./perf record -e probe_libpthread:pthread_create -aR ./test 2 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.052 MB perf.data (2 samples) ] $ /usr/bin/sudo ./perf script test 2915 [000] 19124.260729: probe_libpthread:pthread_create: (3fff99248d38) test 2916 [000] 19124.260962: probe_libpthread:pthread_create: (3fff99248d38) $ /usr/bin/sudo ./perf probe --del=probe_libpthread:pthread_create Removed event: probe_libpthread:pthread_create -- Signed-off-by: Paul A. Clarke --- tools/perf/arch/powerpc/util/sym-handling.c | 12 ++ tools/perf/util/map.c | 5 --- tools/perf/util/map.h | 5 ++- tools/perf/util/symbol.c| 61 +++-- tools/perf/util/symbol.h| 11 ++ 5 files changed, 74 insertions(+), 20 deletions(-) diff --git a/tools/perf/arch/powerpc/util/sym-handling.c b/tools/perf/arch/powerpc/util/sym-handling.c index 39dbe51..bf9a259 100644 --- a/tools/perf/arch/powerpc/util/sym-handling.c +++ b/tools/perf/arch/powerpc/util/sym-handling.c @@ -52,6 +52,18 @@ int
Re: [PATCH v6] Allow user probes on versioned symbols
Em Thu, Apr 13, 2017 at 12:03:13PM -0500, Paul Clarke escreveu: > v4: > - rebased to acme/perf/core Are you sure? [acme@jouet linux]$ patch -p1 < /wb/1.patch patching file tools/perf/arch/powerpc/util/sym-handling.c Hunk #1 FAILED at 52. 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/arch/powerpc/util/sym-handling.c.rej patching file tools/perf/util/map.c Hunk #1 FAILED at 325. 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/map.c.rej patching file tools/perf/util/map.h Hunk #1 FAILED at 130. 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/map.h.rej patching file tools/perf/util/symbol.c Hunk #1 FAILED at 87. Hunk #2 FAILED at 396. Hunk #3 FAILED at 411. Hunk #4 FAILED at 424. Hunk #5 FAILED at 500. 5 out of 5 hunks FAILED -- saving rejects to file tools/perf/util/symbol.c.rej patching file tools/perf/util/symbol.h Hunk #1 FAILED at 348. 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/symbol.h.rej [acme@jouet linux]$
Re: [PATCH v6] Allow user probes on versioned symbols
Em Thu, Apr 13, 2017 at 12:03:13PM -0500, Paul Clarke escreveu: > v4: > - rebased to acme/perf/core Are you sure? [acme@jouet linux]$ patch -p1 < /wb/1.patch patching file tools/perf/arch/powerpc/util/sym-handling.c Hunk #1 FAILED at 52. 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/arch/powerpc/util/sym-handling.c.rej patching file tools/perf/util/map.c Hunk #1 FAILED at 325. 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/map.c.rej patching file tools/perf/util/map.h Hunk #1 FAILED at 130. 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/map.h.rej patching file tools/perf/util/symbol.c Hunk #1 FAILED at 87. Hunk #2 FAILED at 396. Hunk #3 FAILED at 411. Hunk #4 FAILED at 424. Hunk #5 FAILED at 500. 5 out of 5 hunks FAILED -- saving rejects to file tools/perf/util/symbol.c.rej patching file tools/perf/util/symbol.h Hunk #1 FAILED at 348. 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/util/symbol.h.rej [acme@jouet linux]$
Re: [PATCH v6] Allow user probes on versioned symbols
On Thu, 13 Apr 2017 12:03:13 -0500 Paul Clarkewrote: > Symbol versioning, as in glibc, results in symbols being defined as: > @[@] > (Note that "@@" identifies a default symbol, if the symbol name > is repeated.) > > perf is currently unable to deal with this, and is unable to create > user probes at such symbols: > -- > $ nm /lib/powerpc64le-linux-gnu/libpthread.so.0 | grep pthread_create > 8d30 t __pthread_create_2_1 > 8d30 T pthread_create@@GLIBC_2.17 > $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create > probe-definition(0): pthread_create > symbol:pthread_create file:(null) line:0 offset:0 return:0 lazy:(null) > 0 arguments > Open Debuginfo file: > /usr/lib/debug/lib/powerpc64le-linux-gnu/libpthread-2.19.so > Try to find probe point from debuginfo. > Probe point 'pthread_create' not found. > Error: Failed to add events. Reason: No such file or directory (Code: -2) > -- > > One is not able to specify the fully versioned symbol, either, due to > syntactic conflicts with other uses of "@" by perf: > -- > $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create@@GLIBC_2.17 > probe-definition(0): pthread_create@@GLIBC_2.17 > Semantic error :SRC@SRC is not allowed. > 0 arguments > Error: Command Parse Error. Reason: Invalid argument (Code: -22) > -- > > This patch ignores versioning for default symbols, thus allowing probes to be > created for these symbols: > -- > $ /usr/bin/sudo ./perf probe -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create > Added new event: > probe_libpthread:pthread_create (on pthread_create in > /lib/powerpc64le-linux-gnu/libpthread-2.19.so) > > You can now use it in all perf tools, such as: > > perf record -e probe_libpthread:pthread_create -aR sleep 1 > > $ /usr/bin/sudo ./perf record -e probe_libpthread:pthread_create -aR ./test 2 > [ perf record: Woken up 1 times to write data ] > [ perf record: Captured and wrote 0.052 MB perf.data (2 samples) ] > $ /usr/bin/sudo ./perf script > test 2915 [000] 19124.260729: probe_libpthread:pthread_create: > (3fff99248d38) > test 2916 [000] 19124.260962: probe_libpthread:pthread_create: > (3fff99248d38) > $ /usr/bin/sudo ./perf probe --del=probe_libpthread:pthread_create > Removed event: probe_libpthread:pthread_create > -- Sorry for replying later. Looks very good to me :) Acked-by: Masami Hiramatsu Thanks! > > Signed-off-by: Paul A. Clarke > --- > v6: > - new name for enum (per Masami Hiramatsu) > - fixed use of "unsigned int" instead of enum > - some whitespace adjustments > > v5: > - now using new enum to specify matching semantics (per Masami Hiramatsu) > > v4: > - rebased to acme/perf/core > - moved changes from "map" namespace to "symbol" namespace, > - rewrote symbol__compare (now *match) to avoid need for strdup > - new symbol__match_symbol_name to support versioned symbols, ignoring default > tags > - new arch__compare_symbol_names_n to map to strncmp > - dso__find_symbol_by_name: now tries exact match (as before), then tries > also adding symbols tagged as default (@@) > - symbols__find_by_name: new parameter to support finding with or without > default > tags > - does NOT handle setting probes using the tagged symbol name (symbol@[@]tag) > > v3: > - code style fixes per David Ahern > > v2: > - move logic from arch__compare_symbol_names to new map__compare_symbol_names > - call through from map__compare_symbol_names to arch__compare_symbol_names > - redirect uses of arch__compare_symbol_names > - send patch to LKML > tools/perf/arch/powerpc/util/sym-handling.c | 12 ++ > tools/perf/util/map.c | 5 --- > tools/perf/util/map.h | 5 ++- > tools/perf/util/symbol.c| 61 > +++-- > tools/perf/util/symbol.h| 11 ++ > 5 files changed, 74 insertions(+), 20 deletions(-) > > diff --git a/tools/perf/arch/powerpc/util/sym-handling.c > b/tools/perf/arch/powerpc/util/sym-handling.c > index 39dbe51..bf9a259 100644 > --- a/tools/perf/arch/powerpc/util/sym-handling.c > +++ b/tools/perf/arch/powerpc/util/sym-handling.c > @@ -52,6 +52,18 @@ int arch__compare_symbol_names(const char *namea, const > char *nameb) > > return strcmp(namea, nameb); > } > + > +int arch__compare_symbol_names_n(const char *namea, const char *nameb, > + unsigned int n) > +{ > + /* Skip over initial dot */ > + if (*namea == '.') > + namea++; > + if (*nameb == '.') > + nameb++; > + > + return strncmp(namea, nameb, n); > +} > #endif > > #if defined(_CALL_ELF) && _CALL_ELF == 2 > diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c > index c1870ac..f4d8272 100644 > --- a/tools/perf/util/map.c > +++
Re: [PATCH v6] Allow user probes on versioned symbols
On Thu, 13 Apr 2017 12:03:13 -0500 Paul Clarke wrote: > Symbol versioning, as in glibc, results in symbols being defined as: > @[@] > (Note that "@@" identifies a default symbol, if the symbol name > is repeated.) > > perf is currently unable to deal with this, and is unable to create > user probes at such symbols: > -- > $ nm /lib/powerpc64le-linux-gnu/libpthread.so.0 | grep pthread_create > 8d30 t __pthread_create_2_1 > 8d30 T pthread_create@@GLIBC_2.17 > $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create > probe-definition(0): pthread_create > symbol:pthread_create file:(null) line:0 offset:0 return:0 lazy:(null) > 0 arguments > Open Debuginfo file: > /usr/lib/debug/lib/powerpc64le-linux-gnu/libpthread-2.19.so > Try to find probe point from debuginfo. > Probe point 'pthread_create' not found. > Error: Failed to add events. Reason: No such file or directory (Code: -2) > -- > > One is not able to specify the fully versioned symbol, either, due to > syntactic conflicts with other uses of "@" by perf: > -- > $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create@@GLIBC_2.17 > probe-definition(0): pthread_create@@GLIBC_2.17 > Semantic error :SRC@SRC is not allowed. > 0 arguments > Error: Command Parse Error. Reason: Invalid argument (Code: -22) > -- > > This patch ignores versioning for default symbols, thus allowing probes to be > created for these symbols: > -- > $ /usr/bin/sudo ./perf probe -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create > Added new event: > probe_libpthread:pthread_create (on pthread_create in > /lib/powerpc64le-linux-gnu/libpthread-2.19.so) > > You can now use it in all perf tools, such as: > > perf record -e probe_libpthread:pthread_create -aR sleep 1 > > $ /usr/bin/sudo ./perf record -e probe_libpthread:pthread_create -aR ./test 2 > [ perf record: Woken up 1 times to write data ] > [ perf record: Captured and wrote 0.052 MB perf.data (2 samples) ] > $ /usr/bin/sudo ./perf script > test 2915 [000] 19124.260729: probe_libpthread:pthread_create: > (3fff99248d38) > test 2916 [000] 19124.260962: probe_libpthread:pthread_create: > (3fff99248d38) > $ /usr/bin/sudo ./perf probe --del=probe_libpthread:pthread_create > Removed event: probe_libpthread:pthread_create > -- Sorry for replying later. Looks very good to me :) Acked-by: Masami Hiramatsu Thanks! > > Signed-off-by: Paul A. Clarke > --- > v6: > - new name for enum (per Masami Hiramatsu) > - fixed use of "unsigned int" instead of enum > - some whitespace adjustments > > v5: > - now using new enum to specify matching semantics (per Masami Hiramatsu) > > v4: > - rebased to acme/perf/core > - moved changes from "map" namespace to "symbol" namespace, > - rewrote symbol__compare (now *match) to avoid need for strdup > - new symbol__match_symbol_name to support versioned symbols, ignoring default > tags > - new arch__compare_symbol_names_n to map to strncmp > - dso__find_symbol_by_name: now tries exact match (as before), then tries > also adding symbols tagged as default (@@) > - symbols__find_by_name: new parameter to support finding with or without > default > tags > - does NOT handle setting probes using the tagged symbol name (symbol@[@]tag) > > v3: > - code style fixes per David Ahern > > v2: > - move logic from arch__compare_symbol_names to new map__compare_symbol_names > - call through from map__compare_symbol_names to arch__compare_symbol_names > - redirect uses of arch__compare_symbol_names > - send patch to LKML > tools/perf/arch/powerpc/util/sym-handling.c | 12 ++ > tools/perf/util/map.c | 5 --- > tools/perf/util/map.h | 5 ++- > tools/perf/util/symbol.c| 61 > +++-- > tools/perf/util/symbol.h| 11 ++ > 5 files changed, 74 insertions(+), 20 deletions(-) > > diff --git a/tools/perf/arch/powerpc/util/sym-handling.c > b/tools/perf/arch/powerpc/util/sym-handling.c > index 39dbe51..bf9a259 100644 > --- a/tools/perf/arch/powerpc/util/sym-handling.c > +++ b/tools/perf/arch/powerpc/util/sym-handling.c > @@ -52,6 +52,18 @@ int arch__compare_symbol_names(const char *namea, const > char *nameb) > > return strcmp(namea, nameb); > } > + > +int arch__compare_symbol_names_n(const char *namea, const char *nameb, > + unsigned int n) > +{ > + /* Skip over initial dot */ > + if (*namea == '.') > + namea++; > + if (*nameb == '.') > + nameb++; > + > + return strncmp(namea, nameb, n); > +} > #endif > > #if defined(_CALL_ELF) && _CALL_ELF == 2 > diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c > index c1870ac..f4d8272 100644 > --- a/tools/perf/util/map.c > +++ b/tools/perf/util/map.c > @@ -325,11 +325,6 @@ int
Re: [PATCH v6] Allow user probes on versioned symbols
ping On 04/13/2017 12:03 PM, Paul Clarke wrote: > Symbol versioning, as in glibc, results in symbols being defined as: > @[@] > (Note that "@@" identifies a default symbol, if the symbol name > is repeated.) > > perf is currently unable to deal with this, and is unable to create > user probes at such symbols: > -- > $ nm /lib/powerpc64le-linux-gnu/libpthread.so.0 | grep pthread_create > 8d30 t __pthread_create_2_1 > 8d30 T pthread_create@@GLIBC_2.17 > $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create > probe-definition(0): pthread_create > symbol:pthread_create file:(null) line:0 offset:0 return:0 lazy:(null) > 0 arguments > Open Debuginfo file: > /usr/lib/debug/lib/powerpc64le-linux-gnu/libpthread-2.19.so > Try to find probe point from debuginfo. > Probe point 'pthread_create' not found. > Error: Failed to add events. Reason: No such file or directory (Code: -2) > -- > > One is not able to specify the fully versioned symbol, either, due to > syntactic conflicts with other uses of "@" by perf: > -- > $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create@@GLIBC_2.17 > probe-definition(0): pthread_create@@GLIBC_2.17 > Semantic error :SRC@SRC is not allowed. > 0 arguments > Error: Command Parse Error. Reason: Invalid argument (Code: -22) > -- > > This patch ignores versioning for default symbols, thus allowing probes to be > created for these symbols: > -- > $ /usr/bin/sudo ./perf probe -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create > Added new event: > probe_libpthread:pthread_create (on pthread_create in > /lib/powerpc64le-linux-gnu/libpthread-2.19.so) > > You can now use it in all perf tools, such as: > > perf record -e probe_libpthread:pthread_create -aR sleep 1 > > $ /usr/bin/sudo ./perf record -e probe_libpthread:pthread_create -aR ./test 2 > [ perf record: Woken up 1 times to write data ] > [ perf record: Captured and wrote 0.052 MB perf.data (2 samples) ] > $ /usr/bin/sudo ./perf script > test 2915 [000] 19124.260729: probe_libpthread:pthread_create: > (3fff99248d38) > test 2916 [000] 19124.260962: probe_libpthread:pthread_create: > (3fff99248d38) > $ /usr/bin/sudo ./perf probe --del=probe_libpthread:pthread_create > Removed event: probe_libpthread:pthread_create > -- > > Signed-off-by: Paul A. Clarke> --- > v6: > - new name for enum (per Masami Hiramatsu) > - fixed use of "unsigned int" instead of enum > - some whitespace adjustments > > v5: > - now using new enum to specify matching semantics (per Masami Hiramatsu) > > v4: > - rebased to acme/perf/core > - moved changes from "map" namespace to "symbol" namespace, > - rewrote symbol__compare (now *match) to avoid need for strdup > - new symbol__match_symbol_name to support versioned symbols, ignoring default > tags > - new arch__compare_symbol_names_n to map to strncmp > - dso__find_symbol_by_name: now tries exact match (as before), then tries > also adding symbols tagged as default (@@) > - symbols__find_by_name: new parameter to support finding with or without > default > tags > - does NOT handle setting probes using the tagged symbol name (symbol@[@]tag) > > v3: > - code style fixes per David Ahern > > v2: > - move logic from arch__compare_symbol_names to new map__compare_symbol_names > - call through from map__compare_symbol_names to arch__compare_symbol_names > - redirect uses of arch__compare_symbol_names > - send patch to LKML > tools/perf/arch/powerpc/util/sym-handling.c | 12 ++ > tools/perf/util/map.c | 5 --- > tools/perf/util/map.h | 5 ++- > tools/perf/util/symbol.c| 61 > +++-- > tools/perf/util/symbol.h| 11 ++ > 5 files changed, 74 insertions(+), 20 deletions(-) > > diff --git a/tools/perf/arch/powerpc/util/sym-handling.c > b/tools/perf/arch/powerpc/util/sym-handling.c > index 39dbe51..bf9a259 100644 > --- a/tools/perf/arch/powerpc/util/sym-handling.c > +++ b/tools/perf/arch/powerpc/util/sym-handling.c > @@ -52,6 +52,18 @@ int arch__compare_symbol_names(const char *namea, const > char *nameb) > > return strcmp(namea, nameb); > } > + > +int arch__compare_symbol_names_n(const char *namea, const char *nameb, > + unsigned int n) > +{ > + /* Skip over initial dot */ > + if (*namea == '.') > + namea++; > + if (*nameb == '.') > + nameb++; > + > + return strncmp(namea, nameb, n); > +} > #endif > > #if defined(_CALL_ELF) && _CALL_ELF == 2 > diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c > index c1870ac..f4d8272 100644 > --- a/tools/perf/util/map.c > +++ b/tools/perf/util/map.c > @@ -325,11 +325,6 @@ int map__load(struct map *map) > return 0; > } > > -int __weak
Re: [PATCH v6] Allow user probes on versioned symbols
ping On 04/13/2017 12:03 PM, Paul Clarke wrote: > Symbol versioning, as in glibc, results in symbols being defined as: > @[@] > (Note that "@@" identifies a default symbol, if the symbol name > is repeated.) > > perf is currently unable to deal with this, and is unable to create > user probes at such symbols: > -- > $ nm /lib/powerpc64le-linux-gnu/libpthread.so.0 | grep pthread_create > 8d30 t __pthread_create_2_1 > 8d30 T pthread_create@@GLIBC_2.17 > $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create > probe-definition(0): pthread_create > symbol:pthread_create file:(null) line:0 offset:0 return:0 lazy:(null) > 0 arguments > Open Debuginfo file: > /usr/lib/debug/lib/powerpc64le-linux-gnu/libpthread-2.19.so > Try to find probe point from debuginfo. > Probe point 'pthread_create' not found. > Error: Failed to add events. Reason: No such file or directory (Code: -2) > -- > > One is not able to specify the fully versioned symbol, either, due to > syntactic conflicts with other uses of "@" by perf: > -- > $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create@@GLIBC_2.17 > probe-definition(0): pthread_create@@GLIBC_2.17 > Semantic error :SRC@SRC is not allowed. > 0 arguments > Error: Command Parse Error. Reason: Invalid argument (Code: -22) > -- > > This patch ignores versioning for default symbols, thus allowing probes to be > created for these symbols: > -- > $ /usr/bin/sudo ./perf probe -x /lib/powerpc64le-linux-gnu/libpthread.so.0 > pthread_create > Added new event: > probe_libpthread:pthread_create (on pthread_create in > /lib/powerpc64le-linux-gnu/libpthread-2.19.so) > > You can now use it in all perf tools, such as: > > perf record -e probe_libpthread:pthread_create -aR sleep 1 > > $ /usr/bin/sudo ./perf record -e probe_libpthread:pthread_create -aR ./test 2 > [ perf record: Woken up 1 times to write data ] > [ perf record: Captured and wrote 0.052 MB perf.data (2 samples) ] > $ /usr/bin/sudo ./perf script > test 2915 [000] 19124.260729: probe_libpthread:pthread_create: > (3fff99248d38) > test 2916 [000] 19124.260962: probe_libpthread:pthread_create: > (3fff99248d38) > $ /usr/bin/sudo ./perf probe --del=probe_libpthread:pthread_create > Removed event: probe_libpthread:pthread_create > -- > > Signed-off-by: Paul A. Clarke > --- > v6: > - new name for enum (per Masami Hiramatsu) > - fixed use of "unsigned int" instead of enum > - some whitespace adjustments > > v5: > - now using new enum to specify matching semantics (per Masami Hiramatsu) > > v4: > - rebased to acme/perf/core > - moved changes from "map" namespace to "symbol" namespace, > - rewrote symbol__compare (now *match) to avoid need for strdup > - new symbol__match_symbol_name to support versioned symbols, ignoring default > tags > - new arch__compare_symbol_names_n to map to strncmp > - dso__find_symbol_by_name: now tries exact match (as before), then tries > also adding symbols tagged as default (@@) > - symbols__find_by_name: new parameter to support finding with or without > default > tags > - does NOT handle setting probes using the tagged symbol name (symbol@[@]tag) > > v3: > - code style fixes per David Ahern > > v2: > - move logic from arch__compare_symbol_names to new map__compare_symbol_names > - call through from map__compare_symbol_names to arch__compare_symbol_names > - redirect uses of arch__compare_symbol_names > - send patch to LKML > tools/perf/arch/powerpc/util/sym-handling.c | 12 ++ > tools/perf/util/map.c | 5 --- > tools/perf/util/map.h | 5 ++- > tools/perf/util/symbol.c| 61 > +++-- > tools/perf/util/symbol.h| 11 ++ > 5 files changed, 74 insertions(+), 20 deletions(-) > > diff --git a/tools/perf/arch/powerpc/util/sym-handling.c > b/tools/perf/arch/powerpc/util/sym-handling.c > index 39dbe51..bf9a259 100644 > --- a/tools/perf/arch/powerpc/util/sym-handling.c > +++ b/tools/perf/arch/powerpc/util/sym-handling.c > @@ -52,6 +52,18 @@ int arch__compare_symbol_names(const char *namea, const > char *nameb) > > return strcmp(namea, nameb); > } > + > +int arch__compare_symbol_names_n(const char *namea, const char *nameb, > + unsigned int n) > +{ > + /* Skip over initial dot */ > + if (*namea == '.') > + namea++; > + if (*nameb == '.') > + nameb++; > + > + return strncmp(namea, nameb, n); > +} > #endif > > #if defined(_CALL_ELF) && _CALL_ELF == 2 > diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c > index c1870ac..f4d8272 100644 > --- a/tools/perf/util/map.c > +++ b/tools/perf/util/map.c > @@ -325,11 +325,6 @@ int map__load(struct map *map) > return 0; > } > > -int __weak arch__compare_symbol_names(const char
[PATCH v6] Allow user probes on versioned symbols
Symbol versioning, as in glibc, results in symbols being defined as: @[@] (Note that "@@" identifies a default symbol, if the symbol name is repeated.) perf is currently unable to deal with this, and is unable to create user probes at such symbols: -- $ nm /lib/powerpc64le-linux-gnu/libpthread.so.0 | grep pthread_create 8d30 t __pthread_create_2_1 8d30 T pthread_create@@GLIBC_2.17 $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create probe-definition(0): pthread_create symbol:pthread_create file:(null) line:0 offset:0 return:0 lazy:(null) 0 arguments Open Debuginfo file: /usr/lib/debug/lib/powerpc64le-linux-gnu/libpthread-2.19.so Try to find probe point from debuginfo. Probe point 'pthread_create' not found. Error: Failed to add events. Reason: No such file or directory (Code: -2) -- One is not able to specify the fully versioned symbol, either, due to syntactic conflicts with other uses of "@" by perf: -- $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create@@GLIBC_2.17 probe-definition(0): pthread_create@@GLIBC_2.17 Semantic error :SRC@SRC is not allowed. 0 arguments Error: Command Parse Error. Reason: Invalid argument (Code: -22) -- This patch ignores versioning for default symbols, thus allowing probes to be created for these symbols: -- $ /usr/bin/sudo ./perf probe -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create Added new event: probe_libpthread:pthread_create (on pthread_create in /lib/powerpc64le-linux-gnu/libpthread-2.19.so) You can now use it in all perf tools, such as: perf record -e probe_libpthread:pthread_create -aR sleep 1 $ /usr/bin/sudo ./perf record -e probe_libpthread:pthread_create -aR ./test 2 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.052 MB perf.data (2 samples) ] $ /usr/bin/sudo ./perf script test 2915 [000] 19124.260729: probe_libpthread:pthread_create: (3fff99248d38) test 2916 [000] 19124.260962: probe_libpthread:pthread_create: (3fff99248d38) $ /usr/bin/sudo ./perf probe --del=probe_libpthread:pthread_create Removed event: probe_libpthread:pthread_create -- Signed-off-by: Paul A. Clarke--- v6: - new name for enum (per Masami Hiramatsu) - fixed use of "unsigned int" instead of enum - some whitespace adjustments v5: - now using new enum to specify matching semantics (per Masami Hiramatsu) v4: - rebased to acme/perf/core - moved changes from "map" namespace to "symbol" namespace, - rewrote symbol__compare (now *match) to avoid need for strdup - new symbol__match_symbol_name to support versioned symbols, ignoring default tags - new arch__compare_symbol_names_n to map to strncmp - dso__find_symbol_by_name: now tries exact match (as before), then tries also adding symbols tagged as default (@@) - symbols__find_by_name: new parameter to support finding with or without default tags - does NOT handle setting probes using the tagged symbol name (symbol@[@]tag) v3: - code style fixes per David Ahern v2: - move logic from arch__compare_symbol_names to new map__compare_symbol_names - call through from map__compare_symbol_names to arch__compare_symbol_names - redirect uses of arch__compare_symbol_names - send patch to LKML tools/perf/arch/powerpc/util/sym-handling.c | 12 ++ tools/perf/util/map.c | 5 --- tools/perf/util/map.h | 5 ++- tools/perf/util/symbol.c| 61 +++-- tools/perf/util/symbol.h| 11 ++ 5 files changed, 74 insertions(+), 20 deletions(-) diff --git a/tools/perf/arch/powerpc/util/sym-handling.c b/tools/perf/arch/powerpc/util/sym-handling.c index 39dbe51..bf9a259 100644 --- a/tools/perf/arch/powerpc/util/sym-handling.c +++ b/tools/perf/arch/powerpc/util/sym-handling.c @@ -52,6 +52,18 @@ int arch__compare_symbol_names(const char *namea, const char *nameb) return strcmp(namea, nameb); } + +int arch__compare_symbol_names_n(const char *namea, const char *nameb, +unsigned int n) +{ + /* Skip over initial dot */ + if (*namea == '.') + namea++; + if (*nameb == '.') + nameb++; + + return strncmp(namea, nameb, n); +} #endif #if defined(_CALL_ELF) && _CALL_ELF == 2 diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index c1870ac..f4d8272 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -325,11 +325,6 @@ int map__load(struct map *map) return 0; } -int __weak arch__compare_symbol_names(const char *namea, const char *nameb) -{ - return strcmp(namea, nameb); -} - struct symbol *map__find_symbol(struct map *map, u64 addr) { if (map__load(map) < 0) diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index c8a5a64..f9e8ac8 100644 --- a/tools/perf/util/map.h +++
[PATCH v6] Allow user probes on versioned symbols
Symbol versioning, as in glibc, results in symbols being defined as: @[@] (Note that "@@" identifies a default symbol, if the symbol name is repeated.) perf is currently unable to deal with this, and is unable to create user probes at such symbols: -- $ nm /lib/powerpc64le-linux-gnu/libpthread.so.0 | grep pthread_create 8d30 t __pthread_create_2_1 8d30 T pthread_create@@GLIBC_2.17 $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create probe-definition(0): pthread_create symbol:pthread_create file:(null) line:0 offset:0 return:0 lazy:(null) 0 arguments Open Debuginfo file: /usr/lib/debug/lib/powerpc64le-linux-gnu/libpthread-2.19.so Try to find probe point from debuginfo. Probe point 'pthread_create' not found. Error: Failed to add events. Reason: No such file or directory (Code: -2) -- One is not able to specify the fully versioned symbol, either, due to syntactic conflicts with other uses of "@" by perf: -- $ /usr/bin/sudo perf probe -v -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create@@GLIBC_2.17 probe-definition(0): pthread_create@@GLIBC_2.17 Semantic error :SRC@SRC is not allowed. 0 arguments Error: Command Parse Error. Reason: Invalid argument (Code: -22) -- This patch ignores versioning for default symbols, thus allowing probes to be created for these symbols: -- $ /usr/bin/sudo ./perf probe -x /lib/powerpc64le-linux-gnu/libpthread.so.0 pthread_create Added new event: probe_libpthread:pthread_create (on pthread_create in /lib/powerpc64le-linux-gnu/libpthread-2.19.so) You can now use it in all perf tools, such as: perf record -e probe_libpthread:pthread_create -aR sleep 1 $ /usr/bin/sudo ./perf record -e probe_libpthread:pthread_create -aR ./test 2 [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.052 MB perf.data (2 samples) ] $ /usr/bin/sudo ./perf script test 2915 [000] 19124.260729: probe_libpthread:pthread_create: (3fff99248d38) test 2916 [000] 19124.260962: probe_libpthread:pthread_create: (3fff99248d38) $ /usr/bin/sudo ./perf probe --del=probe_libpthread:pthread_create Removed event: probe_libpthread:pthread_create -- Signed-off-by: Paul A. Clarke --- v6: - new name for enum (per Masami Hiramatsu) - fixed use of "unsigned int" instead of enum - some whitespace adjustments v5: - now using new enum to specify matching semantics (per Masami Hiramatsu) v4: - rebased to acme/perf/core - moved changes from "map" namespace to "symbol" namespace, - rewrote symbol__compare (now *match) to avoid need for strdup - new symbol__match_symbol_name to support versioned symbols, ignoring default tags - new arch__compare_symbol_names_n to map to strncmp - dso__find_symbol_by_name: now tries exact match (as before), then tries also adding symbols tagged as default (@@) - symbols__find_by_name: new parameter to support finding with or without default tags - does NOT handle setting probes using the tagged symbol name (symbol@[@]tag) v3: - code style fixes per David Ahern v2: - move logic from arch__compare_symbol_names to new map__compare_symbol_names - call through from map__compare_symbol_names to arch__compare_symbol_names - redirect uses of arch__compare_symbol_names - send patch to LKML tools/perf/arch/powerpc/util/sym-handling.c | 12 ++ tools/perf/util/map.c | 5 --- tools/perf/util/map.h | 5 ++- tools/perf/util/symbol.c| 61 +++-- tools/perf/util/symbol.h| 11 ++ 5 files changed, 74 insertions(+), 20 deletions(-) diff --git a/tools/perf/arch/powerpc/util/sym-handling.c b/tools/perf/arch/powerpc/util/sym-handling.c index 39dbe51..bf9a259 100644 --- a/tools/perf/arch/powerpc/util/sym-handling.c +++ b/tools/perf/arch/powerpc/util/sym-handling.c @@ -52,6 +52,18 @@ int arch__compare_symbol_names(const char *namea, const char *nameb) return strcmp(namea, nameb); } + +int arch__compare_symbol_names_n(const char *namea, const char *nameb, +unsigned int n) +{ + /* Skip over initial dot */ + if (*namea == '.') + namea++; + if (*nameb == '.') + nameb++; + + return strncmp(namea, nameb, n); +} #endif #if defined(_CALL_ELF) && _CALL_ELF == 2 diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index c1870ac..f4d8272 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -325,11 +325,6 @@ int map__load(struct map *map) return 0; } -int __weak arch__compare_symbol_names(const char *namea, const char *nameb) -{ - return strcmp(namea, nameb); -} - struct symbol *map__find_symbol(struct map *map, u64 addr) { if (map__load(map) < 0) diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index c8a5a64..f9e8ac8 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h @@ -130,13