From eb8b0487a05d650499b20fdd5edeb6e47c2c17a5 Mon Sep 17 00:00:00 2001 From: William Findlay Date: Wed, 17 Jun 2020 18:59:43 -0400 Subject: [PATCH 2/2] Delete existing kbuild_modname definitions Upstream-Status: Backported [https://github.com/iovisor/bcc/pull/2974/commits/a5bdc9c65746389d7072e1e8e583025dde78e91b] Adjust context Signed-off-by: He Zhe --- examples/networking/xdp/xdp_drop_count.py | 1 - examples/networking/xdp/xdp_macswap_count.py | 1 - examples/networking/xdp/xdp_redirect_cpu.py | 1 - examples/networking/xdp/xdp_redirect_map.py | 1 - tests/python/test_clang.py | 8 -------- tools/tcplife.lua | 1 - tools/tcplife.py | 1 - tools/tcpstates.py | 1 - 8 files changed, 15 deletions(-) diff --git a/examples/networking/xdp/xdp_drop_count.py b/examples/networking/xdp/xdp_drop_count.py index f03273e9..512e0a20 100755 --- a/examples/networking/xdp/xdp_drop_count.py +++ b/examples/networking/xdp/xdp_drop_count.py @@ -52,7 +52,6 @@ else: # load BPF program b = BPF(text = """ -#define KBUILD_MODNAME "foo" #include #include #include diff --git a/examples/networking/xdp/xdp_macswap_count.py b/examples/networking/xdp/xdp_macswap_count.py index 0e2b21ca..770ce8ca 100755 --- a/examples/networking/xdp/xdp_macswap_count.py +++ b/examples/networking/xdp/xdp_macswap_count.py @@ -50,7 +50,6 @@ else: # load BPF program b = BPF(text = """ -#define KBUILD_MODNAME "foo" #include #include #include diff --git a/examples/networking/xdp/xdp_redirect_cpu.py b/examples/networking/xdp/xdp_redirect_cpu.py index 15b0d09b..470079f4 100755 --- a/examples/networking/xdp/xdp_redirect_cpu.py +++ b/examples/networking/xdp/xdp_redirect_cpu.py @@ -30,7 +30,6 @@ if (cpu_id > max_cpu): # load BPF program b = BPF(text = """ -#define KBUILD_MODNAME "foo" #include #include #include diff --git a/examples/networking/xdp/xdp_redirect_map.py b/examples/networking/xdp/xdp_redirect_map.py index 4a622723..4936ac1e 100755 --- a/examples/networking/xdp/xdp_redirect_map.py +++ b/examples/networking/xdp/xdp_redirect_map.py @@ -29,7 +29,6 @@ out_idx = ip.link_lookup(ifname=out_if)[0] # load BPF program b = BPF(text = """ -#define KBUILD_MODNAME "foo" #include #include #include diff --git a/tests/python/test_clang.py b/tests/python/test_clang.py index 886eebed..648494cf 100755 --- a/tests/python/test_clang.py +++ b/tests/python/test_clang.py @@ -78,7 +78,6 @@ int count_foo(struct pt_regs *ctx, unsigned long a, unsigned long b) { def test_probe_read3(self): text = """ -#define KBUILD_MODNAME "foo" #include #define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;}) int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) { @@ -90,7 +89,6 @@ int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) { def test_probe_read4(self): text = """ -#define KBUILD_MODNAME "foo" #include #define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;}) int test(struct pt_regs *ctx, struct sk_buff *skb) { @@ -102,7 +100,6 @@ int test(struct pt_regs *ctx, struct sk_buff *skb) { def test_probe_read_whitelist1(self): text = """ -#define KBUILD_MODNAME "foo" #include int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) { // The below define is in net/tcp.h: @@ -120,7 +117,6 @@ int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) { def test_probe_read_whitelist2(self): text = """ -#define KBUILD_MODNAME "foo" #include int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) { // The below define is in net/tcp.h: @@ -1072,7 +1068,6 @@ int test(struct __sk_buff *ctx) { def test_probe_read_return(self): text = """ -#define KBUILD_MODNAME "foo" #include #include static inline unsigned char *my_skb_transport_header(struct sk_buff *skb) { @@ -1088,7 +1083,6 @@ int test(struct pt_regs *ctx, struct sock *sk, struct sk_buff *skb) { def test_probe_read_multiple_return(self): text = """ -#define KBUILD_MODNAME "foo" #include #include static inline u64 error_function() { @@ -1109,7 +1103,6 @@ int test(struct pt_regs *ctx, struct sock *sk, struct sk_buff *skb) { def test_probe_read_return_expr(self): text = """ -#define KBUILD_MODNAME "foo" #include #include static inline unsigned char *my_skb_transport_header(struct sk_buff *skb) { @@ -1125,7 +1118,6 @@ int test(struct pt_regs *ctx, struct sock *sk, struct sk_buff *skb) { def test_probe_read_return_call(self): text = """ -#define KBUILD_MODNAME "foo" #include #include static inline struct tcphdr *my_skb_transport_header(struct sk_buff *skb) { diff --git a/tools/tcplife.lua b/tools/tcplife.lua index 3f4f6afd..5e311631 100755 --- a/tools/tcplife.lua +++ b/tools/tcplife.lua @@ -25,7 +25,6 @@ uint16_t ntohs(uint16_t netshort); local program = [[ #include -#define KBUILD_MODNAME "foo" #include #include #include diff --git a/tools/tcplife.py b/tools/tcplife.py index d4e679dd..c2bd8236 100755 --- a/tools/tcplife.py +++ b/tools/tcplife.py @@ -66,7 +66,6 @@ debug = 0 # define BPF program bpf_text = """ #include -#define KBUILD_MODNAME "foo" #include #include #include diff --git a/tools/tcpstates.py b/tools/tcpstates.py index b9a64387..09bbe0ce 100755 --- a/tools/tcpstates.py +++ b/tools/tcpstates.py @@ -61,7 +61,6 @@ debug = 0 # define BPF program bpf_text = """ #include -#define KBUILD_MODNAME "foo" #include #include #include -- 2.26.2