From 8993ea73a9714d22178ba6ada8c04be83cd71ec7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Aug 2022 22:47:16 +0100 Subject: gentoo auto-resync : 29:08:2022 - 22:47:16 --- dev-util/bpftrace/Manifest | 3 +- dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild | 1 + .../bpftrace/files/bpftrace-0.15.0-bcc-025.patch | 88 ++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 dev-util/bpftrace/files/bpftrace-0.15.0-bcc-025.patch (limited to 'dev-util/bpftrace') diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index 4cde796a0850..6b1054ea1bdb 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1,7 +1,8 @@ AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4b5ae28626f6905c45f6510f84b7c6f28aa3b5174f1f48a30763990b2a3cc50c6336249fe1dc4cf31656871a8adce43c8d7 SHA512 332e6cc4d1c21e917451c9aa6028b082f53dde8221419ba45ad7ae6321e444b3f67ec8366cbd56638d8f8b68a3be06af892eba765c810744951af1de9b994113 +AUX bpftrace-0.15.0-bcc-025.patch 3192 BLAKE2B a72790e25963342b2eed5c2b9fd41bd22d88b536a064f6e4039bc83242ea4c5a48b27d2d786008df45656234c700ba9fbb738e09ea8e70e75a3f457163c4da90 SHA512 22ef3d05790416b4286ea9931646c3940877da8cf02b9645edbc753a4adb75e90f233b533d0c2c790eb62592c6af6487c02a502ecca8d547ec3d329a2aa71f64 AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b37e7bf72e6b03b54c244889706ba3c5156e2355d00cf395d14a6e8a7fe622e002acf9bab06dbc1427f6b637f0c59db86af08f05d51 SHA512 b591a73b0bbdd0105e6b87fb264ca4345e200ab58754d09a87dec79e60044eab165f2b34fe5ddc904cd877a460d5f41eef8b4d59eac255ea4f4e0fae37cf3511 AUX bpftrace-0.15.0-install-libs.patch 8206 BLAKE2B 9d8b193f422b0ee64301b7ea12791afdd5111cde487b904ec35750e6189fdd6faca9af36b8956058c820c2398bcabc7dcee6d26b93c55ff1e591b3259a682a27 SHA512 9721d8f3812855d7a9155d8e5ecac305dedb5c8326ccf8ea679048f920ca58a774576840c1b0bc2864a26c66c89bf0c81ed1a1ab30fb571a6cfaebc5b499c2b7 DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B 69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396 SHA512 3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614 DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B 3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4 SHA512 916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a -EBUILD bpftrace-0.15.0-r1.ebuild 1875 BLAKE2B 095b7fdbc206dd65f778addbc236da43d8465e7b07ab958de48c537842d9d93e9afd1c7359b48955126eb38c21bf0a61e2606c8bd1629f9561f5ef367344009e SHA512 6ff4b6726208920ead3bd07f83471ffeb6b0b7f952dc445d094a4729a7822193ee1bb8b2313aac8e3b310599954fe5e220c5688a0a7eb27b887bc3a0de5c9202 +EBUILD bpftrace-0.15.0-r1.ebuild 1920 BLAKE2B 0dbd401e929c3a88106593fd4fe01feb10b7285ecadbec0b1acb2d2ab30a1e60735f45f7ed4b0b07d31e58b0cbe65a8ebe5a1c831f7bc74e9e03ef870fd19027 SHA512 6f6ce6815718a938c4da18c375e1edfbc5cf0d6ae89628cd2b7137015aefab09f34b906e52adadb8f4f4332fac388b5528eb8c7fba42ff02c415c75b2adc1ca6 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild index 1b080a8637d2..51346cb3d38d 100644 --- a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild +++ b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild @@ -52,6 +52,7 @@ PATCHES=( "${FILESDIR}/bpftrace-0.15.0-install-libs.patch" "${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch" "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" + "${FILESDIR}/bpftrace-0.15.0-bcc-025.patch" ) pkg_pretend() { diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-bcc-025.patch b/dev-util/bpftrace/files/bpftrace-0.15.0-bcc-025.patch new file mode 100644 index 000000000000..ef2ca76e1c50 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.15.0-bcc-025.patch @@ -0,0 +1,88 @@ +From f86c3bde84d9e75ec2780a51a1ca7dc20a4740e6 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Thu, 25 Aug 2022 21:47:30 +0900 +Subject: [PATCH] Fix builds against bcc >= 0.25.0 + +libbpf 1.0.0 removed bpf_load_program_attr in +https://github.com/libbpf/libbpf/commit/9476dce6fe905a6bf1d4c483f7b2b8575c4ffb2d +and bcc 0.25.0 in turn changed bcc_prog_load_xattr to use +bpf_prog_load_opts instead in +https://github.com/iovisor/bcc/commit/185143bdec6134255363446f644acd766ffb3825 + +Add a compile check to use the appropriate version + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5c4c39630d2..f23b2ba52740 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -138,7 +138,7 @@ check_symbol_exists(bpf_attach_kfunc "${LIBBCC_INCLUDE_DIRS}/bcc/libbpf.h" HAVE_ + check_symbol_exists(bcc_usdt_addsem_probe "${LIBBCC_INCLUDE_DIRS}/bcc/bcc_usdt.h" HAVE_BCC_USDT_ADDSEM) + check_symbol_exists(bcc_procutils_which_so "${LIBBCC_INCLUDE_DIRS}/bcc/bcc_proc.h" HAVE_BCC_WHICH_SO) + +-# bcc_prog_load_xattr needs struct bpf_load_program_attr, ++# bcc_prog_load_xattr needs struct bpf_prog_load_opts or bpf_load_program_attr, + # which is defined in libbpf + if (LIBBPF_FOUND) + check_symbol_exists(bcc_prog_load_xattr "${LIBBCC_INCLUDE_DIRS}/bcc/libbpf.h" HAVE_BCC_PROG_LOAD_XATTR) +@@ -236,6 +236,10 @@ if(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE) + set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE) + endif(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE) + ++if(LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS) ++ set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS) ++endif(LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS) ++ + if (HAVE_BCC_KFUNC) + set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" HAVE_BCC_KFUNC) + endif(HAVE_BCC_KFUNC) +diff --git a/cmake/FindLibBcc.cmake b/cmake/FindLibBcc.cmake +index 7b4f12835786..20d2e68cd75f 100644 +--- a/cmake/FindLibBcc.cmake ++++ b/cmake/FindLibBcc.cmake +@@ -85,6 +85,16 @@ int main(void) { + return 0; + } + " LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE) ++CHECK_CXX_SOURCE_COMPILES(" ++#include ++ ++int main(void) { ++ struct bpf_prog_load_opts *opts = (struct bpf_prog_load_opts*) 1; ++ ++ bcc_prog_load_xattr(BPF_PROG_TYPE_UNSPEC, 0, 0, 0, opts, 0, 0, 0, true); ++ return 0; ++} ++" LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS) + SET(CMAKE_REQUIRED_INCLUDES) + + SET(CMAKE_REQUIRED_LIBRARIES ${LIBBCC_BPF_LIBRARIES}) +diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp +index 60778e53ce44..dd46f15fd8d2 100644 +--- a/src/attached_probe.cpp ++++ b/src/attached_probe.cpp +@@ -731,7 +731,24 @@ void AttachedProbe::load_prog() + continue; + } + +-#ifdef HAVE_BCC_PROG_LOAD_XATTR ++#ifdef LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS ++ struct bpf_prog_load_opts opts = { }; ++ ++ opts.sz = sizeof(opts); ++ opts.log_level = log_level; ++ ++ progfd_ = bcc_prog_load_xattr( ++ progtype(probe_.type), ++ name.c_str(), ++ license, ++ reinterpret_cast(insns), ++ &opts, ++ prog_len, ++ log_buf.get(), ++ log_buf_size, ++ true); ++ ++#elif HAVE_BCC_PROG_LOAD_XATTR + struct bpf_load_program_attr attr = {}; + + attr.prog_type = progtype(probe_.type); -- cgit v1.2.3