| Message ID | 20250108-perf_syscalltbl-v6-0-7543b5293098@rivosinc.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | perf tools: Use generic syscall scripts for all archs | expand |
On Wed, Jan 08, 2025 at 06:36:15PM -0800, Charlie Jenkins wrote: > Standardize the generation of syscall headers around syscall tables. > Previously each architecture independently selected how syscall headers > would be generated, or would not define a way and fallback onto > libaudit. Convert all architectures to use a standard syscall header > generation script and allow each architecture to override the syscall > table to use if they do not use the generic table. > > As a result of these changes, no architecture will require libaudit, and > so the fallback case of using libaudit is removed by this series. > > Testing: > > I have tested that the syscall mappings of id to name generation works > as expected for every architecture, but I have only validated that perf > trace compiles and runs as expected on riscv, arm64, and x86_64. > > Signed-off-by: Charlie Jenkins <charlie@rivosinc.com> > Reviewed-by: Ian Rogers <irogers@google.com> > Tested-by: Ian Rogers <irogers@google.com> > Acked-by: Namhyung Kim <namhyung@kernel.org> > > --- > Changes in v6: > - Use tools/build/Build.include instead of scripts/Kbuild.include > - Link to v5: https://lore.kernel.org/r/20250107-perf_syscalltbl-v5-0-935de46d3175@rivosinc.com Passed these, so far, more tests underway: ⬢ [acme@toolbox perf-tools-next]$ git log --oneline -1 ; time make -C tools/perf build-test d06826160a982494 (HEAD -> perf-tools-next) perf tools: Remove dependency on libaudit make: Entering directory '/home/acme/git/perf-tools-next/tools/perf' - tarpkg: ./tests/perf-targz-src-pkg . make_static: cd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 NO_LIBTRACEEVENT=1 NO_LIBELF=1 -j28 DESTDIR=/tmp/tmp.JJT3tvN7bV make_with_gtk2: cd . && make GTK2=1 -j28 DESTDIR=/tmp/tmp.BF53V2qpl3 - /home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP: cd . && make FEATURE_DUMP_COPY=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump cd . && make FEATURE_DUMP_COPY=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump make_no_libbionic_O: cd . && make NO_LIBBIONIC=1 FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.KZuQ0q2Vs6 DESTDIR=/tmp/tmp.0sxMyH91gS make_util_map_o_O: cd . && make util/map.o FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.Y0Mx3KLREI DESTDIR=/tmp/tmp.wg9HCVVLHE make_install_O: cd . && make install FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.P0LEBAkW1X DESTDIR=/tmp/tmp.agTavZndFN failed to find: etc/bash_completion.d/perf make_no_libpython_O: cd . && make NO_LIBPYTHON=1 FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.AQ4uSxhHzq DESTDIR=/tmp/tmp.SyRIMEwTpJ make_refcnt_check_O: cd . && make EXTRA_CFLAGS=-DREFCNT_CHECKING=1 FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.boLQpo3gGR DESTDIR=/tmp/tmp.pvNzMWlMJP > Changes in v5: > - Remove references to HAVE_SYSCALL_TABLE_SUPPORT that were > missed/recently introduced > - Rebase on perf-tools-next > - Install headers to $(OUTPUT)arch instead of $(OUTPUT)tools/perf/arch > - Link to v4: https://lore.kernel.org/r/20241218-perf_syscalltbl-v4-0-bc8caef2ca8e@rivosinc.com > > Changes in v4: > - Remove audit_machine member of syscalltbl struct (Ian) > - Rebase on perf-tools-next > - Link to v3: https://lore.kernel.org/r/20241216-perf_syscalltbl-v3-0-239f032481d5@rivosinc.com > > Changes in v3: > - Fix compiliation when OUTPUT is empty > - Correct unused headers to be .h instead of .c (Namhyung) > - Make variable definition of supported archs (Namhyung) > - Convert += into := for syscalls headers (Namhyung) > - Link to v2: https://lore.kernel.org/r/20241212-perf_syscalltbl-v2-0-f8ca984ffe40@rivosinc.com > > Changes in v2: > - Rebase onto 6.13-rc2 > - Fix output path so it generates to /tools/perf/arch properly > - Link to v1: https://lore.kernel.org/r/20241104-perf_syscalltbl-v1-0-9adae5c761ef@rivosinc.com > > --- > Charlie Jenkins (16): > perf tools: Create generic syscall table support > perf tools: arc: Support generic syscall headers > perf tools: csky: Support generic syscall headers > perf tools: arm: Support syscall headers > perf tools: sh: Support syscall headers > perf tools: sparc: Support syscall headers > perf tools: xtensa: Support syscall header > perf tools: x86: Use generic syscall scripts > perf tools: alpha: Support syscall header > perf tools: parisc: Support syscall header > perf tools: arm64: Use syscall table > perf tools: loongarch: Use syscall table > perf tools: mips: Use generic syscall scripts > perf tools: powerpc: Use generic syscall table scripts > perf tools: s390: Use generic syscall table scripts > perf tools: Remove dependency on libaudit > > Documentation/admin-guide/workload-tracing.rst | 2 +- > tools/build/Build.include | 2 + > tools/build/feature/Makefile | 4 - > tools/build/feature/test-libaudit.c | 11 - > tools/perf/Documentation/perf-check.txt | 2 - > tools/perf/Makefile.config | 39 +- > tools/perf/Makefile.perf | 12 +- > tools/perf/arch/alpha/entry/syscalls/Kbuild | 2 + > .../arch/alpha/entry/syscalls/Makefile.syscalls | 5 + > tools/perf/arch/alpha/entry/syscalls/syscall.tbl | 504 ++++++++++++++++++++ > tools/perf/arch/alpha/include/syscall_table.h | 2 + > tools/perf/arch/arc/entry/syscalls/Kbuild | 2 + > .../perf/arch/arc/entry/syscalls/Makefile.syscalls | 3 + > tools/perf/arch/arc/include/syscall_table.h | 2 + > tools/perf/arch/arm/entry/syscalls/Kbuild | 4 + > .../perf/arch/arm/entry/syscalls/Makefile.syscalls | 2 + > tools/perf/arch/arm/entry/syscalls/syscall.tbl | 483 +++++++++++++++++++ > tools/perf/arch/arm/include/syscall_table.h | 2 + > tools/perf/arch/arm64/Makefile | 22 - > tools/perf/arch/arm64/entry/syscalls/Kbuild | 3 + > .../arch/arm64/entry/syscalls/Makefile.syscalls | 6 + > tools/perf/arch/arm64/entry/syscalls/mksyscalltbl | 46 -- > .../perf/arch/arm64/entry/syscalls/syscall_32.tbl | 476 +++++++++++++++++++ > .../perf/arch/arm64/entry/syscalls/syscall_64.tbl | 1 + > tools/perf/arch/arm64/include/syscall_table.h | 8 + > tools/perf/arch/csky/entry/syscalls/Kbuild | 2 + > .../arch/csky/entry/syscalls/Makefile.syscalls | 3 + > tools/perf/arch/csky/include/syscall_table.h | 2 + > tools/perf/arch/loongarch/Makefile | 22 - > tools/perf/arch/loongarch/entry/syscalls/Kbuild | 2 + > .../loongarch/entry/syscalls/Makefile.syscalls | 3 + > .../arch/loongarch/entry/syscalls/mksyscalltbl | 45 -- > tools/perf/arch/loongarch/include/syscall_table.h | 2 + > tools/perf/arch/mips/entry/syscalls/Kbuild | 2 + > .../arch/mips/entry/syscalls/Makefile.syscalls | 5 + > tools/perf/arch/mips/entry/syscalls/mksyscalltbl | 32 -- > tools/perf/arch/mips/include/syscall_table.h | 2 + > tools/perf/arch/parisc/entry/syscalls/Kbuild | 3 + > .../arch/parisc/entry/syscalls/Makefile.syscalls | 6 + > tools/perf/arch/parisc/entry/syscalls/syscall.tbl | 463 +++++++++++++++++++ > tools/perf/arch/parisc/include/syscall_table.h | 8 + > tools/perf/arch/powerpc/Makefile | 25 - > tools/perf/arch/powerpc/entry/syscalls/Kbuild | 3 + > .../arch/powerpc/entry/syscalls/Makefile.syscalls | 6 + > .../perf/arch/powerpc/entry/syscalls/mksyscalltbl | 39 -- > tools/perf/arch/powerpc/include/syscall_table.h | 8 + > tools/perf/arch/riscv/Makefile | 22 - > tools/perf/arch/riscv/entry/syscalls/Kbuild | 2 + > .../arch/riscv/entry/syscalls/Makefile.syscalls | 4 + > tools/perf/arch/riscv/entry/syscalls/mksyscalltbl | 47 -- > tools/perf/arch/riscv/include/syscall_table.h | 8 + > tools/perf/arch/s390/Makefile | 21 - > tools/perf/arch/s390/entry/syscalls/Kbuild | 2 + > .../arch/s390/entry/syscalls/Makefile.syscalls | 5 + > tools/perf/arch/s390/entry/syscalls/mksyscalltbl | 32 -- > tools/perf/arch/s390/include/syscall_table.h | 2 + > tools/perf/arch/sh/entry/syscalls/Kbuild | 2 + > .../perf/arch/sh/entry/syscalls/Makefile.syscalls | 4 + > tools/perf/arch/sh/entry/syscalls/syscall.tbl | 472 +++++++++++++++++++ > tools/perf/arch/sh/include/syscall_table.h | 2 + > tools/perf/arch/sparc/entry/syscalls/Kbuild | 3 + > .../arch/sparc/entry/syscalls/Makefile.syscalls | 5 + > tools/perf/arch/sparc/entry/syscalls/syscall.tbl | 514 +++++++++++++++++++++ > tools/perf/arch/sparc/include/syscall_table.h | 8 + > tools/perf/arch/x86/Build | 1 - > tools/perf/arch/x86/Makefile | 25 - > tools/perf/arch/x86/entry/syscalls/Kbuild | 3 + > .../perf/arch/x86/entry/syscalls/Makefile.syscalls | 6 + > tools/perf/arch/x86/entry/syscalls/syscalltbl.sh | 42 -- > tools/perf/arch/x86/include/syscall_table.h | 8 + > tools/perf/arch/xtensa/entry/syscalls/Kbuild | 2 + > .../arch/xtensa/entry/syscalls/Makefile.syscalls | 4 + > tools/perf/arch/xtensa/entry/syscalls/syscall.tbl | 439 ++++++++++++++++++ > tools/perf/arch/xtensa/include/syscall_table.h | 2 + > tools/perf/builtin-check.c | 2 - > tools/perf/builtin-help.c | 2 - > tools/perf/builtin-trace.c | 30 -- > tools/perf/check-headers.sh | 9 + > tools/perf/perf.c | 6 +- > tools/perf/scripts/Makefile.syscalls | 61 +++ > tools/perf/scripts/syscalltbl.sh | 86 ++++ > tools/perf/tests/make | 7 +- > tools/perf/util/env.c | 6 +- > tools/perf/util/generate-cmdlist.sh | 4 +- > tools/perf/util/syscalltbl.c | 90 +--- > tools/perf/util/syscalltbl.h | 1 - > tools/scripts/syscall.tbl | 409 ++++++++++++++++ > 87 files changed, 4105 insertions(+), 623 deletions(-) > --- > base-commit: 034b5b147bf7f44a45e39334725f8633b7ca8c3b > change-id: 20240913-perf_syscalltbl-6f98defcc6f5 > -- > - Charlie
On Thu, Jan 09, 2025 at 12:59:43PM -0300, Arnaldo Carvalho de Melo wrote: > On Wed, Jan 08, 2025 at 06:36:15PM -0800, Charlie Jenkins wrote: > > Standardize the generation of syscall headers around syscall tables. > > Previously each architecture independently selected how syscall headers > > would be generated, or would not define a way and fallback onto > > libaudit. Convert all architectures to use a standard syscall header > > generation script and allow each architecture to override the syscall > > table to use if they do not use the generic table. > > > > As a result of these changes, no architecture will require libaudit, and > > so the fallback case of using libaudit is removed by this series. > > > > Testing: > > > > I have tested that the syscall mappings of id to name generation works > > as expected for every architecture, but I have only validated that perf > > trace compiles and runs as expected on riscv, arm64, and x86_64. > > > > Signed-off-by: Charlie Jenkins <charlie@rivosinc.com> > > Reviewed-by: Ian Rogers <irogers@google.com> > > Tested-by: Ian Rogers <irogers@google.com> > > Acked-by: Namhyung Kim <namhyung@kernel.org> > > > > --- > > Changes in v6: > > - Use tools/build/Build.include instead of scripts/Kbuild.include > > - Link to v5: https://lore.kernel.org/r/20250107-perf_syscalltbl-v5-0-935de46d3175@rivosinc.com > > Passed these, so far, more tests underway: > > ⬢ [acme@toolbox perf-tools-next]$ git log --oneline -1 ; time make -C tools/perf build-test > d06826160a982494 (HEAD -> perf-tools-next) perf tools: Remove dependency on libaudit > make: Entering directory '/home/acme/git/perf-tools-next/tools/perf' > - tarpkg: ./tests/perf-targz-src-pkg . > make_static: cd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 NO_LIBTRACEEVENT=1 NO_LIBELF=1 -j28 DESTDIR=/tmp/tmp.JJT3tvN7bV > make_with_gtk2: cd . && make GTK2=1 -j28 DESTDIR=/tmp/tmp.BF53V2qpl3 > - /home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP: cd . && make FEATURE_DUMP_COPY=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump > cd . && make FEATURE_DUMP_COPY=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump > make_no_libbionic_O: cd . && make NO_LIBBIONIC=1 FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.KZuQ0q2Vs6 DESTDIR=/tmp/tmp.0sxMyH91gS > make_util_map_o_O: cd . && make util/map.o FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.Y0Mx3KLREI DESTDIR=/tmp/tmp.wg9HCVVLHE > make_install_O: cd . && make install FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.P0LEBAkW1X DESTDIR=/tmp/tmp.agTavZndFN > failed to find: etc/bash_completion.d/perf Is this something introduced by this patch? - Charlie > make_no_libpython_O: cd . && make NO_LIBPYTHON=1 FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.AQ4uSxhHzq DESTDIR=/tmp/tmp.SyRIMEwTpJ > make_refcnt_check_O: cd . && make EXTRA_CFLAGS=-DREFCNT_CHECKING=1 FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.boLQpo3gGR DESTDIR=/tmp/tmp.pvNzMWlMJP > > > Changes in v5: > > - Remove references to HAVE_SYSCALL_TABLE_SUPPORT that were > > missed/recently introduced > > - Rebase on perf-tools-next > > - Install headers to $(OUTPUT)arch instead of $(OUTPUT)tools/perf/arch > > - Link to v4: https://lore.kernel.org/r/20241218-perf_syscalltbl-v4-0-bc8caef2ca8e@rivosinc.com > > > > Changes in v4: > > - Remove audit_machine member of syscalltbl struct (Ian) > > - Rebase on perf-tools-next > > - Link to v3: https://lore.kernel.org/r/20241216-perf_syscalltbl-v3-0-239f032481d5@rivosinc.com > > > > Changes in v3: > > - Fix compiliation when OUTPUT is empty > > - Correct unused headers to be .h instead of .c (Namhyung) > > - Make variable definition of supported archs (Namhyung) > > - Convert += into := for syscalls headers (Namhyung) > > - Link to v2: https://lore.kernel.org/r/20241212-perf_syscalltbl-v2-0-f8ca984ffe40@rivosinc.com > > > > Changes in v2: > > - Rebase onto 6.13-rc2 > > - Fix output path so it generates to /tools/perf/arch properly > > - Link to v1: https://lore.kernel.org/r/20241104-perf_syscalltbl-v1-0-9adae5c761ef@rivosinc.com > > > > --- > > Charlie Jenkins (16): > > perf tools: Create generic syscall table support > > perf tools: arc: Support generic syscall headers > > perf tools: csky: Support generic syscall headers > > perf tools: arm: Support syscall headers > > perf tools: sh: Support syscall headers > > perf tools: sparc: Support syscall headers > > perf tools: xtensa: Support syscall header > > perf tools: x86: Use generic syscall scripts > > perf tools: alpha: Support syscall header > > perf tools: parisc: Support syscall header > > perf tools: arm64: Use syscall table > > perf tools: loongarch: Use syscall table > > perf tools: mips: Use generic syscall scripts > > perf tools: powerpc: Use generic syscall table scripts > > perf tools: s390: Use generic syscall table scripts > > perf tools: Remove dependency on libaudit > > > > Documentation/admin-guide/workload-tracing.rst | 2 +- > > tools/build/Build.include | 2 + > > tools/build/feature/Makefile | 4 - > > tools/build/feature/test-libaudit.c | 11 - > > tools/perf/Documentation/perf-check.txt | 2 - > > tools/perf/Makefile.config | 39 +- > > tools/perf/Makefile.perf | 12 +- > > tools/perf/arch/alpha/entry/syscalls/Kbuild | 2 + > > .../arch/alpha/entry/syscalls/Makefile.syscalls | 5 + > > tools/perf/arch/alpha/entry/syscalls/syscall.tbl | 504 ++++++++++++++++++++ > > tools/perf/arch/alpha/include/syscall_table.h | 2 + > > tools/perf/arch/arc/entry/syscalls/Kbuild | 2 + > > .../perf/arch/arc/entry/syscalls/Makefile.syscalls | 3 + > > tools/perf/arch/arc/include/syscall_table.h | 2 + > > tools/perf/arch/arm/entry/syscalls/Kbuild | 4 + > > .../perf/arch/arm/entry/syscalls/Makefile.syscalls | 2 + > > tools/perf/arch/arm/entry/syscalls/syscall.tbl | 483 +++++++++++++++++++ > > tools/perf/arch/arm/include/syscall_table.h | 2 + > > tools/perf/arch/arm64/Makefile | 22 - > > tools/perf/arch/arm64/entry/syscalls/Kbuild | 3 + > > .../arch/arm64/entry/syscalls/Makefile.syscalls | 6 + > > tools/perf/arch/arm64/entry/syscalls/mksyscalltbl | 46 -- > > .../perf/arch/arm64/entry/syscalls/syscall_32.tbl | 476 +++++++++++++++++++ > > .../perf/arch/arm64/entry/syscalls/syscall_64.tbl | 1 + > > tools/perf/arch/arm64/include/syscall_table.h | 8 + > > tools/perf/arch/csky/entry/syscalls/Kbuild | 2 + > > .../arch/csky/entry/syscalls/Makefile.syscalls | 3 + > > tools/perf/arch/csky/include/syscall_table.h | 2 + > > tools/perf/arch/loongarch/Makefile | 22 - /scratch/ewlu/ppa/new-glibc-dumps$ file core._home_ubuntu_glibc_glibc-2_39_build-tree_riscv64-libc_elf_ld_so.1000.a95f9a60-edce-47cf-a6fb-14d3a1705685.58093.1340004> > tools/perf/arch/loongarch/entry/syscalls/Kbuild | 2 + > > .../loongarch/entry/syscalls/Makefile.syscalls | 3 + > > .../arch/loongarch/entry/syscalls/mksyscalltbl | 45 -- > > tools/perf/arch/loongarch/include/syscall_table.h | 2 + > > tools/perf/arch/mips/entry/syscalls/Kbuild | 2 + > > .../arch/mips/entry/syscalls/Makefile.syscalls | 5 + > > tools/perf/arch/mips/entry/syscalls/mksyscalltbl | 32 -- > > tools/perf/arch/mips/include/syscall_table.h | 2 + > > tools/perf/arch/parisc/entry/syscalls/Kbuild | 3 + > > .../arch/parisc/entry/syscalls/Makefile.syscalls | 6 + > > tools/perf/arch/parisc/entry/syscalls/syscall.tbl | 463 +++++++++++++++++++ > > tools/perf/arch/parisc/include/syscall_table.h | 8 + > > tools/perf/arch/powerpc/Makefile | 25 - > > tools/perf/arch/powerpc/entry/syscalls/Kbuild | 3 + > > .../arch/powerpc/entry/syscalls/Makefile.syscalls | 6 + > > .../perf/arch/powerpc/entry/syscalls/mksyscalltbl | 39 -- > > tools/perf/arch/powerpc/include/syscall_table.h | 8 + > > tools/perf/arch/riscv/Makefile | 22 - > > tools/perf/arch/riscv/entry/syscalls/Kbuild | 2 + > > .../arch/riscv/entry/syscalls/Makefile.syscalls | 4 + > > tools/perf/arch/riscv/entry/syscalls/mksyscalltbl | 47 -- > > tools/perf/arch/riscv/include/syscall_table.h | 8 + > > tools/perf/arch/s390/Makefile | 21 - > > tools/perf/arch/s390/entry/syscalls/Kbuild | 2 + > > .../arch/s390/entry/syscalls/Makefile.syscalls | 5 + > > tools/perf/arch/s390/entry/syscalls/mksyscalltbl | 32 -- > > tools/perf/arch/s390/include/syscall_table.h | 2 + > > tools/perf/arch/sh/entry/syscalls/Kbuild | 2 + > > .../perf/arch/sh/entry/syscalls/Makefile.syscalls | 4 + > > tools/perf/arch/sh/entry/syscalls/syscall.tbl | 472 +++++++++++++++++++ > > tools/perf/arch/sh/include/syscall_table.h | 2 + > > tools/perf/arch/sparc/entry/syscalls/Kbuild | 3 + > > .../arch/sparc/entry/syscalls/Makefile.syscalls | 5 + > > tools/perf/arch/sparc/entry/syscalls/syscall.tbl | 514 +++++++++++++++++++++ > > tools/perf/arch/sparc/include/syscall_table.h | 8 + > > tools/perf/arch/x86/Build | 1 - > > tools/perf/arch/x86/Makefile | 25 - > > tools/perf/arch/x86/entry/syscalls/Kbuild | 3 + > > .../perf/arch/x86/entry/syscalls/Makefile.syscalls | 6 + > > tools/perf/arch/x86/entry/syscalls/syscalltbl.sh | 42 -- > > tools/perf/arch/x86/include/syscall_table.h | 8 + > > tools/perf/arch/xtensa/entry/syscalls/Kbuild | 2 + > > .../arch/xtensa/entry/syscalls/Makefile.syscalls | 4 + > > tools/perf/arch/xtensa/entry/syscalls/syscall.tbl | 439 ++++++++++++++++++ > > tools/perf/arch/xtensa/include/syscall_table.h | 2 + > > tools/perf/builtin-check.c | 2 - > > tools/perf/builtin-help.c | 2 - > > tools/perf/builtin-trace.c | 30 -- > > tools/perf/check-headers.sh | 9 + > > tools/perf/perf.c | 6 +- > > tools/perf/scripts/Makefile.syscalls | 61 +++ > > tools/perf/scripts/syscalltbl.sh | 86 ++++ > > tools/perf/tests/make | 7 +- > > tools/perf/util/env.c | 6 +- > > tools/perf/util/generate-cmdlist.sh | 4 +- > > tools/perf/util/syscalltbl.c | 90 +--- > > tools/perf/util/syscalltbl.h | 1 - > > tools/scripts/syscall.tbl | 409 ++++++++++++++++ > > 87 files changed, 4105 insertions(+), 623 deletions(-) > > --- > > base-commit: 034b5b147bf7f44a45e39334725f8633b7ca8c3b > > change-id: 20240913-perf_syscalltbl-6f98defcc6f5 > > -- > > - Charlie
On Thu, Jan 09, 2025 at 11:48:36AM -0800, Charlie Jenkins wrote: > On Thu, Jan 09, 2025 at 12:59:43PM -0300, Arnaldo Carvalho de Melo wrote: > > ⬢ [acme@toolbox perf-tools-next]$ git log --oneline -1 ; time make -C tools/perf build-test > > d06826160a982494 (HEAD -> perf-tools-next) perf tools: Remove dependency on libaudit > > make: Entering directory '/home/acme/git/perf-tools-next/tools/perf' > > - tarpkg: ./tests/perf-targz-src-pkg . > > make_static: cd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 NO_LIBTRACEEVENT=1 NO_LIBELF=1 -j28 DESTDIR=/tmp/tmp.JJT3tvN7bV > > make_with_gtk2: cd . && make GTK2=1 -j28 DESTDIR=/tmp/tmp.BF53V2qpl3 > > - /home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP: cd . && make FEATURE_DUMP_COPY=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump > > cd . && make FEATURE_DUMP_COPY=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump > > make_no_libbionic_O: cd . && make NO_LIBBIONIC=1 FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.KZuQ0q2Vs6 DESTDIR=/tmp/tmp.0sxMyH91gS > > make_util_map_o_O: cd . && make util/map.o FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.Y0Mx3KLREI DESTDIR=/tmp/tmp.wg9HCVVLHE > > make_install_O: cd . && make install FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.P0LEBAkW1X DESTDIR=/tmp/tmp.agTavZndFN > > failed to find: etc/bash_completion.d/perf > > Is this something introduced by this patch? I don't think so. BTW this series is already pushed out to perf-tools-next: https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/log/?h=perf-tools-next Thanks! - Arnaldo
On Thu, Jan 09, 2025 at 05:49:39PM -0300, Arnaldo Carvalho de Melo wrote: > On Thu, Jan 09, 2025 at 11:48:36AM -0800, Charlie Jenkins wrote: > > On Thu, Jan 09, 2025 at 12:59:43PM -0300, Arnaldo Carvalho de Melo wrote: > > > ⬢ [acme@toolbox perf-tools-next]$ git log --oneline -1 ; time make -C tools/perf build-test > > > d06826160a982494 (HEAD -> perf-tools-next) perf tools: Remove dependency on libaudit > > > make: Entering directory '/home/acme/git/perf-tools-next/tools/perf' > > > - tarpkg: ./tests/perf-targz-src-pkg . > > > make_static: cd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 NO_LIBTRACEEVENT=1 NO_LIBELF=1 -j28 DESTDIR=/tmp/tmp.JJT3tvN7bV > > > make_with_gtk2: cd . && make GTK2=1 -j28 DESTDIR=/tmp/tmp.BF53V2qpl3 > > > - /home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP: cd . && make FEATURE_DUMP_COPY=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump > > > cd . && make FEATURE_DUMP_COPY=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP feature-dump > > > make_no_libbionic_O: cd . && make NO_LIBBIONIC=1 FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.KZuQ0q2Vs6 DESTDIR=/tmp/tmp.0sxMyH91gS > > > make_util_map_o_O: cd . && make util/map.o FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.Y0Mx3KLREI DESTDIR=/tmp/tmp.wg9HCVVLHE > > > make_install_O: cd . && make install FEATURES_DUMP=/home/acme/git/perf-tools-next/tools/perf/BUILD_TEST_FEATURE_DUMP -j28 O=/tmp/tmp.P0LEBAkW1X DESTDIR=/tmp/tmp.agTavZndFN > > > failed to find: etc/bash_completion.d/perf > > > > Is this something introduced by this patch? > > I don't think so. > > BTW this series is already pushed out to perf-tools-next: > > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/log/?h=perf-tools-next > > Thanks! > > - Arnaldo Thank you! - Charlie
On Thu, Jan 09, 2025 at 05:49:42PM -0300, Arnaldo Carvalho de Melo wrote: > BTW this series is already pushed out to perf-tools-next: > > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/log/?h=perf-tools-next Hey, now I noticed that with this latest version we see: ⬢ [acme@toolbox perf-tools-next]$ m make: Entering directory '/home/acme/git/perf-tools-next/tools/perf' BUILD: Doing 'make -j28' parallel build Warning: Kernel ABI header differences: diff -u tools/arch/arm64/include/uapi/asm/unistd.h arch/arm64/include/uapi/asm/unistd.h Auto-detecting system features: ... libdw: [ on ] ... glibc: [ on ] ... libbfd: [ on ] ... libbfd-buildid: [ on ] ... libelf: [ on ] ... libnuma: [ on ] ... numa_num_possible_cpus: [ on ] ... libperl: [ on ] ... libpython: [ on ] ... libcrypto: [ on ] ... libunwind: [ on ] ... libcapstone: [ on ] ... llvm-perf: [ on ] ... zlib: [ on ] ... lzma: [ on ] ... get_cpuid: [ on ] ... bpf: [ on ] ... libaio: [ on ] ... libzstd: [ on ] /home/acme/git/perf-tools-next/tools/perf/scripts/syscalltbl.sh --abis common,32,i386 /home/acme/git/perf-tools-next/tools/perf/arch/x86/entry/syscalls/syscall_32.tbl /tmp/build/perf-tools-next/arch/x86/include/generated/asm/syscalls_32.h /home/acme/git/perf-tools-next/tools/perf/scripts/syscalltbl.sh --abis common,64 /home/acme/git/perf-tools-next/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl /tmp/build/perf-tools-next/arch/x86/include/generated/asm/syscalls_64.h GEN /tmp/build/perf-tools-next/common-cmds.h GEN /tmp/build/perf-tools-next/arch/arm64/include/generated/asm/sysreg-defs.h PERF_VERSION = 6.13.rc2.gd73982c39183 GEN perf-archive GEN perf-iostat MKDIR /tmp/build/perf-tools-next/jvmti/ MKDIR /tmp/build/perf-tools-next/jvmti/ MKDIR /tmp/build/perf-tools-next/jvmti/ MKDIR /tmp/build/perf-tools-next/jvmti/ While with the previous one we would see something like SYSCALLTBL as the step name, like we have GEN, MKDIR, etc, can you take a look? All is out there in perf-tools-next. - Arnaldo
On Thu, Jan 09, 2025 at 06:51:06PM -0300, Arnaldo Carvalho de Melo wrote: > On Thu, Jan 09, 2025 at 05:49:42PM -0300, Arnaldo Carvalho de Melo wrote: > > BTW this series is already pushed out to perf-tools-next: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/log/?h=perf-tools-next > > Hey, now I noticed that with this latest version we see: > > ⬢ [acme@toolbox perf-tools-next]$ m > make: Entering directory '/home/acme/git/perf-tools-next/tools/perf' > BUILD: Doing 'make -j28' parallel build > Warning: Kernel ABI header differences: > diff -u tools/arch/arm64/include/uapi/asm/unistd.h arch/arm64/include/uapi/asm/unistd.h > > Auto-detecting system features: > ... libdw: [ on ] > ... glibc: [ on ] > ... libbfd: [ on ] > ... libbfd-buildid: [ on ] > ... libelf: [ on ] > ... libnuma: [ on ] > ... numa_num_possible_cpus: [ on ] > ... libperl: [ on ] > ... libpython: [ on ] > ... libcrypto: [ on ] > ... libunwind: [ on ] > ... libcapstone: [ on ] > ... llvm-perf: [ on ] > ... zlib: [ on ] > ... lzma: [ on ] > ... get_cpuid: [ on ] > ... bpf: [ on ] > ... libaio: [ on ] > ... libzstd: [ on ] > > /home/acme/git/perf-tools-next/tools/perf/scripts/syscalltbl.sh --abis common,32,i386 /home/acme/git/perf-tools-next/tools/perf/arch/x86/entry/syscalls/syscall_32.tbl /tmp/build/perf-tools-next/arch/x86/include/generated/asm/syscalls_32.h > /home/acme/git/perf-tools-next/tools/perf/scripts/syscalltbl.sh --abis common,64 /home/acme/git/perf-tools-next/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl /tmp/build/perf-tools-next/arch/x86/include/generated/asm/syscalls_64.h > GEN /tmp/build/perf-tools-next/common-cmds.h > GEN /tmp/build/perf-tools-next/arch/arm64/include/generated/asm/sysreg-defs.h > PERF_VERSION = 6.13.rc2.gd73982c39183 > GEN perf-archive > GEN perf-iostat > MKDIR /tmp/build/perf-tools-next/jvmti/ > MKDIR /tmp/build/perf-tools-next/jvmti/ > MKDIR /tmp/build/perf-tools-next/jvmti/ > MKDIR /tmp/build/perf-tools-next/jvmti/ > > > While with the previous one we would see something like SYSCALLTBL as > the step name, like we have GEN, MKDIR, etc, can you take a look? Ooh okay I see, the quiet commands were being ignored as-is. We could add the lines to handle this to Makefile.syscalls, but I think the better solution is to move the lines from Makefile.build to Makefile.perf to be more generically available. Here is a patch for that. I also added the comment from the kernel Makefile describing what this does. From 8dcec7f5d937ede3d33c687573dc2f1654ddc59e Mon Sep 17 00:00:00 2001 From: Charlie Jenkins <charlie@rivosinc.com> Date: Thu, 9 Jan 2025 14:36:40 -0800 Subject: [PATCH] perf tools: Expose quiet/verbose variables in Makefile.perf The variables to make builds silent/verbose live inside tools/build/Makefile.build. Move those variables to the top-level Makefile.perf to be generally available. Signed-off-by: Charlie Jenkins <charlie@rivosinc.com> --- tools/build/Makefile.build | 20 -------------------- tools/perf/Makefile.perf | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build index 5fb3fb3d97e0..e710ed67a1b4 100644 --- a/tools/build/Makefile.build +++ b/tools/build/Makefile.build @@ -12,26 +12,6 @@ PHONY := __build __build: -ifeq ($(V),1) - quiet = - Q = -else - quiet=quiet_ - Q=@ -endif - -# If the user is running make -s (silent mode), suppress echoing of commands -# make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS. -ifeq ($(filter 3.%,$(MAKE_VERSION)),) -short-opts := $(firstword -$(MAKEFLAGS)) -else -short-opts := $(filter-out --%,$(MAKEFLAGS)) -endif - -ifneq ($(findstring s,$(short-opts)),) - quiet=silent_ -endif - build-dir := $(srctree)/tools/build # Define $(fixdep) for dep-cmd function diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index a449d0015536..55d6ce9ea52f 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -161,12 +161,47 @@ export VPATH SOURCE := $(shell ln -sf $(srctree)/tools/perf $(OUTPUT)/source) endif +# Beautify output +# --------------------------------------------------------------------------- +# +# Most of build commands in Kbuild start with "cmd_". You can optionally define +# "quiet_cmd_*". If defined, the short log is printed. Otherwise, no log from +# that command is printed by default. +# +# e.g.) +# quiet_cmd_depmod = DEPMOD $(MODLIB) +# cmd_depmod = $(srctree)/scripts/depmod.sh $(DEPMOD) $(KERNELRELEASE) +# +# A simple variant is to prefix commands with $(Q) - that's useful +# for commands that shall be hidden in non-verbose mode. +# +# $(Q)$(MAKE) $(build)=scripts/basic +# +# To put more focus on warnings, be less verbose as default +# Use 'make V=1' to see the full commands + ifeq ($(V),1) + quiet = Q = else - Q = @ + quiet=quiet_ + Q=@ endif +# If the user is running make -s (silent mode), suppress echoing of commands +# make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS. +ifeq ($(filter 3.%,$(MAKE_VERSION)),) +short-opts := $(firstword -$(MAKEFLAGS)) +else +short-opts := $(filter-out --%,$(MAKEFLAGS)) +endif + +ifneq ($(findstring s,$(short-opts)),) + quiet=silent_ +endif + +export quiet Q + # Do not use make's built-in rules # (this improves performance and avoids hard-to-debug behaviour); MAKEFLAGS += -r