tmp

Author: lec-bit

build.sh

@@ -43,6 +43,7 @@ if [ "$1" == "-h" -o "$1" == "--help" ]; then
 fi
 
 if [ -z "$1" -o "$1" == "-b" -o "$1" == "--build" ]; then
+	bash kmesh_macros_env_kernel.sh
 	prepare
 	make
 	exit

config/kmesh_marcos_def.h

@@ -7,35 +7,35 @@
  * loopback address link conflicts. Obtains the namespace cookie of the
  * current container based on the bpf_get_netns_cookie auxiliary function.
  */
-#define MDA_LOOPBACK_ADDR 1
+#define MDA_LOOPBACK_ADDR 0
 
 /* supports NAT acceleration. That is, acceleration can also be performed
  * when iptables is used to forward traffic between service containers
  * and sidecar containers. The bpf_sk_original_addr auxiliary function is
  * used to obtain the original destination address.
  */
-#define MDA_NAT_ACCEL 1
+#define MDA_NAT_ACCEL 0
 
 /* supports acceleration function filtering based on GID and UID.
  * That is, the GID or UID corresponding to the process to be accelerated
  * is configured in the configuration file. The bpf_get_sockops_uid_gid
  * auxiliary function is used to obtain the GID and UID of the current
  * process.
  */
-#define MDA_GID_UID_FILTER 1
+#define MDA_GID_UID_FILTER 0
 
 /*
  * in kernel 6.x version, add the new iter type ITER_UBUF, and we need add code
  * for the corresponding scenarios.
  */
-#define KERNEL_VERISON6 0
+#define KERNEL_VERISON6 1
 
 /*
  * Kmesh’s Layer 7 acceleration proxy capability relies on kernel enhancements.
  * It’s necessary to determine whether the current environment has an
  * enhanced kernel in order to enable Kmesh’s capabilities.
  */
-#define ENHANCED_KERNEL 0
+#define ENHANCED_KERNEL 1
 
 /*
  * Different versions of libbpf can be installed in different environments,
@@ -50,4 +50,4 @@
 /*
  * Determine whether the current kernel version supports the use of kfunc.
  */
-#define KERNEL_KFUNC 0
+#define KERNEL_KFUNC 1

kernel/ko_src/kmesh/Makefile

@@ -13,12 +13,13 @@ kmesh-objs = kmesh_main.o defer_connect.o \
 	kmesh_parse_http_1_1.o kmesh_func.o
 
 KERNELDIR ?= /lib/modules/$(shell uname -r)/build
+VMLINUX_PATH := /sys/kernel/btf/vmlinux
 PWD := $(shell pwd)
 
 ccflags-y += -Wno-discarded-qualifiers
 
 all:
-	$(MAKE) -C $(KERNELDIR) M=$(PWD)
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) KBUILD_VMLINUX_LIBS=$(VMLINUX_PATH) modules
 
 install:
 	install -dp -m 0500 /lib/modules/kmesh

kmesh_compile_env_pre.sh

@@ -146,6 +146,10 @@ function set_enhanced_kernel_env() {
 
 	KERNEL_MAJOR=$(uname -r | awk -F '.' '{print $1}')
 
+	zcat /proc/config.gz | grep BTF
+	cat "/boot/config-$(uname -r)" | grep BTF
+	check_config "CONFIG_DEBUG_INFO_BTF_MODULES"
+	check_config "CONFIG_DEBUG_INFO_BTF"
 	if grep -q "FN(parse_header_msg)" $KERNEL_HEADER_LINUX_BPF ||
 		[ "$(check_config "CONFIG_DEBUG_INFO_BTF_MODULES")" == "y" ] &&
 		[ "$(check_config "CONFIG_DEBUG_INFO_BTF")" == "y" ] &&

kmesh_macros_env_kernel.sh

@@ -39,12 +39,17 @@ else
 	set_config ENHANCED_KERNEL 0
 fi
 
+zcat /proc/config.gz | grep BTF
+cat "/boot/config-$(uname -r)" | grep BTF
 # KERNEL_KFUNC
 if [ "$(check_config "CONFIG_DEBUG_INFO_BTF_MODULES")" == "y" ] &&
 	[ "$(check_config "CONFIG_DEBUG_INFO_BTF")" == "y" ] &&
 	[ "$KERNEL_VERSION" -ge 6 ]; then
 	set_config ENHANCED_KERNEL 1
 	set_config KERNEL_KFUNC 1
+	cp /sys/kernel/btf/vmlinux /lib/modules/$(uname -r)/build
 else
 	set_config KERNEL_KFUNC 0
 fi
+
+cat config/kmesh_marcos_def.h