Improve internal codes

includes/netdata_common.h

@@ -224,5 +224,63 @@ static __always_inline __u32 monitor_apps(void *ctrl_tbl)
     return 1;
 }
 
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(4,11,0))
+#define NETDATA_BPF_MAP_DEF(NAME, TYPE, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    struct { \
+        __uint(type, TYPE); \
+        __type(key, KEY_TYPE); \
+        __type(value, VALUE_TYPE); \
+        __uint(max_entries, MAX_ENTRIES); \
+    } NAME SEC(".maps")
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0))
+#define NETDATA_BPF_HASH_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_HASH, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+
+#define NETDATA_BPF_PERCPU_HASH_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_PERCPU_HASH, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+
+#define NETDATA_BPF_ARRAY_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_ARRAY, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+
+#define NETDATA_BPF_PERCPU_ARRAY_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_PERCPU_ARRAY, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+#else
+#define NETDATA_BPF_HASH_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_HASH, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+
+#define NETDATA_BPF_PERCPU_HASH_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_HASH, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+
+#define NETDATA_BPF_ARRAY_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_ARRAY, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+
+#define NETDATA_BPF_PERCPU_ARRAY_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_ARRAY, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+#endif
+
+#else
+#define NETDATA_BPF_MAP_DEF(NAME, TYPE, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    struct bpf_map_def SEC("maps") NAME = { \
+        .type = TYPE, \
+        .key_size = sizeof(KEY_TYPE), \
+        .value_size = sizeof(VALUE_TYPE), \
+        .max_entries = MAX_ENTRIES \
+    }
+
+#define NETDATA_BPF_HASH_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_HASH, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+
+#define NETDATA_BPF_PERCPU_HASH_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_HASH, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+
+#define NETDATA_BPF_ARRAY_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_ARRAY, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+
+#define NETDATA_BPF_PERCPU_ARRAY_DEF(NAME, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES) \
+    NETDATA_BPF_MAP_DEF(NAME, BPF_MAP_TYPE_ARRAY, KEY_TYPE, VALUE_TYPE, MAX_ENTRIES)
+
+#endif
+
 #endif /* _NETDATA_COMMON_ */
 

kernel/Makefile

@@ -6,6 +6,7 @@ LIBBPF_HEADERS = ../.local_libbpf
 ARCH := $(shell uname -m | sed 's/x86_64/x86/')
 
 EXTRA_CFLAGS += -fno-stack-protector
+EXTRA_CFLAGS += -DCONFIG_CC_HAS_ASM_INLINE=0
 
 LINUXINCLUDE += -I$(KERNELSOURCE)/arch/$(ARCH)/include/generated
 LINUXINCLUDE += -I$(KERNELSOURCE)/arch/$(ARCH)/include/generated/uapi
@@ -114,30 +115,35 @@ libbpf:
 	cd $(LIBBPF)/src && /bin/bash ../../.dockerfiles/change_libbpf.sh $(VER_MAJOR) $(VER_MINOR) && $(MAKE) CC=$(CC_LIBBPF) CFLAGS="-fPIE" BUILD_STATIC_ONLY=1 DESTDIR=../../.local_libbpf INCLUDEDIR= LIBDIR= UAPIDIR= install \
 
 %_kern.o: %_kern.c libbpf
-	if [ -w $(KERNELSOURCE)/include/generated/autoconf.h ]; then  if [ "$(CURRENT_KERNEL)" -ge 328448 ]; then sed -i -e 's/\(#define CONFIG_CC_HAS_ASM_INLINE 1\)/\/\/\1/' $(KERNELSOURCE)/include/generated/autoconf.h; fi ; fi
 	$(CLANG) $(EXTRA_CFLAGS) -S -nostdinc $(LINUXINCLUDE) $(LLVM_INCLUDES) \
 		-D__KERNEL__ -D__ASM_SYSREG_H -Wno-unused-value -Wno-pointer-sign \
 	    	-Wno-compare-distinct-pointer-types \
 	    	-Wno-gnu-variable-sized-type-not-at-end \
 	    	-Wno-tautological-compare \
-	    	-fno-asynchronous-unwind-tables \
+		-Wno-duplicate-decl-specifier \
+		-Wno-address-of-packed-member \
+		-Wno-macro-redefined \
+		-fno-asynchronous-unwind-tables \
 		-DNETDATASEL=0 \
 		-D__BPF_TRACING__ \
 		-D__TARGET_ARCH_$(ARCH) \
 		-include ../includes/netdata_asm_goto.h \
-		-O2 -g -emit-llvm -c $<
+		-O2 -g -emit-llvm $< -o $(<:.c=.ll)
 	$(LLC) -march=bpf -filetype=obj -o r$@ $(<:.c=.ll)
 	$(CLANG) $(EXTRA_CFLAGS) -S -nostdinc $(LINUXINCLUDE) $(LLVM_INCLUDES) \
 		-D__KERNEL__ -D__ASM_SYSREG_H -Wno-unused-value -Wno-pointer-sign \
-	    	-Wno-compare-distinct-pointer-types \
-	    	-Wno-gnu-variable-sized-type-not-at-end \
-	    	-Wno-tautological-compare \
-	    	-fno-asynchronous-unwind-tables \
+		-Wno-compare-distinct-pointer-types \
+		-Wno-gnu-variable-sized-type-not-at-end \
+		-Wno-tautological-compare \
+		-Wno-duplicate-decl-specifier \
+		-Wno-address-of-packed-member \
+		-Wno-macro-redefined \
+		-fno-asynchronous-unwind-tables \
 		-DNETDATASEL=2 \
 		-D__BPF_TRACING__ \
 		-D__TARGET_ARCH_$(ARCH) \
 		-include ../includes/netdata_asm_goto.h \
-		-O2 -g -emit-llvm -c $<
+		-O2 -g -emit-llvm $< -o $(<:.c=.ll)
 	$(LLC) -march=bpf -filetype=obj -o p$@ $(<:.c=.ll)
 	/bin/bash rename_binaries.sh "$(VER_MAJOR)" "$(VER_MINOR)" "$@"
 

kernel/btrfs_kern.c

@@ -25,68 +25,10 @@
  *     
  ***********************************************************************************/
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(4,11,0))
-struct {
-    __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
-    __type(key, __u32);
-    __type(value, __u64);
-    __uint(max_entries, NETDATA_FS_MAX_ELEMENTS);
-} tbl_btrfs SEC(".maps");
-
-struct {
-    __uint(type, BPF_MAP_TYPE_HASH);
-    __type(key, __u32);
-    __type(value, __u64);
-    __uint(max_entries,  1);
-} tbl_ext_addr SEC(".maps");
-
-struct {
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,15,0))
-    __uint(type, BPF_MAP_TYPE_HASH);
-#else
-    __uint(type, BPF_MAP_TYPE_PERCPU_HASH);
-#endif
-    __type(key, __u32);
-    __type(value, __u64);
-    __uint(max_entries,  4192);
-} tmp_btrfs SEC(".maps");
-
-struct {
-    __uint(type, BPF_MAP_TYPE_ARRAY);
-    __type(key, __u32);
-    __type(value, __u64);
-    __uint(max_entries, NETDATA_CONTROLLER_END);
-} btrfs_ctrl SEC(".maps");
-#else
-
-struct bpf_map_def SEC("maps") tbl_btrfs = {
-    .type = BPF_MAP_TYPE_PERCPU_ARRAY,
-    .key_size = sizeof(__u32),
-    .value_size = sizeof(__u64),
-    .max_entries = NETDATA_FS_MAX_ELEMENTS
-};
-
-struct bpf_map_def SEC("maps") tbl_ext_addr = {
-    .type = BPF_MAP_TYPE_HASH,
-    .key_size = sizeof(__u32),
-    .value_size = sizeof(__u64),
-    .max_entries = 1
-};
-
-struct bpf_map_def SEC("maps") tmp_btrfs = {
-    .type = BPF_MAP_TYPE_HASH,
-    .key_size = sizeof(__u32),
-    .value_size = sizeof(__u64),
-    .max_entries = 4192
-};
-
-struct bpf_map_def SEC("maps") btrfs_ctrl = {
-    .type = BPF_MAP_TYPE_ARRAY,
-    .key_size = sizeof(__u32),
-    .value_size = sizeof(__u64),
-    .max_entries = NETDATA_CONTROLLER_END
-};
-#endif
+NETDATA_BPF_PERCPU_ARRAY_DEF(tbl_btrfs, __u32, __u64, NETDATA_FS_MAX_ELEMENTS);
+NETDATA_BPF_HASH_DEF(tbl_ext_addr, __u32, __u64, 1);
+NETDATA_BPF_HASH_DEF(tmp_btrfs, __u32, __u64, 4192);
+NETDATA_BPF_ARRAY_DEF(btrfs_ctrl, __u32, __u64, NETDATA_CONTROLLER_END);
 
 /************************************************************************************
  *