Commit 3f189349 authored by Florian Westphal's avatar Florian Westphal Committed by Jakub Kicinski
Browse files

selftests: netfilter: move to net subdir 



.. so this can start re-using existing lib.sh infra in next patches.

Several of these scripts will not work, e.g. because they assume
rp_filter is disabled, or reliance on a particular version/flavor
of "netcat" tool.

Add config settings for them.

nft_trans_stress.sh script is removed, it also exists in the nftables
userspace selftests.  I do not see a reason to keep two versions in
different repositories/projects.

The settings file is removed for now:

It was used to increase the timeout to avoid slow scripts from getting
zapped by the 45s timeout, but some of the slow scripts can be sped up.
Re-add it later for scripts that cannot be sped up easily.

Update MAINTAINERS to reflect that future updates to netfilter
scripts should go through netfilter-devel@.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Link: https://lore.kernel.org/r/20240411233624.8129-2-fw@strlen.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 982a73c7

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -15264,6 +15264,7 @@ F: net/*/netfilter.c 
F:	net/*/netfilter/

F:	net/bridge/br_netfilter*.c

F:	net/netfilter/

F:	tools/testing/selftests/net/netfilter/









NETROM NETWORK LAYER









M:	Ralf Baechle <ralf@linux-mips.org>
































tools/testing/selftests/netfilter/.gitignore→tools/testing/selftests/net/netfilter/.gitignore



+2
−2






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









nf-queue









connect_close









audit_logread









connect_close









conntrack_dump_flush









sctp_collision









nf_queue
























tools/testing/selftests/net/netfilter/Makefile
0 → 100644



+44
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0



















top_srcdir = ../../../../..



















HOSTPKG_CONFIG := pkg-config









MNL_CFLAGS := $(shell $(HOSTPKG_CONFIG) --cflags libmnl 2>/dev/null)









MNL_LDLIBS := $(shell $(HOSTPKG_CONFIG) --libs libmnl 2>/dev/null || echo -lmnl)



















TEST_PROGS := br_netfilter.sh bridge_brouter.sh









TEST_PROGS += conntrack_icmp_related.sh









TEST_PROGS += conntrack_ipip_mtu.sh









TEST_PROGS += conntrack_tcp_unreplied.sh









TEST_PROGS += conntrack_sctp_collision.sh









TEST_PROGS += conntrack_vrf.sh









TEST_PROGS += ipvs.sh









TEST_PROGS += nf_nat_edemux.sh









TEST_PROGS += nft_audit.sh









TEST_PROGS += nft_concat_range.sh









TEST_PROGS += nft_conntrack_helper.sh









TEST_PROGS += nft_fib.sh









TEST_PROGS += nft_flowtable.sh









TEST_PROGS += nft_meta.sh









TEST_PROGS += nft_nat.sh









TEST_PROGS += nft_nat_zones.sh









TEST_PROGS += nft_queue.sh









TEST_PROGS += nft_synproxy.sh









TEST_PROGS += nft_zones_many.sh









TEST_PROGS += rpath.sh









TEST_PROGS += xt_string.sh



















TEST_CUSTOM_PROGS += conntrack_dump_flush



















TEST_GEN_FILES = audit_logread









TEST_GEN_FILES += conntrack_dump_flush









TEST_GEN_FILES += connect_close nf_queue









TEST_GEN_FILES += sctp_collision



















include ../../lib.mk



















$(OUTPUT)/nf_queue: CFLAGS += $(MNL_CFLAGS)









$(OUTPUT)/nf_queue: LDLIBS += $(MNL_LDLIBS)



















$(OUTPUT)/conntrack_dump_flush: CFLAGS += $(MNL_CFLAGS)









$(OUTPUT)/conntrack_dump_flush: LDLIBS += $(MNL_LDLIBS)