perf: Move arch specific code into separate arch directory
in [Kernel]
|
Prev: make xconfig needs qt-mt according to error msg
Next: [PATCH]BUG FIX: hwmon applesmc.c add iMac9, 1 and MacBookPro2, 2 to fix bug 14429
From: Masami Hiramatsu on 12 Apr 2010 08:40 Hi Ian, Ian Munsie wrote: > From: Ian Munsie <imunsie(a)au.ibm.com> > > The perf userspace tool included some architecture specific code to map > registers from the DWARF register number into the names used by the regs > and stack access API. > > This patch moves the architecture specific code out into a seperate > arch/x86 directory along with the infrastructure required to use it. Nice! :) I have just some comments on it. > > Signed-off-by: Ian Munsie <imunsie(a)au.ibm.com> > --- > tools/perf/Makefile | 18 ++++++- > tools/perf/arch/x86/Makefile | 1 + > tools/perf/arch/x86/include/arch_dwarf-regs.h | 6 ++ > tools/perf/arch/x86/util/dwarf-regs.c | 75 +++++++++++++++++++++++++ > tools/perf/util/include/dwarf-regs.h | 8 +++ > tools/perf/util/probe-finder.c | 55 ++---------------- > 6 files changed, 113 insertions(+), 50 deletions(-) > create mode 100644 tools/perf/arch/x86/Makefile > create mode 100644 tools/perf/arch/x86/include/arch_dwarf-regs.h > create mode 100644 tools/perf/arch/x86/util/dwarf-regs.c > create mode 100644 tools/perf/util/include/dwarf-regs.h > > diff --git a/tools/perf/Makefile b/tools/perf/Makefile > index f578b05..07a6ee2 100644 > --- a/tools/perf/Makefile > +++ b/tools/perf/Makefile > @@ -172,6 +172,20 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') > uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not') > uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not') > > +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ > + -e s/arm.*/arm/ -e s/sa110/arm/ \ > + -e s/s390x/s390/ -e s/parisc64/parisc/ \ > + -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ > + -e s/sh[234].*/sh/ ) > + > +# Additional ARCH settings for x86 > +ifeq ($(ARCH),i386) > + ARCH := x86 > +endif > +ifeq ($(ARCH),x86_64) > + ARCH := x86 > +endif > + > # CFLAGS and LDFLAGS are for the users to override from the command line. > > # > @@ -284,7 +298,7 @@ endif > # Those must not be GNU-specific; they are shared with perl/ which may > # be built by a different compiler. (Note that this is an artifact now > # but it still might be nice to keep that distinction.) > -BASIC_CFLAGS = -Iutil/include > +BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include > BASIC_LDFLAGS = > > # Guard against environment variables > @@ -366,6 +380,7 @@ LIB_H += util/include/asm/byteorder.h > LIB_H += util/include/asm/swab.h > LIB_H += util/include/asm/system.h > LIB_H += util/include/asm/uaccess.h > +LIB_H += util/include/dwarf-regs.h > LIB_H += perf.h > LIB_H += util/cache.h > LIB_H += util/callchain.h > @@ -484,6 +499,7 @@ PERFLIBS = $(LIB_FILE) > > -include config.mak.autogen > -include config.mak > +-include arch/$(ARCH)/Makefile > > ifeq ($(uname_S),Darwin) > ifndef NO_FINK Could you add a check whether the get_arch_regstr() is defined (or dwarf-regs.h is exist) in Makefile? If it is not defined, we'd better drop dwarf support(so set NO_DWARF), because it means we haven't ported perf probe on that architecture yet. :) > diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile > new file mode 100644 > index 0000000..1191403 > --- /dev/null > +++ b/tools/perf/arch/x86/Makefile > @@ -0,0 +1 @@ > +LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o > diff --git a/tools/perf/arch/x86/include/arch_dwarf-regs.h b/tools/perf/arch/x86/include/arch_dwarf-regs.h > new file mode 100644 > index 0000000..9e8da6a > --- /dev/null > +++ b/tools/perf/arch/x86/include/arch_dwarf-regs.h > @@ -0,0 +1,6 @@ > +#ifndef _PREF_ARCH_PPC_DWARF_REGS_H > +#define _PREF_ARCH_PPC_DWARF_REGS_H _PREF_ARCH_X86_DWARF_REGS_H ? > + > +#define get_arch_regstr(n) get_arch_regstr(n) If we checked above dwarf support, we don't need this odd macro. > + > +#endif > diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c > new file mode 100644 > index 0000000..a794d30 > --- /dev/null > +++ b/tools/perf/arch/x86/util/dwarf-regs.c > @@ -0,0 +1,75 @@ > +/* > + * dwarf-regs.c : Mapping of DWARF debug register numbers into register names. > + * Extracted from probe-finder.c > + * > + * Written by Masami Hiramatsu <mhiramat(a)redhat.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + * > + */ > + > +#include <libio.h> > +#include <dwarf-regs.h> > + > +/* > + * Generic dwarf analysis helpers > + */ > + > +#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", > +}; > + > +#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", > +}; > + > +/* 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 > +#else > +#define ARCH_MAX_REGS X86_32_MAX_REGS > +#define arch_regs_table x86_32_regs_table > +#endif > + > +/* 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; > +} > diff --git a/tools/perf/util/include/dwarf-regs.h b/tools/perf/util/include/dwarf-regs.h > new file mode 100644 > index 0000000..2a1cf6f > --- /dev/null > +++ b/tools/perf/util/include/dwarf-regs.h > @@ -0,0 +1,8 @@ > +#ifndef _PERF_DWARF_REGS_H_ > +#define _PERF_DWARF_REGS_H_ > + > +#include <arch_dwarf-regs.h> > + > +const char *get_arch_regstr(unsigned int n); > + > +#endif > diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c > index a851377..27020fe 100644 > --- a/tools/perf/util/probe-finder.c > +++ b/tools/perf/util/probe-finder.c > @@ -31,6 +31,7 @@ > #include <string.h> > #include <stdarg.h> > #include <ctype.h> > +#include <dwarf-regs.h> > > #include "string.h" > #include "event.h" > @@ -38,57 +39,13 @@ > #include "util.h" > #include "probe-finder.h" > > - > -/* > - * Generic dwarf analysis helpers > - */ > - > -#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", > -}; > - > -#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", > -}; > - > -/* 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 > -#else > -#define ARCH_MAX_REGS X86_32_MAX_REGS > -#define arch_regs_table x86_32_regs_table > -#endif > - > /* Return architecture dependent register string (for kprobe-tracer) */ > -static const char *get_arch_regstr(unsigned int n) > +#ifndef get_arch_regstr > +const char *get_arch_regstr(unsigned int n __attribute__((unused))) > { > - return (n <= ARCH_MAX_REGS) ? arch_regs_table[n] : NULL; > + return NULL; > } > +#endif Again, if we add a check in Makefile, we can remove this completely. > > /* > * Compare the tail of two strings. > @@ -397,7 +354,7 @@ static void convert_location(Dwarf_Op *op, struct probe_finder *pf) > > regs = get_arch_regstr(regn); > if (!regs) > - die("%u exceeds max register number.", regn); > + die("Mapping for DWARF register number %u missing on this architecture.", regn); > > tvar->value = xstrdup(regs); > if (ref) { Thank you, -- Masami Hiramatsu e-mail: mhiramat(a)redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Masami Hiramatsu on 14 Apr 2010 10:50 Ian Munsie wrote: > From: Ian Munsie <imunsie(a)au.ibm.com> > > The perf userspace tool included some architecture specific code to map > registers from the DWARF register number into the names used by the regs > and stack access API. > > This patch moves the architecture specific code out into a separate > arch/x86 directory along with the infrastructure required to use it. > > Signed-off-by: Ian Munsie <imunsie(a)au.ibm.com> > --- > Changes since v1: From Masami Hiramatsu's suggestion, I added a check in the > Makefile for if the arch specific Makefile defines PERF_HAVE_DWARF_REGS, > printing a message during build if it has not. This simplifies the code > removing the odd macro from the previous version and the need for an arch > specific arch_dwarf-regs.h. I have not entirely disabled DWARF support for > architectures that don't implement the register mappings, so that they can > still add a probe based on a line number (they will be missing the ability to > capture the value of a variable from a register). Hmm, sorry, I don't think it is a good way to go... IMHO, porting dwarf-regs.c is so easy (you can just refer systemtap/runtime/loc2c-runtime.h), easier than porting kprobe-tracer on another arch. And perf is a part of kernel tree. It means that someone who are porting kprobe-tracer, he should port dwarf-regs.c too. In that case, PERF_HAVE_DWARF_REGS flag will be used only between those two patches in same patchset. So, I suggested you to drop dwarf support if dwarf-regs mapping doesn't exist. AFAIK, at this point, only s390 users are affected. I'd like to ask them to just port a register mapping on perf and test it too. Thank you, -- Masami Hiramatsu e-mail: mhiramat(a)redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Masami Hiramatsu on 14 Apr 2010 14:50 Heiko Carstens wrote: > On Wed, Apr 14, 2010 at 07:46:12AM -0700, Masami Hiramatsu wrote: >> Ian Munsie wrote: >>> From: Ian Munsie <imunsie(a)au.ibm.com> >>> >>> The perf userspace tool included some architecture specific code to map >>> registers from the DWARF register number into the names used by the regs >>> and stack access API. >>> >>> This patch moves the architecture specific code out into a separate >>> arch/x86 directory along with the infrastructure required to use it. >>> >>> Signed-off-by: Ian Munsie <imunsie(a)au.ibm.com> >>> --- >>> Changes since v1: From Masami Hiramatsu's suggestion, I added a check in the >>> Makefile for if the arch specific Makefile defines PERF_HAVE_DWARF_REGS, >>> printing a message during build if it has not. This simplifies the code >>> removing the odd macro from the previous version and the need for an arch >>> specific arch_dwarf-regs.h. I have not entirely disabled DWARF support for >>> architectures that don't implement the register mappings, so that they can >>> still add a probe based on a line number (they will be missing the ability to >>> capture the value of a variable from a register). >> >> Hmm, sorry, I don't think it is a good way to go... IMHO, porting dwarf-regs.c >> is so easy (you can just refer systemtap/runtime/loc2c-runtime.h), easier >> than porting kprobe-tracer on another arch. And perf is a part of kernel tree. >> It means that someone who are porting kprobe-tracer, he should port >> dwarf-regs.c too. In that case, PERF_HAVE_DWARF_REGS flag will be used only >> between those two patches in same patchset. So, I suggested you to drop dwarf >> support if dwarf-regs mapping doesn't exist. >> >> AFAIK, at this point, only s390 users are affected. I'd like to ask >> them to just port a register mapping on perf and test it too. > > Hm, I'm a bit lost here. Probably due to lack of context. What would be missing > on s390 and what am I supposed to implement and how can I test it? > Any pointers to git commits? Ah, sorry about that. Now we're talking about an idea about porting perf-probe on some architectures which supports kprobe-tracer. Ian's patch (https://patchwork.kernel.org/patch/92328/) is currently under discussion, so there is no git commit yet (but it will be in a few days). So what I'd like to suggest you is implementing s390 version of DWARF register mapping support(ppc version is here: https://patchwork.kernel.org/patch/92329/) for perf probe (a subcommand of perf tools(tools/perf)) and test the perf-probe can work. For testing, you may need to compile kernel with CONFIG_DEBUG_INFO, install elfutils-devel, and make perf tools (cd tools/perf; make). And then, execute below command. $ ./perf probe -v --add 'vfs_read file' Thank you, -- Masami Hiramatsu e-mail: mhiramat(a)redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Masami Hiramatsu on 15 Apr 2010 11:20 Ian Munsie wrote: > From: Ian Munsie <imunsie(a)au.ibm.com> > > The perf userspace tool included some architecture specific code to map > registers from the DWARF register number into the names used by the regs > and stack access API. > > This patch moves the architecture specific code out into a separate > arch/x86 directory along with the infrastructure required to use it. > > Signed-off-by: Ian Munsie <imunsie(a)au.ibm.com> Good work! Acked-by: Masami Hiramatsu <mhiramat(a)redhat.com> Thank you very much! > --- > Changes since v2: From Masami Hiramatsu's feedback DWARF support is disabled > altogether if the architecture specific Makefile does not define > PERF_HAVE_DWARF_REGS - ie, DWARF register mappings are missing for the > architecture. A message indicating this is printed out during compilation. > > tools/perf/Makefile | 26 ++++++++++- > tools/perf/arch/x86/Makefile | 2 + > tools/perf/arch/x86/util/dwarf-regs.c | 75 +++++++++++++++++++++++++++++++++ > tools/perf/util/include/dwarf-regs.h | 8 ++++ > tools/perf/util/probe-finder.c | 55 +----------------------- > 5 files changed, 110 insertions(+), 56 deletions(-) > create mode 100644 tools/perf/arch/x86/Makefile > create mode 100644 tools/perf/arch/x86/util/dwarf-regs.c > create mode 100644 tools/perf/util/include/dwarf-regs.h > > diff --git a/tools/perf/Makefile b/tools/perf/Makefile > index 57b3569..269d5dd 100644 > --- a/tools/perf/Makefile > +++ b/tools/perf/Makefile > @@ -173,6 +173,20 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') > uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not') > uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not') > > +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ > + -e s/arm.*/arm/ -e s/sa110/arm/ \ > + -e s/s390x/s390/ -e s/parisc64/parisc/ \ > + -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ > + -e s/sh[234].*/sh/ ) > + > +# Additional ARCH settings for x86 > +ifeq ($(ARCH),i386) > + ARCH := x86 > +endif > +ifeq ($(ARCH),x86_64) > + ARCH := x86 > +endif > + > # CFLAGS and LDFLAGS are for the users to override from the command line. > > # > @@ -285,7 +299,7 @@ endif > # Those must not be GNU-specific; they are shared with perl/ which may > # be built by a different compiler. (Note that this is an artifact now > # but it still might be nice to keep that distinction.) > -BASIC_CFLAGS = -Iutil/include > +BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include > BASIC_LDFLAGS = > > # Guard against environment variables > @@ -367,6 +381,7 @@ LIB_H += util/include/asm/byteorder.h > LIB_H += util/include/asm/swab.h > LIB_H += util/include/asm/system.h > LIB_H += util/include/asm/uaccess.h > +LIB_H += util/include/dwarf-regs.h > LIB_H += perf.h > LIB_H += util/cache.h > LIB_H += util/callchain.h > @@ -485,6 +500,7 @@ PERFLIBS = $(LIB_FILE) > > -include config.mak.autogen > -include config.mak > +-include arch/$(ARCH)/Makefile > > ifeq ($(uname_S),Darwin) > ifndef NO_FINK > @@ -521,12 +537,16 @@ endif > ifneq ($(shell sh -c "(echo '\#include <dwarf.h>'; echo '\#include <libdw.h>'; echo 'int main(void) { Dwarf *dbg; dbg = dwarf_begin(0, DWARF_C_READ); return (long)dbg; }') | $(CC) -x c - $(ALL_CFLAGS) -I/usr/include/elfutils -ldw -lelf -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y) > msg := $(warning No libdw.h found or old libdw.h found, disables dwarf support. Please install elfutils-devel/elfutils-dev); > else > +ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) > + msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); > +else > ifndef NO_DWARF > BASIC_CFLAGS += -I/usr/include/elfutils -DDWARF_SUPPORT > EXTLIBS += -lelf -ldw > LIB_OBJS += $(OUTPUT)util/probe-finder.o > -endif > -endif > +endif # NO_DWARF > +endif # PERF_HAVE_DWARF_REGS > +endif # Dwarf support > > ifneq ($(shell sh -c "(echo '\#include <newt.h>'; echo 'int main(void) { newtInit(); newtCls(); return newtFinished(); }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -lnewt -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y) > msg := $(warning newt not found, disables TUI support. Please install newt-devel or libnewt-dev); > diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile > new file mode 100644 > index 0000000..cbd7833 > --- /dev/null > +++ b/tools/perf/arch/x86/Makefile > @@ -0,0 +1,2 @@ > +PERF_HAVE_DWARF_REGS := 1 > +LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o > diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c > new file mode 100644 > index 0000000..a794d30 > --- /dev/null > +++ b/tools/perf/arch/x86/util/dwarf-regs.c > @@ -0,0 +1,75 @@ > +/* > + * dwarf-regs.c : Mapping of DWARF debug register numbers into register names. > + * Extracted from probe-finder.c > + * > + * Written by Masami Hiramatsu <mhiramat(a)redhat.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + * > + */ > + > +#include <libio.h> > +#include <dwarf-regs.h> > + > +/* > + * Generic dwarf analysis helpers > + */ > + > +#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", > +}; > + > +#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", > +}; > + > +/* 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 > +#else > +#define ARCH_MAX_REGS X86_32_MAX_REGS > +#define arch_regs_table x86_32_regs_table > +#endif > + > +/* 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; > +} > diff --git a/tools/perf/util/include/dwarf-regs.h b/tools/perf/util/include/dwarf-regs.h > new file mode 100644 > index 0000000..cf6727e > --- /dev/null > +++ b/tools/perf/util/include/dwarf-regs.h > @@ -0,0 +1,8 @@ > +#ifndef _PERF_DWARF_REGS_H_ > +#define _PERF_DWARF_REGS_H_ > + > +#ifdef DWARF_SUPPORT > +const char *get_arch_regstr(unsigned int n); > +#endif > + > +#endif > diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c > index a851377..83e5bd8 100644 > --- a/tools/perf/util/probe-finder.c > +++ b/tools/perf/util/probe-finder.c > @@ -31,6 +31,7 @@ > #include <string.h> > #include <stdarg.h> > #include <ctype.h> > +#include <dwarf-regs.h> > > #include "string.h" > #include "event.h" > @@ -38,58 +39,6 @@ > #include "util.h" > #include "probe-finder.h" > > - > -/* > - * Generic dwarf analysis helpers > - */ > - > -#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", > -}; > - > -#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", > -}; > - > -/* 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 > -#else > -#define ARCH_MAX_REGS X86_32_MAX_REGS > -#define arch_regs_table x86_32_regs_table > -#endif > - > -/* Return architecture dependent register string (for kprobe-tracer) */ > -static const char *get_arch_regstr(unsigned int n) > -{ > - return (n <= ARCH_MAX_REGS) ? arch_regs_table[n] : NULL; > -} > - > /* > * Compare the tail of two strings. > * Return 0 if whole of either string is same as another's tail part. > @@ -397,7 +346,7 @@ static void convert_location(Dwarf_Op *op, struct probe_finder *pf) > > regs = get_arch_regstr(regn); > if (!regs) > - die("%u exceeds max register number.", regn); > + die("Mapping for DWARF register number %u missing on this architecture.", regn); > > tvar->value = xstrdup(regs); > if (ref) { -- Masami Hiramatsu e-mail: mhiramat(a)redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Masami Hiramatsu on 20 Apr 2010 13:00
Hi Ian, Please feel free to add my ack. :) Acked-by: Masami Hiramatsu <mhiramat(a)redhat.com> Ingo, I think this one is important enhancement for perf to port it on other archs. Thank you, Ian Munsie wrote: > From: Ian Munsie <imunsie(a)au.ibm.com> > > The perf userspace tool included some architecture specific code to map > registers from the DWARF register number into the names used by the regs > and stack access API. > > This patch moves the architecture specific code out into a separate > arch/x86 directory along with the infrastructure required to use it. > > Signed-off-by: Ian Munsie <imunsie(a)au.ibm.com> > --- > Changes since v3: > * Move the check for DWARF support prior to the inclusion of the arch specific > Makefile so that the arch specific Makefile can include the relevant files in > the build only if DWARF support is available. > * Fix NO_DWARF build > > tools/perf/Makefile | 36 +++++++++++++--- > tools/perf/arch/x86/Makefile | 4 ++ > tools/perf/arch/x86/util/dwarf-regs.c | 75 +++++++++++++++++++++++++++++++++ > tools/perf/util/include/dwarf-regs.h | 8 ++++ > tools/perf/util/probe-finder.c | 55 +----------------------- > 5 files changed, 119 insertions(+), 59 deletions(-) > create mode 100644 tools/perf/arch/x86/Makefile > create mode 100644 tools/perf/arch/x86/util/dwarf-regs.c > create mode 100644 tools/perf/util/include/dwarf-regs.h > > diff --git a/tools/perf/Makefile b/tools/perf/Makefile > index 3cb3449..e8bf2e1 100644 > --- a/tools/perf/Makefile > +++ b/tools/perf/Makefile > @@ -173,6 +173,20 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') > uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not') > uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not') > > +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ > + -e s/arm.*/arm/ -e s/sa110/arm/ \ > + -e s/s390x/s390/ -e s/parisc64/parisc/ \ > + -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ > + -e s/sh[234].*/sh/ ) > + > +# Additional ARCH settings for x86 > +ifeq ($(ARCH),i386) > + ARCH := x86 > +endif > +ifeq ($(ARCH),x86_64) > + ARCH := x86 > +endif > + > # CFLAGS and LDFLAGS are for the users to override from the command line. > > # > @@ -285,7 +299,7 @@ endif > # Those must not be GNU-specific; they are shared with perl/ which may > # be built by a different compiler. (Note that this is an artifact now > # but it still might be nice to keep that distinction.) > -BASIC_CFLAGS = -Iutil/include > +BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include > BASIC_LDFLAGS = > > # Guard against environment variables > @@ -367,6 +381,7 @@ LIB_H += util/include/asm/byteorder.h > LIB_H += util/include/asm/swab.h > LIB_H += util/include/asm/system.h > LIB_H += util/include/asm/uaccess.h > +LIB_H += util/include/dwarf-regs.h > LIB_H += perf.h > LIB_H += util/cache.h > LIB_H += util/callchain.h > @@ -487,6 +502,15 @@ PERFLIBS = $(LIB_FILE) > -include config.mak.autogen > -include config.mak > > +ifndef NO_DWARF > +ifneq ($(shell sh -c "(echo '\#include <dwarf.h>'; echo '\#include <libdw.h>'; echo 'int main(void) { Dwarf *dbg; dbg = dwarf_begin(0, DWARF_C_READ); return (long)dbg; }') | $(CC) -x c - $(ALL_CFLAGS) -I/usr/include/elfutils -ldw -lelf -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y) > + msg := $(warning No libdw.h found or old libdw.h found, disables dwarf support. Please install elfutils-devel/elfutils-dev); > + NO_DWARF := 1 > +endif # Dwarf support > +endif # NO_DWARF > + > +-include arch/$(ARCH)/Makefile > + > ifeq ($(uname_S),Darwin) > ifndef NO_FINK > ifeq ($(shell test -d /sw/lib && echo y),y) > @@ -519,15 +543,15 @@ else > msg := $(error No libelf.h/libelf found, please install libelf-dev/elfutils-libelf-devel and glibc-dev[el]); > endif > > -ifneq ($(shell sh -c "(echo '\#include <dwarf.h>'; echo '\#include <libdw.h>'; echo 'int main(void) { Dwarf *dbg; dbg = dwarf_begin(0, DWARF_C_READ); return (long)dbg; }') | $(CC) -x c - $(ALL_CFLAGS) -I/usr/include/elfutils -ldw -lelf -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y) > - msg := $(warning No libdw.h found or old libdw.h found, disables dwarf support. Please install elfutils-devel/elfutils-dev); > -else > ifndef NO_DWARF > +ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) > + msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); > +else > BASIC_CFLAGS += -I/usr/include/elfutils -DDWARF_SUPPORT > EXTLIBS += -lelf -ldw > LIB_OBJS += $(OUTPUT)util/probe-finder.o > -endif > -endif > +endif # PERF_HAVE_DWARF_REGS > +endif # NO_DWARF > > ifneq ($(shell sh -c "(echo '\#include <newt.h>'; echo 'int main(void) { newtInit(); newtCls(); return newtFinished(); }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -lnewt -o $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) "$(QUIET_STDERR)" && echo y"), y) > msg := $(warning newt not found, disables TUI support. Please install newt-devel or libnewt-dev); > diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile > new file mode 100644 > index 0000000..15130b5 > --- /dev/null > +++ b/tools/perf/arch/x86/Makefile > @@ -0,0 +1,4 @@ > +ifndef NO_DWARF > +PERF_HAVE_DWARF_REGS := 1 > +LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o > +endif > diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c > new file mode 100644 > index 0000000..a794d30 > --- /dev/null > +++ b/tools/perf/arch/x86/util/dwarf-regs.c > @@ -0,0 +1,75 @@ > +/* > + * dwarf-regs.c : Mapping of DWARF debug register numbers into register names. > + * Extracted from probe-finder.c > + * > + * Written by Masami Hiramatsu <mhiramat(a)redhat.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + * > + */ > + > +#include <libio.h> > +#include <dwarf-regs.h> > + > +/* > + * Generic dwarf analysis helpers > + */ > + > +#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", > +}; > + > +#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", > +}; > + > +/* 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 > +#else > +#define ARCH_MAX_REGS X86_32_MAX_REGS > +#define arch_regs_table x86_32_regs_table > +#endif > + > +/* 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; > +} > diff --git a/tools/perf/util/include/dwarf-regs.h b/tools/perf/util/include/dwarf-regs.h > new file mode 100644 > index 0000000..cf6727e > --- /dev/null > +++ b/tools/perf/util/include/dwarf-regs.h > @@ -0,0 +1,8 @@ > +#ifndef _PERF_DWARF_REGS_H_ > +#define _PERF_DWARF_REGS_H_ > + > +#ifdef DWARF_SUPPORT > +const char *get_arch_regstr(unsigned int n); > +#endif > + > +#endif > diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c > index 3e79775..e7ee52f 100644 > --- a/tools/perf/util/probe-finder.c > +++ b/tools/perf/util/probe-finder.c > @@ -31,6 +31,7 @@ > #include <string.h> > #include <stdarg.h> > #include <ctype.h> > +#include <dwarf-regs.h> > > #include "string.h" > #include "event.h" > @@ -38,61 +39,9 @@ > #include "util.h" > #include "probe-finder.h" > > - > -/* > - * Generic dwarf analysis helpers > - */ > - > -#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", > -}; > - > -#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", > -}; > - > -/* 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 > -#else > -#define ARCH_MAX_REGS X86_32_MAX_REGS > -#define arch_regs_table x86_32_regs_table > -#endif > - > /* Kprobe tracer basic type is up to u64 */ > #define MAX_BASIC_TYPE_BITS 64 > > -/* Return architecture dependent register string (for kprobe-tracer) */ > -static const char *get_arch_regstr(unsigned int n) > -{ > - return (n <= ARCH_MAX_REGS) ? arch_regs_table[n] : NULL; > -} > - > /* > * Compare the tail of two strings. > * Return 0 if whole of either string is same as another's tail part. > @@ -447,7 +396,7 @@ static int convert_location(Dwarf_Op *op, struct probe_finder *pf) > > regs = get_arch_regstr(regn); > if (!regs) { > - pr_warning("%u exceeds max register number.\n", regn); > + pr_warning("Mapping for DWARF register number %u missing on this architecture.", regn); > return -ERANGE; > } > -- Masami Hiramatsu e-mail: mhiramat(a)redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |