Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b3f5229 authored by Parthasarathy Bhuvaragan's avatar Parthasarathy Bhuvaragan Committed by David S. Miller
Browse files

tipc: make cluster size threshold for monitoring configurable 



In this commit, we introduce support to configure the minimum
threshold to activate the new link monitoring algorithm.

Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarParthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ff26e9f

include/uapi/linux/tipc_netlink.h

+11 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ enum { 
	TIPC_NL_NET_GET,

	TIPC_NL_NET_SET,

	TIPC_NL_NAME_TABLE_GET,

	TIPC_NL_MON_SET,



	__TIPC_NL_CMD_MAX,

	TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1
@@ -72,6 +73,7 @@ enum { 
	TIPC_NLA_NODE,			/* nest */

	TIPC_NLA_NET,			/* nest */

	TIPC_NLA_NAME_TABLE,		/* nest */

	TIPC_NLA_MON,			/* nest */



	__TIPC_NLA_MAX,

	TIPC_NLA_MAX = __TIPC_NLA_MAX - 1
@@ -166,6 +168,15 @@ enum { 
	TIPC_NLA_NAME_TABLE_MAX = __TIPC_NLA_NAME_TABLE_MAX - 1

};



/* Monitor info */

enum {

	TIPC_NLA_MON_UNSPEC,

	TIPC_NLA_MON_ACTIVATION_THRESHOLD,	/* u32 */



	__TIPC_NLA_MON_MAX,

	TIPC_NLA_MON_MAX = __TIPC_NLA_MON_MAX - 1

};



/* Publication info */

enum {

	TIPC_NLA_PUBL_UNSPEC,

net/tipc/monitor.c

+12 −0
Original line number Diff line number Diff line
@@ -649,3 +649,15 @@ void tipc_mon_delete(struct net *net, int bearer_id) 
	kfree(self);

	kfree(mon);

}



int tipc_nl_monitor_set_threshold(struct net *net, u32 cluster_size)

{

	struct tipc_net *tn = tipc_net(net);



	if (cluster_size > TIPC_CLUSTER_SIZE)

		return -EINVAL;



	tn->mon_threshold = cluster_size;



	return 0;

}

net/tipc/monitor.h

+1 −0
Original line number Diff line number Diff line
@@ -69,5 +69,6 @@ void tipc_mon_get_state(struct net *net, u32 addr, 
			int bearer_id);

void tipc_mon_remove_peer(struct net *net, u32 addr, int bearer_id);



int tipc_nl_monitor_set_threshold(struct net *net, u32 cluster_size);

extern const int tipc_max_domain_size;

#endif

net/tipc/netlink.c

+13 −2
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ static const struct nla_policy tipc_nl_policy[TIPC_NLA_MAX + 1] = { 
	[TIPC_NLA_MEDIA]	= { .type = NLA_NESTED, },

	[TIPC_NLA_NODE]		= { .type = NLA_NESTED, },

	[TIPC_NLA_NET]		= { .type = NLA_NESTED, },

	[TIPC_NLA_NAME_TABLE]	= { .type = NLA_NESTED, }

	[TIPC_NLA_NAME_TABLE]	= { .type = NLA_NESTED, },

	[TIPC_NLA_MON]		= { .type = NLA_NESTED, },

};



const struct nla_policy
@@ -61,6 +62,11 @@ tipc_nl_name_table_policy[TIPC_NLA_NAME_TABLE_MAX + 1] = { 
	[TIPC_NLA_NAME_TABLE_PUBL]	= { .type = NLA_NESTED }

};



const struct nla_policy tipc_nl_monitor_policy[TIPC_NLA_MON_MAX + 1] = {

	[TIPC_NLA_MON_UNSPEC]			= { .type = NLA_UNSPEC },

	[TIPC_NLA_MON_ACTIVATION_THRESHOLD]	= { .type = NLA_U32 },

};



const struct nla_policy tipc_nl_sock_policy[TIPC_NLA_SOCK_MAX + 1] = {

	[TIPC_NLA_SOCK_UNSPEC]		= { .type = NLA_UNSPEC },

	[TIPC_NLA_SOCK_ADDR]		= { .type = NLA_U32 },
@@ -214,7 +220,12 @@ static const struct genl_ops tipc_genl_v2_ops[] = { 
		.cmd	= TIPC_NL_NAME_TABLE_GET,

		.dumpit	= tipc_nl_name_table_dump,

		.policy = tipc_nl_policy,

	}

	},

	{

		.cmd	= TIPC_NL_MON_SET,

		.doit	= tipc_nl_node_set_monitor,

		.policy = tipc_nl_policy,

	},

};



int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***attr)

net/tipc/netlink.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ extern const struct nla_policy tipc_nl_prop_policy[]; 
extern const struct nla_policy tipc_nl_bearer_policy[];

extern const struct nla_policy tipc_nl_media_policy[];

extern const struct nla_policy tipc_nl_udp_policy[];

extern const struct nla_policy tipc_nl_monitor_policy[];



int tipc_netlink_start(void);

int tipc_netlink_compat_start(void);