From cbfa0320a48bf012cac1e0f79a2cec0dc8ac5c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 5 Sep 2023 20:25:30 +0700 Subject: [PATCH 1/3] New package: libpfm4-4.13.0 --- srcpkgs/libpfm4-devel | 1 + srcpkgs/libpfm4/patches/build-params.patch | 43 +++++++++++++++ srcpkgs/libpfm4/template | 63 ++++++++++++++++++++++ srcpkgs/python3-perfmon | 1 + 4 files changed, 108 insertions(+) create mode 120000 srcpkgs/libpfm4-devel create mode 100644 srcpkgs/libpfm4/patches/build-params.patch create mode 100644 srcpkgs/libpfm4/template create mode 120000 srcpkgs/python3-perfmon diff --git a/srcpkgs/libpfm4-devel b/srcpkgs/libpfm4-devel new file mode 120000 index 0000000000000..954b4ab6aebc1 --- /dev/null +++ b/srcpkgs/libpfm4-devel @@ -0,0 +1 @@ +libpfm4 \ No newline at end of file diff --git a/srcpkgs/libpfm4/patches/build-params.patch b/srcpkgs/libpfm4/patches/build-params.patch new file mode 100644 index 0000000000000..646050477577b --- /dev/null +++ b/srcpkgs/libpfm4/patches/build-params.patch @@ -0,0 +1,43 @@ +--- a/config.mk ++++ b/config.mk +@@ -28,8 +28,20 @@ + # It is included by every Makefile + # + # +-SYS := $(shell uname -s) +-ARCH := $(shell uname -m) ++SYS := Linux ++ifeq (i686,$(findstring i686,$(XBPS_TARGET_MACHINE))) ++ARCH := i386 ++else ifeq (x86_64,$(findstring x86_64,$(XBPS_TARGET_MACHINE))) ++ARCH := x86_64 ++else ifeq (arm,$(findstring arm,$(XBPS_TARGET_MACHINE))) ++ARCH := arm ++else ifeq (aarch64,$(findstring aarch64,$(XBPS_TARGET_MACHINE))) ++ARCH := arm64 ++else ifeq (ppc,$(findstring ppc,$(XBPS_TARGET_MACHINE))) ++ARCH := powerpc ++else ifeq (mips,$(findstring mips,$(XBPS_TARGET_MACHINE))) ++ARCH := mips ++endif + ifeq (i686,$(findstring i686,$(ARCH))) + override ARCH=i386 + endif +@@ -116,7 +128,7 @@ AGE=0 + # + # Where should things (lib, headers, man) go in the end. + # +-PREFIX?=/usr/local ++PREFIX?=/usr + LIBDIR=$(PREFIX)/lib + INCDIR=$(PREFIX)/include + MANDIR=$(PREFIX)/share/man +@@ -198,7 +210,7 @@ PFMLIBDIR=$(TOPDIR)/lib + # -Wextra: to enable extra compiler sanity checks (e.g., signed vs. unsigned) + # -Wno-unused-parameter: to avoid warnings on unused foo(void *this) parameter + # +-DBG?=-g -Wall -Werror -Wextra -Wno-unused-parameter ++DBG?=-g -Wall -Wextra -Wno-unused-parameter + + ifeq ($(SYS),Darwin) + # older gcc-4.2 does not like -Wextra and some of our initialization code diff --git a/srcpkgs/libpfm4/template b/srcpkgs/libpfm4/template new file mode 100644 index 0000000000000..3bad5ca7a17b9 --- /dev/null +++ b/srcpkgs/libpfm4/template @@ -0,0 +1,63 @@ +# Template file for 'libpfm4' +pkgname=libpfm4 +version=4.13.0 +revision=1 +#archs="i686 x86_64" +#build_wrksrc= +build_style=gnu-makefile +build_helper=python3 +make_use_env=yes +#configure_args="" +#make_build_args="" +#make_install_args="" +#conf_files="" +#make_dirs="/var/log/dir 0755 root root" +hostmakedepends="python3-setuptools swig" +makedepends="python3-devel" +depends="" +short_desc="Library to program the performance monitoring events" +maintainer="Đoàn Trần Công Danh " +license="Expat" +homepage="https://perfmon2.sourceforge.net/" +#changelog="" +distfiles="${SOURCEFORGE_SITE}/perfmon2/libpfm-${version}.tar.gz" +checksum=d18b97764c755528c1051d376e33545d0eb60c6ebf85680436813fa5b04cc3d1 + +export XBPS_TARGET_MACHINE + +do_build() { + msg_normal "Building libpfm4\n" + make ${makejobs} PREFIX=/usr + msg_normal "Building Python 3 bindings\n" + cd python + python3 setup.py build +} + +do_install() { + make install DESTDIR=${DESTDIR} PREFIX=/usr + { + find include lib -name '*.h' -o -name '*.c' | + xargs grep -h Copyright + cat COPYING + } >license + vlicense license +} + +libpfm4-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/share/man/man3 + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} + +python3-perfmon_package() { + short_desc+=" - Python 3 bindings" + pkg_install() { + cd python + python3 setup.py install --prefix=/usr --root=${PKGDESTDIR} + } +} diff --git a/srcpkgs/python3-perfmon b/srcpkgs/python3-perfmon new file mode 120000 index 0000000000000..954b4ab6aebc1 --- /dev/null +++ b/srcpkgs/python3-perfmon @@ -0,0 +1 @@ +libpfm4 \ No newline at end of file From c130926e7d9d6189eacce5978b07525cdb5cbcc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 5 Sep 2023 20:25:45 +0700 Subject: [PATCH 2/3] libtraceevent: update to 1.7.3. --- srcpkgs/libtraceevent/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libtraceevent/template b/srcpkgs/libtraceevent/template index bc970d52014e6..09f48b475fc8e 100644 --- a/srcpkgs/libtraceevent/template +++ b/srcpkgs/libtraceevent/template @@ -1,7 +1,7 @@ # Template file for 'libtraceevent' pkgname=libtraceevent -version=1.6.3 -revision=2 +version=1.7.3 +revision=1 build_style=gnu-makefile make_build_args="libdir_relative=lib${XBPS_TARGET_WORDSIZE}" make_build_target="all doc" @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/" distfiles="https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-${version}.tar.gz" -checksum=031e4428586788bb835d894f7f11c54e482764063d96ead303c7f208fb59e353 +checksum=097b72e0d907f3107825fb2edf0188324bf70dc9da360f6efa68dc484ffde541 do_check() { make ${makejobs} test From 50ff8e2002f90f5b4afa5f912519869969aea837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 5 Sep 2023 20:25:55 +0700 Subject: [PATCH 3/3] linux-tools: update to 6.5. --- .../patches/binutils-add-compat-check.patch | 103 ------------ .../patches/binutils-disasm-compat.patch | 102 ------------ .../bpf_jit_disasm-binutils-2.39.patch | 104 ------------ .../patches/bpftool-binutils-2.39.patch | 149 ------------------ srcpkgs/linux-tools/patches/musl.patch | 62 ++++++-- .../patches/perf-binutils-2.39.patch | 114 -------------- srcpkgs/linux-tools/template | 115 ++++++-------- 7 files changed, 98 insertions(+), 651 deletions(-) delete mode 100644 srcpkgs/linux-tools/patches/binutils-add-compat-check.patch delete mode 100644 srcpkgs/linux-tools/patches/binutils-disasm-compat.patch delete mode 100644 srcpkgs/linux-tools/patches/bpf_jit_disasm-binutils-2.39.patch delete mode 100644 srcpkgs/linux-tools/patches/bpftool-binutils-2.39.patch delete mode 100644 srcpkgs/linux-tools/patches/perf-binutils-2.39.patch diff --git a/srcpkgs/linux-tools/patches/binutils-add-compat-check.patch b/srcpkgs/linux-tools/patches/binutils-add-compat-check.patch deleted file mode 100644 index e4e7ece9635e5..0000000000000 --- a/srcpkgs/linux-tools/patches/binutils-add-compat-check.patch +++ /dev/null @@ -1,103 +0,0 @@ -From cfd59ca91467056bb2c36907b2fa67b8e1af9952 Mon Sep 17 00:00:00 2001 -From: Andres Freund -Date: Sun, 31 Jul 2022 18:38:27 -0700 -Subject: [PATCH] tools build: Add feature test for init_disassemble_info API - changes - -binutils changed the signature of init_disassemble_info(), which now causes -compilation failures for tools/{perf,bpf}, e.g. on debian unstable. - -Relevant binutils commit: - - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 - -This commit adds a feature test to detect the new signature. Subsequent -commits will use it to fix the build failures. - -Signed-off-by: Andres Freund -Acked-by: Quentin Monnet -Cc: Alexei Starovoitov -Cc: Ben Hutchings -Cc: Jiri Olsa -Cc: Quentin Monnet -Cc: Sedat Dilek -Cc: bpf@vger.kernel.org -Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de -Link: https://lore.kernel.org/r/20220801013834.156015-2-andres@anarazel.de -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/build/Makefile.feature | 1 + - tools/build/feature/Makefile | 4 ++++ - tools/build/feature/test-all.c | 4 ++++ - tools/build/feature/test-disassembler-init-styled.c | 13 +++++++++++++ - 4 files changed, 22 insertions(+) - create mode 100644 tools/build/feature/test-disassembler-init-styled.c - -diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature -index 888a0421d43b96..8f6578e4d3249e 100644 ---- a/tools/build/Makefile.feature -+++ b/tools/build/Makefile.feature -@@ -70,6 +70,7 @@ FEATURE_TESTS_BASIC := \ - libaio \ - libzstd \ - disassembler-four-args \ -+ disassembler-init-styled \ - file-handle - - # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list -diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile -index 7c2a17e23c30ac..c3059739318a95 100644 ---- a/tools/build/feature/Makefile -+++ b/tools/build/feature/Makefile -@@ -18,6 +18,7 @@ FILES= \ - test-libbfd.bin \ - test-libbfd-buildid.bin \ - test-disassembler-four-args.bin \ -+ test-disassembler-init-styled.bin \ - test-reallocarray.bin \ - test-libbfd-liberty.bin \ - test-libbfd-liberty-z.bin \ -@@ -248,6 +249,9 @@ $(OUTPUT)test-libbfd-buildid.bin: - $(OUTPUT)test-disassembler-four-args.bin: - $(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes - -+$(OUTPUT)test-disassembler-init-styled.bin: -+ $(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes -+ - $(OUTPUT)test-reallocarray.bin: - $(BUILD) - -diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c -index 5ffafb967b6e49..957c02c7b163b5 100644 ---- a/tools/build/feature/test-all.c -+++ b/tools/build/feature/test-all.c -@@ -166,6 +166,10 @@ - # include "test-disassembler-four-args.c" - #undef main - -+#define main main_test_disassembler_init_styled -+# include "test-disassembler-init-styled.c" -+#undef main -+ - #define main main_test_libzstd - # include "test-libzstd.c" - #undef main -diff --git a/tools/build/feature/test-disassembler-init-styled.c b/tools/build/feature/test-disassembler-init-styled.c -new file mode 100644 -index 00000000000000..f1ce0ec3bee9d3 ---- /dev/null -+++ b/tools/build/feature/test-disassembler-init-styled.c -@@ -0,0 +1,13 @@ -+// SPDX-License-Identifier: GPL-2.0 -+#include -+#include -+ -+int main(void) -+{ -+ struct disassemble_info info; -+ -+ init_disassemble_info(&info, stdout, -+ NULL, NULL); -+ -+ return 0; -+} diff --git a/srcpkgs/linux-tools/patches/binutils-disasm-compat.patch b/srcpkgs/linux-tools/patches/binutils-disasm-compat.patch deleted file mode 100644 index 1a6cc0e6d97ca..0000000000000 --- a/srcpkgs/linux-tools/patches/binutils-disasm-compat.patch +++ /dev/null @@ -1,102 +0,0 @@ -From a45b3d6926231c3d024ea0de4f7bd967f83709ee Mon Sep 17 00:00:00 2001 -From: Andres Freund -Date: Sun, 31 Jul 2022 18:38:29 -0700 -Subject: tools include: add dis-asm-compat.h to handle version differences - -binutils changed the signature of init_disassemble_info(), which now causes -compilation failures for tools/{perf,bpf}, e.g. on debian unstable. - -Relevant binutils commit: - - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 - -This commit introduces a wrapper for init_disassemble_info(), to avoid -spreading #ifdef DISASM_INIT_STYLED to a bunch of places. Subsequent -commits will use it to fix the build failures. - -It likely is worth adding a wrapper for disassember(), to avoid the already -existing DISASM_FOUR_ARGS_SIGNATURE ifdefery. - -Signed-off-by: Andres Freund -Signed-off-by: Ben Hutchings -Acked-by: Quentin Monnet -Cc: Alexei Starovoitov -Cc: Ben Hutchings -Cc: Jiri Olsa -Cc: Quentin Monnet -Cc: Sedat Dilek -Cc: bpf@vger.kernel.org -Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de -Link: https://lore.kernel.org/r/20220801013834.156015-4-andres@anarazel.de -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/include/tools/dis-asm-compat.h | 55 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 55 insertions(+) - create mode 100644 tools/include/tools/dis-asm-compat.h - -(limited to 'tools/include/tools/dis-asm-compat.h') - -diff --git a/tools/include/tools/dis-asm-compat.h b/tools/include/tools/dis-asm-compat.h -new file mode 100644 -index 0000000000000..70f331e23ed3d ---- /dev/null -+++ b/tools/include/tools/dis-asm-compat.h -@@ -0,0 +1,55 @@ -+/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */ -+#ifndef _TOOLS_DIS_ASM_COMPAT_H -+#define _TOOLS_DIS_ASM_COMPAT_H -+ -+#include -+#include -+ -+/* define types for older binutils version, to centralize ifdef'ery a bit */ -+#ifndef DISASM_INIT_STYLED -+enum disassembler_style {DISASSEMBLER_STYLE_NOT_EMPTY}; -+typedef int (*fprintf_styled_ftype) (void *, enum disassembler_style, const char*, ...); -+#endif -+ -+/* -+ * Trivial fprintf wrapper to be used as the fprintf_styled_func argument to -+ * init_disassemble_info_compat() when normal fprintf suffices. -+ */ -+static inline int fprintf_styled(void *out, -+ enum disassembler_style style, -+ const char *fmt, ...) -+{ -+ va_list args; -+ int r; -+ -+ (void)style; -+ -+ va_start(args, fmt); -+ r = vfprintf(out, fmt, args); -+ va_end(args); -+ -+ return r; -+} -+ -+/* -+ * Wrapper for init_disassemble_info() that hides version -+ * differences. Depending on binutils version and architecture either -+ * fprintf_func or fprintf_styled_func will be called. -+ */ -+static inline void init_disassemble_info_compat(struct disassemble_info *info, -+ void *stream, -+ fprintf_ftype unstyled_func, -+ fprintf_styled_ftype styled_func) -+{ -+#ifdef DISASM_INIT_STYLED -+ init_disassemble_info(info, stream, -+ unstyled_func, -+ styled_func); -+#else -+ (void)styled_func; -+ init_disassemble_info(info, stream, -+ unstyled_func); -+#endif -+} -+ -+#endif /* _TOOLS_DIS_ASM_COMPAT_H */ --- -cgit - diff --git a/srcpkgs/linux-tools/patches/bpf_jit_disasm-binutils-2.39.patch b/srcpkgs/linux-tools/patches/bpf_jit_disasm-binutils-2.39.patch deleted file mode 100644 index 01221fad3a4a6..0000000000000 --- a/srcpkgs/linux-tools/patches/bpf_jit_disasm-binutils-2.39.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 96ed066054abf11c7d3e106e3011a51f3f1227a3 Mon Sep 17 00:00:00 2001 -From: Andres Freund -Date: Sun, 31 Jul 2022 18:38:31 -0700 -Subject: [PATCH] tools bpf_jit_disasm: Fix compilation error with new binutils - -binutils changed the signature of init_disassemble_info(), which now causes -compilation to fail for tools/bpf/bpf_jit_disasm.c, e.g. on debian -unstable. - -Relevant binutils commit: - - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 - -Wire up the feature test and switch to init_disassemble_info_compat(), -which were introduced in prior commits, fixing the compilation failure. - -I verified that bpf_jit_disasm can still disassemble bpf programs, both -with the old and new dis-asm.h API. With old binutils there's no change in -output before/after this patch. When comparing the output from old -binutils (2.35) to new bintuils with the patch (upstream snapshot) there -are a few output differences, but they are unrelated to this patch. An -example hunk is: - - f4: mov %r14,%rsi - f7: mov %r15,%rdx - fa: mov $0x2a,%ecx - - ff: callq 0xffffffffea8c4988 - + ff: call 0xffffffffea8c4988 - 104: test %rax,%rax - 107: jge 0x0000000000000110 - 109: xor %eax,%eax - - 10b: jmpq 0x0000000000000073 - + 10b: jmp 0x0000000000000073 - 110: cmp $0x16,%rax - -However, I had to use an older kernel to generate the bpf_jit_enabled = -2 output, as that has been broken since 5.18 / 1022a5498f6f745c ("bpf, -x86_64: Use bpf_jit_binary_pack_alloc"). - - https://lore.kernel.org/20220703030210.pmjft7qc2eajzi6c@alap3.anarazel.de - -Signed-off-by: Andres Freund -Acked-by: Quentin Monnet -Cc: Alexei Starovoitov -Cc: Ben Hutchings -Cc: Daniel Borkmann -Cc: Jiri Olsa -Cc: Quentin Monnet -Cc: Sedat Dilek -Cc: bpf@vger.kernel.org -Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de -Link: https://lore.kernel.org/r/20220801013834.156015-6-andres@anarazel.de -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/bpf/Makefile | 5 ++++- - tools/bpf/bpf_jit_disasm.c | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/tools/bpf/Makefile b/tools/bpf/Makefile -index b11cfc86a3d021..664601ab1705ab 100644 ---- a/tools/bpf/Makefile -+++ b/tools/bpf/Makefile -@@ -34,7 +34,7 @@ else - endif - - FEATURE_USER = .bpf --FEATURE_TESTS = libbfd disassembler-four-args -+FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled - FEATURE_DISPLAY = libbfd disassembler-four-args - - check_feat := 1 -@@ -56,6 +56,9 @@ endif - ifeq ($(feature-disassembler-four-args), 1) - CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE - endif -+ifeq ($(feature-disassembler-init-styled), 1) -+CFLAGS += -DDISASM_INIT_STYLED -+endif - - $(OUTPUT)%.yacc.c: $(srctree)/tools/bpf/%.y - $(QUIET_BISON)$(YACC) -o $@ -d $< -diff --git a/tools/bpf/bpf_jit_disasm.c b/tools/bpf/bpf_jit_disasm.c -index c8ae9580472814..a90a5d110f9255 100644 ---- a/tools/bpf/bpf_jit_disasm.c -+++ b/tools/bpf/bpf_jit_disasm.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #define CMD_ACTION_SIZE_BUFFER 10 - #define CMD_ACTION_READ_ALL 3 -@@ -64,7 +65,9 @@ static void get_asm_insns(uint8_t *image, size_t len, int opcodes) - assert(bfdf); - assert(bfd_check_format(bfdf, bfd_object)); - -- init_disassemble_info(&info, stdout, (fprintf_ftype) fprintf); -+ init_disassemble_info_compat(&info, stdout, -+ (fprintf_ftype) fprintf, -+ fprintf_styled); - info.arch = bfd_get_arch(bfdf); - info.mach = bfd_get_mach(bfdf); - info.buffer = image; diff --git a/srcpkgs/linux-tools/patches/bpftool-binutils-2.39.patch b/srcpkgs/linux-tools/patches/bpftool-binutils-2.39.patch deleted file mode 100644 index 1e55c40011be7..0000000000000 --- a/srcpkgs/linux-tools/patches/bpftool-binutils-2.39.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 600b7b26c07a070d0153daa76b3806c1e52c9e00 Mon Sep 17 00:00:00 2001 -From: Andres Freund -Date: Sun, 31 Jul 2022 18:38:33 -0700 -Subject: [PATCH] tools bpftool: Fix compilation error with new binutils - -binutils changed the signature of init_disassemble_info(), which now causes -compilation to fail for tools/bpf/bpftool/jit_disasm.c, e.g. on debian -unstable. - -Relevant binutils commit: - - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 - -Wire up the feature test and switch to init_disassemble_info_compat(), -which were introduced in prior commits, fixing the compilation failure. - -I verified that bpftool can still disassemble bpf programs, both with an -old and new dis-asm.h API. There are no output changes for plain and json -formats. When comparing the output from old binutils (2.35) -to new bintuils with the patch (upstream snapshot) there are a few output -differences, but they are unrelated to this patch. An example hunk is: - - 2f: pop %r14 - 31: pop %r13 - 33: pop %rbx - - 34: leaveq - - 35: retq - + 34: leave - + 35: ret - -Signed-off-by: Andres Freund -Acked-by: Quentin Monnet -Cc: Alexei Starovoitov -Cc: Ben Hutchings -Cc: Jiri Olsa -Cc: Quentin Monnet -Cc: Sedat Dilek -Cc: bpf@vger.kernel.org -Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de -Link: https://lore.kernel.org/r/20220801013834.156015-8-andres@anarazel.de -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/bpf/bpftool/Makefile | 5 +++- - tools/bpf/bpftool/jit_disasm.c | 42 +++++++++++++++++++++++++++------- - 2 files changed, 38 insertions(+), 9 deletions(-) - -diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile -index c6d2c77d02524a..436e671b2657d4 100644 ---- a/tools/bpf/bpftool/Makefile -+++ b/tools/bpf/bpftool/Makefile -@@ -62,7 +62,7 @@ CLANG ?= clang - LLVM_STRIP ?= llvm-strip - - FEATURE_USER = .bpftool --FEATURE_TESTS = libbfd disassembler-four-args reallocarray zlib libcap \ -+FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled reallocarray zlib libcap \ - clang-bpf-co-re - FEATURE_DISPLAY = libbfd disassembler-four-args zlib libcap \ - clang-bpf-co-re -@@ -117,6 +117,9 @@ endif - ifeq ($(feature-disassembler-four-args), 1) - CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE - endif -+ifeq ($(feature-disassembler-init-styled), 1) -+ CFLAGS += -DDISASM_INIT_STYLED -+endif - - LIBS = $(LIBBPF) -lelf -lz - LIBS_BOOTSTRAP = $(LIBBPF_BOOTSTRAP) -lelf -lz -diff --git a/tools/bpf/bpftool/jit_disasm.c b/tools/bpf/bpftool/jit_disasm.c -index 24734f2249d6ec..aaf99a0168c90b 100644 ---- a/tools/bpf/bpftool/jit_disasm.c -+++ b/tools/bpf/bpftool/jit_disasm.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include "json_writer.h" - #include "main.h" -@@ -39,15 +40,12 @@ static void get_exec_path(char *tpath, s - } - - static int oper_count; --static int fprintf_json(void *out, const char *fmt, ...) -+static int printf_json(void *out, const char *fmt, va_list ap) - { -- va_list ap; - char *s; - -- va_start(ap, fmt); - if (vasprintf(&s, fmt, ap) < 0) - return -1; -- va_end(ap); - - if (!oper_count) { - int i; -@@ -73,6 +71,32 @@ static int fprintf_json(void *out, const char *fmt, ...) - return 0; - } - -+static int fprintf_json(void *out, const char *fmt, ...) -+{ -+ va_list ap; -+ int r; -+ -+ va_start(ap, fmt); -+ r = printf_json(out, fmt, ap); -+ va_end(ap); -+ -+ return r; -+} -+ -+static int fprintf_json_styled(void *out, -+ enum disassembler_style style __maybe_unused, -+ const char *fmt, ...) -+{ -+ va_list ap; -+ int r; -+ -+ va_start(ap, fmt); -+ r = printf_json(out, fmt, ap); -+ va_end(ap); -+ -+ return r; -+} -+ - void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes, - const char *arch, const char *disassembler_options, - const struct btf *btf, -@@ -99,11 +123,13 @@ void disasm_print_insn(unsigned char *image, ssize_t len, int opcodes, - assert(bfd_check_format(bfdf, bfd_object)); - - if (json_output) -- init_disassemble_info(&info, stdout, -- (fprintf_ftype) fprintf_json); -+ init_disassemble_info_compat(&info, stdout, -+ (fprintf_ftype) fprintf_json, -+ fprintf_json_styled); - else -- init_disassemble_info(&info, stdout, -- (fprintf_ftype) fprintf); -+ init_disassemble_info_compat(&info, stdout, -+ (fprintf_ftype) fprintf, -+ fprintf_styled); - - /* Update architecture info for offload. */ - if (arch) { diff --git a/srcpkgs/linux-tools/patches/musl.patch b/srcpkgs/linux-tools/patches/musl.patch index 57ca91cae26c0..bff29b39e04d1 100644 --- a/srcpkgs/linux-tools/patches/musl.patch +++ b/srcpkgs/linux-tools/patches/musl.patch @@ -1,6 +1,6 @@ --- a/tools/include/uapi/linux/perf_event.h +++ b/tools/include/uapi/linux/perf_event.h -@@ -14,6 +14,7 @@ +@@ -15,6 +15,7 @@ #ifndef _UAPI_LINUX_PERF_EVENT_H #define _UAPI_LINUX_PERF_EVENT_H @@ -10,24 +10,54 @@ #include --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c -@@ -43,7 +43,8 @@ - #include - #include +@@ -33,6 +33,7 @@ + #include #include #include +#include + #include + #include + #include +--- a/tools/bpf/bpf_jit_disasm.c ++++ b/tools/bpf/bpf_jit_disasm.c +@@ -306,7 +306,7 @@ int main(int argc, char **argv) + goto done; + } - char *proc_stat = "/proc/stat"; - FILE *outf; ---- a/tools/thermal/tmon/tmon.h -+++ b/tools/thermal/tmon/tmon.h -@@ -19,6 +19,9 @@ - #ifndef TMON_H - #define TMON_H +- ofd = open(ofile, O_WRONLY | O_CREAT | O_TRUNC, DEFFILEMODE); ++ ofd = open(ofile, O_WRONLY | O_CREAT | O_TRUNC, 0666); + if (ofd < 0) { + fprintf(stderr, "Could not open file %s for writing: ", ofile); + perror(NULL); +--- a/tools/bpf/bpftool/btf_dumper.c ++++ b/tools/bpf/bpftool/btf_dumper.c +@@ -2,9 +2,15 @@ + /* Copyright (c) 2018 Facebook */ -+#include -+#include + #include ++#include + #include /* for (FILE *) used by json_writer */ + #include + #include + - #define MAX_DISP_TEMP 125 - #define MAX_CTRL_TEMP 105 - #define MIN_CTRL_TEMP 40 ++#ifndef __always_inline ++#define __always_inline inline __attribute__((always_inline)) ++#endif ++ + #include + #include + #include +--- a/tools/include/linux/err.h ++++ b/tools/include/linux/err.h +@@ -6,6 +6,11 @@ + #include + + #include ++#include ++ ++#ifndef __must_check ++#define __must_check __attribute__((warn_unused_result)) ++#endif + + /* + * Original kernel header comment: diff --git a/srcpkgs/linux-tools/patches/perf-binutils-2.39.patch b/srcpkgs/linux-tools/patches/perf-binutils-2.39.patch deleted file mode 100644 index 3484330f7286a..0000000000000 --- a/srcpkgs/linux-tools/patches/perf-binutils-2.39.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 83aa0120487e8bc3f231e72c460add783f71f17c Mon Sep 17 00:00:00 2001 -From: Andres Freund -Date: Sun, 31 Jul 2022 18:38:30 -0700 -Subject: [PATCH] tools perf: Fix compilation error with new binutils - -binutils changed the signature of init_disassemble_info(), which now causes -compilation failures for tools/perf/util/annotate.c, e.g. on debian -unstable. - -Relevant binutils commit: - - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07 - -Wire up the feature test and switch to init_disassemble_info_compat(), -which were introduced in prior commits, fixing the compilation failure. - -I verified that perf can still disassemble bpf programs by using bpftrace -under load, recording a perf trace, and then annotating the bpf "function" -with and without the changes. With old binutils there's no change in output -before/after this patch. When comparing the output from old binutils (2.35) -to new bintuils with the patch (upstream snapshot) there are a few output -differences, but they are unrelated to this patch. An example hunk is: - - 1.15 : 55:mov %rbp,%rdx - 0.00 : 58:add $0xfffffffffffffff8,%rdx - 0.00 : 5c:xor %ecx,%ecx - - 1.03 : 5e:callq 0xffffffffe12aca3c - + 1.03 : 5e:call 0xffffffffe12aca3c - 0.00 : 63:xor %eax,%eax - - 2.18 : 65:leaveq - - 2.82 : 66:retq - + 2.18 : 65:leave - + 2.82 : 66:ret - -Signed-off-by: Andres Freund -Acked-by: Quentin Monnet -Cc: Alexei Starovoitov -Cc: Ben Hutchings -Cc: Jiri Olsa -Cc: Sedat Dilek -Cc: bpf@vger.kernel.org -Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de -Link: https://lore.kernel.org/r/20220801013834.156015-5-andres@anarazel.de -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/perf/Makefile.config | 8 ++++++++ - tools/perf/util/annotate.c | 7 ++++--- - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config -index d3c254c0f5c611..23648ea54e8d3d 100644 ---- a/tools/perf/Makefile.config -+++ b/tools/perf/Makefile.config -@@ -298,6 +298,7 @@ FEATURE_CHECK_LDFLAGS-libpython := $(PYTHON_EMBED_LDOPTS) - FEATURE_CHECK_LDFLAGS-libaio = -lrt - - FEATURE_CHECK_LDFLAGS-disassembler-four-args = -lbfd -lopcodes -ldl -+FEATURE_CHECK_LDFLAGS-disassembler-init-styled = -lbfd -lopcodes -ldl - - CORE_CFLAGS += -fno-omit-frame-pointer - CORE_CFLAGS += -ggdb3 -@@ -818,13 +819,16 @@ else - ifeq ($(feature-libbfd-liberty), 1) - EXTLIBS += -lbfd -lopcodes -liberty - FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -ldl -+ FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -ldl - else - ifeq ($(feature-libbfd-liberty-z), 1) - EXTLIBS += -lbfd -lopcodes -liberty -lz - FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -lz -ldl -+ FEATURE_CHECK_LDFLAGS-disassembler-init-styled += -liberty -lz -ldl - endif - endif - $(call feature_check,disassembler-four-args) -+ $(call feature_check,disassembler-init-styled) - endif - - ifeq ($(feature-libbfd-buildid), 1) -@@ -1044,6 +1048,10 @@ ifeq ($(feature-disassembler-four-args), 1) - CFLAGS += -DDISASM_FOUR_ARGS_SIGNATURE - endif - -+ifeq ($(feature-disassembler-init-styled), 1) -+ CFLAGS += -DDISASM_INIT_STYLED -+endif -+ - ifeq (${IS_64_BIT}, 1) - ifndef NO_PERF_READ_VDSO32 - $(call feature_check,compile-32) -diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c -index 82cc396ef516c4..2c6a485c3de5d9 100644 ---- a/tools/perf/util/annotate.c -+++ b/tools/perf/util/annotate.c -@@ -1676,6 +1676,7 @@ fallback: - #define PACKAGE "perf" - #include - #include -+#include - - static int symbol__disassemble_bpf(struct symbol *sym, - struct annotate_args *args) -@@ -1762,9 +1763,9 @@ static int symbol__disassemble_bpf(struct symbol *sym, - ret = errno; - goto out; - } -- init_disassemble_info(&info, s, -- (fprintf_ftype) fprintf); -- -+ init_disassemble_info_compat(&info, s, -+ (fprintf_ftype) fprintf, -+ fprintf_styled); - info.arch = bfd_get_arch(bfdf); - info.mach = bfd_get_mach(bfdf); - diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index baf111b170ec2..14c83f1ff74e4 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -1,26 +1,26 @@ # Template file for 'linux-tools' pkgname=linux-tools -version=5.10.4 -revision=11 +version=6.5 +revision=1 build_style=meta hostmakedepends="asciidoc automake flex gettext libtool perl python3 - python3-docutils xmlto" + python3-docutils xmlto pkg-config" makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel - slang-devel libaudit-devel" + slang-devel libaudit-devel libtraceevent-devel libpfm4-devel" depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}" short_desc="Linux kernel tools meta-pkg" maintainer="Enno Boland " license="GPL-2.0-only" homepage="https://www.kernel.org" -distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz" -checksum=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec +distfiles="${KERNEL_SITE}/kernel/v${version%%.*}.x/linux-${version}.tar.xz" +checksum=7a574bbc20802ea76b52ca7faf07267f72045e861b18915c5272a98c27abf884 python_version=3 -subpackages="cpupower freefall libcpupower libcpupower-devel libusbip libusbip-devel perf tmon usbip" +subpackages="cpupower freefall libcpupower libcpupower-devel libusbip libusbip-devel perf tmon usbip bpftool" -CFLAGS="-Wno-error -fcommon" +CFLAGS="-Wno-error" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) makedepends+=" libnuma-devel" @@ -32,8 +32,7 @@ ppc64*) ;; esac case "$XBPS_TARGET_MACHINE" in -*-musl) ;; -*) subpackages+=" bpftool";; # needs FTW_ACTIONRETVAL +*-musl) makedepends+=" argp-standalone" ;; esac case "$XBPS_TARGET_MACHINE" in i686-musl) makedepends+=" libunwind-devel" ;; @@ -51,15 +50,15 @@ pre_configure() { } do_build() { - local arch subarch + local arch case "$XBPS_TARGET_MACHINE" in i686*) arch=i386;; x86_64*) arch=x86_64;; arm*) arch=arm;; aarch64*) arch=arm64;; - ppc64le*) arch=powerpc; subarch=ppc64le;; - ppc64*) arch=powerpc; subarch=ppc64;; - ppc*) arch=powerpc; subarch=ppc;; + ppc64le*) arch=powerpc;; + ppc64*) arch=powerpc;; + ppc*) arch=powerpc;; mips*) arch=mips;; esac @@ -71,7 +70,7 @@ do_build() { make -C tools/perf ${makejobs} V=1 ARCH=$arch \ CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \ + WERROR=0 prefix=/usr lib=lib/perf \ NO_GTK2=1 NO_SDT=1 PYTHON=python3 \ all man @@ -102,68 +101,44 @@ do_build() { make -C tools/thermal/tmon ${makejobs} V=1 ARCH=$arch \ CC=$CC LD=$LD CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" - case "$XBPS_TARGET_MACHINE" in - *-musl) ;; - *) - make -C tools/bpf/bpftool ARCH=$arch all doc - make -C tools/bpf/bpftool ARCH=$arch -W runqslower - esac + make -C tools/bpf/bpftool ${makejobs} ARCH=$arch all doc + make -C tools/bpf/bpftool ${makejobs} ARCH=$arch -W runqslower + make -C tools/bpf ${makejobs} ARCH=$arch all -W runqslower } do_install() { - local arch subarch + local arch case "$XBPS_TARGET_MACHINE" in i686*) arch=i386;; x86_64*) arch=x86_64;; arm*) arch=arm;; aarch64*) arch=arm64;; - ppc64le*) arch=powerpc; subarch=ppc64le;; - ppc64*) arch=powerpc; subarch=ppc64;; - ppc*) arch=powerpc; subarch=ppc;; + ppc64le*) arch=powerpc;; + ppc64*) arch=powerpc;; + ppc*) arch=powerpc;; mips*) arch=mips;; esac # cpupower - cd ${wrksrc}/tools/power/cpupower - make DESTDIR=${DESTDIR} ARCH=$arch \ + make -C tools/power/cpupower DESTDIR=${DESTDIR} ARCH=$arch \ sbindir='/usr/bin' \ mandir='/usr/share/man' \ docdir='/usr/share/doc/cpupower' \ install install-man - # freefall - vbin "${wrksrc}/tools/laptop/freefall/freefall" - - # perf - cd ${wrksrc}/tools/perf - make CC=$CC LD=$LD CFLAGS="$CFLAGS" EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - WERROR=0 DESTDIR=${DESTDIR} prefix=/usr lib=lib/perf \ - NO_GTK2=1 NO_SDT=1 PYTHON=python3 ARCH=$arch \ - install install-man - # move completion in new directory - vmkdir usr/share/bash-completion/completions - mv ${DESTDIR}/etc/bash_completion.d/perf \ - ${DESTDIR}/usr/share/bash-completion/completions - # usbip - cd ${wrksrc}/tools/usb/usbip - make install ARCH=$arch DESTDIR=${DESTDIR} + make -C tools/usb/usbip install ARCH=$arch DESTDIR=${DESTDIR} vmkdir usr/lib/modules-load.d printf '%s\n' usbip-core usbip-host \ >${DESTDIR}/usr/lib/modules-load.d/usbip.conf # bpf - case "$XBPS_TARGET_MACHINE" in - *-musl) ;; - *) - cd ${wrksrc}/tools/bpf - make -W runqslower_install install \ - DESTDIR=${DESTDIR} prefix=/usr ARCH=$arch - make -C bpftool doc-install \ - DESTDIR=${DESTDIR} prefix=/usr/share ARCH=$arch - rm ${DESTDIR}/usr/share/man/man7/bpf-helpers.7 - mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin - esac + make -C tools/bpf install \ + DESTDIR=${DESTDIR} prefix=/usr ARCH=$arch + make -C tools/bpf/bpftool doc-install \ + DESTDIR=${DESTDIR} prefix=/usr/share ARCH=$arch + rm -f ${DESTDIR}/usr/share/man/man7/bpf-helpers.7 + mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin rm ${DESTDIR}/usr/include/cpuidle.h } @@ -199,6 +174,7 @@ libcpupower-devel_package() { depends="libcpupower-${version}_${revision}" pkg_install() { vmove usr/include/cpufreq.h + vmove usr/include/powercap.h vmove usr/lib/libcpupower.so } } @@ -220,14 +196,27 @@ libusbip-devel_package() { perf_package() { short_desc="Linux kernel performance auditing tool" pkg_install() { - vmove usr/bin/perf - vmove usr/bin/trace - vmove usr/lib/perf - vmove usr/libexec/perf-core - vmove usr/share/bash-completion/completions/perf - vmove usr/share/perf-core - vmove /usr/share/doc/perf-tip - vmove "usr/share/man/man1/perf*" + local arch + case "$XBPS_TARGET_MACHINE" in + i686*) arch=i386;; + x86_64*) arch=x86_64;; + arm*) arch=arm;; + aarch64*) arch=arm64;; + ppc64le*) arch=powerpc;; + ppc64*) arch=powerpc;; + ppc*) arch=powerpc;; + mips*) arch=mips;; + esac + make -C tools/perf \ + CC=$CC LD=$LD CFLAGS="$CFLAGS" \ + EXTRA_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + WERROR=0 DESTDIR=${PKGDESTDIR} prefix=/usr lib=lib/perf \ + NO_GTK2=1 NO_SDT=1 PYTHON=python3 ARCH=$arch \ + install install-man + # move completion in new directory + vmkdir usr/share/bash-completion/completions + mv ${PKGDESTDIR}/etc/bash_completion.d/perf \ + ${PKGDESTDIR}/usr/share/bash-completion/completions } } x86_energy_perf_policy_package() { @@ -250,7 +239,7 @@ usbip_package() { freefall_package() { short_desc="Disk protection for HP/DELL machines" pkg_install() { - vmove usr/bin/freefall + vbin "${wrksrc}/tools/laptop/freefall/freefall" vsv freefall } }