Update Libbpf (#18921)
thiagoftsm committed
Nov 1, 2024 at 16:53 UTC
bc813514ce8c9345ce6d03bc476f238002c96dc6
5 files changed
+20
-7
packaging/cmake/Modules/NetdataEBPFCORE.cmake
+2
-2
@@ -11,8 +11,8 @@ set(ebpf-co-re_SOURCE_DIR "${CMAKE_BINARY_DIR}/ebpf-co-re")
11
function(netdata_fetch_ebpf_co_re)
12
ExternalProject_Add(
13
ebpf-co-re
14
- URL https://github.com/netdata/ebpf-co-re/releases/download/v1.4.6/netdata-ebpf-co-re-glibc-v1.4.6.tar.xz
15
- URL_HASH SHA256=e5ec1992132e7c4bb2772601cf2e131a77a199d77a2ec44177e8282d1ed42e57
14
+ URL https://github.com/netdata/ebpf-co-re/releases/download/v1.5.0/netdata-ebpf-co-re-glibc-v1.5.0.tar.xz
15
+ URL_HASH SHA256=9585a5a48853f70efa51c48f57df34b4e47b1af56eaaef731f57525ebd76b90c
16
SOURCE_DIR "${ebpf-co-re_SOURCE_DIR}"
17
CONFIGURE_COMMAND ""
18
BUILD_COMMAND ""
packaging/cmake/Modules/NetdataEBPFLegacy.cmake
+4
-4
@@ -20,19 +20,19 @@ function(netdata_fetch_legacy_ebpf_code)
20
endif()
21
22
if(need_static)
23
- set(_hash 944ed28a95443c8476a907cad8275af27be818bdf25713126650297baebcfe9b)
23
+ set(_hash ca0c6186b5c9c4640f8ba13ea375b66882203e8ca831a2e6e5e4e039b37f277a)
24
set(_libc "static")
25
elseif(_libc STREQUAL "glibc")
26
- set(_hash 204e817978cd6a7985161cbcec4af5731bcd67c860a1c20236f73c9703860a29)
26
+ set(_hash d3027685e15fdb6406fd36faf45287d79534d40601d388aca5ab87e90959846d)
27
elseif(_libc STREQUAL "musl")
28
- set(_hash 4ce0f9ebe25b1921de79924a3684dd9d0beae87b01a0d1690a3a1e303682a409)
28
+ set(_hash e2268ca1fa012e87d4d3d588e01b3a2389ad8a4b1c878508f6226ce1dad34acf)
29
else()
30
message(FATAL_ERROR "Could not determine libc implementation, unable to install eBPF legacy code.")
31
endif()
32
33
ExternalProject_Add(
34
ebpf-code-legacy
35
- URL https://github.com/netdata/kernel-collector/releases/download/v1.4.6/netdata-kernel-collector-${_libc}-v1.4.6.tar.xz
35
+ URL https://github.com/netdata/kernel-collector/releases/download/v1.5.0/netdata-kernel-collector-${_libc}-v1.5.0.tar.xz
36
URL_HASH SHA256=${_hash}
37
SOURCE_DIR "${ebpf-legacy_SOURCE_DIR}"
38
CONFIGURE_COMMAND ""
packaging/cmake/Modules/NetdataLibBPF.cmake
+1
-1
@@ -31,7 +31,7 @@ function(netdata_bundle_libbpf)
31
if(USE_LEGACY_LIBBPF)
32
set(_libbpf_tag 673424c56127bb556e64095f41fd60c26f9083ec) # v0.0.9_netdata-1
33
else()
34
- set(_libbpf_tag 057f85d00029b2d2b71676b68c4fab961dc6dc96) # v1.4.6p_netdata
34
+ set(_libbpf_tag ad7c3a4266bf5ce301a5691eb7b405dbb27c7f3d) # v1.5.0p_netdata
35
endif()
36
37
if(DEFINED BUILD_SHARED_LIBS)
src/collectors/ebpf.plugin/ebpf.c
+4
@@ -4034,6 +4034,10 @@ int main(int argc, char **argv)
4034
4035
#ifdef LIBBPF_MAJOR_VERSION
4036
libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
4037
+
4038
+#ifndef NETDATA_INTERNAL_CHECKS
4039
+ libbpf_set_print(netdata_silent_libbpf_vfprintf);
4040
+#endif
4041
#endif
4042
4043
ebpf_read_local_addresses_unsafe();
src/libnetdata/ebpf/ebpf.h
+9
@@ -492,4 +492,13 @@ void ebpf_send_data_aral_chart(ARAL *memory, ebpf_module_t *em);
492
int ebpf_can_plugin_load_code(int kver, char *plugin_name);
493
int ebpf_adjust_memory_limit();
494
495
+#ifdef LIBBPF_MAJOR_VERSION
496
+static inline int netdata_silent_libbpf_vfprintf(enum libbpf_print_level level __maybe_unused,
497
+ const char *format __maybe_unused,
498
+ va_list args __maybe_unused)
499
+{
500
+ return 0;
501
+}
502
+#endif
503
+
504
#endif /* NETDATA_EBPF_H */