Skip to content

Commit 98e20e5

Browse files
qdeslandesAlexei Starovoitov
authored andcommitted
bpfilter: remove bpfilter
bpfilter was supposed to convert iptables filtering rules into BPF programs on the fly, from the kernel, through a usermode helper. The base code for the UMH was introduced in 2018, and couple of attempts (2, 3) tried to introduce the BPF program generate features but were abandoned. bpfilter now sits in a kernel tree unused and unusable, occasionally causing confusion amongst Linux users (4, 5). As bpfilter is now developed in a dedicated repository on GitHub (6), it was suggested a couple of times this year (LSFMM/BPF 2023, LPC 2023) to remove the deprecated kernel part of the project. This is the purpose of this patch. [1]: https://lore.kernel.org/lkml/[email protected]/ [2]: https://lore.kernel.org/bpf/[email protected]/#t [3]: https://lore.kernel.org/lkml/[email protected]/ [4]: https://dxuuu.xyz/bpfilter.html [5]: linuxkit/linuxkit#3904 [6]: https://github.com/facebook/bpfilter Signed-off-by: Quentin Deslandes <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 9ddf872 commit 98e20e5

File tree

21 files changed

+0
-413
lines changed

21 files changed

+0
-413
lines changed

arch/loongarch/configs/loongson3_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ CONFIG_BRIDGE_EBT_T_NAT=m
276276
CONFIG_BRIDGE_EBT_ARP=m
277277
CONFIG_BRIDGE_EBT_IP=m
278278
CONFIG_BRIDGE_EBT_IP6=m
279-
CONFIG_BPFILTER=y
280279
CONFIG_IP_SCTP=m
281280
CONFIG_RDS=y
282281
CONFIG_L2TP=m

include/linux/bpfilter.h

Lines changed: 0 additions & 24 deletions
This file was deleted.

include/uapi/linux/bpfilter.h

Lines changed: 0 additions & 21 deletions
This file was deleted.

net/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,6 @@ source "net/bridge/netfilter/Kconfig"
233233

234234
endif
235235

236-
source "net/bpfilter/Kconfig"
237-
238236
source "net/dccp/Kconfig"
239237
source "net/sctp/Kconfig"
240238
source "net/rds/Kconfig"

net/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ obj-$(CONFIG_TLS) += tls/
1919
obj-$(CONFIG_XFRM) += xfrm/
2020
obj-$(CONFIG_UNIX_SCM) += unix/
2121
obj-y += ipv6/
22-
obj-$(CONFIG_BPFILTER) += bpfilter/
2322
obj-$(CONFIG_PACKET) += packet/
2423
obj-$(CONFIG_NET_KEY) += key/
2524
obj-$(CONFIG_BRIDGE) += bridge/

net/bpfilter/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

net/bpfilter/Kconfig

Lines changed: 0 additions & 23 deletions
This file was deleted.

net/bpfilter/Makefile

Lines changed: 0 additions & 20 deletions
This file was deleted.

net/bpfilter/bpfilter_kern.c

Lines changed: 0 additions & 136 deletions
This file was deleted.

net/bpfilter/bpfilter_umh_blob.S

Lines changed: 0 additions & 7 deletions
This file was deleted.

net/bpfilter/main.c

Lines changed: 0 additions & 64 deletions
This file was deleted.

net/bpfilter/msgfmt.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

net/ipv4/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ obj-y := route.o inetpeer.o protocol.o \
1616
inet_fragment.o ping.o ip_tunnel_core.o gre_offload.o \
1717
metrics.o netlink.o nexthop.o udp_tunnel_stub.o
1818

19-
obj-$(CONFIG_BPFILTER) += bpfilter/
20-
2119
obj-$(CONFIG_NET_IP_TUNNEL) += ip_tunnel.o
2220
obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o
2321
obj-$(CONFIG_PROC_FS) += proc.o

net/ipv4/bpfilter/Makefile

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)