opt

Signed-off-by: lec-bit <glfhzmy@126.com>

Author: lec-bit

bpf/include/common.h

@@ -5,6 +5,7 @@
 #define _COMMON_H_
 
 #include "../../config/kmesh_marcos_def.h"
+#include <linux/in.h>
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -17,7 +18,17 @@
 #include "errno.h"
 
 #if ENHANCED_KERNEL
-#include <bpf_helper_defs_ext.h>
+#if KERNEL_KFUNC
+#include "bpf_kfunc.h"
+#else
+struct bpf_mem_ptr {
+    void *ptr;
+    __u32 size;
+};
+#include "bpf_helper_defs_ext.h"
+#define bpf_km_setsockopt bpf_setsockopt
+#define bpf_km_getsockopt bpf_getsockopt
+#endif
 #endif
 
 #define bpf_unused __attribute__((__unused__))

bpf/kmesh/ads/cgroup_sock.c

@@ -14,11 +14,11 @@
 
 #if ENHANCED_KERNEL
 #include "route_config.h"
+static const char kmesh_module_ulp_name[] = KMESH_MODULE_ULP_NAME;
 #endif
 #if KMESH_ENABLE_IPV4
 #if KMESH_ENABLE_HTTP
 
-static const char kmesh_module_name[] = "kmesh_defer";
 static char kmesh_module_name_get[KMESH_MODULE_NAME_LEN] = "";
 static inline int sock4_traffic_control(struct bpf_sock_addr *ctx)
 {
@@ -42,9 +42,10 @@ static inline int sock4_traffic_control(struct bpf_sock_addr *ctx)
     BPF_LOG(DEBUG, KMESH, "bpf find listener addr=[%s:%u]\n", ip2str(&ip, 1), bpf_ntohs(ctx->user_port));
 
 #if ENHANCED_KERNEL
-    ret = bpf_getsockopt(ctx, IPPROTO_TCP, TCP_ULP, (void *)kmesh_module_name_get, KMESH_MODULE_NAME_LEN);
-    if (CHECK_MODULE_NAME_NULL(ret) || bpf__strncmp(kmesh_module_name_get, KMESH_MODULE_NAME_LEN, kmesh_module_name)) {
-        ret = bpf_setsockopt(ctx, IPPROTO_TCP, TCP_ULP, (void *)kmesh_module_name, sizeof(kmesh_module_name));
+    ret = bpf_km_getsockopt(ctx, IPPROTO_TCP, TCP_ULP, kmesh_module_ulp_name_get, KMESH_MODULE_NAME_LEN);
+    if (CHECK_MODULE_NAME_NULL(ret)
+        || bpf__strncmp(kmesh_module_ulp_name_get, KMESH_MODULE_NAME_LEN, kmesh_module_ulp_name)) {
+        ret = bpf_km_setsockopt(ctx, IPPROTO_TCP, TCP_ULP, kmesh_module_ulp_name, sizeof(kmesh_module_ulp_name));
         if (ret)
             BPF_LOG(ERR, KMESH, "bpf set sockopt failed! ret %d\n", ret);
         return 0;

bpf/kmesh/ads/include/kmesh_common.h

@@ -31,11 +31,6 @@
         val;                                                                                                           \
     })
 
-struct bpf_mem_ptr {
-    void *ptr;
-    __u32 size;
-};
-
 static inline int bpf__strncmp(const char *dst, int n, const char *src)
 {
     if (dst == NULL || src == NULL)

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

@@ -28,7 +28,7 @@
  * in kernel 6.x version, add the new iter type ITER_UBUF, and we need add code
  * for the corresponding scenarios.
  */
-#define ITER_TYPE_IS_UBUF 0
+#define KERNEL_VERISON6 1
 
 /*
  * Kmesh’s Layer 7 acceleration proxy capability relies on kernel enhancements.
@@ -46,3 +46,8 @@
  * is enabled accordingly.
  * */
 #define LIBBPF_HIGHER_0_6_0_VERSION 0
+
+/*
+ * Determine whether the current kernel version supports the use of kfunc.
+ */
+#define KERNEL_KFUNC 0

kernel/ko_src/kmesh/Makefile

@@ -13,12 +13,13 @@ kmesh-objs = kmesh_main.o defer_connect.o \
 	kmesh_parse_http_1_1.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

kernel/ko_src/kmesh/defer_connect.c

@@ -20,8 +20,9 @@
 
 #include "defer_connect.h"
 
+#define KMESH_MODULE_ULP_NAME "kmesh_defer"
+
 static struct proto *kmesh_defer_proto = NULL;
-#define KMESH_DELAY_ERROR -1000
 
 #define BPF_CGROUP_RUN_PROG_INET4_CONNECT_KMESH(sk, uaddr, t_ctx)                                                      \
     ({                                                                                                                 \
@@ -54,13 +55,17 @@ static int defer_connect(struct sock *sk, struct msghdr *msg, size_t size)
         ubase = iov->iov_base;
         kbuf_size = iov->iov_len;
     } else if (iter_is_iovec(&msg->msg_iter)) {
-        iov = msg->msg_iter.iov;
+#if KERNEL_VERISON6
+        iov = msg->msg_iter.__iov;
         ubase = iov->iov_base;
         kbuf_size = iov->iov_len;
-#if ITER_TYPE_IS_UBUF
     } else if (iter_is_ubuf(&msg->msg_iter)) {
         ubase = msg->msg_iter.ubuf;
         kbuf_size = msg->msg_iter.count;
+#else
+        iov = msg->msg_iter.iov;
+        ubase = iov->iov_base;
+        kbuf_size = iov->iov_len;
 #endif
     } else
         goto connect;

kmesh_compile_env_pre.sh

@@ -15,7 +15,7 @@ function dependency_pkg_install() {
 	if command -v apt >/dev/null; then
 		echo "Checking for required packages on a Debian-based system..."
 
-		packages=(git make clang libbpf-dev llvm linux-tools-generic protobuf-compiler libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler cmake pkg-config gcc-multilib)
+		packages=(git make clang libbpf-dev llvm linux-tools-generic protobuf-compiler libprotobuf-dev libprotobuf-c-dev protobuf-c-compiler cmake pkg-config gcc-multilib pahole linux-headers)
 
 		update_needed=false
 		for pkg in "${packages[@]}"; do
@@ -47,7 +47,7 @@ function dependency_pkg_install() {
 		echo "Checking for required packages on a Red Hat-based system..."
 
 		# List of required packages
-		packages=(git make clang llvm libboundscheck protobuf protobuf-c protobuf-c-devel bpftool libbpf libbpf-devel cmake pkg-config glibc-devel libstdc++-devel)
+		packages=(git make clang llvm libboundscheck protobuf protobuf-c protobuf-c-devel bpftool libbpf libbpf-devel cmake pkg-config glibc-devel libstdc++-devel dwarves)
 
 		# Install each missing package
 		for pkg in "${packages[@]}"; do
@@ -104,6 +104,32 @@ function kmesh_set_env() {
 	export EXTRA_CFLAGS="-O0 -g"
 }
 
+function set_config() {
+	sed -i -r -e "s/($1)([ \t]*)([0-9]+)/\1\2$2/" config/kmesh_marcos_def.h
+}
+
+detect_config() {
+	local kernel_version=$(uname -r)
+
+	if [ -f "/proc/config.gz" ]; then
+		zcat /proc/config.gz 2>/dev/null
+		return $?
+	fi
+
+	if [ -f "/boot/config-$kernel_version" ]; then
+		cat "/boot/config-$kernel_version" 2>/dev/null
+		return $?
+	fi
+}
+
+CONFIG_CONTENT=$(detect_config)
+
+check_config() {
+	local config_name=$1
+	value=$(echo "$CONFIG_CONTENT" | grep -w "$config_name" | cut -d= -f2)
+	echo "$value"
+}
+
 function set_enhanced_kernel_env() {
 	# we use /usr/include/linux/bpf.h to determine the runtime environment’s
 	# support for kmesh. Considering the case of online image compilation, a
@@ -118,8 +144,17 @@ function set_enhanced_kernel_env() {
 		export KERNEL_HEADER_LINUX_BPF=/usr/include/linux/bpf.h
 	fi
 
-	if grep -q "FN(parse_header_msg)" $KERNEL_HEADER_LINUX_BPF; then
-		export ENHANCED_KERNEL="enhanced"
+	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" ] &&
+		[ "$KERNEL_MAJOR" -ge 6 ]; then
+		export ENHANCED_KERNEL="normal"
 	else
 		export ENHANCED_KERNEL="normal"
 	fi

kmesh_macros_env.sh

@@ -1,11 +1,7 @@
 #!/bin/bash
 
-VERSION=$(uname -r | cut -d '.' -f 1)
-KERNEL_VERSION=$(uname -r | cut -d '-' -f 1)
-
-function set_config() {
-	sed -i -r -e "s/($1)([ \t]*)([0-9]+)/\1\2$2/" config/kmesh_marcos_def.h
-}
+source ./kmesh_compile_env_pre.sh
+KERNEL_VERSION=$(uname -r | cut -d '.' -f 1)
 
 # MDA_LOOPBACK_ADDR
 if grep -q "FN(get_netns_cookie)" $KERNEL_HEADER_LINUX_BPF; then
@@ -28,27 +24,6 @@ else
 	set_config MDA_GID_UID_FILTER 0
 fi
 
-# OE_23_03
-if (uname -r | grep oe2303); then
-	set_config OE_23_03 1
-else
-	set_config OE_23_03 0
-fi
-
-# ITER_TYPE_IS_UBUF
-if [ "$VERSION" -ge 6 ]; then
-	set_config ITER_TYPE_IS_UBUF 1
-else
-	set_config ITER_TYPE_IS_UBUF 0
-fi
-
-# ENHANCED_KERNEL
-if grep -q "FN(parse_header_msg)" $KERNEL_HEADER_LINUX_BPF; then
-	set_config ENHANCED_KERNEL 1
-else
-	set_config ENHANCED_KERNEL 0
-fi
-
 # Determine libbpf version
 if command -v apt >/dev/null; then
 	LIBBPF_VERSION=$(ls /usr/lib/x86_64-linux-gnu | grep -P 'libbpf\.so\.\d+\.\d+\.\d+$' | sed -n -e 's/^.*libbpf.so.\(.*\)$/\1/p')

kmesh_macros_env_kernel.sh

@@ -1,13 +1,9 @@
 #!/bin/bash
 
-VERSION=$(uname -r | cut -d '.' -f 1)
-KERNEL_VERSION=$(uname -r | cut -d '-' -f 1)
+source ./kmesh_compile_env_pre.sh
+KERNEL_VERSION=$(uname -r | cut -d '.' -f 1)
 KERNEL_HEADER_LINUX_BPF=/usr/include/linux/bpf.h
 
-function set_config() {
-	sed -i -r -e "s/($1)([ \t]*)([0-9]+)/\1\2$2/" config/kmesh_marcos_def.h
-}
-
 # MDA_LOOPBACK_ADDR
 if grep -q "FN(get_netns_cookie)" $KERNEL_HEADER_LINUX_BPF; then
 	set_config MDA_LOOPBACK_ADDR 1
@@ -29,24 +25,31 @@ else
 	set_config MDA_GID_UID_FILTER 0
 fi
 
-# ITER_TYPE_IS_UBUF
-if [ "$VERSION" -ge 6 ]; then
-	set_config ITER_TYPE_IS_UBUF 1
+# KERNEL_VERISON6
+if [ "$KERNEL_VERSION" -ge 6 ]; then
+	set_config KERNEL_VERISON6 1
 else
-	set_config ITER_TYPE_IS_UBUF 0
+	set_config KERNEL_VERISON6 0
 fi
 
 # ENHANCED_KERNEL
 if grep -q "FN(parse_header_msg)" $KERNEL_HEADER_LINUX_BPF; then
-	set_config ENHANCED_KERNEL 1
+	set_config ENHANCED_KERNEL 0
 else
 	set_config ENHANCED_KERNEL 0
 fi
 
+zcat /proc/config.gz | grep BTF
+cat "/boot/config-$(uname -r)" | grep BTF
 # KERNEL_KFUNC
-if [ "$VERSION" -ge 6 ]; then
-	set_config ENHANCED_KERNEL 1
-	set_config KERNEL_KFUNC 1
+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 0
+	set_config KERNEL_KFUNC 0
+	cp /sys/kernel/btf/vmlinux /lib/modules/$(uname -r)/build
 else
 	set_config KERNEL_KFUNC 0
 fi
+
+cat config/kmesh_marcos_def.h