Commit 4b54db13 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bpftool' 



Jakub Kicinski says:

====================
tools: add bpftool

This set adds bpftool to the tools/ directory.  The first
patch renames tools/net to tools/bpf, the second one adds
the new code, while the third adds simple documentation.

v4:
 - rename docs *.txt -> *.rst (Jesper).
v3:
 - address Alexei's comments about output and docs.
v2:
 - report names, map ids, load time, uid;
 - add docs/man pages;
 - general cleanups & fixes.
====================

Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c331501c ff69c21a

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -2725,7 +2725,7 @@ F: net/core/filter.c 
F:	net/sched/act_bpf.c

F:	net/sched/cls_bpf.c

F:	samples/bpf/

F:	tools/net/bpf*

F:	tools/bpf/

F:	tools/testing/selftests/bpf/



BROADCOM B44 10/100 ETHERNET DRIVER
@@ -9416,7 +9416,6 @@ F: include/uapi/linux/in.h 
F:	include/uapi/linux/net.h

F:	include/uapi/linux/netdevice.h

F:	include/uapi/linux/net_namespace.h

F:	tools/net/

F:	tools/testing/selftests/net/

F:	lib/random32.c

tools/Makefile

+7 −7
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ help: 
	@echo '  kvm_stat               - top-like utility for displaying kvm statistics'

	@echo '  leds                   - LEDs  tools'

	@echo '  liblockdep             - user-space wrapper for kernel locking-validator'

	@echo '  net                    - misc networking tools'

	@echo '  bpf                    - misc BPF tools'

	@echo '  perf                   - Linux performance measurement and analysis tool'

	@echo '  selftests              - various kernel selftests'

	@echo '  spi                    - spi tools'
@@ -57,7 +57,7 @@ acpi: FORCE 
cpupower: FORCE

	$(call descend,power/$@)



cgroup firewire hv guest spi usb virtio vm net iio gpio objtool leds: FORCE

cgroup firewire hv guest spi usb virtio vm bpf iio gpio objtool leds: FORCE

	$(call descend,$@)



liblockdep: FORCE
@@ -91,7 +91,7 @@ kvm_stat: FORCE 


all: acpi cgroup cpupower gpio hv firewire liblockdep \

		perf selftests spi turbostat usb \

		virtio vm net x86_energy_perf_policy \

		virtio vm bpf x86_energy_perf_policy \

		tmon freefall iio objtool kvm_stat



acpi_install:
@@ -100,7 +100,7 @@ acpi_install: 
cpupower_install:

	$(call descend,power/$(@:_install=),install)



cgroup_install firewire_install gpio_install hv_install iio_install perf_install spi_install usb_install virtio_install vm_install net_install objtool_install:

cgroup_install firewire_install gpio_install hv_install iio_install perf_install spi_install usb_install virtio_install vm_install bpf_install objtool_install:

	$(call descend,$(@:_install=),install)



liblockdep_install:
@@ -124,7 +124,7 @@ kvm_stat_install: 
install: acpi_install cgroup_install cpupower_install gpio_install \

		hv_install firewire_install iio_install liblockdep_install \

		perf_install selftests_install turbostat_install usb_install \

		virtio_install vm_install net_install x86_energy_perf_policy_install \

		virtio_install vm_install bpf_install x86_energy_perf_policy_install \

		tmon_install freefall_install objtool_install kvm_stat_install



acpi_clean:
@@ -133,7 +133,7 @@ acpi_clean: 
cpupower_clean:

	$(call descend,power/cpupower,clean)



cgroup_clean hv_clean firewire_clean spi_clean usb_clean virtio_clean vm_clean net_clean iio_clean gpio_clean objtool_clean leds_clean:

cgroup_clean hv_clean firewire_clean spi_clean usb_clean virtio_clean vm_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean:

	$(call descend,$(@:_clean=),clean)



liblockdep_clean:
@@ -169,7 +169,7 @@ build_clean: 


clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean \

		perf_clean selftests_clean turbostat_clean spi_clean usb_clean virtio_clean \

		vm_clean net_clean iio_clean x86_energy_perf_policy_clean tmon_clean \

		vm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \

		freefall_clean build_clean libbpf_clean libsubcmd_clean liblockdep_clean \

		gpio_clean objtool_clean leds_clean

tools/net/Makefile→tools/bpf/Makefile

+15 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ prefix = /usr 
CC = gcc

LEX = flex

YACC = bison

MAKE = make



CFLAGS += -Wall -O2

CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include
@@ -13,7 +14,7 @@ CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include 
%.lex.c: %.l

	$(LEX) -o $@ $<



all : bpf_jit_disasm bpf_dbg bpf_asm

all: bpf_jit_disasm bpf_dbg bpf_asm bpftool



bpf_jit_disasm : CFLAGS += -DPACKAGE='bpf_jit_disasm'

bpf_jit_disasm : LDLIBS = -lopcodes -lbfd -ldl
@@ -26,10 +27,21 @@ bpf_asm : LDLIBS = 
bpf_asm : bpf_asm.o bpf_exp.yacc.o bpf_exp.lex.o

bpf_exp.lex.o : bpf_exp.yacc.c



clean :

clean: bpftool_clean

	rm -rf *.o bpf_jit_disasm bpf_dbg bpf_asm bpf_exp.yacc.* bpf_exp.lex.*



install :

install: bpftool_install

	install bpf_jit_disasm $(prefix)/bin/bpf_jit_disasm

	install bpf_dbg $(prefix)/bin/bpf_dbg

	install bpf_asm $(prefix)/bin/bpf_asm



bpftool:

	$(MAKE) -C bpftool



bpftool_install:

	$(MAKE) -C bpftool install



bpftool_clean:

	$(MAKE) -C bpftool clean



.PHONY: bpftool FORCE

tools/net/bpf_asm.c→tools/bpf/bpf_asm.c

+0 −0

File moved.

View file

tools/net/bpf_dbg.c→tools/bpf/bpf_dbg.c

+0 −0

File moved.

View file

CRA Git | Maintained and supported by SUSTech CRA and CCSE