Merge pull request #43 from OpenCloudOS/dev

nettrace: support to compile without CONFIG_NF_TABLES

Author: menglongdong

src/progs/kprobe.c

@@ -357,10 +357,12 @@ on_hooks:;
 	return 0;
 }
 
+#ifndef NT_DISABLE_NFT
 #undef NFT_COMPAT
 #include "nft_do_chain.c"
 
 #define NFT_COMPAT
 #include "nft_do_chain.c"
+#endif
 
 char _license[] SEC("license") = "GPL";

src/trace_probe.c

@@ -27,7 +27,7 @@ static void probe_trace_attach_manual(char *prog_name, char *func,
 
 	prog = probe_program(skel->obj, prog_name);
 	if (!prog) {
-		pr_err("failed to find prog %s\n", prog_name);
+		pr_warn("failed to find prog %s\n", prog_name);
 		return;
 	}
 
@@ -95,7 +95,7 @@ static int probe_trace_pre_load()
 
 		prog = probe_program(skel->obj, trace->prog);
 		if (!prog) {
-			pr_err("prog: %s not founded\n", trace->prog);
+			pr_warn("prog: %s not founded\n", trace->prog);
 			continue;
 		}
 		bpf_program__set_autoload(prog, false);
@@ -109,7 +109,7 @@ static int probe_trace_pre_load()
 		sprintf(kret_name, "ret%s", trace->prog);
 		prog = probe_program(skel->obj, kret_name);
 		if (!prog) {
-			pr_err("prog: %s not founded\n", kret_name);
+			pr_warn("prog: %s not founded\n", kret_name);
 			continue;
 		}
 		bpf_program__set_autoload(prog, false);

src/vmlinux_header.h

@@ -1,10 +1,19 @@
 // SPDX-License-Identifier: MulanPSL-2.0
 
-#include <linux/skbuff.h>
-#include <net/netfilter/nf_tables.h>
+#include <uapi/linux/in.h>
 #include <uapi/linux/ip.h>
 #include <uapi/linux/ipv6.h>
 #include <uapi/linux/tcp.h>
 #include <uapi/linux/udp.h>
 #include <uapi/linux/icmp.h>
 #include <uapi/linux/bpf.h>
+
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+#include <linux/netfilter/x_tables.h>
+
+#if defined(CONFIG_NF_TABLES) || defined(CONFIG_NF_TABLES_MODULE)
+#include <net/netfilter/nf_tables.h>
+#else
+#define NT_DISABLE_NFT
+#endif