Commit c87f60a7 authored by Michal Rostecki's avatar Michal Rostecki Committed by Alexei Starovoitov
Browse files

samples: bpf: Do not define bpf_printk macro 



The bpf_printk macro was moved to bpf_helpers.h which is included in all
example programs.

Signed-off-by: default avatarMichal Rostecki <mrostecki@opensuse.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 37739d1b

samples/bpf/hbm_kern.h

+2 −9
Original line number Original line Diff line number Diff line
@@ -30,15 +30,8 @@ 
#define ALLOW_PKT	1

#define ALLOW_PKT	1

#define TCP_ECN_OK	1

#define TCP_ECN_OK	1





#define HBM_DEBUG 0  // Set to 1 to enable debugging

#ifndef HBM_DEBUG  // Define HBM_DEBUG to enable debugging

#if HBM_DEBUG

#undef bpf_printk

#define bpf_printk(fmt, ...)					\

({								\

	char ____fmt[] = fmt;					\

	bpf_trace_printk(____fmt, sizeof(____fmt),		\

			 ##__VA_ARGS__);			\

})

#else

#define bpf_printk(fmt, ...)

#define bpf_printk(fmt, ...)

#endif

#endif

samples/bpf/tcp_basertt_kern.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -21,13 +21,6 @@ 




#define DEBUG 1

#define DEBUG 1





#define bpf_printk(fmt, ...)					\

({								\

	       char ____fmt[] = fmt;				\

	       bpf_trace_printk(____fmt, sizeof(____fmt),	\

				##__VA_ARGS__);			\

})



SEC("sockops")

SEC("sockops")

int bpf_basertt(struct bpf_sock_ops *skops)

int bpf_basertt(struct bpf_sock_ops *skops)

{

{

samples/bpf/tcp_bufs_kern.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -22,13 +22,6 @@ 




#define DEBUG 1

#define DEBUG 1





#define bpf_printk(fmt, ...)					\

({								\

	       char ____fmt[] = fmt;				\

	       bpf_trace_printk(____fmt, sizeof(____fmt),	\

				##__VA_ARGS__);			\

})



SEC("sockops")

SEC("sockops")

int bpf_bufs(struct bpf_sock_ops *skops)

int bpf_bufs(struct bpf_sock_ops *skops)

{

{

samples/bpf/tcp_clamp_kern.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -22,13 +22,6 @@ 




#define DEBUG 1

#define DEBUG 1





#define bpf_printk(fmt, ...)					\

({								\

	       char ____fmt[] = fmt;				\

	       bpf_trace_printk(____fmt, sizeof(____fmt),	\

				##__VA_ARGS__);			\

})



SEC("sockops")

SEC("sockops")

int bpf_clamp(struct bpf_sock_ops *skops)

int bpf_clamp(struct bpf_sock_ops *skops)

{

{

samples/bpf/tcp_cong_kern.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -21,13 +21,6 @@ 




#define DEBUG 1

#define DEBUG 1





#define bpf_printk(fmt, ...)					\

({								\

	       char ____fmt[] = fmt;				\

	       bpf_trace_printk(____fmt, sizeof(____fmt),	\

				##__VA_ARGS__);			\

})



SEC("sockops")

SEC("sockops")

int bpf_cong(struct bpf_sock_ops *skops)

int bpf_cong(struct bpf_sock_ops *skops)

{

{