perf record: Add support for arch_sdt_arg_parse_op() on s390
Subsystems (2)
PATCH v3 1/1 perf record: Add support for arch_sdt_arg_parse_op() on s390
commit e5e66adfe45a6 ("perf regs: Remove __weak attributive arch_sdt_arg_parse_op() function") removes arch_sdt_arg_parse_op() functions and s390 support is lost.
The following warning is printed:
Unknown ELF machine 22, standard arguments parse will be skipped.
ELF machine 22 is the EM_S390 host. This happens with command
# ./perf record -v -- stress-ng -t 1s --matrix 0 on a z/VM system when the event is not specified.
Add s390 specific __perf_sdt_arg_parse_op_s390() function to support -architecture calls to arch_sdt_arg_parse_op() for s390. The warning disappears.
--- .../perf/util/perf-regs-arch/perf_regs_s390.c | 89 +++++++++++++++++++ tools/perf/util/perf_regs.c | 3 + tools/perf/util/perf_regs.h | 1 + 3 files changed, 93 insertions(+)
tools/perf/util/perf-regs-arch/perf_regs_s390.c +89 -0
@@ -1,7 +1,13 @@// SPDX-License-Identifier: GPL-2.0 +#include <errno.h> +#include <regex.h> #include "../perf_regs.h" #include "../../arch/s390/include/perf_regs.h" +#include "debug.h" + +#include <linux/zalloc.h> +#include <linux/kernel.h> uint64_t __perf_reg_mask_s390 (bool intr__maybe_unused ) {
@@ -95,3 +101,86 @@ uint64_t __perf_reg_sp_s390(void) {return PERF_REG_S390_R15 ; } + +/* %rXX */ +#define SDT_OP_REGEX1 "^%(r([0-9]|1[0-5]))$" +/* -###(%rXX) */ +#define SDT_OP_REGEX2 "^([+-]?[0-9]+)\\(%(r[0-9]|r1[0-5])\\)$" +static regex_t sdt_op_regex1, sdt_op_regex2; + +static int sdt_init_op_regex (void ) +{ +static int initialized; +int ret =0 ; + +if (initialized) +return 0 ; + + ret =regcomp (&sdt_op_regex1,SDT_OP_REGEX1 ,REG_EXTENDED ); +if (ret) + goto error; + initialized =1 ; + + ret =regcomp (&sdt_op_regex2,SDT_OP_REGEX2 ,REG_EXTENDED ); +if (ret) + goto free_regex1; + initialized =2 ; + +return 0 ; + +free_regex1: +regfree (&sdt_op_regex1); +error: +pr_debug4 ("Regex compilation error, initialized %d\n" , initialized); +return ret; +} + +/* +* Parse OP and convert it into uprobe format, which is, +/-NUM(%gprREG). +* Possible variants of OP are: +* Format Example +* ------------------------- +* NUM(%rREG) 48(%r1) +* -NUM(%rREG) -48(%r1) +* %rREG %r1 +*/ +int __perf_sdt_arg_parse_op_s390 (char *old_op,char **new_op) +{ +int ret, new_len; +regmatch_t rm[6 ]; +unsigned long i; + + *new_op =NULL ; + ret =sdt_init_op_regex (); +if (ret) +return -EINVAL ; + +if (!regexec (&sdt_op_regex1, old_op,3 , rm,0 )) { +/* Extract %rX */ + new_len =2 ;/* % NULL */ + new_len += (int )(rm[1 ].rm_eo - rm[1 ].rm_so); + *new_op =zalloc (new_len); +if (!*new_op) +return -ENOMEM ; + +scnprintf (*new_op, new_len,"%.*s" , + (int )(rm[1 ].rm_eo - rm[1 ].rm_so), old_op + rm[1 ].rm_so); + }else if (!regexec (&sdt_op_regex2, old_op,ARRAY_SIZE (rm), rm,0 )) { +/* Extract #(%rX) */ + new_len =4 ;/* (%)NULL */ +for (i =1 ; i <ARRAY_SIZE (rm) && rm[i].rm_so !=-1 ; ++i) + new_len += (int )(rm[i].rm_eo - rm[i].rm_so); + *new_op =zalloc (new_len); +if (!*new_op) +return -ENOMEM ; + +scnprintf (*new_op, new_len,"%.*s(%.*s)" , + (int )(rm[1 ].rm_eo - rm[1 ].rm_so), old_op + rm[1 ].rm_so, + (int )(rm[2 ].rm_eo - rm[2 ].rm_so), old_op + rm[2 ].rm_so); + }else { +pr_debug4 ("Skipping unsupported SDT argument: %s\n" , old_op); +return SDT_ARG_SKIP ; + } + +return SDT_ARG_VALID ; +}
tools/perf/util/perf_regs.c +3 -0
@@ -23,6 +23,9 @@ int perf_sdt_arg_parse_op(uint16_t e_machine, char *old_op, char **new_op)case EM_X86_64 : ret =__perf_sdt_arg_parse_op_x86 (old_op, new_op);break ; +case EM_S390 : + ret =__perf_sdt_arg_parse_op_s390 (old_op, new_op); +break ;default :pr_debug ("Unknown ELF machine %d, standard arguments parse will be skipped.\n" , e_machine);
tools/perf/util/perf_regs.h +1 -0
@@ -62,6 +62,7 @@ uint64_t __perf_reg_mask_s390(bool intr);const char *__perf_reg_name_s390 (int id);uint64_t __perf_reg_ip_s390 (void );uint64_t __perf_reg_sp_s390 (void ); +int __perf_sdt_arg_parse_op_s390 (char *old_op,char **new_op);int __perf_sdt_arg_parse_op_x86 (char *old_op,char **new_op);uint64_t __perf_reg_mask_x86 (bool intr);
Signature · 1 line
2.53.0
Ian Rogers
reviewerQuoted 4 lines · Thomas Richter
commit
e5e66adfe45a6("perf regs: Remove__weakattributivearch_sdt_arg_parse_op()function") removesarch_sdt_arg_parse_op()functions and s390 support is lost.
The following warning is printed:
Apologies again for this breakage.
Quoted 55 lines
Unknown ELF machine 22, standard arguments parse will be skipped.
ELF machine 22 is the
EM_S390host. This happens with command# ./perf record -v -- stress-ng -t 1s --matrix 0 on a z/VM system when the event is not specified.Add s390 specific
__perf_sdt_arg_parse_op_s390()function to support -architecture calls toarch_sdt_arg_parse_op()for s390. The warning disappears.Signed-off-by Thomas Richter <[email protected]>Cc Dapeng Mi <[email protected]>Cc Ian Rogers <[email protected]>Tested-by Jan Polensky <[email protected]>--- .../perf/util/perf-regs-arch/perf_regs_s390.c | 89 +++++++++++++++++++ tools/perf/util/perf_regs.c | 3 + tools/perf/util/perf_regs.h | 1 + 3 files changed, 93 insertions(+)tools/perf/util/perf-regs-arch/perf_regs_s390.c +19
-0@@ -1,7 +1,13 @@// SPDX-License-Identifier: GPL-2.0 +#include <errno.h> +#include <regex.h> #include "../perf_regs.h" #include "../../arch/s390/include/perf_regs.h" +#include "debug.h" + +#include <linux/zalloc.h> +#include <linux/kernel.h> uint64_t __perf_reg_mask_s390 (bool intr__maybe_unused ) {@@ -95,3 +101,86 @@ uint64_t __perf_reg_sp_s390(void) {return PERF_REG_S390_R15 ; } + +/* %rXX */ +#define SDT_OP_REGEX1 "^%(r([0-9]|1[0-5]))$" +/* -###(%rXX) */ +#define SDT_OP_REGEX2 "^([+-]?[0-9]+)\\(%(r[0-9]|r1[0-5])\\)$" +static regex_t sdt_op_regex1, sdt_op_regex2; + +static int sdt_init_op_regex (void ) +{ +static int initialized; +int ret =0 ; + +if (initialized)
tools/perf/util/perf-regs-arch/perf_regs_s390.c uint64_t __perf_reg_sp_s390(void) · line 126
Quoted 10 lines
tools/perf/util/perf-regs-arch/perf_regs_s390.c +10
-0+return 0 ; + + ret =regcomp (&sdt_op_regex1,SDT_OP_REGEX1 ,REG_EXTENDED ); +if (ret) + goto error; + initialized =1 ; + + ret =regcomp (&sdt_op_regex2,SDT_OP_REGEX2 ,REG_EXTENDED ); +if (ret) + goto free_regex1;
Sashiko's review:
https://sashiko.dev/#/patchset/20260317110641.39975-1-tmricht%40linux.ibm.com
notes that here 'initialized' will still be 1, should it be made 0 again?
It triggers an ENOMEM, so I doubt this will be very useful, but it may make the code read better.
Quoted 31 lines
tools/perf/util/perf-regs-arch/perf_regs_s390.c +31
-0+ initialized =2 ; + +return 0 ; + +free_regex1: +regfree (&sdt_op_regex1); +error: +pr_debug4 ("Regex compilation error, initialized %d\n" , initialized); +return ret; +} + +/* +* Parse OP and convert it into uprobe format, which is, +/-NUM(%gprREG). +* Possible variants of OP are: +* Format Example +* ------------------------- +* NUM(%rREG) 48(%r1) +* -NUM(%rREG) -48(%r1) +* %rREG %r1 +*/ +int __perf_sdt_arg_parse_op_s390 (char *old_op,char **new_op) +{ +int ret, new_len; +regmatch_t rm[6 ]; +unsigned long i; + + *new_op =NULL ; + ret =sdt_init_op_regex (); +if (ret) +return -EINVAL ; +
tools/perf/util/perf-regs-arch/perf_regs_s390.c uint64_t __perf_reg_sp_s390(void) · line 167
Quoted 10 lines
tools/perf/util/perf-regs-arch/perf_regs_s390.c +10
-0+if (!regexec (&sdt_op_regex1, old_op,3 , rm,0 )) { +/* Extract %rX */ + new_len =2 ;/* % NULL */ + new_len += (int )(rm[1 ].rm_eo - rm[1 ].rm_so); + *new_op =zalloc (new_len); +if (!*new_op) +return -ENOMEM ; + +scnprintf (*new_op, new_len,"%.*s" , + (int )(rm[1 ].rm_eo - rm[1 ].rm_so), old_op + rm[1 ].rm_so);
Sashiko notes this is probably more of an issue:
The allocation size accounts for a % character, but the scnprintf format string "%.*s" seems to omit it.
Will this output r1 instead of %r1?
tools/perf/util/perf-regs-arch/perf_regs_s390.c uint64_t __perf_reg_sp_s390(void) · line 179
Quoted 12 lines
tools/perf/util/perf-regs-arch/perf_regs_s390.c +12
-0+ }else if (!regexec (&sdt_op_regex2, old_op,ARRAY_SIZE (rm), rm,0 )) { +/* Extract #(%rX) */ + new_len =4 ;/* (%)NULL */ +for (i =1 ; i <ARRAY_SIZE (rm) && rm[i].rm_so !=-1 ; ++i) + new_len += (int )(rm[i].rm_eo - rm[i].rm_so); + *new_op =zalloc (new_len); +if (!*new_op) +return -ENOMEM ; + +scnprintf (*new_op, new_len,"%.*s(%.*s)" , + (int )(rm[1 ].rm_eo - rm[1 ].rm_so), old_op + rm[1 ].rm_so, + (int )(rm[2 ].rm_eo - rm[2 ].rm_so), old_op + rm[2 ].rm_so);
Similarly, does this scnprintf format string "%.*s(%.*s)" need a %% character to produce the correct uprobe format? As written, it appears it will output 48(r1) instead of 48(%r1).
Thanks,
Ian
Quoted 36 lines
tools/perf/util/perf-regs-arch/perf_regs_s390.c +7
-0+ }else { +pr_debug4 ("Skipping unsupported SDT argument: %s\n" , old_op); +return SDT_ARG_SKIP ; + } + +return SDT_ARG_VALID ; +}tools/perf/util/perf_regs.c +3
-0@@ -23,6 +23,9 @@ int perf_sdt_arg_parse_op(uint16_t e_machine, char *old_op, char **new_op)case EM_X86_64 : ret =__perf_sdt_arg_parse_op_x86 (old_op, new_op);break ; +case EM_S390 : + ret =__perf_sdt_arg_parse_op_s390 (old_op, new_op); +break ;default :pr_debug ("Unknown ELF machine %d, standard arguments parse will be skipped.\n" , e_machine);tools/perf/util/perf_regs.h +1
-1@@ -62,6 +62,7 @@ uint64_t __perf_reg_mask_s390(bool intr);const char *__perf_reg_name_s390 (int id);uint64_t __perf_reg_ip_s390 (void );uint64_t __perf_reg_sp_s390 (void ); +int __perf_sdt_arg_parse_op_s390 (char *old_op,char **new_op);int __perf_sdt_arg_parse_op_x86 (char *old_op,char **new_op);uint64_t __perf_reg_mask_x86 (bool intr); --2.53.0
Quoted 3 lines · Thomas Richter
commit
e5e66adfe45a6("perf regs: Remove__weakattributivearch_sdt_arg_parse_op()function") removesarch_sdt_arg_parse_op()functions and s390 support is lost.
The following warning is printed:
Not sure if I miss something, but it looks there was also no s390 specific support for arch_sdt_arg_parse_op() before the commit e5e66adfe45a6 ("perf
regs: Remove __weak attributive arch_sdt_arg_parse_op() function") and we would see same warning even without the commit e5e66adfe45a6, right?
Quoted 152 lines
Unknown ELF machine 22, standard arguments parse will be skipped.
ELF machine 22 is the
EM_S390host. This happens with command# ./perf record -v -- stress-ng -t 1s --matrix 0 on a z/VM system when the event is not specified.Add s390 specific
__perf_sdt_arg_parse_op_s390()function to support -architecture calls toarch_sdt_arg_parse_op()for s390. The warning disappears.Signed-off-by Thomas Richter <[email protected]>Cc Dapeng Mi <[email protected]>Cc Ian Rogers <[email protected]>Tested-by Jan Polensky <[email protected]>--- .../perf/util/perf-regs-arch/perf_regs_s390.c | 89 +++++++++++++++++++ tools/perf/util/perf_regs.c | 3 + tools/perf/util/perf_regs.h | 1 + 3 files changed, 93 insertions(+)tools/perf/util/perf-regs-arch/perf_regs_s390.c +89
-0@@ -1,7 +1,13 @@// SPDX-License-Identifier: GPL-2.0 +#include <errno.h> +#include <regex.h> #include "../perf_regs.h" #include "../../arch/s390/include/perf_regs.h" +#include "debug.h" + +#include <linux/zalloc.h> +#include <linux/kernel.h> uint64_t __perf_reg_mask_s390 (bool intr__maybe_unused ) {@@ -95,3 +101,86 @@ uint64_t __perf_reg_sp_s390(void) {return PERF_REG_S390_R15 ; } + +/* %rXX */ +#define SDT_OP_REGEX1 "^%(r([0-9]|1[0-5]))$" +/* -###(%rXX) */ +#define SDT_OP_REGEX2 "^([+-]?[0-9]+)\\(%(r[0-9]|r1[0-5])\\)$" +static regex_t sdt_op_regex1, sdt_op_regex2; + +static int sdt_init_op_regex (void ) +{ +static int initialized; +int ret =0 ; + +if (initialized) +return 0 ; + + ret =regcomp (&sdt_op_regex1,SDT_OP_REGEX1 ,REG_EXTENDED ); +if (ret) + goto error; + initialized =1 ; + + ret =regcomp (&sdt_op_regex2,SDT_OP_REGEX2 ,REG_EXTENDED ); +if (ret) + goto free_regex1; + initialized =2 ; + +return 0 ; + +free_regex1: +regfree (&sdt_op_regex1); +error: +pr_debug4 ("Regex compilation error, initialized %d\n" , initialized); +return ret; +} + +/* +* Parse OP and convert it into uprobe format, which is, +/-NUM(%gprREG). +* Possible variants of OP are: +* Format Example +* ------------------------- +* NUM(%rREG) 48(%r1) +* -NUM(%rREG) -48(%r1) +* %rREG %r1 +*/ +int __perf_sdt_arg_parse_op_s390 (char *old_op,char **new_op) +{ +int ret, new_len; +regmatch_t rm[6 ]; +unsigned long i; + + *new_op =NULL ; + ret =sdt_init_op_regex (); +if (ret) +return -EINVAL ; + +if (!regexec (&sdt_op_regex1, old_op,3 , rm,0 )) { +/* Extract %rX */ + new_len =2 ;/* % NULL */ + new_len += (int )(rm[1 ].rm_eo - rm[1 ].rm_so); + *new_op =zalloc (new_len); +if (!*new_op) +return -ENOMEM ; + +scnprintf (*new_op, new_len,"%.*s" , + (int )(rm[1 ].rm_eo - rm[1 ].rm_so), old_op + rm[1 ].rm_so); + }else if (!regexec (&sdt_op_regex2, old_op,ARRAY_SIZE (rm), rm,0 )) { +/* Extract #(%rX) */ + new_len =4 ;/* (%)NULL */ +for (i =1 ; i <ARRAY_SIZE (rm) && rm[i].rm_so !=-1 ; ++i) + new_len += (int )(rm[i].rm_eo - rm[i].rm_so); + *new_op =zalloc (new_len); +if (!*new_op) +return -ENOMEM ; + +scnprintf (*new_op, new_len,"%.*s(%.*s)" , + (int )(rm[1 ].rm_eo - rm[1 ].rm_so), old_op + rm[1 ].rm_so, + (int )(rm[2 ].rm_eo - rm[2 ].rm_so), old_op + rm[2 ].rm_so); + }else { +pr_debug4 ("Skipping unsupported SDT argument: %s\n" , old_op); +return SDT_ARG_SKIP ; + } + +return SDT_ARG_VALID ; +}tools/perf/util/perf_regs.c +3
-0@@ -23,6 +23,9 @@ int perf_sdt_arg_parse_op(uint16_t e_machine, char *old_op, char **new_op)case EM_X86_64 : ret =__perf_sdt_arg_parse_op_x86 (old_op, new_op);break ; +case EM_S390 : + ret =__perf_sdt_arg_parse_op_s390 (old_op, new_op); +break ;default :pr_debug ("Unknown ELF machine %d, standard arguments parse will be skipped.\n" , e_machine);tools/perf/util/perf_regs.h +1
-0@@ -62,6 +62,7 @@ uint64_t __perf_reg_mask_s390(bool intr);const char *__perf_reg_name_s390 (int id);uint64_t __perf_reg_ip_s390 (void );uint64_t __perf_reg_sp_s390 (void ); +int __perf_sdt_arg_parse_op_s390 (char *old_op,char **new_op);int __perf_sdt_arg_parse_op_x86 (char *old_op,char **new_op);uint64_t __perf_reg_mask_x86 (bool intr);
Quoted 12 lines · Dapeng
Quoted 3 lines · Thomas Richter
commit
e5e66adfe45a6("perf regs: Remove__weakattributivearch_sdt_arg_parse_op()function") removesarch_sdt_arg_parse_op()functions and s390 support is lost.
The following warning is printed:Not sure if I miss something, but it looks there was also no s390 specific support for
arch_sdt_arg_parse_op()before the commite5e66adfe45a6("perf
regs: Remove__weakattributivearch_sdt_arg_parse_op()function") and we would see same warning even without the commite5e66adfe45a6, right?
Absolutely Correct, but in my opinion it does not matter if it was your patch or if you just remove the __weak attribute. Your patch revealed the missing s390 support, which triggered this patch.
If you do not like the wording, what do you suggest?
Thanks Thomas
Signature · 9 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Quoted 11 lines · Thomas Richter
Quoted 10 lines · Dapeng
Quoted 3 lines · Thomas Richter
commit
e5e66adfe45a6("perf regs: Remove__weakattributivearch_sdt_arg_parse_op()function") removesarch_sdt_arg_parse_op()functions and s390 support is lost.
The following warning is printed:Not sure if I miss something, but it looks there was also no s390 specific support for
arch_sdt_arg_parse_op()before the commite5e66adfe45a6("perf
regs: Remove__weakattributivearch_sdt_arg_parse_op()function") and we would see same warning even without the commite5e66adfe45a6, right?
Quoted 4 lines
Absolutely Correct, but in my opinion it does not matter if it was your patch or if you just remove the
__weakattribute. Your patch revealed the missing s390 support, which triggered this patch.
If you do not like the wording, what do you suggest?
I see. The original words lead me think the commit e5e66adfe45a6 ("perf
regs: Remove __weak attributive arch_sdt_arg_parse_op() function") drops the s390 specific support unexpectedly. :)
So precisely speaking, we may say "the commit e5e66adfe45a6 ("perf regs:
Remove __weak attributive arch_sdt_arg_parse_op() function") introducing perf_sdt_arg_parse_op() to support architecture-specific argument parsing, but s390 specific argument parsing is still not supported. So this patch adds the missing support for s390 ..."
Thanks.
Quoted 2 lines
Thanks Thomas