Merge branch 'tipc-netlink-monitor-updates'

Parthasarathy Bhuvaragan says:

====================
tipc: netlink updates for neighbour monitor

This series contains the updates to configure and read the attributes for
neighbour monitor.

v2: rebase on top of net-next
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

9 files changed, 382 insertions, 8 deletions

diff --git a/net/tipc/addr.h b/net/tipc/addr.h
index 64f4004a6fac..bebb347803ce 100644
--- a/net/tipc/addr.h
+++ b/net/tipc/addr.h
@@ -43,9 +43,6 @@
 #include <net/netns/generic.h>
 #include "core.h"
 
-#define TIPC_ZONE_MASK          0xff000000u
-#define TIPC_CLUSTER_MASK       0xfffff000u
-
 static inline u32 tipc_own_addr(struct net *net)
 {
         struct tipc_net *tn = net_generic(net, tipc_net_id);
@@ -60,7 +57,7 @@ static inline u32 tipc_zone_mask(u32 addr)
 
 static inline u32 tipc_cluster_mask(u32 addr)
 {
-        return addr & TIPC_CLUSTER_MASK;
+        return addr & TIPC_ZONE_CLUSTER_MASK;
 }
 
 u32 tipc_own_addr(struct net *net);
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 4131d5a86f55..65b1bbf133bd 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -171,6 +171,27 @@ struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name)
         return NULL;
 }
 
+/*     tipc_bearer_get_name - get the bearer name from its id.
+ *     @net: network namespace
+ *     @name: a pointer to the buffer where the name will be stored.
+ *     @bearer_id: the id to get the name from.
+ */
+int tipc_bearer_get_name(struct net *net, char *name, u32 bearer_id)
+{
+        struct tipc_net *tn = tipc_net(net);
+        struct tipc_bearer *b;
+
+        if (bearer_id >= MAX_BEARERS)
+                return -EINVAL;
+
+        b = rtnl_dereference(tn->bearer_list[bearer_id]);
+        if (!b)
+                return -EINVAL;
+
+        strcpy(name, b->name);
+        return 0;
+}
+
 void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest)
 {
         struct tipc_net *tn = net_generic(net, tipc_net_id);
@@ -225,7 +246,7 @@ static int tipc_enable_bearer(struct net *net, const char *name,
         if (tipc_addr_domain_valid(disc_domain) &&
             (disc_domain != tn->own_addr)) {
                 if (tipc_in_scope(disc_domain, tn->own_addr)) {
-                        disc_domain = tn->own_addr & TIPC_CLUSTER_MASK;
+                        disc_domain = tn->own_addr & TIPC_ZONE_CLUSTER_MASK;
                         res = 0;   /* accept any node in own cluster */
                 } else if (in_own_cluster_exact(net, disc_domain))
                         res = 0;   /* accept specified node in own cluster */
@@ -832,7 +853,7 @@ int tipc_nl_bearer_enable(struct sk_buff *skb, struct genl_info *info)
         u32 prio;
 
         prio = TIPC_MEDIA_LINK_PRI;
-        domain = tn->own_addr & TIPC_CLUSTER_MASK;
+        domain = tn->own_addr & TIPC_ZONE_CLUSTER_MASK;
 
         if (!info->attrs[TIPC_NLA_BEARER])
                 return -EINVAL;
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index f1e6db5e6345..43757f1f9cb3 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -197,6 +197,7 @@ int tipc_l2_send_msg(struct net *net, struct sk_buff *buf,
 void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest);
 void tipc_bearer_remove_dest(struct net *net, u32 bearer_id, u32 dest);
 struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name);
+int tipc_bearer_get_name(struct net *net, char *name, u32 bearer_id);
 struct tipc_media *tipc_media_find(const char *name);
 void tipc_bearer_reset_all(struct net *net);
 int tipc_bearer_setup(void);
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
index 0d489e81fcca..be70a57c1ff9 100644
--- a/net/tipc/monitor.c
+++ b/net/tipc/monitor.c
@@ -33,9 +33,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <net/genetlink.h>
 #include "core.h"
 #include "addr.h"
 #include "monitor.h"
+#include "bearer.h"
 
 #define MAX_MON_DOMAIN       64
 #define MON_TIMEOUT          120000
@@ -649,3 +651,153 @@ 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;
+}
+
+int tipc_nl_monitor_get_threshold(struct net *net)
+{
+        struct tipc_net *tn = tipc_net(net);
+
+        return tn->mon_threshold;
+}
+
+int __tipc_nl_add_monitor_peer(struct tipc_peer *peer, struct tipc_nl_msg *msg)
+{
+        struct tipc_mon_domain *dom = peer->domain;
+        struct nlattr *attrs;
+        void *hdr;
+
+        hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
+                          NLM_F_MULTI, TIPC_NL_MON_PEER_GET);
+        if (!hdr)
+                return -EMSGSIZE;
+
+        attrs = nla_nest_start(msg->skb, TIPC_NLA_MON_PEER);
+        if (!attrs)
+                goto msg_full;
+
+        if (nla_put_u32(msg->skb, TIPC_NLA_MON_PEER_ADDR, peer->addr))
+                goto attr_msg_full;
+        if (nla_put_u32(msg->skb, TIPC_NLA_MON_PEER_APPLIED, peer->applied))
+                goto attr_msg_full;
+
+        if (peer->is_up)
+                if (nla_put_flag(msg->skb, TIPC_NLA_MON_PEER_UP))
+                        goto attr_msg_full;
+        if (peer->is_local)
+                if (nla_put_flag(msg->skb, TIPC_NLA_MON_PEER_LOCAL))
+                        goto attr_msg_full;
+        if (peer->is_head)
+                if (nla_put_flag(msg->skb, TIPC_NLA_MON_PEER_HEAD))
+                        goto attr_msg_full;
+
+        if (dom) {
+                if (nla_put_u32(msg->skb, TIPC_NLA_MON_PEER_DOMGEN, dom->gen))
+                        goto attr_msg_full;
+                if (nla_put_u64_64bit(msg->skb, TIPC_NLA_MON_PEER_UPMAP,
+                                      dom->up_map, TIPC_NLA_MON_PEER_PAD))
+                        goto attr_msg_full;
+                if (nla_put(msg->skb, TIPC_NLA_MON_PEER_MEMBERS,
+                            dom->member_cnt * sizeof(u32), &dom->members))
+                        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_add_monitor_peer(struct net *net, struct tipc_nl_msg *msg,
+                             u32 bearer_id, u32 *prev_node)
+{
+        struct tipc_monitor *mon = tipc_monitor(net, bearer_id);
+        struct tipc_peer *peer = mon->self;
+
+        if (!mon)
+                return -EINVAL;
+
+        read_lock_bh(&mon->lock);
+        do {
+                if (*prev_node) {
+                        if (peer->addr == *prev_node)
+                                *prev_node = 0;
+                        else
+                                continue;
+                }
+                if (__tipc_nl_add_monitor_peer(peer, msg)) {
+                        *prev_node = peer->addr;
+                        read_unlock_bh(&mon->lock);
+                        return -EMSGSIZE;
+                }
+        } while ((peer = peer_nxt(peer)) != mon->self);
+        read_unlock_bh(&mon->lock);
+
+        return 0;
+}
+
+int __tipc_nl_add_monitor(struct net *net, struct tipc_nl_msg *msg,
+                          u32 bearer_id)
+{
+        struct tipc_monitor *mon = tipc_monitor(net, bearer_id);
+        char bearer_name[TIPC_MAX_BEARER_NAME];
+        struct nlattr *attrs;
+        void *hdr;
+        int ret;
+
+        ret = tipc_bearer_get_name(net, bearer_name, bearer_id);
+        if (ret || !mon)
+                return -EINVAL;
+
+        hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_family,
+                          NLM_F_MULTI, TIPC_NL_MON_GET);
+        if (!hdr)
+                return -EMSGSIZE;
+
+        attrs = nla_nest_start(msg->skb, TIPC_NLA_MON);
+        if (!attrs)
+                goto msg_full;
+
+        read_lock_bh(&mon->lock);
+        if (nla_put_u32(msg->skb, TIPC_NLA_MON_REF, bearer_id))
+                goto attr_msg_full;
+        if (tipc_mon_is_active(net, mon))
+                if (nla_put_flag(msg->skb, TIPC_NLA_MON_ACTIVE))
+                        goto attr_msg_full;
+        if (nla_put_string(msg->skb, TIPC_NLA_MON_BEARER_NAME, bearer_name))
+                goto attr_msg_full;
+        if (nla_put_u32(msg->skb, TIPC_NLA_MON_PEERCNT, mon->peer_cnt))
+                goto attr_msg_full;
+        if (nla_put_u32(msg->skb, TIPC_NLA_MON_LISTGEN, mon->list_gen))
+                goto attr_msg_full;
+
+        read_unlock_bh(&mon->lock);
+        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);
+        read_unlock_bh(&mon->lock);
+
+        return -EMSGSIZE;
+}
diff --git a/net/tipc/monitor.h b/net/tipc/monitor.h
index 598459cbed5d..2a21b93e0d04 100644
--- a/net/tipc/monitor.h
+++ b/net/tipc/monitor.h
@@ -36,6 +36,8 @@
 #ifndef _TIPC_MONITOR_H
 #define _TIPC_MONITOR_H
 
+#include "netlink.h"
+
 /* struct tipc_mon_state: link instance's cache of monitor list and domain state
  * @list_gen: current generation of this node's monitor list
  * @gen: current generation of this node's local domain
@@ -69,5 +71,12 @@ 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);
+int tipc_nl_monitor_get_threshold(struct net *net);
+int __tipc_nl_add_monitor(struct net *net, struct tipc_nl_msg *msg,
+                          u32 bearer_id);
+int tipc_nl_add_monitor_peer(struct net *net, struct tipc_nl_msg *msg,
+                             u32 bearer_id, u32 *prev_node);
+
 extern const int tipc_max_domain_size;
 #endif
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 56935df2167a..a84daec0afe9 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -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,12 @@ 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_REF]                      = { .type = NLA_U32 },
+        [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 +221,23 @@ 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,
+        },
+        {
+                .cmd    = TIPC_NL_MON_GET,
+                .doit   = tipc_nl_node_get_monitor,
+                .dumpit = tipc_nl_node_dump_monitor,
+                .policy = tipc_nl_policy,
+        },
+        {
+                .cmd    = TIPC_NL_MON_PEER_GET,
+                .dumpit = tipc_nl_node_dump_monitor_peer,
+                .policy = tipc_nl_policy,
+        },
 };
 
 int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***attr)
diff --git a/net/tipc/netlink.h b/net/tipc/netlink.h
index ed1dbcb4afbd..4ba0ad422110 100644
--- a/net/tipc/netlink.h
+++ b/net/tipc/netlink.h
@@ -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);
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 95cc78b51532..21974191e425 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -1928,3 +1928,168 @@ out:
 
         return skb->len;
 }
+
+int tipc_nl_node_set_monitor(struct sk_buff *skb, struct genl_info *info)
+{
+        struct nlattr *attrs[TIPC_NLA_MON_MAX + 1];
+        struct net *net = sock_net(skb->sk);
+        int err;
+
+        if (!info->attrs[TIPC_NLA_MON])
+                return -EINVAL;
+
+        err = nla_parse_nested(attrs, TIPC_NLA_MON_MAX,
+                               info->attrs[TIPC_NLA_MON],
+                               tipc_nl_monitor_policy);
+        if (err)
+                return err;
+
+        if (attrs[TIPC_NLA_MON_ACTIVATION_THRESHOLD]) {
+                u32 val;
+
+                val = nla_get_u32(attrs[TIPC_NLA_MON_ACTIVATION_THRESHOLD]);
+                err = tipc_nl_monitor_set_threshold(net, val);
+                if (err)
+                        return err;
+        }
+
+        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);
+}
+
+int tipc_nl_node_dump_monitor(struct sk_buff *skb, struct netlink_callback *cb)
+{
+        struct net *net = sock_net(skb->sk);
+        u32 prev_bearer = cb->args[0];
+        struct tipc_nl_msg msg;
+        int err;
+        int i;
+
+        if (prev_bearer == MAX_BEARERS)
+                return 0;
+
+        msg.skb = skb;
+        msg.portid = NETLINK_CB(cb->skb).portid;
+        msg.seq = cb->nlh->nlmsg_seq;
+
+        rtnl_lock();
+        for (i = prev_bearer; i < MAX_BEARERS; i++) {
+                prev_bearer = i;
+                err = __tipc_nl_add_monitor(net, &msg, prev_bearer);
+                if (err)
+                        goto out;
+        }
+
+out:
+        rtnl_unlock();
+        cb->args[0] = prev_bearer;
+
+        return skb->len;
+}
+
+int tipc_nl_node_dump_monitor_peer(struct sk_buff *skb,
+                                   struct netlink_callback *cb)
+{
+        struct net *net = sock_net(skb->sk);
+        u32 prev_node = cb->args[1];
+        u32 bearer_id = cb->args[2];
+        int done = cb->args[0];
+        struct tipc_nl_msg msg;
+        int err;
+
+        if (!prev_node) {
+                struct nlattr **attrs;
+                struct nlattr *mon[TIPC_NLA_MON_MAX + 1];
+
+                err = tipc_nlmsg_parse(cb->nlh, &attrs);
+                if (err)
+                        return err;
+
+                if (!attrs[TIPC_NLA_MON])
+                        return -EINVAL;
+
+                err = nla_parse_nested(mon, TIPC_NLA_MON_MAX,
+                                       attrs[TIPC_NLA_MON],
+                                       tipc_nl_monitor_policy);
+                if (err)
+                        return err;
+
+                if (!mon[TIPC_NLA_MON_REF])
+                        return -EINVAL;
+
+                bearer_id = nla_get_u32(mon[TIPC_NLA_MON_REF]);
+
+                if (bearer_id >= MAX_BEARERS)
+                        return -EINVAL;
+        }
+
+        if (done)
+                return 0;
+
+        msg.skb = skb;
+        msg.portid = NETLINK_CB(cb->skb).portid;
+        msg.seq = cb->nlh->nlmsg_seq;
+
+        rtnl_lock();
+        err = tipc_nl_add_monitor_peer(net, &msg, bearer_id, &prev_node);
+        if (!err)
+                done = 1;
+
+        rtnl_unlock();
+        cb->args[0] = done;
+        cb->args[1] = prev_node;
+        cb->args[2] = bearer_id;
+
+        return skb->len;
+}
diff --git a/net/tipc/node.h b/net/tipc/node.h
index 8264b3d97dc4..d69fdfcc0ec9 100644
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -78,4 +78,9 @@ int tipc_nl_node_reset_link_stats(struct sk_buff *skb, struct genl_info *info);
 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);
+int tipc_nl_node_dump_monitor(struct sk_buff *skb, struct netlink_callback *cb);
+int tipc_nl_node_dump_monitor_peer(struct sk_buff *skb,
+                                   struct netlink_callback *cb);
 #endif