[PATCH net 0/7] selftests: net: add missing kconfig and settings

[PATCH net 0/7] selftests: net: add missing kconfig and settings

[Matthieu Baerts (NGI0)]

When trying to execute the same selftests targets as the ones executed
on NIPA, but using containers with minimal tools, I got some issues
with a few tests.

Most of these issues are due to missing kernel config, but also too
short timeout:

- For the kconfig, these issues were not visible on NIPA, because some
  targets are executed in the same runner, using the same kernel: the
  config files of the different targets are merged. On my side, I
  followed the recommended way, and only used the config file on top of
  a 'make defconfig', revealing some missing kconfig's.

- For the timeout, that was not visible on NIPA either because the
  Netdev machines are very powerful and the timeout is doubled when
  using a debug kernel config (ovpn case), or because there are some
  custom values on the test branches only (drv-net).

While at it, add an extra patch to display an error message in case of
failure with some netconsole scripts.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Matthieu Baerts (NGI0) (7):
      selftests: af_unix: add USER_NS config
      selftests: openvswitch: add config file
      selftests: ovpn: add IPV6 and VETH configs
      selftests: ovpn: increase timeout
      selftests: drv-net: increase timeout
      selftests: drv-net: add missing kconfig for psp.py
      selftests: netconsole: ignore busywait errors

 tools/testing/selftests/drivers/net/config               |  3 +++
 .../selftests/drivers/net/netconsole/netcons_cmdline.sh  |  2 +-
 .../drivers/net/netconsole/netcons_fragmented_msg.sh     |  4 ++--
 .../selftests/drivers/net/netconsole/netcons_resume.sh   |  2 +-
 .../selftests/drivers/net/netconsole/netcons_sysdata.sh  |  2 +-
 tools/testing/selftests/drivers/net/settings             |  1 +
 tools/testing/selftests/net/af_unix/config               |  1 +
 tools/testing/selftests/net/openvswitch/config           | 16 ++++++++++++++++
 tools/testing/selftests/net/ovpn/config                  |  2 ++
 tools/testing/selftests/net/ovpn/settings                |  1 +
 10 files changed, 29 insertions(+), 5 deletions(-)
---
base-commit: 1cd23ca80784223fa2204e16203f754da4e821f8
change-id: 20260709-net-sft-fix-containers-2b4261007fec

Best regards,
--  
Matthieu Baerts (NGI0) <matttbe@kernel.org>

[PATCH net 1/7] selftests: af_unix: add USER_NS config

[Matthieu Baerts (NGI0)]

This is required to use unshare(CLONE_NEWUSER).

This has not been seen on NIPA before, because the 'af_unix' tests are
executed with the 'net' ones, merging their config files. USER_NS is
present in tools/testing/selftests/net/config.

This issue is visible when only the af_unix config is used on top of the
default one. This is the recommended way to execute selftest targets.

Fixes: ac011361bd4f ("af_unix: Add test for sock_diag and UDIAG_SHOW_UID.")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
To: Kuniyuki Iwashima <kuniyu@google.com>
---
 tools/testing/selftests/net/af_unix/config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/net/af_unix/config b/tools/testing/selftests/net/af_unix/config
index b5429c15a53c..41dbb03c747e 100644
--- a/tools/testing/selftests/net/af_unix/config
+++ b/tools/testing/selftests/net/af_unix/config
@@ -1,3 +1,4 @@
 CONFIG_AF_UNIX_OOB=y
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
+CONFIG_USER_NS=y

-- 
2.53.0

[PATCH net 2/7] selftests: openvswitch: add config file

[Matthieu Baerts (NGI0)]

The kselftests doc mentions that a config file should be present "if a
test needs specific kernel config options enabled". This selftest
requires some kernel config, but no config file was provided.

We could say that a sub-target could use the parent's config file, but
the kselftests doc doesn't mention anything about that. Plus the
net/openvswitch target is the only net target without a config file.

Here is a new config file, which is a trimmed version of the net one,
with hopefully the minimal required kconfig on top of 'make defconfig'.

The Fixes tag points to the introduction of the net/openvswitch target,
just to help validating this target on stable kernels.

Fixes: 25f16c873fb1 ("selftests: add openvswitch selftest suite")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
To: Aaron Conole <aconole@redhat.com>
To: Eelco Chaudron <echaudro@redhat.com>
To: Ilya Maximets <i.maximets@ovn.org>
Cc: dev@openvswitch.org
---
 tools/testing/selftests/net/openvswitch/config | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tools/testing/selftests/net/openvswitch/config b/tools/testing/selftests/net/openvswitch/config
new file mode 100644
index 000000000000..c659749cd086
--- /dev/null
+++ b/tools/testing/selftests/net/openvswitch/config
@@ -0,0 +1,16 @@
+CONFIG_GENEVE=m
+CONFIG_INET_DIAG=y
+CONFIG_IPV6=y
+CONFIG_NETFILTER=y
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_OVS=y
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_PSAMPLE=m
+CONFIG_VETH=y
+CONFIG_VLAN_8021Q=y
+CONFIG_VXLAN=m

-- 
2.53.0

[PATCH net 3/7] selftests: ovpn: add IPV6 and VETH configs

[Matthieu Baerts (NGI0)]

They are required to run the selftests:

 - Tests are executed in v4 and v6.

 - Virtual Ethernet are used between the different netns.

This has not been seen on NIPA before, because the 'ovpn' tests are
executed with the 'tcp_ao' ones, merging their config files. These two
kernel config are present in tools/testing/selftests/net/tcp_ao/config.

This issue is visible when only the ovpn config is used on top of the
default one. This is the recommended way to execute selftest targets.

Fixes: 959bc330a439 ("testing/selftests: add test tool and scripts for ovpn module")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
To: Antonio Quartulli <antonio@openvpn.net>
To: Sabrina Dubroca <sd@queasysnail.net>
---
 tools/testing/selftests/net/ovpn/config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/testing/selftests/net/ovpn/config b/tools/testing/selftests/net/ovpn/config
index d6cf033d555e..6b424762e46e 100644
--- a/tools/testing/selftests/net/ovpn/config
+++ b/tools/testing/selftests/net/ovpn/config
@@ -4,6 +4,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=y
 CONFIG_CRYPTO_GCM=y
 CONFIG_DST_CACHE=y
 CONFIG_INET=y
+CONFIG_IPV6=y
 CONFIG_NET=y
 CONFIG_NETFILTER=y
 CONFIG_NET_UDP_TUNNEL=y
@@ -11,3 +12,4 @@ CONFIG_NF_TABLES=m
 CONFIG_NF_TABLES_INET=y
 CONFIG_OVPN=m
 CONFIG_STREAM_PARSER=y
+CONFIG_VETH=y

-- 
2.53.0

[PATCH net 4/7] selftests: ovpn: increase timeout

[Matthieu Baerts (NGI0)]

The default timeout is 45 seconds, that's too low for a few ovpn tests.

Indeed, these tests can take up to 50 seconds with some debug kernel
config on NIPA. Set a timeout to 90 seconds, just to be on the safe
side.

Note that the Fixes tag here points to the introduction of the ovpn
tests because I don't know when they started to take more than 45
seconds. That's OK because a timeout of 1.5 minutes is not exaggerated.

Fixes: 959bc330a439 ("testing/selftests: add test tool and scripts for ovpn module")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
To: Antonio Quartulli <antonio@openvpn.net>
To: Sabrina Dubroca <sd@queasysnail.net>
---
 tools/testing/selftests/net/ovpn/settings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/net/ovpn/settings b/tools/testing/selftests/net/ovpn/settings
new file mode 100644
index 000000000000..ba4d85f74cd6
--- /dev/null
+++ b/tools/testing/selftests/net/ovpn/settings
@@ -0,0 +1 @@
+timeout=90

-- 
2.53.0

[PATCH net 5/7] selftests: drv-net: increase timeout

[Matthieu Baerts (NGI0)]

The default timeout is 45 seconds, that's too low for the xdp.py test.

Indeed, this test can take up to 3 minutes with some debug kernel config
on NIPA. Set a timeout to 6 minutes, just to be on the safe side.

Note that the Fixes tag here points to the introduction of the xdp.py
test because I don't know when this test started to take more than 45
seconds. That's OK because a timeout of 6 minutes is not exaggerated.

Fixes: 1cbcb1b28b26 ("selftests: drv-net: Test XDP_PASS/DROP support")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
To: Andrew Lunn <andrew+netdev@lunn.ch>
---
 tools/testing/selftests/drivers/net/settings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/drivers/net/settings b/tools/testing/selftests/drivers/net/settings
new file mode 100644
index 000000000000..eef533824a3c
--- /dev/null
+++ b/tools/testing/selftests/drivers/net/settings
@@ -0,0 +1 @@
+timeout=360

-- 
2.53.0

[PATCH net 6/7] selftests: drv-net: add missing kconfig for psp.py

[Matthieu Baerts (NGI0)]

This psp.py selftest was failing on my side when only using the
drivers/net config file on top of the default one -- the recommended way
to execute selftest targets.

It looks like some kernel config are needed to execute the new tc
commands.

Note that this was not visible on NIPA, because these tests are executed
with the drivers/net/hw ones, combining the two config files, and the hw
one contains the missing ones.

Fixes: 3f74d5bb807e ("selftests/net: Add env for container based tests")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
To: Andrew Lunn <andrew+netdev@lunn.ch>
To: Alexei Starovoitov <ast@kernel.org>
To: Daniel Borkmann <daniel@iogearbox.net>
To: Jesper Dangaard Brouer <hawk@kernel.org>
To: John Fastabend <john.fastabend@gmail.com>
To: Stanislav Fomichev <sdf@fomichev.me>
To: Mohsin Bashir <mohsin.bashr@gmail.com>
To: David Wei <dw@davidwei.uk>
Cc: Wei Wang <weibunny@fb.com>
Cc: bpf@vger.kernel.org
---
 tools/testing/selftests/drivers/net/config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/testing/selftests/drivers/net/config b/tools/testing/selftests/drivers/net/config
index 91d4fd410914..2070e890e064 100644
--- a/tools/testing/selftests/drivers/net/config
+++ b/tools/testing/selftests/drivers/net/config
@@ -4,6 +4,8 @@ CONFIG_DEBUG_INFO_BTF_MODULES=n
 CONFIG_INET_PSP=y
 CONFIG_IPV6=y
 CONFIG_MACSEC=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_CLS_BPF=y
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE_EXTENDED_LOG=y
@@ -11,6 +13,7 @@ CONFIG_NETDEVSIM=m
 CONFIG_NETKIT=y
 CONFIG_NET_SCH_ETF=m
 CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_INGRESS=y
 CONFIG_PPP=y
 CONFIG_PPPOE=y
 CONFIG_VLAN_8021Q=m

-- 
2.53.0

[PATCH net 7/7] selftests: netconsole: ignore busywait errors

[Matthieu Baerts (NGI0)]

In these netconsole tests, bash is used with errexit (set -e). It means
that if the busywait timeout, the tests finish without printing an error
message.

It is fine to ignore these errors, because the following validate_xxx
helpers will check the content of the output file, and exit with an
appropriated error message, e.g. FAIL: File was not generated.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
To: Andrew Lunn <andrew+netdev@lunn.ch>
To: Breno Leitao <leitao@debian.org>
Cc: Andre Carvalho <asantostc@gmail.com>
---
 tools/testing/selftests/drivers/net/netconsole/netcons_cmdline.sh     | 2 +-
 .../selftests/drivers/net/netconsole/netcons_fragmented_msg.sh        | 4 ++--
 tools/testing/selftests/drivers/net/netconsole/netcons_resume.sh      | 2 +-
 tools/testing/selftests/drivers/net/netconsole/netcons_sysdata.sh     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/drivers/net/netconsole/netcons_cmdline.sh b/tools/testing/selftests/drivers/net/netconsole/netcons_cmdline.sh
index 96d704b8d9d9..4436567abc94 100755
--- a/tools/testing/selftests/drivers/net/netconsole/netcons_cmdline.sh
+++ b/tools/testing/selftests/drivers/net/netconsole/netcons_cmdline.sh
@@ -50,7 +50,7 @@ do
 	# Send the message
 	echo "${MSG}: ${TARGET}" > /dev/kmsg
 	# Wait until socat saves the file to disk
-	busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"
+	busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}" || true
 	# Make sure the message was received in the dst part
 	# and exit
 	validate_msg "${OUTPUT_FILE}"
diff --git a/tools/testing/selftests/drivers/net/netconsole/netcons_fragmented_msg.sh b/tools/testing/selftests/drivers/net/netconsole/netcons_fragmented_msg.sh
index 0dc7280c3080..fc3db40c1df5 100755
--- a/tools/testing/selftests/drivers/net/netconsole/netcons_fragmented_msg.sh
+++ b/tools/testing/selftests/drivers/net/netconsole/netcons_fragmented_msg.sh
@@ -104,7 +104,7 @@ wait_local_port_listen "${NAMESPACE}" "${PORT}" udp
 # Send the message
 echo "${MSG}: ${TARGET}" > /dev/kmsg
 # Wait until socat saves the file to disk
-busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"
+busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}" || true
 # Check if the message was not corrupted
 validate_fragmented_result "${OUTPUT_FILE}"
 
@@ -117,6 +117,6 @@ disable_release_append
 listen_port_and_save_to "${OUTPUT_FILE}" &
 wait_local_port_listen "${NAMESPACE}" "${PORT}" udp
 echo "${MSG}: ${TARGET}" > /dev/kmsg
-busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"
+busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}" || true
 validate_fragmented_result "${OUTPUT_FILE}"
 exit "${ksft_pass}"
diff --git a/tools/testing/selftests/drivers/net/netconsole/netcons_resume.sh b/tools/testing/selftests/drivers/net/netconsole/netcons_resume.sh
index cb59cf436dd0..cec6afaba4a3 100755
--- a/tools/testing/selftests/drivers/net/netconsole/netcons_resume.sh
+++ b/tools/testing/selftests/drivers/net/netconsole/netcons_resume.sh
@@ -107,7 +107,7 @@ do
 	# Send the message
 	echo "${MSG}: ${TARGET}" > /dev/kmsg
 	# Wait until socat saves the file to disk
-	busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"
+	busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}" || true
 	# Make sure the message was received in the dst part
 	# and exit
 	validate_msg "${OUTPUT_FILE}"
diff --git a/tools/testing/selftests/drivers/net/netconsole/netcons_sysdata.sh b/tools/testing/selftests/drivers/net/netconsole/netcons_sysdata.sh
index 3fb8c4afe3d2..7089f7bd1e34 100755
--- a/tools/testing/selftests/drivers/net/netconsole/netcons_sysdata.sh
+++ b/tools/testing/selftests/drivers/net/netconsole/netcons_sysdata.sh
@@ -197,7 +197,7 @@ function runtest {
 	# Send the message
 	taskset -c "${CPU}" echo "${MSG}: ${TARGET}" > /dev/kmsg
 	# Wait until socat saves the file to disk
-	busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}"
+	busywait "${BUSYWAIT_TIMEOUT}" test -s "${OUTPUT_FILE}" || true
 }
 
 # ========== #

-- 
2.53.0

Re: [PATCH net 1/7] selftests: af_unix: add USER_NS config

[Kuniyuki Iwashima]

On Fri, Jul 10, 2026 at 11:05 AM Matthieu Baerts (NGI0)
<matttbe@kernel.org> wrote:
>
> This is required to use unshare(CLONE_NEWUSER).
>
> This has not been seen on NIPA before, because the 'af_unix' tests are
> executed with the 'net' ones, merging their config files. USER_NS is
> present in tools/testing/selftests/net/config.
>
> This issue is visible when only the af_unix config is used on top of the
> default one. This is the recommended way to execute selftest targets.
>
> Fixes: ac011361bd4f ("af_unix: Add test for sock_diag and UDIAG_SHOW_UID.")
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com>

Re: [PATCH net 6/7] selftests: drv-net: add missing kconfig for psp.py

[Wei Wang]

On Fri, Jul 10, 2026 at 11:05 AM Matthieu Baerts (NGI0)
<matttbe@kernel.org> wrote:
>
> >
> This psp.py selftest was failing on my side when only using the
> drivers/net config file on top of the default one -- the recommended way
> to execute selftest targets.
>
> It looks like some kernel config are needed to execute the new tc
> commands.
>
> Note that this was not visible on NIPA, because these tests are executed
> with the drivers/net/hw ones, combining the two config files, and the hw
> one contains the missing ones.
>
> Fixes: 3f74d5bb807e ("selftests/net: Add env for container based tests")
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> ---
> To: Andrew Lunn <andrew+netdev@lunn.ch>
> To: Alexei Starovoitov <ast@kernel.org>
> To: Daniel Borkmann <daniel@iogearbox.net>
> To: Jesper Dangaard Brouer <hawk@kernel.org>
> To: John Fastabend <john.fastabend@gmail.com>
> To: Stanislav Fomichev <sdf@fomichev.me>
> To: Mohsin Bashir <mohsin.bashr@gmail.com>
> To: David Wei <dw@davidwei.uk>
> Cc: Wei Wang <weibunny@fb.com>
> Cc: bpf@vger.kernel.org
> ---

The fix makes sense to me.

Reviewed-by: Wei Wang <weibunny@fb.com>

>  tools/testing/selftests/drivers/net/config | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/tools/testing/selftests/drivers/net/config b/tools/testing/selftests/drivers/net/config
> index 91d4fd410914..2070e890e064 100644
> --- a/tools/testing/selftests/drivers/net/config
> +++ b/tools/testing/selftests/drivers/net/config
> @@ -4,6 +4,8 @@ CONFIG_DEBUG_INFO_BTF_MODULES=n
>  CONFIG_INET_PSP=y
>  CONFIG_IPV6=y
>  CONFIG_MACSEC=m
> +CONFIG_NET_CLS_ACT=y
> +CONFIG_NET_CLS_BPF=y
>  CONFIG_NETCONSOLE=m
>  CONFIG_NETCONSOLE_DYNAMIC=y
>  CONFIG_NETCONSOLE_EXTENDED_LOG=y
> @@ -11,6 +13,7 @@ CONFIG_NETDEVSIM=m
>  CONFIG_NETKIT=y
>  CONFIG_NET_SCH_ETF=m
>  CONFIG_NET_SCH_FQ=m
> +CONFIG_NET_SCH_INGRESS=y
>  CONFIG_PPP=y
>  CONFIG_PPPOE=y
>  CONFIG_VLAN_8021Q=m
>
> --
> 2.53.0
>

Re: [PATCH net 7/7] selftests: netconsole: ignore busywait errors

[Breno Leitao]

On Fri, Jul 10, 2026 at 08:04:47PM +0200, Matthieu Baerts (NGI0) wrote:
> In these netconsole tests, bash is used with errexit (set -e). It means
> that if the busywait timeout, the tests finish without printing an error
> message.
> 
> It is fine to ignore these errors, because the following validate_xxx
> helpers will check the content of the output file, and exit with an
> appropriated error message, e.g. FAIL: File was not generated.

Agreed, the validate functions will catch this and report it more
appropriately.

> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Reviewed-by: Breno Leitao <leitao@debian.org>

Re: [PATCH net 3/7] selftests: ovpn: add IPV6 and VETH configs

[Antonio Quartulli]

Hi all,

On 10/07/2026 20:04, Matthieu Baerts (NGI0) wrote:
> They are required to run the selftests:
> 
>   - Tests are executed in v4 and v6.
> 
>   - Virtual Ethernet are used between the different netns.
> 
> This has not been seen on NIPA before, because the 'ovpn' tests are
> executed with the 'tcp_ao' ones, merging their config files. These two
> kernel config are present in tools/testing/selftests/net/tcp_ao/config.
> 
> This issue is visible when only the ovpn config is used on top of the
> default one. This is the recommended way to execute selftest targets.
> 
> Fixes: 959bc330a439 ("testing/selftests: add test tool and scripts for ovpn module")
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Acked-by: Antonio Quartulli <antonio@openvpn.net>

Jakub can pull this one directly without going through my tree.

-- 
Antonio Quartulli
OpenVPN Inc.

Re: [PATCH net 4/7] selftests: ovpn: increase timeout

[Antonio Quartulli]

Hi all,

On 10/07/2026 20:04, Matthieu Baerts (NGI0) wrote:
> The default timeout is 45 seconds, that's too low for a few ovpn tests.
> 
> Indeed, these tests can take up to 50 seconds with some debug kernel
> config on NIPA. Set a timeout to 90 seconds, just to be on the safe
> side.
> 
> Note that the Fixes tag here points to the introduction of the ovpn
> tests because I don't know when they started to take more than 45
> seconds. That's OK because a timeout of 1.5 minutes is not exaggerated.
> 
> Fixes: 959bc330a439 ("testing/selftests: add test tool and scripts for ovpn module")
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

we didn't really bother tweaking this value because AFAIK NIPA uses a 
much higher timeout value.

This said, I agree that when running locally 45 seconds may not be 
always enough.


Acked-by: Antonio Quartulli <antonio@openvpn.net>

Jakub can pull this one directly without going through my tree.


-- 
Antonio Quartulli
OpenVPN Inc.