eBPF different improvements (#13624)
thiagoftsm committed
Sep 7, 2022 at 17:02 UTC
2cb23d5b81b3b0c90e0630eacff93e2ed4e79b81
13 files changed
+27
-16
collectors/ebpf.plugin/ebpf.c
+4
-4
@@ -44,7 +44,7 @@ ebpf_module_t ebpf_modules[] = {
44
.load = EBPF_LOAD_LEGACY, .targets = NULL, .probe_links = NULL, .objects = NULL},
45
{ .thread_name = "socket", .config_name = "socket", .enabled = 0, .start_routine = ebpf_socket_thread,
46
.update_every = EBPF_DEFAULT_UPDATE_EVERY, .global_charts = 1, .apps_charts = NETDATA_EBPF_APPS_FLAG_NO,
47
- .apps_level = NETDATA_APPS_NOT_SET, .cgroup_charts = CONFIG_BOOLEAN_NO, .mode = MODE_ENTRY, .optional = 0,
47
+ .apps_level = NETDATA_APPS_LEVEL_REAL_PARENT, .cgroup_charts = CONFIG_BOOLEAN_NO, .mode = MODE_ENTRY, .optional = 0,
48
.apps_routine = ebpf_socket_create_apps_charts, .maps = NULL,
49
.pid_map_size = ND_EBPF_DEFAULT_PID_SIZE, .names = NULL, .cfg = &socket_config,
50
.config_file = NETDATA_NETWORK_CONFIG_FILE,
@@ -137,15 +137,15 @@ ebpf_module_t ebpf_modules[] = {
137
.load = EBPF_LOAD_LEGACY, .targets = NULL, .probe_links = NULL, .objects = NULL},
138
{ .thread_name = "oomkill", .config_name = "oomkill", .enabled = 0, .start_routine = ebpf_oomkill_thread,
139
.update_every = EBPF_DEFAULT_UPDATE_EVERY, .global_charts = 1, .apps_charts = NETDATA_EBPF_APPS_FLAG_NO,
140
- .apps_level = NETDATA_APPS_NOT_SET, .cgroup_charts = CONFIG_BOOLEAN_NO, .mode = MODE_ENTRY, .optional = 0,
140
+ .apps_level = NETDATA_APPS_LEVEL_REAL_PARENT, .cgroup_charts = CONFIG_BOOLEAN_NO, .mode = MODE_ENTRY, .optional = 0,
141
.apps_routine = ebpf_oomkill_create_apps_charts, .maps = NULL,
142
.pid_map_size = ND_EBPF_DEFAULT_PID_SIZE, .names = NULL, .cfg = &oomkill_config,
143
.config_file = NETDATA_OOMKILL_CONFIG_FILE,
144
- .kernels = NETDATA_V3_10 | NETDATA_V4_14 | NETDATA_V4_16 | NETDATA_V4_18 | NETDATA_V5_4 | NETDATA_V5_14,
144
+ .kernels = NETDATA_V4_14 | NETDATA_V4_16 | NETDATA_V4_18 | NETDATA_V5_4 | NETDATA_V5_14,
145
.load = EBPF_LOAD_LEGACY, .targets = NULL, .probe_links = NULL, .objects = NULL},
146
{ .thread_name = "shm", .config_name = "shm", .enabled = 0, .start_routine = ebpf_shm_thread,
147
.update_every = EBPF_DEFAULT_UPDATE_EVERY, .global_charts = 1, .apps_charts = NETDATA_EBPF_APPS_FLAG_NO,
148
- .apps_level = NETDATA_APPS_LEVEL_ALL, .cgroup_charts = CONFIG_BOOLEAN_NO, .mode = MODE_ENTRY, .optional = 0,
148
+ .apps_level = NETDATA_APPS_LEVEL_REAL_PARENT, .cgroup_charts = CONFIG_BOOLEAN_NO, .mode = MODE_ENTRY, .optional = 0,
149
.apps_routine = ebpf_shm_create_apps_charts, .maps = NULL,
150
.pid_map_size = ND_EBPF_DEFAULT_PID_SIZE, .names = NULL, .cfg = &shm_config,
151
.config_file = NETDATA_DIRECTORY_SHM_CONFIG_FILE,
collectors/ebpf.plugin/ebpf_oomkill.c
+7
-1
@@ -367,11 +367,17 @@ void *ebpf_oomkill_thread(void *ptr)
367
ebpf_module_t *em = (ebpf_module_t *)ptr;
368
em->maps = oomkill_maps;
369
370
+#define NETDATA_DEFAULT_OOM_DISABLED_MSG "Disabling OOMKILL thread, because"
371
if (unlikely(!all_pids || !em->apps_charts)) {
372
// When we are not running integration with apps, we won't fill necessary variables for this thread to run, so
373
// we need to disable it.
374
if (em->enabled)
374
- info("Disabling OOMKILL thread, because apps integration is completely disabled.");
375
+ info("%s apps integration is completely disabled.", NETDATA_DEFAULT_OOM_DISABLED_MSG);
376
+
377
+ em->enabled = 0;
378
+ } else if (running_on_kernel < NETDATA_EBPF_KERNEL_4_14) {
379
+ if (em->enabled)
380
+ info("%s kernel does not have necessary tracepoints.", NETDATA_DEFAULT_OOM_DISABLED_MSG);
381
382
em->enabled = 0;
383
}
collectors/ebpf.plugin/ebpf_socket.c
+1
-1
@@ -23,7 +23,7 @@ static char *socket_id_names[NETDATA_MAX_SOCKET_VECTOR] = { "tcp_cleanup_rbuf",
23
static ebpf_local_maps_t socket_maps[] = {{.name = "tbl_bandwidth",
24
.internal_input = NETDATA_COMPILED_CONNECTIONS_ALLOWED,
25
.user_input = NETDATA_MAXIMUM_CONNECTIONS_ALLOWED,
26
- .type = NETDATA_EBPF_MAP_STATIC,
26
+ .type = NETDATA_EBPF_MAP_RESIZABLE | NETDATA_EBPF_MAP_PID,
27
.map_fd = ND_EBPF_MAP_FD_NOT_INITIALIZED},
28
{.name = "tbl_global_sock",
29
.internal_input = NETDATA_SOCKET_COUNTER,
libnetdata/ebpf/ebpf.c
+4
@@ -696,6 +696,10 @@ struct bpf_link **ebpf_load_program(char *plugins_dir, ebpf_module_t *em, int kv
696
697
ebpf_mount_name(lpath, 4095, plugins_dir, idx, em->thread_name, em->mode);
698
699
+ // When this function is called ebpf.plugin is using legacy code, so we should reset the variable
700
+ em->load &= ~ NETDATA_EBPF_LOAD_METHODS;
701
+ em->load |= EBPF_LOAD_LEGACY;
702
+
703
*obj = bpf_object__open_file(lpath, NULL);
704
if (libbpf_get_error(obj)) {
705
error("Cannot open BPF object %s", lpath);
libnetdata/ebpf/ebpf.h
+1
@@ -77,6 +77,7 @@
77
*/
78
enum netdata_ebpf_kernel_versions {
79
NETDATA_EBPF_KERNEL_4_11 = 264960, // 264960 = 4 * 65536 + 15 * 256
80
+ NETDATA_EBPF_KERNEL_4_14 = 265728, // 264960 = 4 * 65536 + 14 * 256
81
NETDATA_EBPF_KERNEL_4_15 = 265984, // 265984 = 4 * 65536 + 15 * 256
82
NETDATA_EBPF_KERNEL_4_17 = 266496, // 266496 = 4 * 65536 + 17 * 256
83
NETDATA_EBPF_KERNEL_5_0 = 327680, // 327680 = 5 * 65536 + 0 * 256
packaging/current_libbpf.checksums
+1
-1
@@ -1 +1 @@
1
-1b4708f22af0e38ec29f01c9948ec2d436e8e06781ad6ad4a231ef62352a4736 v0.8.1_netdata.tar.gz
1
+9c49cfdc04201172ca6953877ce44bb24a0b56ac6e896deaf66820192d31be37 v1.0.0_netdata.tar.gz
packaging/current_libbpf.version
+1
-1
@@ -1 +1 @@
1
-0.8.1_netdata
1
+1.0.0_netdata
packaging/ebpf-co-re.checksums
+1
-1
@@ -1 +1 @@
1
-ab36f617b045d4740536769f84b7a527714431c02e80e15aa7fa2fe84c64d0cc netdata-ebpf-co-re-glibc-v0.9.5.tar.xz
1
+798c792af0a82a0397c258b089a4a807004ebee493d79d12dee9dbf7adee2cce netdata-ebpf-co-re-glibc-v1.0.0.tar.xz
packaging/ebpf-co-re.version
+1
-1
@@ -1 +1 @@
1
-v0.9.5
1
+v1.0.0
packaging/ebpf.checksums
+3
-3
@@ -1,3 +1,3 @@
1
-e7408cbfe77d570edea4c562efd631e914827a5d5ad51dab0638d7aa3e999a99 ./netdata-kernel-collector-glibc-v0.9.5.tar.xz
2
-8a0f5117d71d3b1975ad31fe51c1e2a887d66e676aa53cd5939d22192cb581a6 ./netdata-kernel-collector-musl-v0.9.5.tar.xz
3
-472e2b6cb473cea69efd1645a35589904db4eddc162a372833bde156b53ec44b ./netdata-kernel-collector-static-v0.9.5.tar.xz
1
+914c0fd53d346b2bd94130582e9154e7219988800f7e1d5edd857e29b2acbf50 ./netdata-kernel-collector-glibc-v1.0.0.tar.xz
2
+490da694325a4c04a01fd9149d15344b354bb7336ad014fdeb80b3ee4b8fc2cf ./netdata-kernel-collector-musl-v1.0.0.tar.xz
3
+101c51698207630f758d42a81f28929e3b69c05739234d8b3baffa59d968b4f7 ./netdata-kernel-collector-static-v1.0.0.tar.xz
packaging/ebpf.version
+1
-1
@@ -1 +1 @@
1
-v0.9.5
1
+v1.0.0
packaging/libbpf.checksums
+1
-1
@@ -1 +1 @@
1
-1b4708f22af0e38ec29f01c9948ec2d436e8e06781ad6ad4a231ef62352a4736 v0.8.1_netdata.tar.gz
1
+9c49cfdc04201172ca6953877ce44bb24a0b56ac6e896deaf66820192d31be37 v1.0.0_netdata.tar.gz
packaging/libbpf.version
+1
-1
@@ -1 +1 @@
1
-0.8.1_netdata
1
+1.0.0_netdata