samples: net: Remove / replace the CONFIG_ZVFS_OPEN_MAX option

jukkar · jukkar · commit 25b5c221c863 · 2025-10-17T12:07:08.000+03:00
Remove unneeded CONFIG_ZVFS_OPEN_MAX config option as it is now
controlled by number of net_context i.e., CONFIG_NET_MAX_CONTEXTS

Some of the samples now use CONFIG_ZVFS_OPEN_ADD_SIZE_NET_SAMPLE
to specify the sample socket needs.

Signed-off-by: Jukka Rissanen &lt;jukka.rissanen@nordicsemi.no&gt;
diff --git a/samples/net/dns_resolve/prj.conf b/samples/net/dns_resolve/prj.conf
@@ -15,7 +15,6 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_DHCPV4=n
 
 CONFIG_ZVFS_POLL_MAX=5
-CONFIG_ZVFS_OPEN_MAX=5
 
 # Enable the DNS resolver
 CONFIG_DNS_RESOLVER=y
diff --git a/samples/net/dsa/prj.conf b/samples/net/dsa/prj.conf
@@ -18,7 +18,6 @@ CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=5
 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5
 CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=1
 CONFIG_NET_MAX_CONTEXTS=4
-CONFIG_ZVFS_OPEN_MAX=4
 CONFIG_ZVFS_POLL_MAX=4
 CONFIG_NET_MAX_CONN=4
 
diff --git a/samples/net/lwm2m_client/boards/native_sim.conf b/samples/net/lwm2m_client/boards/native_sim.conf
@@ -4,4 +4,4 @@ CONFIG_DNS_SERVER1="192.0.2.2"
 CONFIG_LWM2M_DNS_SUPPORT=y
 CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"
 CONFIG_HEAP_MEM_POOL_SIZE=32768
-CONFIG_ZVFS_OPEN_MAX=16
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET_SAMPLE=16
diff --git a/samples/net/mqtt_sn_publisher/prj.conf b/samples/net/mqtt_sn_publisher/prj.conf
@@ -4,7 +4,6 @@ CONFIG_NET_UDP=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_SOCKETS=y
-CONFIG_ZVFS_OPEN_MAX=6
 CONFIG_NET_CONNECTION_MANAGER=y
 
 # Kernel options
diff --git a/samples/net/openthread/border_router/prj.conf b/samples/net/openthread/border_router/prj.conf
@@ -16,7 +16,6 @@ CONFIG_NET_ROUTE_MCAST=y
 CONFIG_NET_SOCKETS_SERVICE=y
 CONFIG_NET_CONTEXT_RECV_PKTINFO=y
 CONFIG_NET_CONTEXT_RECV_HOPLIMIT=y
-CONFIG_ZVFS_POLL_MAX=15
 CONFIG_NET_SOCKETS_SERVICE_STACK_SIZE=12288
 CONFIG_NET_MAX_CONN=12
 CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE=2048
@@ -72,10 +71,6 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=6
 CONFIG_NET_IF_MAX_IPV4_COUNT=2
 CONFIG_NET_IF_MAX_IPV6_COUNT=6
 
-# Number of socket descriptors might need adjusting
-# if there are more than 1 handlers defined.
-CONFIG_ZVFS_OPEN_MAX=15
-
 # DNS resolver required by DNS upstream resolver
 CONFIG_DNS_RESOLVER=y
 CONFIG_DNS_RESOLVER_PACKET_FORWARDING=y
diff --git a/samples/net/prometheus/prj.conf b/samples/net/prometheus/prj.conf
@@ -5,13 +5,11 @@ CONFIG_LOG=y
 CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_INIT_STACKS=y
-CONFIG_ZVFS_OPEN_MAX=32
 CONFIG_POSIX_API=y
 CONFIG_FDTABLE=y
 CONFIG_NET_SOCKETS_POLL_MAX=32
 CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_HEAP_MEM_POOL_SIZE=2048
-CONFIG_ZVFS_OPEN_MAX=32
 
 # Prometheus
 CONFIG_PROMETHEUS=y
diff --git a/samples/net/sockets/dumb_http_server_mt/prj.conf b/samples/net/sockets/dumb_http_server_mt/prj.conf
@@ -2,7 +2,6 @@
 CONFIG_TEST_RANDOM_GENERATOR=y
 
 # POSIX options
-CONFIG_ZVFS_OPEN_MAX=20
 CONFIG_POSIX_API=y
 
 # Networking config
diff --git a/samples/net/sockets/echo_client/overlay-tls.conf b/samples/net/sockets/echo_client/overlay-tls.conf
@@ -13,4 +13,4 @@ CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
 CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS=4
 CONFIG_NET_SOCKETS_ENABLE_DTLS=y
 CONFIG_NET_SOCKETS_DTLS_MAX_FRAGMENT_LENGTH=2048
-CONFIG_ZVFS_OPEN_MAX=12
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET_SAMPLE=9
diff --git a/samples/net/sockets/echo_server/overlay-tls.conf b/samples/net/sockets/echo_server/overlay-tls.conf
@@ -14,4 +14,4 @@ CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS=6
 CONFIG_NET_SOCKETS_ENABLE_DTLS=y
 CONFIG_NET_SOCKETS_DTLS_TIMEOUT=30000
 CONFIG_NET_SOCKETS_DTLS_MAX_FRAGMENT_LENGTH=2048
-CONFIG_ZVFS_OPEN_MAX=20
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET_SAMPLE=16
diff --git a/samples/net/sockets/echo_server/overlay-ws-console.conf b/samples/net/sockets/echo_server/overlay-ws-console.conf
@@ -9,4 +9,4 @@ CONFIG_NET_SOCKETS_POLL_MAX=32
 CONFIG_NET_MAX_CONN=32
 CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS=32
 CONFIG_ZVFS_EVENTFD_MAX=10
-CONFIG_ZVFS_OPEN_MAX=32
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET_SAMPLE=24
diff --git a/samples/net/sockets/echo_server/prj.conf b/samples/net/sockets/echo_server/prj.conf
@@ -47,7 +47,7 @@ CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 
 # Number of socket descriptors might need adjusting
 # if there are more than 1 handlers defined.
-CONFIG_ZVFS_OPEN_MAX=12
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET_SAMPLE=8
 
 # How many client can connect to echo-server simultaneously
 CONFIG_NET_SAMPLE_NUM_HANDLERS=1
diff --git a/samples/net/sockets/http_server/prj.conf b/samples/net/sockets/http_server/prj.conf
@@ -6,7 +6,7 @@ CONFIG_LOG=y
 CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_INIT_STACKS=y
-CONFIG_ZVFS_OPEN_MAX=32
+CONFIG_ZVFS_OPEN_ADD_SIZE_NET_SAMPLE=24
 CONFIG_POSIX_API=y
 CONFIG_FDTABLE=y
 CONFIG_ZVFS_POLL_MAX=32
diff --git a/samples/net/sockets/net_mgmt/prj.conf b/samples/net/sockets/net_mgmt/prj.conf
@@ -6,7 +6,6 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_SOCKETS=y
 CONFIG_POSIX_API=y
-CONFIG_ZVFS_OPEN_MAX=6
 CONFIG_NET_SOCKETS_NET_MGMT=y
 CONFIG_NET_MGMT_EVENT=y
 
diff --git a/samples/net/sockets/packet/prj.conf b/samples/net/sockets/packet/prj.conf
@@ -7,7 +7,6 @@ CONFIG_NET_IPV4=n
 CONFIG_NET_MAX_CONTEXTS=10
 CONFIG_NET_SOCKETS=y
 CONFIG_POSIX_API=y
-CONFIG_ZVFS_OPEN_MAX=6
 CONFIG_NET_CONTEXT_RCVTIMEO=y
 CONFIG_NET_MGMT=y
 CONFIG_NET_MGMT_EVENT=y
diff --git a/samples/net/zperf/prj.conf b/samples/net/zperf/prj.conf
@@ -23,7 +23,6 @@ CONFIG_NET_TC_TX_COUNT=1
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_SERVICE_THREAD_PRIO=-1
 CONFIG_ZVFS_POLL_MAX=9
-CONFIG_ZVFS_OPEN_MAX=12
 CONFIG_POSIX_API=y
 
 CONFIG_INIT_STACKS=y
