From: Florian Westphal <fw@strlen.de>
To: <netdev@vger.kernel.org>
Cc: <netfilter-devel@vger.kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Pablo Neira Ayuso <pablo@netfilter.org>
Subject: [PATCH net-next 00/15] selftests: move netfilter tests to net
Date: Fri, 12 Apr 2024 01:36:05 +0200 [thread overview]
Message-ID: <20240411233624.8129-1-fw@strlen.de> (raw)
First patch in this series moves selftests/netfilter/
to selftests/net/netfilter/.
Passing this via net-next rather than nf-next for this reason.
Main motivation is that a lot of these scripts only work on my old
development VM, I hope that placing this in net/ will get these
tests to get run in more regular intervals (and tests get more robust).
Changes are:
- make use of existing 'setup_ns' and 'busywait' helpers
- fix shellcheck warnings
- add more SKIP checks to avoid failures
- get rid of netcat in favor of socat, too many test
failures due to 'wrong' netcat flavor
- do not assume rp_filter sysctl is off
I have more patches that fix up the remaining test scripts,
but the series was too large to send them at once (34 patches).
After all scripts are fixed up, tests pass on both my Debian
and Fedora test machines.
If you want me to route this via a different tree, e.g. nf-next,
please let me know.
MAINTAINERS is updated to reflect that future updates should be handled
via netfilter-devel@.
Florian Westphal (15):
selftests: netfilter: move to net subdir
selftests: netfilter: bridge_brouter.sh: move to lib.sh infra
selftests: netfilter: br_netfilter.sh: move to lib.sh infra
selftests: netfilter: conntrack_icmp_related.sh: move to lib.sh infra
selftests: netfilter: conntrack_tcp_unreplied.sh: move to lib.sh infra
selftests: netfilter: conntrack_sctp_collision.sh: move to lib.sh infra
selftests: netfilter: conntrack_vrf.sh: move to lib.sh infra
selftests: netfilter: conntrack_ipip_mtu.sh" move to lib.sh infra
selftests: netfilter: place checktool helper in lib.sh
selftests: netfilter: ipvs.sh: move to lib.sh infra
selftests: netfilter: nf_nat_edemux.sh: move to lib.sh infra
selftests: netfilter: nft_conntrack_helper.sh: test to lib.sh infra
selftests: netfilter: nft_fib.sh: move to lib.sh infra
selftests: netfilter: nft_flowtable.sh: move test to lib.sh infra
selftests: netfilter: nft_nat.sh: move to lib.sh infra
MAINTAINERS | 1 +
.../selftests/{ => net}/netfilter/.gitignore | 4 +-
.../testing/selftests/net/netfilter/Makefile | 44 ++
.../{ => net}/netfilter/audit_logread.c | 0
.../selftests/net/netfilter/br_netfilter.sh | 163 ++++++
.../selftests/net/netfilter/bridge_brouter.sh | 122 +++++
tools/testing/selftests/net/netfilter/config | 37 ++
.../{ => net}/netfilter/connect_close.c | 0
.../netfilter/conntrack_dump_flush.c | 2 +-
.../netfilter/conntrack_icmp_related.sh | 179 +++----
.../netfilter/conntrack_ipip_mtu.sh} | 44 +-
.../net/netfilter/conntrack_sctp_collision.sh | 87 ++++
.../net/netfilter/conntrack_tcp_unreplied.sh | 153 ++++++
.../{ => net}/netfilter/conntrack_vrf.sh | 101 ++--
tools/testing/selftests/net/netfilter/ipvs.sh | 211 ++++++++
tools/testing/selftests/net/netfilter/lib.sh | 10 +
.../selftests/net/netfilter/nf_nat_edemux.sh | 97 ++++
.../nf-queue.c => net/netfilter/nf_queue.c} | 0
.../{ => net}/netfilter/nft_audit.sh | 0
.../{ => net}/netfilter/nft_concat_range.sh | 0
.../net/netfilter/nft_conntrack_helper.sh | 171 +++++++
.../selftests/{ => net}/netfilter/nft_fib.sh | 71 +--
.../{ => net}/netfilter/nft_flowtable.sh | 108 ++--
.../selftests/{ => net}/netfilter/nft_meta.sh | 0
.../selftests/{ => net}/netfilter/nft_nat.sh | 480 ++++++++----------
.../{ => net}/netfilter/nft_nat_zones.sh | 0
.../{ => net}/netfilter/nft_queue.sh | 18 +-
.../{ => net}/netfilter/nft_synproxy.sh | 0
.../{ => net}/netfilter/nft_zones_many.sh | 0
.../selftests/{ => net}/netfilter/rpath.sh | 0
.../{ => net}/netfilter/sctp_collision.c | 0
.../{ => net}/netfilter/xt_string.sh | 0
tools/testing/selftests/netfilter/Makefile | 21 -
.../selftests/netfilter/bridge_brouter.sh | 146 ------
.../selftests/netfilter/bridge_netfilter.sh | 188 -------
tools/testing/selftests/netfilter/config | 9 -
.../netfilter/conntrack_sctp_collision.sh | 89 ----
.../netfilter/conntrack_tcp_unreplied.sh | 167 ------
tools/testing/selftests/netfilter/ipvs.sh | 228 ---------
.../selftests/netfilter/nf_nat_edemux.sh | 127 -----
.../netfilter/nft_conntrack_helper.sh | 197 -------
.../selftests/netfilter/nft_trans_stress.sh | 151 ------
tools/testing/selftests/netfilter/settings | 1 -
43 files changed, 1493 insertions(+), 1934 deletions(-)
rename tools/testing/selftests/{ => net}/netfilter/.gitignore (92%)
create mode 100644 tools/testing/selftests/net/netfilter/Makefile
rename tools/testing/selftests/{ => net}/netfilter/audit_logread.c (100%)
create mode 100755 tools/testing/selftests/net/netfilter/br_netfilter.sh
create mode 100755 tools/testing/selftests/net/netfilter/bridge_brouter.sh
create mode 100644 tools/testing/selftests/net/netfilter/config
rename tools/testing/selftests/{ => net}/netfilter/connect_close.c (100%)
rename tools/testing/selftests/{ => net}/netfilter/conntrack_dump_flush.c (99%)
rename tools/testing/selftests/{ => net}/netfilter/conntrack_icmp_related.sh (52%)
rename tools/testing/selftests/{netfilter/ipip-conntrack-mtu.sh => net/netfilter/conntrack_ipip_mtu.sh} (89%)
create mode 100755 tools/testing/selftests/net/netfilter/conntrack_sctp_collision.sh
create mode 100755 tools/testing/selftests/net/netfilter/conntrack_tcp_unreplied.sh
rename tools/testing/selftests/{ => net}/netfilter/conntrack_vrf.sh (66%)
create mode 100755 tools/testing/selftests/net/netfilter/ipvs.sh
create mode 100644 tools/testing/selftests/net/netfilter/lib.sh
create mode 100755 tools/testing/selftests/net/netfilter/nf_nat_edemux.sh
rename tools/testing/selftests/{netfilter/nf-queue.c => net/netfilter/nf_queue.c} (100%)
rename tools/testing/selftests/{ => net}/netfilter/nft_audit.sh (100%)
rename tools/testing/selftests/{ => net}/netfilter/nft_concat_range.sh (100%)
create mode 100755 tools/testing/selftests/net/netfilter/nft_conntrack_helper.sh
rename tools/testing/selftests/{ => net}/netfilter/nft_fib.sh (78%)
rename tools/testing/selftests/{ => net}/netfilter/nft_flowtable.sh (88%)
rename tools/testing/selftests/{ => net}/netfilter/nft_meta.sh (100%)
rename tools/testing/selftests/{ => net}/netfilter/nft_nat.sh (62%)
rename tools/testing/selftests/{ => net}/netfilter/nft_nat_zones.sh (100%)
rename tools/testing/selftests/{ => net}/netfilter/nft_queue.sh (95%)
rename tools/testing/selftests/{ => net}/netfilter/nft_synproxy.sh (100%)
rename tools/testing/selftests/{ => net}/netfilter/nft_zones_many.sh (100%)
rename tools/testing/selftests/{ => net}/netfilter/rpath.sh (100%)
rename tools/testing/selftests/{ => net}/netfilter/sctp_collision.c (100%)
rename tools/testing/selftests/{ => net}/netfilter/xt_string.sh (100%)
delete mode 100644 tools/testing/selftests/netfilter/Makefile
delete mode 100755 tools/testing/selftests/netfilter/bridge_brouter.sh
delete mode 100644 tools/testing/selftests/netfilter/bridge_netfilter.sh
delete mode 100644 tools/testing/selftests/netfilter/config
delete mode 100755 tools/testing/selftests/netfilter/conntrack_sctp_collision.sh
delete mode 100755 tools/testing/selftests/netfilter/conntrack_tcp_unreplied.sh
delete mode 100755 tools/testing/selftests/netfilter/ipvs.sh
delete mode 100755 tools/testing/selftests/netfilter/nf_nat_edemux.sh
delete mode 100755 tools/testing/selftests/netfilter/nft_conntrack_helper.sh
delete mode 100755 tools/testing/selftests/netfilter/nft_trans_stress.sh
delete mode 100644 tools/testing/selftests/netfilter/settings
--
2.43.2
next reply other threads:[~2024-04-11 23:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 23:36 Florian Westphal [this message]
2024-04-11 23:36 ` [PATCH net-next 01/15] selftests: netfilter: move to net subdir Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 02/15] selftests: netfilter: bridge_brouter.sh: move to lib.sh infra Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 03/15] selftests: netfilter: br_netfilter.sh: " Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 04/15] selftests: netfilter: conntrack_icmp_related.sh: " Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 05/15] selftests: netfilter: conntrack_tcp_unreplied.sh: " Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 06/15] selftests: netfilter: conntrack_sctp_collision.sh: " Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 07/15] selftests: netfilter: conntrack_vrf.sh: " Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 08/15] selftests: netfilter: conntrack_ipip_mtu.sh" " Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 09/15] selftests: netfilter: place checktool helper in lib.sh Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 10/15] selftests: netfilter: ipvs.sh: move to lib.sh infra Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 11/15] selftests: netfilter: nf_nat_edemux.sh: " Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 12/15] selftests: netfilter: nft_conntrack_helper.sh: test " Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 13/15] selftests: netfilter: nft_fib.sh: move " Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 14/15] selftests: netfilter: nft_flowtable.sh: move test " Florian Westphal
2024-04-11 23:36 ` [PATCH net-next 15/15] selftests: netfilter: nft_nat.sh: move " Florian Westphal
2024-04-12 2:16 ` [PATCH net-next 00/15] selftests: move netfilter tests to net Jakub Kicinski
2024-04-12 6:53 ` Florian Westphal
2024-04-12 13:38 ` Jakub Kicinski
2024-04-12 13:40 ` Florian Westphal
2024-04-13 0:54 ` Jakub Kicinski
2024-04-13 1:00 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240411233624.8129-1-fw@strlen.de \
--to=fw@strlen.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).