Re: [PATCH 2/5] perf/sdt/x86: Add renaming logic for rNN and other registers
Em Tue, Feb 07, 2017 at 12:11:59PM +0900, Masami Hiramatsu escreveu: > On Thu, 2 Feb 2017 16:41:40 +0530 > Ravi Bangoriawrote: > > > 'perf probe' is failing for sdt markers whose arguments has rNN > > (with postfix b/w/d), %rsp, %esp, %sil etc. registers. Add renaming > > logic for these registers. > > > > Looks good to me. > > Acked-by: Masami Hiramatsu Thanks, applied right after that v5 series from Alexis. > Thanks! > > > Signed-off-by: Ravi Bangoria > > --- > > tools/perf/arch/x86/util/perf_regs.c | 44 > > ++-- > > 1 file changed, 32 insertions(+), 12 deletions(-) > > > > diff --git a/tools/perf/arch/x86/util/perf_regs.c > > b/tools/perf/arch/x86/util/perf_regs.c > > index 09a7f55..d8a8dcf 100644 > > --- a/tools/perf/arch/x86/util/perf_regs.c > > +++ b/tools/perf/arch/x86/util/perf_regs.c > > @@ -48,10 +48,42 @@ static const struct sdt_name_reg sdt_reg_renamings[] = { > > SDT_NAME_REG(rdx, dx), > > SDT_NAME_REG(esi, si), > > SDT_NAME_REG(rsi, si), > > + SDT_NAME_REG(sil, si), > > SDT_NAME_REG(edi, di), > > SDT_NAME_REG(rdi, di), > > + SDT_NAME_REG(dil, di), > > SDT_NAME_REG(ebp, bp), > > SDT_NAME_REG(rbp, bp), > > + SDT_NAME_REG(bpl, bp), > > + SDT_NAME_REG(rsp, sp), > > + SDT_NAME_REG(esp, sp), > > + SDT_NAME_REG(spl, sp), > > + > > + /* rNN registers */ > > + SDT_NAME_REG(r8b, r8), > > + SDT_NAME_REG(r8w, r8), > > + SDT_NAME_REG(r8d, r8), > > + SDT_NAME_REG(r9b, r9), > > + SDT_NAME_REG(r9w, r9), > > + SDT_NAME_REG(r9d, r9), > > + SDT_NAME_REG(r10b, r10), > > + SDT_NAME_REG(r10w, r10), > > + SDT_NAME_REG(r10d, r10), > > + SDT_NAME_REG(r11b, r11), > > + SDT_NAME_REG(r11w, r11), > > + SDT_NAME_REG(r11d, r11), > > + SDT_NAME_REG(r12b, r12), > > + SDT_NAME_REG(r12w, r12), > > + SDT_NAME_REG(r12d, r12), > > + SDT_NAME_REG(r13b, r13), > > + SDT_NAME_REG(r13w, r13), > > + SDT_NAME_REG(r13d, r13), > > + SDT_NAME_REG(r14b, r14), > > + SDT_NAME_REG(r14w, r14), > > + SDT_NAME_REG(r14d, r14), > > + SDT_NAME_REG(r15b, r15), > > + SDT_NAME_REG(r15w, r15), > > + SDT_NAME_REG(r15d, r15), > > SDT_NAME_REG_END, > > }; > > > > @@ -88,18 +120,6 @@ int sdt_rename_register(char **pdesc, char *old_name) > > > > /* Copy the chars after the register name (if need be) */ > > offset = prefix_len + sdt_len; > > - if (offset < old_desc_len) { > > - /* > > -* The orginal register name can be suffixed by 'b', > > -* 'w' or 'd' to indicate its size; so, we need to > > -* skip this char if we met one. > > -*/ > > - char sfx = old_desc[offset]; > > - > > - if (sfx == 'b' || sfx == 'w' || sfx == 'd') > > - offset++; > > - } > > - > > if (offset < old_desc_len) > > memcpy(new_desc + prefix_len + uprobe_len, > > old_desc + offset, old_desc_len - offset); > > -- > > 2.9.3 > > > > > -- > Masami Hiramatsu
Re: [PATCH 2/5] perf/sdt/x86: Add renaming logic for rNN and other registers
Em Tue, Feb 07, 2017 at 12:11:59PM +0900, Masami Hiramatsu escreveu: > On Thu, 2 Feb 2017 16:41:40 +0530 > Ravi Bangoria wrote: > > > 'perf probe' is failing for sdt markers whose arguments has rNN > > (with postfix b/w/d), %rsp, %esp, %sil etc. registers. Add renaming > > logic for these registers. > > > > Looks good to me. > > Acked-by: Masami Hiramatsu Thanks, applied right after that v5 series from Alexis. > Thanks! > > > Signed-off-by: Ravi Bangoria > > --- > > tools/perf/arch/x86/util/perf_regs.c | 44 > > ++-- > > 1 file changed, 32 insertions(+), 12 deletions(-) > > > > diff --git a/tools/perf/arch/x86/util/perf_regs.c > > b/tools/perf/arch/x86/util/perf_regs.c > > index 09a7f55..d8a8dcf 100644 > > --- a/tools/perf/arch/x86/util/perf_regs.c > > +++ b/tools/perf/arch/x86/util/perf_regs.c > > @@ -48,10 +48,42 @@ static const struct sdt_name_reg sdt_reg_renamings[] = { > > SDT_NAME_REG(rdx, dx), > > SDT_NAME_REG(esi, si), > > SDT_NAME_REG(rsi, si), > > + SDT_NAME_REG(sil, si), > > SDT_NAME_REG(edi, di), > > SDT_NAME_REG(rdi, di), > > + SDT_NAME_REG(dil, di), > > SDT_NAME_REG(ebp, bp), > > SDT_NAME_REG(rbp, bp), > > + SDT_NAME_REG(bpl, bp), > > + SDT_NAME_REG(rsp, sp), > > + SDT_NAME_REG(esp, sp), > > + SDT_NAME_REG(spl, sp), > > + > > + /* rNN registers */ > > + SDT_NAME_REG(r8b, r8), > > + SDT_NAME_REG(r8w, r8), > > + SDT_NAME_REG(r8d, r8), > > + SDT_NAME_REG(r9b, r9), > > + SDT_NAME_REG(r9w, r9), > > + SDT_NAME_REG(r9d, r9), > > + SDT_NAME_REG(r10b, r10), > > + SDT_NAME_REG(r10w, r10), > > + SDT_NAME_REG(r10d, r10), > > + SDT_NAME_REG(r11b, r11), > > + SDT_NAME_REG(r11w, r11), > > + SDT_NAME_REG(r11d, r11), > > + SDT_NAME_REG(r12b, r12), > > + SDT_NAME_REG(r12w, r12), > > + SDT_NAME_REG(r12d, r12), > > + SDT_NAME_REG(r13b, r13), > > + SDT_NAME_REG(r13w, r13), > > + SDT_NAME_REG(r13d, r13), > > + SDT_NAME_REG(r14b, r14), > > + SDT_NAME_REG(r14w, r14), > > + SDT_NAME_REG(r14d, r14), > > + SDT_NAME_REG(r15b, r15), > > + SDT_NAME_REG(r15w, r15), > > + SDT_NAME_REG(r15d, r15), > > SDT_NAME_REG_END, > > }; > > > > @@ -88,18 +120,6 @@ int sdt_rename_register(char **pdesc, char *old_name) > > > > /* Copy the chars after the register name (if need be) */ > > offset = prefix_len + sdt_len; > > - if (offset < old_desc_len) { > > - /* > > -* The orginal register name can be suffixed by 'b', > > -* 'w' or 'd' to indicate its size; so, we need to > > -* skip this char if we met one. > > -*/ > > - char sfx = old_desc[offset]; > > - > > - if (sfx == 'b' || sfx == 'w' || sfx == 'd') > > - offset++; > > - } > > - > > if (offset < old_desc_len) > > memcpy(new_desc + prefix_len + uprobe_len, > > old_desc + offset, old_desc_len - offset); > > -- > > 2.9.3 > > > > > -- > Masami Hiramatsu
Re: [PATCH 2/5] perf/sdt/x86: Add renaming logic for rNN and other registers
On Thu, 2 Feb 2017 16:41:40 +0530 Ravi Bangoriawrote: > 'perf probe' is failing for sdt markers whose arguments has rNN > (with postfix b/w/d), %rsp, %esp, %sil etc. registers. Add renaming > logic for these registers. > Looks good to me. Acked-by: Masami Hiramatsu Thanks! > Signed-off-by: Ravi Bangoria > --- > tools/perf/arch/x86/util/perf_regs.c | 44 > ++-- > 1 file changed, 32 insertions(+), 12 deletions(-) > > diff --git a/tools/perf/arch/x86/util/perf_regs.c > b/tools/perf/arch/x86/util/perf_regs.c > index 09a7f55..d8a8dcf 100644 > --- a/tools/perf/arch/x86/util/perf_regs.c > +++ b/tools/perf/arch/x86/util/perf_regs.c > @@ -48,10 +48,42 @@ static const struct sdt_name_reg sdt_reg_renamings[] = { > SDT_NAME_REG(rdx, dx), > SDT_NAME_REG(esi, si), > SDT_NAME_REG(rsi, si), > + SDT_NAME_REG(sil, si), > SDT_NAME_REG(edi, di), > SDT_NAME_REG(rdi, di), > + SDT_NAME_REG(dil, di), > SDT_NAME_REG(ebp, bp), > SDT_NAME_REG(rbp, bp), > + SDT_NAME_REG(bpl, bp), > + SDT_NAME_REG(rsp, sp), > + SDT_NAME_REG(esp, sp), > + SDT_NAME_REG(spl, sp), > + > + /* rNN registers */ > + SDT_NAME_REG(r8b, r8), > + SDT_NAME_REG(r8w, r8), > + SDT_NAME_REG(r8d, r8), > + SDT_NAME_REG(r9b, r9), > + SDT_NAME_REG(r9w, r9), > + SDT_NAME_REG(r9d, r9), > + SDT_NAME_REG(r10b, r10), > + SDT_NAME_REG(r10w, r10), > + SDT_NAME_REG(r10d, r10), > + SDT_NAME_REG(r11b, r11), > + SDT_NAME_REG(r11w, r11), > + SDT_NAME_REG(r11d, r11), > + SDT_NAME_REG(r12b, r12), > + SDT_NAME_REG(r12w, r12), > + SDT_NAME_REG(r12d, r12), > + SDT_NAME_REG(r13b, r13), > + SDT_NAME_REG(r13w, r13), > + SDT_NAME_REG(r13d, r13), > + SDT_NAME_REG(r14b, r14), > + SDT_NAME_REG(r14w, r14), > + SDT_NAME_REG(r14d, r14), > + SDT_NAME_REG(r15b, r15), > + SDT_NAME_REG(r15w, r15), > + SDT_NAME_REG(r15d, r15), > SDT_NAME_REG_END, > }; > > @@ -88,18 +120,6 @@ int sdt_rename_register(char **pdesc, char *old_name) > > /* Copy the chars after the register name (if need be) */ > offset = prefix_len + sdt_len; > - if (offset < old_desc_len) { > - /* > - * The orginal register name can be suffixed by 'b', > - * 'w' or 'd' to indicate its size; so, we need to > - * skip this char if we met one. > - */ > - char sfx = old_desc[offset]; > - > - if (sfx == 'b' || sfx == 'w' || sfx == 'd') > - offset++; > - } > - > if (offset < old_desc_len) > memcpy(new_desc + prefix_len + uprobe_len, > old_desc + offset, old_desc_len - offset); > -- > 2.9.3 > -- Masami Hiramatsu
Re: [PATCH 2/5] perf/sdt/x86: Add renaming logic for rNN and other registers
On Thu, 2 Feb 2017 16:41:40 +0530 Ravi Bangoria wrote: > 'perf probe' is failing for sdt markers whose arguments has rNN > (with postfix b/w/d), %rsp, %esp, %sil etc. registers. Add renaming > logic for these registers. > Looks good to me. Acked-by: Masami Hiramatsu Thanks! > Signed-off-by: Ravi Bangoria > --- > tools/perf/arch/x86/util/perf_regs.c | 44 > ++-- > 1 file changed, 32 insertions(+), 12 deletions(-) > > diff --git a/tools/perf/arch/x86/util/perf_regs.c > b/tools/perf/arch/x86/util/perf_regs.c > index 09a7f55..d8a8dcf 100644 > --- a/tools/perf/arch/x86/util/perf_regs.c > +++ b/tools/perf/arch/x86/util/perf_regs.c > @@ -48,10 +48,42 @@ static const struct sdt_name_reg sdt_reg_renamings[] = { > SDT_NAME_REG(rdx, dx), > SDT_NAME_REG(esi, si), > SDT_NAME_REG(rsi, si), > + SDT_NAME_REG(sil, si), > SDT_NAME_REG(edi, di), > SDT_NAME_REG(rdi, di), > + SDT_NAME_REG(dil, di), > SDT_NAME_REG(ebp, bp), > SDT_NAME_REG(rbp, bp), > + SDT_NAME_REG(bpl, bp), > + SDT_NAME_REG(rsp, sp), > + SDT_NAME_REG(esp, sp), > + SDT_NAME_REG(spl, sp), > + > + /* rNN registers */ > + SDT_NAME_REG(r8b, r8), > + SDT_NAME_REG(r8w, r8), > + SDT_NAME_REG(r8d, r8), > + SDT_NAME_REG(r9b, r9), > + SDT_NAME_REG(r9w, r9), > + SDT_NAME_REG(r9d, r9), > + SDT_NAME_REG(r10b, r10), > + SDT_NAME_REG(r10w, r10), > + SDT_NAME_REG(r10d, r10), > + SDT_NAME_REG(r11b, r11), > + SDT_NAME_REG(r11w, r11), > + SDT_NAME_REG(r11d, r11), > + SDT_NAME_REG(r12b, r12), > + SDT_NAME_REG(r12w, r12), > + SDT_NAME_REG(r12d, r12), > + SDT_NAME_REG(r13b, r13), > + SDT_NAME_REG(r13w, r13), > + SDT_NAME_REG(r13d, r13), > + SDT_NAME_REG(r14b, r14), > + SDT_NAME_REG(r14w, r14), > + SDT_NAME_REG(r14d, r14), > + SDT_NAME_REG(r15b, r15), > + SDT_NAME_REG(r15w, r15), > + SDT_NAME_REG(r15d, r15), > SDT_NAME_REG_END, > }; > > @@ -88,18 +120,6 @@ int sdt_rename_register(char **pdesc, char *old_name) > > /* Copy the chars after the register name (if need be) */ > offset = prefix_len + sdt_len; > - if (offset < old_desc_len) { > - /* > - * The orginal register name can be suffixed by 'b', > - * 'w' or 'd' to indicate its size; so, we need to > - * skip this char if we met one. > - */ > - char sfx = old_desc[offset]; > - > - if (sfx == 'b' || sfx == 'w' || sfx == 'd') > - offset++; > - } > - > if (offset < old_desc_len) > memcpy(new_desc + prefix_len + uprobe_len, > old_desc + offset, old_desc_len - offset); > -- > 2.9.3 > -- Masami Hiramatsu
[PATCH 2/5] perf/sdt/x86: Add renaming logic for rNN and other registers
'perf probe' is failing for sdt markers whose arguments has rNN (with postfix b/w/d), %rsp, %esp, %sil etc. registers. Add renaming logic for these registers. Signed-off-by: Ravi Bangoria--- tools/perf/arch/x86/util/perf_regs.c | 44 ++-- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/tools/perf/arch/x86/util/perf_regs.c b/tools/perf/arch/x86/util/perf_regs.c index 09a7f55..d8a8dcf 100644 --- a/tools/perf/arch/x86/util/perf_regs.c +++ b/tools/perf/arch/x86/util/perf_regs.c @@ -48,10 +48,42 @@ static const struct sdt_name_reg sdt_reg_renamings[] = { SDT_NAME_REG(rdx, dx), SDT_NAME_REG(esi, si), SDT_NAME_REG(rsi, si), + SDT_NAME_REG(sil, si), SDT_NAME_REG(edi, di), SDT_NAME_REG(rdi, di), + SDT_NAME_REG(dil, di), SDT_NAME_REG(ebp, bp), SDT_NAME_REG(rbp, bp), + SDT_NAME_REG(bpl, bp), + SDT_NAME_REG(rsp, sp), + SDT_NAME_REG(esp, sp), + SDT_NAME_REG(spl, sp), + + /* rNN registers */ + SDT_NAME_REG(r8b, r8), + SDT_NAME_REG(r8w, r8), + SDT_NAME_REG(r8d, r8), + SDT_NAME_REG(r9b, r9), + SDT_NAME_REG(r9w, r9), + SDT_NAME_REG(r9d, r9), + SDT_NAME_REG(r10b, r10), + SDT_NAME_REG(r10w, r10), + SDT_NAME_REG(r10d, r10), + SDT_NAME_REG(r11b, r11), + SDT_NAME_REG(r11w, r11), + SDT_NAME_REG(r11d, r11), + SDT_NAME_REG(r12b, r12), + SDT_NAME_REG(r12w, r12), + SDT_NAME_REG(r12d, r12), + SDT_NAME_REG(r13b, r13), + SDT_NAME_REG(r13w, r13), + SDT_NAME_REG(r13d, r13), + SDT_NAME_REG(r14b, r14), + SDT_NAME_REG(r14w, r14), + SDT_NAME_REG(r14d, r14), + SDT_NAME_REG(r15b, r15), + SDT_NAME_REG(r15w, r15), + SDT_NAME_REG(r15d, r15), SDT_NAME_REG_END, }; @@ -88,18 +120,6 @@ int sdt_rename_register(char **pdesc, char *old_name) /* Copy the chars after the register name (if need be) */ offset = prefix_len + sdt_len; - if (offset < old_desc_len) { - /* -* The orginal register name can be suffixed by 'b', -* 'w' or 'd' to indicate its size; so, we need to -* skip this char if we met one. -*/ - char sfx = old_desc[offset]; - - if (sfx == 'b' || sfx == 'w' || sfx == 'd') - offset++; - } - if (offset < old_desc_len) memcpy(new_desc + prefix_len + uprobe_len, old_desc + offset, old_desc_len - offset); -- 2.9.3
[PATCH 2/5] perf/sdt/x86: Add renaming logic for rNN and other registers
'perf probe' is failing for sdt markers whose arguments has rNN (with postfix b/w/d), %rsp, %esp, %sil etc. registers. Add renaming logic for these registers. Signed-off-by: Ravi Bangoria --- tools/perf/arch/x86/util/perf_regs.c | 44 ++-- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/tools/perf/arch/x86/util/perf_regs.c b/tools/perf/arch/x86/util/perf_regs.c index 09a7f55..d8a8dcf 100644 --- a/tools/perf/arch/x86/util/perf_regs.c +++ b/tools/perf/arch/x86/util/perf_regs.c @@ -48,10 +48,42 @@ static const struct sdt_name_reg sdt_reg_renamings[] = { SDT_NAME_REG(rdx, dx), SDT_NAME_REG(esi, si), SDT_NAME_REG(rsi, si), + SDT_NAME_REG(sil, si), SDT_NAME_REG(edi, di), SDT_NAME_REG(rdi, di), + SDT_NAME_REG(dil, di), SDT_NAME_REG(ebp, bp), SDT_NAME_REG(rbp, bp), + SDT_NAME_REG(bpl, bp), + SDT_NAME_REG(rsp, sp), + SDT_NAME_REG(esp, sp), + SDT_NAME_REG(spl, sp), + + /* rNN registers */ + SDT_NAME_REG(r8b, r8), + SDT_NAME_REG(r8w, r8), + SDT_NAME_REG(r8d, r8), + SDT_NAME_REG(r9b, r9), + SDT_NAME_REG(r9w, r9), + SDT_NAME_REG(r9d, r9), + SDT_NAME_REG(r10b, r10), + SDT_NAME_REG(r10w, r10), + SDT_NAME_REG(r10d, r10), + SDT_NAME_REG(r11b, r11), + SDT_NAME_REG(r11w, r11), + SDT_NAME_REG(r11d, r11), + SDT_NAME_REG(r12b, r12), + SDT_NAME_REG(r12w, r12), + SDT_NAME_REG(r12d, r12), + SDT_NAME_REG(r13b, r13), + SDT_NAME_REG(r13w, r13), + SDT_NAME_REG(r13d, r13), + SDT_NAME_REG(r14b, r14), + SDT_NAME_REG(r14w, r14), + SDT_NAME_REG(r14d, r14), + SDT_NAME_REG(r15b, r15), + SDT_NAME_REG(r15w, r15), + SDT_NAME_REG(r15d, r15), SDT_NAME_REG_END, }; @@ -88,18 +120,6 @@ int sdt_rename_register(char **pdesc, char *old_name) /* Copy the chars after the register name (if need be) */ offset = prefix_len + sdt_len; - if (offset < old_desc_len) { - /* -* The orginal register name can be suffixed by 'b', -* 'w' or 'd' to indicate its size; so, we need to -* skip this char if we met one. -*/ - char sfx = old_desc[offset]; - - if (sfx == 'b' || sfx == 'w' || sfx == 'd') - offset++; - } - if (offset < old_desc_len) memcpy(new_desc + prefix_len + uprobe_len, old_desc + offset, old_desc_len - offset); -- 2.9.3