Browse Source

tools: rename tools/net directory to tools/bpf

We currently only have BPF tools in the tools/net directory.
We are about to add more BPF tools there, not necessarily
networking related, rename the directory and related Makefile
targets to bpf.

Suggested-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jakub Kicinski 7 years ago
parent
commit
a92bb546cf
8 changed files with 8 additions and 9 deletions
  1. 1 2
      MAINTAINERS
  2. 7 7
      tools/Makefile
  3. 0 0
      tools/bpf/Makefile
  4. 0 0
      tools/bpf/bpf_asm.c
  5. 0 0
      tools/bpf/bpf_dbg.c
  6. 0 0
      tools/bpf/bpf_exp.l
  7. 0 0
      tools/bpf/bpf_exp.y
  8. 0 0
      tools/bpf/bpf_jit_disasm.c

+ 1 - 2
MAINTAINERS

@@ -2725,7 +2725,7 @@ F:	net/core/filter.c
 F:	net/sched/act_bpf.c
 F:	net/sched/act_bpf.c
 F:	net/sched/cls_bpf.c
 F:	net/sched/cls_bpf.c
 F:	samples/bpf/
 F:	samples/bpf/
-F:	tools/net/bpf*
+F:	tools/bpf/
 F:	tools/testing/selftests/bpf/
 F:	tools/testing/selftests/bpf/
 
 
 BROADCOM B44 10/100 ETHERNET DRIVER
 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/net.h
 F:	include/uapi/linux/netdevice.h
 F:	include/uapi/linux/netdevice.h
 F:	include/uapi/linux/net_namespace.h
 F:	include/uapi/linux/net_namespace.h
-F:	tools/net/
 F:	tools/testing/selftests/net/
 F:	tools/testing/selftests/net/
 F:	lib/random32.c
 F:	lib/random32.c
 
 

+ 7 - 7
tools/Makefile

@@ -19,7 +19,7 @@ help:
 	@echo '  kvm_stat               - top-like utility for displaying kvm statistics'
 	@echo '  kvm_stat               - top-like utility for displaying kvm statistics'
 	@echo '  leds                   - LEDs  tools'
 	@echo '  leds                   - LEDs  tools'
 	@echo '  liblockdep             - user-space wrapper for kernel locking-validator'
 	@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 '  perf                   - Linux performance measurement and analysis tool'
 	@echo '  selftests              - various kernel selftests'
 	@echo '  selftests              - various kernel selftests'
 	@echo '  spi                    - spi tools'
 	@echo '  spi                    - spi tools'
@@ -57,7 +57,7 @@ acpi: FORCE
 cpupower: FORCE
 cpupower: FORCE
 	$(call descend,power/$@)
 	$(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,$@)
 	$(call descend,$@)
 
 
 liblockdep: FORCE
 liblockdep: FORCE
@@ -91,7 +91,7 @@ kvm_stat: FORCE
 
 
 all: acpi cgroup cpupower gpio hv firewire liblockdep \
 all: acpi cgroup cpupower gpio hv firewire liblockdep \
 		perf selftests spi turbostat usb \
 		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
 		tmon freefall iio objtool kvm_stat
 
 
 acpi_install:
 acpi_install:
@@ -100,7 +100,7 @@ acpi_install:
 cpupower_install:
 cpupower_install:
 	$(call descend,power/$(@:_install=),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)
 	$(call descend,$(@:_install=),install)
 
 
 liblockdep_install:
 liblockdep_install:
@@ -124,7 +124,7 @@ kvm_stat_install:
 install: acpi_install cgroup_install cpupower_install gpio_install \
 install: acpi_install cgroup_install cpupower_install gpio_install \
 		hv_install firewire_install iio_install liblockdep_install \
 		hv_install firewire_install iio_install liblockdep_install \
 		perf_install selftests_install turbostat_install usb_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
 		tmon_install freefall_install objtool_install kvm_stat_install
 
 
 acpi_clean:
 acpi_clean:
@@ -133,7 +133,7 @@ acpi_clean:
 cpupower_clean:
 cpupower_clean:
 	$(call descend,power/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)
 	$(call descend,$(@:_clean=),clean)
 
 
 liblockdep_clean:
 liblockdep_clean:
@@ -169,7 +169,7 @@ build_clean:
 
 
 clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean \
 clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean \
 		perf_clean selftests_clean turbostat_clean spi_clean usb_clean virtio_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 \
 		freefall_clean build_clean libbpf_clean libsubcmd_clean liblockdep_clean \
 		gpio_clean objtool_clean leds_clean
 		gpio_clean objtool_clean leds_clean
 
 

+ 0 - 0
tools/net/Makefile → tools/bpf/Makefile


+ 0 - 0
tools/net/bpf_asm.c → tools/bpf/bpf_asm.c


+ 0 - 0
tools/net/bpf_dbg.c → tools/bpf/bpf_dbg.c


+ 0 - 0
tools/net/bpf_exp.l → tools/bpf/bpf_exp.l


+ 0 - 0
tools/net/bpf_exp.y → tools/bpf/bpf_exp.y


+ 0 - 0
tools/net/bpf_jit_disasm.c → tools/bpf/bpf_jit_disasm.c