| Message ID | 20190825132330.5015-2-changbin.du@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ftrace: add support for recording function parameters and return value | expand |
On Sun, 25 Aug 2019 21:23:20 +0800 Changbin Du <changbin.du@gmail.com> wrote: > Move ftrace tools to its own directory. We will add another tool later. > > Cc: John F. Reiser <jreiser@BitWagon.com> > Signed-off-by: Changbin Du <changbin.du@gmail.com> > --- > scripts/.gitignore | 1 - > scripts/Makefile | 2 +- > scripts/Makefile.build | 10 +++++----- > scripts/ftrace/.gitignore | 4 ++++ > scripts/ftrace/Makefile | 4 ++++ > scripts/{ => ftrace}/recordmcount.c | 0 > scripts/{ => ftrace}/recordmcount.h | 0 > scripts/{ => ftrace}/recordmcount.pl | 0 > 8 files changed, 14 insertions(+), 7 deletions(-) > create mode 100644 scripts/ftrace/.gitignore > create mode 100644 scripts/ftrace/Makefile > rename scripts/{ => ftrace}/recordmcount.c (100%) > rename scripts/{ => ftrace}/recordmcount.h (100%) > rename scripts/{ => ftrace}/recordmcount.pl (100%) > mode change 100755 => 100644 Note, we are in the process of merging recordmcount with objtool. It would be better to continue from that work. http://lkml.kernel.org/r/2767f55f4a5fbf30ba0635aed7a9c5ee92ac07dd.1563992889.git.mhelsley@vmware.com -- Steve > > diff --git a/scripts/.gitignore b/scripts/.gitignore > index 17f8cef88fa8..1b5b5d595d80 100644 > --- a/scripts/.gitignore > +++ b/scripts/.gitignore > @@ -6,7 +6,6 @@ conmakehash > kallsyms > pnmtologo > unifdef > -recordmcount > sortextable > asn1_compiler > extract-cert > diff --git a/scripts/Makefile b/scripts/Makefile > index 16bcb8087899..d5992def49a8 100644 > --- a/scripts/Makefile > +++ b/scripts/Makefile > @@ -14,7 +14,6 @@ hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c > hostprogs-$(CONFIG_KALLSYMS) += kallsyms > hostprogs-$(CONFIG_LOGO) += pnmtologo > hostprogs-$(CONFIG_VT) += conmakehash > -hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount > hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable > hostprogs-$(CONFIG_ASN1) += asn1_compiler > hostprogs-$(CONFIG_MODULE_SIG) += sign-file > @@ -34,6 +33,7 @@ hostprogs-y += unifdef > subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins > subdir-$(CONFIG_MODVERSIONS) += genksyms > subdir-$(CONFIG_SECURITY_SELINUX) += selinux > +subdir-$(CONFIG_FTRACE) += ftrace > > # Let clean descend into subdirs > subdir- += basic dtc gdb kconfig mod package > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > index 2f66ed388d1c..67558983c518 100644 > --- a/scripts/Makefile.build > +++ b/scripts/Makefile.build > @@ -188,18 +188,18 @@ endif > # files, including recordmcount. > sub_cmd_record_mcount = \ > if [ $(@) != "scripts/mod/empty.o" ]; then \ > - $(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \ > + $(objtree)/scripts/ftrace/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \ > fi; > -recordmcount_source := $(srctree)/scripts/recordmcount.c \ > - $(srctree)/scripts/recordmcount.h > +recordmcount_source := $(srctree)/scripts/ftrace/recordmcount.c \ > + $(srctree)/scripts/ftrace/recordmcount.h > else > -sub_cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ > +sub_cmd_record_mcount = perl $(srctree)/scripts/ftrace/recordmcount.pl "$(ARCH)" \ > "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \ > "$(if $(CONFIG_64BIT),64,32)" \ > "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \ > "$(LD) $(KBUILD_LDFLAGS)" "$(NM)" "$(RM)" "$(MV)" \ > "$(if $(part-of-module),1,0)" "$(@)"; > -recordmcount_source := $(srctree)/scripts/recordmcount.pl > +recordmcount_source := $(srctree)/scripts/ftrace/recordmcount.pl > endif # BUILD_C_RECORDMCOUNT > cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)), \ > $(sub_cmd_record_mcount)) > diff --git a/scripts/ftrace/.gitignore b/scripts/ftrace/.gitignore > new file mode 100644 > index 000000000000..54d582c8faad > --- /dev/null > +++ b/scripts/ftrace/.gitignore > @@ -0,0 +1,4 @@ > +# > +# Generated files > +# > +recordmcount > diff --git a/scripts/ftrace/Makefile b/scripts/ftrace/Makefile > new file mode 100644 > index 000000000000..6797e51473e5 > --- /dev/null > +++ b/scripts/ftrace/Makefile > @@ -0,0 +1,4 @@ > +# SPDX-License-Identifier: GPL-2.0 > + > +hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount > +always := $(hostprogs-y) > diff --git a/scripts/recordmcount.c b/scripts/ftrace/recordmcount.c > similarity index 100% > rename from scripts/recordmcount.c > rename to scripts/ftrace/recordmcount.c > diff --git a/scripts/recordmcount.h b/scripts/ftrace/recordmcount.h > similarity index 100% > rename from scripts/recordmcount.h > rename to scripts/ftrace/recordmcount.h > diff --git a/scripts/recordmcount.pl b/scripts/ftrace/recordmcount.pl > old mode 100755 > new mode 100644 > similarity index 100% > rename from scripts/recordmcount.pl > rename to scripts/ftrace/recordmcount.pl
On Mon, Aug 26, 2019 at 06:44:44PM -0400, Steven Rostedt wrote: > On Sun, 25 Aug 2019 21:23:20 +0800 > Changbin Du <changbin.du@gmail.com> wrote: > > > Move ftrace tools to its own directory. We will add another tool later. > > > > Cc: John F. Reiser <jreiser@BitWagon.com> > > Signed-off-by: Changbin Du <changbin.du@gmail.com> > > --- > > scripts/.gitignore | 1 - > > scripts/Makefile | 2 +- > > scripts/Makefile.build | 10 +++++----- > > scripts/ftrace/.gitignore | 4 ++++ > > scripts/ftrace/Makefile | 4 ++++ > > scripts/{ => ftrace}/recordmcount.c | 0 > > scripts/{ => ftrace}/recordmcount.h | 0 > > scripts/{ => ftrace}/recordmcount.pl | 0 > > 8 files changed, 14 insertions(+), 7 deletions(-) > > create mode 100644 scripts/ftrace/.gitignore > > create mode 100644 scripts/ftrace/Makefile > > rename scripts/{ => ftrace}/recordmcount.c (100%) > > rename scripts/{ => ftrace}/recordmcount.h (100%) > > rename scripts/{ => ftrace}/recordmcount.pl (100%) > > mode change 100755 => 100644 > > Note, we are in the process of merging recordmcount with objtool. It > would be better to continue from that work. > > http://lkml.kernel.org/r/2767f55f4a5fbf30ba0635aed7a9c5ee92ac07dd.1563992889.git.mhelsley@vmware.com > > -- Steve Thanks for reminding. Let me check if prototype tool can merge into objtool easily after above work.
diff --git a/scripts/.gitignore b/scripts/.gitignore index 17f8cef88fa8..1b5b5d595d80 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -6,7 +6,6 @@ conmakehash kallsyms pnmtologo unifdef -recordmcount sortextable asn1_compiler extract-cert diff --git a/scripts/Makefile b/scripts/Makefile index 16bcb8087899..d5992def49a8 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -14,7 +14,6 @@ hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-$(CONFIG_KALLSYMS) += kallsyms hostprogs-$(CONFIG_LOGO) += pnmtologo hostprogs-$(CONFIG_VT) += conmakehash -hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable hostprogs-$(CONFIG_ASN1) += asn1_compiler hostprogs-$(CONFIG_MODULE_SIG) += sign-file @@ -34,6 +33,7 @@ hostprogs-y += unifdef subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins subdir-$(CONFIG_MODVERSIONS) += genksyms subdir-$(CONFIG_SECURITY_SELINUX) += selinux +subdir-$(CONFIG_FTRACE) += ftrace # Let clean descend into subdirs subdir- += basic dtc gdb kconfig mod package diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 2f66ed388d1c..67558983c518 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -188,18 +188,18 @@ endif # files, including recordmcount. sub_cmd_record_mcount = \ if [ $(@) != "scripts/mod/empty.o" ]; then \ - $(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \ + $(objtree)/scripts/ftrace/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \ fi; -recordmcount_source := $(srctree)/scripts/recordmcount.c \ - $(srctree)/scripts/recordmcount.h +recordmcount_source := $(srctree)/scripts/ftrace/recordmcount.c \ + $(srctree)/scripts/ftrace/recordmcount.h else -sub_cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ +sub_cmd_record_mcount = perl $(srctree)/scripts/ftrace/recordmcount.pl "$(ARCH)" \ "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \ "$(if $(CONFIG_64BIT),64,32)" \ "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \ "$(LD) $(KBUILD_LDFLAGS)" "$(NM)" "$(RM)" "$(MV)" \ "$(if $(part-of-module),1,0)" "$(@)"; -recordmcount_source := $(srctree)/scripts/recordmcount.pl +recordmcount_source := $(srctree)/scripts/ftrace/recordmcount.pl endif # BUILD_C_RECORDMCOUNT cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)), \ $(sub_cmd_record_mcount)) diff --git a/scripts/ftrace/.gitignore b/scripts/ftrace/.gitignore new file mode 100644 index 000000000000..54d582c8faad --- /dev/null +++ b/scripts/ftrace/.gitignore @@ -0,0 +1,4 @@ +# +# Generated files +# +recordmcount diff --git a/scripts/ftrace/Makefile b/scripts/ftrace/Makefile new file mode 100644 index 000000000000..6797e51473e5 --- /dev/null +++ b/scripts/ftrace/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 + +hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount +always := $(hostprogs-y) diff --git a/scripts/recordmcount.c b/scripts/ftrace/recordmcount.c similarity index 100% rename from scripts/recordmcount.c rename to scripts/ftrace/recordmcount.c diff --git a/scripts/recordmcount.h b/scripts/ftrace/recordmcount.h similarity index 100% rename from scripts/recordmcount.h rename to scripts/ftrace/recordmcount.h diff --git a/scripts/recordmcount.pl b/scripts/ftrace/recordmcount.pl old mode 100755 new mode 100644 similarity index 100% rename from scripts/recordmcount.pl rename to scripts/ftrace/recordmcount.pl
Move ftrace tools to its own directory. We will add another tool later. Cc: John F. Reiser <jreiser@BitWagon.com> Signed-off-by: Changbin Du <changbin.du@gmail.com> --- scripts/.gitignore | 1 - scripts/Makefile | 2 +- scripts/Makefile.build | 10 +++++----- scripts/ftrace/.gitignore | 4 ++++ scripts/ftrace/Makefile | 4 ++++ scripts/{ => ftrace}/recordmcount.c | 0 scripts/{ => ftrace}/recordmcount.h | 0 scripts/{ => ftrace}/recordmcount.pl | 0 8 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 scripts/ftrace/.gitignore create mode 100644 scripts/ftrace/Makefile rename scripts/{ => ftrace}/recordmcount.c (100%) rename scripts/{ => ftrace}/recordmcount.h (100%) rename scripts/{ => ftrace}/recordmcount.pl (100%) mode change 100755 => 100644