tipc: get monitor threshold for the cluster

In this commit, we add support to fetch the configured
cluster monitoring threshold.

Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/tipc_netlink.h b/include/uapi/linux/tipc_netlink.h
index d387b65a0d97e59fa32a5515770d3b8e718290fd..d07c6ec76062f372548e46a09bcef5a9a94f2729 100644 (file)
--- a/include/uapi/linux/tipc_netlink.h
+++ b/include/uapi/linux/tipc_netlink.h
@@ -57,6 +57,7 @@ enum {
        TIPC_NL_NET_SET,
        TIPC_NL_NAME_TABLE_GET,
        TIPC_NL_MON_SET,
+       TIPC_NL_MON_GET,
 
        __TIPC_NL_CMD_MAX,
        TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1

diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
index 3892d05b8b45353bcb867891c8cfc84fbc2b629d..3579126e2ac867b29c360d731f8bb2c006577dc8 100644 (file)
--- a/net/tipc/monitor.c
+++ b/net/tipc/monitor.c
@@ -661,3 +661,10 @@ int tipc_nl_monitor_set_threshold(struct net *net, u32 cluster_size)
 
        return 0;
 }
+
+int tipc_nl_monitor_get_threshold(struct net *net)
+{
+       struct tipc_net *tn = tipc_net(net);
+
+       return tn->mon_threshold;
+}

diff --git a/net/tipc/monitor.h b/net/tipc/monitor.h
index 91f5dd09432b1812daea8ea66212b906ed9a71ff..aedf62c60bd35614b79537396d6f605a24a61537 100644 (file)
--- a/net/tipc/monitor.h
+++ b/net/tipc/monitor.h
@@ -70,5 +70,7 @@ void tipc_mon_get_state(struct net *net, u32 addr,
 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);
+int tipc_nl_monitor_get_threshold(struct net *net);
+
 extern const int tipc_max_domain_size;
 #endif

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 1e43ac0200ed704e6674f43efa05dd29e679820b..2cfc5f7c638078faf804af14a62676c5ce25adbc 100644 (file)
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -226,6 +226,11 @@ static const struct genl_ops tipc_genl_v2_ops[] = {
                .doit   = tipc_nl_node_set_monitor,
                .policy = tipc_nl_policy,
        },
+       {
+               .cmd    = TIPC_NL_MON_GET,
+               .doit   = tipc_nl_node_get_monitor,
+               .policy = tipc_nl_policy,
+       },
 };
 
 int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***attr)

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 0fc531d0f7093798fe3ea89b08739f220b03945e..2a7e74753f9f603945916f6d5b96f3e8cf547bbc 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -1955,3 +1955,55 @@ int tipc_nl_node_set_monitor(struct sk_buff *skb, struct genl_info *info)
 
        return 0;
 }
+
+static int __tipc_nl_add_monitor_prop(struct net *net, struct tipc_nl_msg *msg)
+{
+       struct nlattr *attrs;
+       void *hdr;
+       u32 val;
+
+       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
+                         0, TIPC_NL_MON_GET);
+       if (!hdr)
+               return -EMSGSIZE;
+
+       attrs = nla_nest_start(msg->skb, TIPC_NLA_MON);
+       if (!attrs)
+               goto msg_full;
+
+       val = tipc_nl_monitor_get_threshold(net);
+
+       if (nla_put_u32(msg->skb, TIPC_NLA_MON_ACTIVATION_THRESHOLD, val))
+               goto attr_msg_full;
+
+       nla_nest_end(msg->skb, attrs);
+       genlmsg_end(msg->skb, hdr);
+
+       return 0;
+
+attr_msg_full:
+       nla_nest_cancel(msg->skb, attrs);
+msg_full:
+       genlmsg_cancel(msg->skb, hdr);
+
+       return -EMSGSIZE;
+}
+
+int tipc_nl_node_get_monitor(struct sk_buff *skb, struct genl_info *info)
+{
+       struct net *net = sock_net(skb->sk);
+       struct tipc_nl_msg msg;
+       int err;
+
+       msg.skb = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+       msg.portid = info->snd_portid;
+       msg.seq = info->snd_seq;
+
+       err = __tipc_nl_add_monitor_prop(net, &msg);
+       if (err) {
+               nlmsg_free(msg.skb);
+               return err;
+       }
+
+       return genlmsg_reply(msg.skb, info);
+}

diff --git a/net/tipc/node.h b/net/tipc/node.h
index 65aa12ede8a51f33b10b36e17af6a7b872c14c3f..216f053b817ff6e5514bf675e6ca0f8bdbefadcd 100644 (file)
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -79,4 +79,5 @@ int tipc_nl_node_get_link(struct sk_buff *skb, struct genl_info *info);
 int tipc_nl_node_set_link(struct sk_buff *skb, struct genl_info *info);
 
 int tipc_nl_node_set_monitor(struct sk_buff *skb, struct genl_info *info);
+int tipc_nl_node_get_monitor(struct sk_buff *skb, struct genl_info *info);
 #endif