tcp_estats: ebpf hacks
Subsystems (5)
PATCH RESEND 1/1 tcp_estats: ebpf hacks
Signed-off-by Martin KaFai Lau <[email protected]>
--- kernel/trace/bpf_trace.c | 20 ++ samples/Makefile | 2 +- samples/bpf/Makefile | 11 +- samples/bpf/bpf_helpers.h | 4 + samples/bpf/bpf_load.c | 44 +++-- samples/bpf/tcp_trace.h | 51 +++++ samples/bpf/tcp_trace_kern.c | 454 +++++++++++++++++++++++++++++++++++++++++++ samples/bpf/tcp_trace_user.c | 115 +++++++++++ tools/net/Makefile | 6 +- 9 files changed, 689 insertions(+), 18 deletions(-) create mode 100644 samples/bpf/tcp_trace.h create mode 100644 samples/bpf/tcp_trace_kern.c create mode 100644 samples/bpf/tcp_trace_user.c
kernel/trace/bpf_trace.c +20 -0
@@ -68,6 +68,7 @@ static u64 bpf_probe_read(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)void *unsafe_ptr = (void *) (long ) r3;return probe_kernel_read (dst, unsafe_ptr, size); +/* return __bpf_probe_read_hack(dst, unsafe_ptr, size); */ }static const struct bpf_func_proto bpf_probe_read_proto = {
@@ -79,6 +80,25 @@ static const struct bpf_func_proto bpf_probe_read_proto = { .arg3_type = ARG_ANYTHING, }; +static u64 bpf_probe_read_u32 (u64 r1,u64 r2,u64 r3,u64 r4,u64 r5) +{ +u32 *dst = (u32 *) (long ) r1; +int size = (int ) r2; +u32 *unsafe_ptr = (void *) (long ) r3; + + *dst = *unsafe_ptr; +return probe_kernel_read (dst, unsafe_ptr, size); +} + +static const struct bpf_func_proto bpf_probe_read_u32_proto = { + .func = bpf_probe_read, + .gpl_only = true, + .ret_type =RET_VOID , + .arg1_type =ARG_PTR_TO_STACK , + .arg2_type =ARG_CONST_STACK_SIZE , + .arg3_type =ARG_ANYTHING , +}; +/* * limited trace_printk() * only %d %u %x %ld %lu %lx %lld %llu %llx %p %s conversion specifiers allowed
samples/Makefile +1 -1
@@ -1,4 +1,4 @@ # Makefile for Linux samples code obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \ - hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ + hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ bpf/
samples/bpf/Makefile +8 -3
@@ -14,6 +14,7 @@ hostprogs-y += tracex4 hostprogs-y += tracex5 hostprogs-y += trace_output hostprogs-y += lathist +hostprogs-y += tcp_trace test_verifier-objs := test_verifier.o libbpf.o test_maps-objs := test_maps.o libbpf.o
@@ -28,6 +29,7 @@ tracex4-objs := bpf_load.o libbpf.o tracex4_user.o tracex5-objs := bpf_load.o libbpf.o tracex5_user.o trace_output-objs := bpf_load.o libbpf.o trace_output_user.o lathist-objs := bpf_load.o libbpf.o lathist_user.o +tcp_trace-objs := bpf_load.o libbpf.o tcp_trace_user.o # Tell kbuild to always build the programs always := $(hostprogs-y)
@@ -42,6 +44,7 @@ always += tracex5_kern.o always += trace_output_kern.o always += tcbpf1_kern.o always += lathist_kern.o +always += tcp_trace_kern.o HOSTCFLAGS += -I$(objtree)/usr/include
@@ -56,14 +59,16 @@ HOSTLOADLIBES_tracex4 += -lelf -lrt HOSTLOADLIBES_tracex5 += -lelf HOSTLOADLIBES_trace_output += -lelf -lrt HOSTLOADLIBES_lathist += -lelf +HOSTLOADLIBES_tcp_trace += -lelf # point this to your LLVM backend with bpf support -LLC=$(srctree)/tools/bpf/llvm/bld/Debug+Asserts/bin/llc +LLC=/home/kafai/local/llvm-git-master/bin/llc +CLANG=/home/kafai/local/llvm-git-master/bin/clang $(obj)/%.o: $(src)/%.c - clang $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \ + $(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \ -D__KERNEL__ -Wno-unused-value -Wno-pointer-sign \ -O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=obj -o $@ - clang $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \ + $(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \ -D__KERNEL__ -Wno-unused-value -Wno-pointer-sign \ -O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=asm -o [email protected]
samples/bpf/bpf_helpers.h +4 -0
@@ -33,6 +33,10 @@ static int (*bpf_get_current_comm)(void *buf, int buf_size) = (void *) BPF_FUNC_get_current_comm;static int (*bpf_perf_event_output)(void *ctx,void *map,int index,void *data,int size) = (void *) BPF_FUNC_perf_event_output; +static unsigned long long (*bpf_get_prandom_u32)(void ) = + (void *) BPF_FUNC_get_prandom_u32; +static unsigned long long (*bpf_probe_read_u32)(void *dst,int size,void *unsafe_ptr) = + (void *) BPF_FUNC_probe_read_u32;/* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions
samples/bpf/bpf_load.c +33 -11
124 lines not on this page · raw message
samples/bpf/tcp_trace.h new file +51 -0
51 lines not on this page · raw message
samples/bpf/tcp_trace_kern.c new file +454 -0
454 lines not on this page · raw message
samples/bpf/tcp_trace_user.c new file +115 -0
115 lines not on this page · raw message
tools/net/Makefile +3 -3
@@ -12,15 +12,15 @@ YACC = bison all : bpf_jit_disasm bpf_dbg bpf_asm -bpf_jit_disasm : CFLAGS = -Wall -O2 -DPACKAGE='bpf_jit_disasm' +bpf_jit_disasm : CFLAGS = -Wall -O2 -DPACKAGE='bpf_jit_disasm' -I '../../include/uapi' -I '../../include' bpf_jit_disasm : LDLIBS = -lopcodes -lbfd -ldl bpf_jit_disasm : bpf_jit_disasm.o -bpf_dbg : CFLAGS = -Wall -O2 +bpf_dbg : CFLAGS = -Wall -O2 -I '../../include/uapi' -I '../../include' bpf_dbg : LDLIBS = -lreadline bpf_dbg : bpf_dbg.o -bpf_asm : CFLAGS = -Wall -O2 -I. +bpf_asm : CFLAGS = -Wall -O2 -I. -I '../../include/uapi' -I '../../include' bpf_asm : LDLIBS = bpf_asm : bpf_asm.o bpf_exp.yacc.o bpf_exp.lex.o bpf_exp.lex.o : bpf_exp.yacc.c
Signature · 1 line
2.5.1
Please ignore. It is a mistake...
________________________________________
From: Martin KaFai Lau [[email protected]]
Sent: Wednesday, February 03, 2016 9:39 PM
To: [email protected]
Cc: Ingo Molnar; Masami Hiramatsu; Steven Rostedt; Alexei Starovoitov; Josef Bacik; Kernel Team
Subject: [PATCH RESEND] tcp_estats: ebpf hacks
Signed-off-by Martin KaFai Lau <[email protected]>
--- kernel/trace/bpf_trace.c | 20 ++ samples/Makefile | 2 +- samples/bpf/Makefile | 11 +- samples/bpf/bpf_helpers.h | 4 + samples/bpf/bpf_load.c | 44 +++-- samples/bpf/tcp_trace.h | 51 +++++ samples/bpf/tcp_trace_kern.c | 454 +++++++++++++++++++++++++++++++++++++++++++ samples/bpf/tcp_trace_user.c | 115 +++++++++++ tools/net/Makefile | 6 +- 9 files changed, 689 insertions(+), 18 deletions(-) create mode 100644 samples/bpf/tcp_trace.h create mode 100644 samples/bpf/tcp_trace_kern.c create mode 100644 samples/bpf/tcp_trace_user.c
kernel/trace/bpf_trace.c +20 -0
@@ -68,6 +68,7 @@ static u64 bpf_probe_read(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5)void *unsafe_ptr = (void *) (long ) r3;return probe_kernel_read (dst, unsafe_ptr, size); +/* return __bpf_probe_read_hack(dst, unsafe_ptr, size); */ }static const struct bpf_func_proto bpf_probe_read_proto = {
@@ -79,6 +80,25 @@ static const struct bpf_func_proto bpf_probe_read_proto = { .arg3_type = ARG_ANYTHING, }; +static u64 bpf_probe_read_u32 (u64 r1,u64 r2,u64 r3,u64 r4,u64 r5) +{ +u32 *dst = (u32 *) (long ) r1; +int size = (int ) r2; +u32 *unsafe_ptr = (void *) (long ) r3; + + *dst = *unsafe_ptr; +return probe_kernel_read (dst, unsafe_ptr, size); +} + +static const struct bpf_func_proto bpf_probe_read_u32_proto = { + .func = bpf_probe_read, + .gpl_only = true, + .ret_type =RET_VOID , + .arg1_type =ARG_PTR_TO_STACK , + .arg2_type =ARG_CONST_STACK_SIZE , + .arg3_type =ARG_ANYTHING , +}; +/* * limited trace_printk() * only %d %u %x %ld %lu %lx %lld %llu %llx %p %s conversion specifiers allowed
samples/Makefile +1 -1
@@ -1,4 +1,4 @@ # Makefile for Linux samples code obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \ - hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ + hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ bpf/
samples/bpf/Makefile +8 -3
@@ -14,6 +14,7 @@ hostprogs-y += tracex4 hostprogs-y += tracex5 hostprogs-y += trace_output hostprogs-y += lathist +hostprogs-y += tcp_trace test_verifier-objs := test_verifier.o libbpf.o test_maps-objs := test_maps.o libbpf.o
@@ -28,6 +29,7 @@ tracex4-objs := bpf_load.o libbpf.o tracex4_user.o tracex5-objs := bpf_load.o libbpf.o tracex5_user.o trace_output-objs := bpf_load.o libbpf.o trace_output_user.o lathist-objs := bpf_load.o libbpf.o lathist_user.o +tcp_trace-objs := bpf_load.o libbpf.o tcp_trace_user.o # Tell kbuild to always build the programs always := $(hostprogs-y)
@@ -42,6 +44,7 @@ always += tracex5_kern.o always += trace_output_kern.o always += tcbpf1_kern.o always += lathist_kern.o +always += tcp_trace_kern.o HOSTCFLAGS += -I$(objtree)/usr/include
@@ -56,14 +59,16 @@ HOSTLOADLIBES_tracex4 += -lelf -lrt HOSTLOADLIBES_tracex5 += -lelf HOSTLOADLIBES_trace_output += -lelf -lrt HOSTLOADLIBES_lathist += -lelf +HOSTLOADLIBES_tcp_trace += -lelf # point this to your LLVM backend with bpf support -LLC=$(srctree)/tools/bpf/llvm/bld/Debug+Asserts/bin/llc +LLC=/home/kafai/local/llvm-git-master/bin/llc +CLANG=/home/kafai/local/llvm-git-master/bin/clang $(obj)/%.o: $(src)/%.c - clang $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \ + $(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \ -D__KERNEL__ -Wno-unused-value -Wno-pointer-sign \ -O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=obj -o $@ - clang $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \ + $(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \ -D__KERNEL__ -Wno-unused-value -Wno-pointer-sign \ -O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=asm -o [email protected]
samples/bpf/bpf_helpers.h +4 -0
@@ -33,6 +33,10 @@ static int (*bpf_get_current_comm)(void *buf, int buf_size) = (void *) BPF_FUNC_get_current_comm;static int (*bpf_perf_event_output)(void *ctx,void *map,int index,void *data,int size) = (void *) BPF_FUNC_perf_event_output; +static unsigned long long (*bpf_get_prandom_u32)(void ) = + (void *) BPF_FUNC_get_prandom_u32; +static unsigned long long (*bpf_probe_read_u32)(void *dst,int size,void *unsafe_ptr) = + (void *) BPF_FUNC_probe_read_u32;/* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions
samples/bpf/bpf_load.c +33 -11
124 lines not on this page · raw message
samples/bpf/tcp_trace.h new file +51 -0
51 lines not on this page · raw message
samples/bpf/tcp_trace_kern.c new file +454 -0
454 lines not on this page · raw message
samples/bpf/tcp_trace_user.c new file +115 -0
115 lines not on this page · raw message
tools/net/Makefile +3 -3
@@ -12,15 +12,15 @@ YACC = bison all : bpf_jit_disasm bpf_dbg bpf_asm -bpf_jit_disasm : CFLAGS = -Wall -O2 -DPACKAGE='bpf_jit_disasm' +bpf_jit_disasm : CFLAGS = -Wall -O2 -DPACKAGE='bpf_jit_disasm' -I '../../include/uapi' -I '../../include' bpf_jit_disasm : LDLIBS = -lopcodes -lbfd -ldl bpf_jit_disasm : bpf_jit_disasm.o -bpf_dbg : CFLAGS = -Wall -O2 +bpf_dbg : CFLAGS = -Wall -O2 -I '../../include/uapi' -I '../../include' bpf_dbg : LDLIBS = -lreadline bpf_dbg : bpf_dbg.o -bpf_asm : CFLAGS = -Wall -O2 -I. +bpf_asm : CFLAGS = -Wall -O2 -I. -I '../../include/uapi' -I '../../include' bpf_asm : LDLIBS = bpf_asm : bpf_asm.o bpf_exp.yacc.o bpf_exp.lex.o bpf_exp.lex.o : bpf_exp.yacc.c
--
2.5.1