tipc: use kconfig to limit numeric ranges
Subsystems (3)
PATCH 1/1 tipc: use kconfig to limit numeric ranges
We can rely on kconfig to limit these numbers, no need to limit them at compile time/run time.
Users who modify these numbers manually should be responsible for themself. :)
---
net/tipc/Kconfig +6 -2
@@ -33,6 +33,7 @@ config TIPC_ADVANCED config TIPC_ZONES int "Maximum number of zones in network" depends on TIPC_ADVANCED + range 1 255 default "3" help Max number of zones inside TIPC network. Max supported value
@@ -44,10 +45,10 @@ config TIPC_ZONES config TIPC_CLUSTERS int "Maximum number of clusters in a zone" depends on TIPC_ADVANCED + range 1 1 default "1" help - ***Only 1 (one cluster in a zone) is supported by current code. - Any value set here will be overridden.*** + ***Only 1 (one cluster in a zone) is supported by current code.*** (Max number of clusters inside TIPC zone. Max supported value is 4095 clusters, minimum is 1.
@@ -59,6 +60,7 @@ config TIPC_CLUSTERS config TIPC_NODES int "Maximum number of nodes in cluster" depends on TIPC_ADVANCED + range 8 2047 default "255" help Maximum number of nodes inside a TIPC cluster. Maximum
@@ -70,6 +72,7 @@ config TIPC_NODES config TIPC_SLAVE_NODES int "Maximum number of slave nodes in cluster" depends on TIPC_ADVANCED + range 0 2047 default "0" help ***This capability is not supported by current code.***
@@ -83,6 +86,7 @@ config TIPC_SLAVE_NODES config TIPC_PORTS int "Maximum number of ports in a node" depends on TIPC_ADVANCED + range 217 65536 default "8191" help Maximum number of ports within a node. Maximum
net/tipc/core.c +5 -5
@@ -189,11 +189,11 @@ static int __init tipc_init(void) tipc_remote_management =1 ; tipc_max_publications =10000 ; tipc_max_subscriptions =2000 ; - tipc_max_ports =delimit (CONFIG_TIPC_PORTS ,127 ,65536 ); - tipc_max_zones =delimit (CONFIG_TIPC_ZONES ,1 ,255 ); - tipc_max_clusters =delimit (CONFIG_TIPC_CLUSTERS ,1 ,1 ); - tipc_max_nodes =delimit (CONFIG_TIPC_NODES ,8 ,2047 ); - tipc_max_slaves =delimit (CONFIG_TIPC_SLAVE_NODES ,0 ,2047 ); + tipc_max_ports =CONFIG_TIPC_PORTS ; + tipc_max_zones =CONFIG_TIPC_ZONES ; + tipc_max_clusters =CONFIG_TIPC_CLUSTERS ; + tipc_max_nodes =CONFIG_TIPC_NODES ; + tipc_max_slaves =CONFIG_TIPC_SLAVE_NODES ; tipc_net_id =4711 ;if ((res =tipc_core_start ()))
Quoted 7 lines · Amerigo Wang
We can rely on kconfig to limit these numbers,
no need to limit them at compile time/run time.+ ***Only 1 (one cluster in a zone) is supported by current code.***
(Max number of clusters inside TIPC zone. Max supported value is 4095 clusters, minimum is 1.
Given the limit of 1, maybe the reference to 4095 should be nuked?
Quoted 11 lines · [email protected] wrote:
Quoted 7 lines · Amerigo Wang
We can rely on kconfig to limit these numbers,
no need to limit them at compile time/run time.+ ***Only 1 (one cluster in a zone) is supported by current code.***
(Max number of clusters inside TIPC zone. Max supported value is 4095 clusters, minimum is 1.
Given the limit of 1, maybe the reference to 4095 should be nuked?
I am not sure, I think the limit of 1 is a temporary choice currently.