From 759f3a0c7c641e9af9d0aac3397abf687443d1a0 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Fri, 27 Sep 2024 08:51:43 +0300 Subject: [PATCH] tests/samples: net: Fix the max number of file descriptors Make sure that CONFIG_ZVFS_OPEN_MAX in the tests and samples is at least the same value as CONFIG_NET_SOCKETS_POLL_MAX so that we cannot have more polled sockets than there are available file descriptors. Signed-off-by: Jukka Rissanen --- samples/net/sockets/echo_service/prj.conf | 1 + tests/net/all/prj.conf | 1 + tests/net/lib/dns_addremove/prj.conf | 1 + tests/net/lib/dns_resolve/prj.conf | 2 +- tests/net/lib/mdns_responder/prj.conf | 1 + tests/net/pm/prj.conf | 2 +- tests/net/socket/service/prj.conf | 2 +- 7 files changed, 7 insertions(+), 3 deletions(-) diff --git a/samples/net/sockets/echo_service/prj.conf b/samples/net/sockets/echo_service/prj.conf index b9c053c27a2..3b12a238378 100644 --- a/samples/net/sockets/echo_service/prj.conf +++ b/samples/net/sockets/echo_service/prj.conf @@ -14,6 +14,7 @@ CONFIG_ZVFS_OPEN_MAX=10 CONFIG_NET_MAX_CONN=5 CONFIG_NET_SOCKETS_SERVICE=y CONFIG_NET_SOCKETS_POLL_MAX=20 +CONFIG_ZVFS_OPEN_MAX=20 # Network driver config CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf index 7944be6a884..f4f42f78187 100644 --- a/tests/net/all/prj.conf +++ b/tests/net/all/prj.conf @@ -354,6 +354,7 @@ CONFIG_NET_SOCKETS_LOG_LEVEL_DBG=y CONFIG_NET_SOCKETS_OFFLOAD=y CONFIG_NET_SOCKETS_PACKET=y CONFIG_NET_SOCKETS_POLL_MAX=50 +CONFIG_ZVFS_OPEN_MAX=50 CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_SOCKOPT_TLS=y CONFIG_NET_SOCKETS_TLS_MAX_CIPHERSUITES=10 diff --git a/tests/net/lib/dns_addremove/prj.conf b/tests/net/lib/dns_addremove/prj.conf index c28f0a14eac..81c65b34f32 100644 --- a/tests/net/lib/dns_addremove/prj.conf +++ b/tests/net/lib/dns_addremove/prj.conf @@ -18,3 +18,4 @@ CONFIG_PRINTK=y CONFIG_ZTEST=y CONFIG_MAIN_STACK_SIZE=2048 CONFIG_NET_SOCKETS_POLL_MAX=5 +CONFIG_ZVFS_OPEN_MAX=5 diff --git a/tests/net/lib/dns_resolve/prj.conf b/tests/net/lib/dns_resolve/prj.conf index 39ab38272e6..e90e185040a 100644 --- a/tests/net/lib/dns_resolve/prj.conf +++ b/tests/net/lib/dns_resolve/prj.conf @@ -30,4 +30,4 @@ CONFIG_ZTEST=y CONFIG_MAIN_STACK_SIZE=1344 CONFIG_NET_SOCKETS_POLL_MAX=9 -CONFIG_ZVFS_OPEN_MAX=8 +CONFIG_ZVFS_OPEN_MAX=9 diff --git a/tests/net/lib/mdns_responder/prj.conf b/tests/net/lib/mdns_responder/prj.conf index 6d4db394c8d..9ea50969898 100644 --- a/tests/net/lib/mdns_responder/prj.conf +++ b/tests/net/lib/mdns_responder/prj.conf @@ -6,6 +6,7 @@ CONFIG_NET_LOOPBACK=y CONFIG_NET_IPV4=y CONFIG_NET_IPV6=y CONFIG_NET_SOCKETS_POLL_MAX=7 +CONFIG_ZVFS_OPEN_MAX=7 # Network driver config CONFIG_TEST_RANDOM_GENERATOR=y diff --git a/tests/net/pm/prj.conf b/tests/net/pm/prj.conf index 5d478e4d070..9c838139d9b 100644 --- a/tests/net/pm/prj.conf +++ b/tests/net/pm/prj.conf @@ -7,7 +7,7 @@ CONFIG_NET_L2_ETHERNET=n CONFIG_NET_UDP=y CONFIG_NET_IPV4=y CONFIG_NET_SOCKETS=y -CONFIG_ZVFS_OPEN_MAX=2 +CONFIG_ZVFS_OPEN_MAX=3 CONFIG_ZTEST_STACK_SIZE=2048 CONFIG_MAIN_STACK_SIZE=2048 CONFIG_NET_LOG=y diff --git a/tests/net/socket/service/prj.conf b/tests/net/socket/service/prj.conf index 5f5c2325a33..d0664554f7f 100644 --- a/tests/net/socket/service/prj.conf +++ b/tests/net/socket/service/prj.conf @@ -5,7 +5,7 @@ CONFIG_NET_IPV6=y CONFIG_NET_UDP=y CONFIG_NET_TCP=y CONFIG_NET_SOCKETS=y -CONFIG_ZVFS_OPEN_MAX=10 +CONFIG_ZVFS_OPEN_MAX=20 CONFIG_NET_PKT_TX_COUNT=8 CONFIG_NET_PKT_RX_COUNT=8 CONFIG_NET_MAX_CONN=5