tipc: add node get/dump to new netlink api

Add TIPC_NL_NODE_GET to the new tipc netlink API.

This command can dump the address and node status of all nodes in the
tipc cluster.

Netlink logical layout of returned node/address data:
-> node
    -> address
    -> up flag

Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Acked-by: Ying Xue <ying.xue@windriver.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 43beef28d67fc23df013d6e5f96178da55d20e6d..08a793374e8c3f6a4cdf5db285412c0cbee1c0da 100644 (file)
--- a/include/uapi/linux/tipc_netlink.h
+++ b/include/uapi/linux/tipc_netlink.h
@@ -52,6 +52,7 @@ enum {
        TIPC_NL_LINK_RESET_STATS,
        TIPC_NL_MEDIA_GET,
        TIPC_NL_MEDIA_SET,
+       TIPC_NL_NODE_GET,
 
        __TIPC_NL_CMD_MAX,
        TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1
@@ -65,6 +66,7 @@ enum {
        TIPC_NLA_PUBL,                  /* nest */
        TIPC_NLA_LINK,                  /* nest */
        TIPC_NLA_MEDIA,                 /* nest */
+       TIPC_NLA_NODE,                  /* nest */
 
        __TIPC_NLA_MAX,
        TIPC_NLA_MAX = __TIPC_NLA_MAX - 1
@@ -121,6 +123,16 @@ enum {
        TIPC_NLA_MEDIA_MAX = __TIPC_NLA_MEDIA_MAX - 1
 };
 
+/* Node info */
+enum {
+       TIPC_NLA_NODE_UNSPEC,
+       TIPC_NLA_NODE_ADDR,             /* u32 */
+       TIPC_NLA_NODE_UP,               /* flag */
+
+       __TIPC_NLA_NODE_MAX,
+       TIPC_NLA_NODE_MAX = __TIPC_NLA_NODE_MAX - 1
+};
+
 /* Publication info */
 enum {
        TIPC_NLA_PUBL_UNSPEC,

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 8673e370b7ed4d466a434309d9fff4905ca25f40..5b0e3c8457d2080d6a5f46af6088ac62cb7178e9 100644 (file)
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -39,6 +39,7 @@
 #include "socket.h"
 #include "bearer.h"
 #include "link.h"
+#include "node.h"
 #include <net/genetlink.h>
 
 static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
@@ -78,6 +79,7 @@ static const struct nla_policy tipc_nl_policy[TIPC_NLA_MAX + 1] = {
        [TIPC_NLA_PUBL]         = { .type = NLA_NESTED, },
        [TIPC_NLA_LINK]         = { .type = NLA_NESTED, },
        [TIPC_NLA_MEDIA]        = { .type = NLA_NESTED, },
+       [TIPC_NLA_NODE]         = { .type = NLA_NESTED, }
 };
 
 /* Legacy ASCII API */
@@ -166,6 +168,11 @@ static const struct genl_ops tipc_genl_v2_ops[] = {
                .cmd    = TIPC_NL_MEDIA_SET,
                .doit   = tipc_nl_media_set,
                .policy = tipc_nl_policy,
+       },
+       {
+               .cmd    = TIPC_NL_NODE_GET,
+               .dumpit = tipc_nl_node_dump,
+               .policy = tipc_nl_policy,
        }
 };
 

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 5781634e957d7be47c2e572783f3af2a3db9bf91..72a75d4838b2fb076d985658fdc09f4f42176108 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -58,6 +58,12 @@ struct tipc_sock_conn {
        struct list_head list;
 };
 
+static const struct nla_policy tipc_nl_node_policy[TIPC_NLA_NODE_MAX + 1] = {
+       [TIPC_NLA_NODE_UNSPEC]          = { .type = NLA_UNSPEC },
+       [TIPC_NLA_NODE_ADDR]            = { .type = NLA_U32 },
+       [TIPC_NLA_NODE_UP]              = { .type = NLA_FLAG }
+};
+
 /*
  * A trivial power-of-two bitmask technique is used for speed, since this
  * operation is done for every incoming TIPC packet. The number of hash table
@@ -601,3 +607,93 @@ void tipc_node_unlock(struct tipc_node *node)
                tipc_nametbl_withdraw(TIPC_LINK_STATE, addr,
                                      link_id, addr);
 }
+
+/* Caller should hold node lock for the passed node */
+int __tipc_nl_add_node(struct tipc_nl_msg *msg, struct tipc_node *node)
+{
+       void *hdr;
+       struct nlattr *attrs;
+
+       hdr = genlmsg_put(msg->skb, msg->portid, msg->seq, &tipc_genl_v2_family,
+                         NLM_F_MULTI, TIPC_NL_NODE_GET);
+       if (!hdr)
+               return -EMSGSIZE;
+
+       attrs = nla_nest_start(msg->skb, TIPC_NLA_NODE);
+       if (!attrs)
+               goto msg_full;
+
+       if (nla_put_u32(msg->skb, TIPC_NLA_NODE_ADDR, node->addr))
+               goto attr_msg_full;
+       if (tipc_node_is_up(node))
+               if (nla_put_flag(msg->skb, TIPC_NLA_NODE_UP))
+                       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_dump(struct sk_buff *skb, struct netlink_callback *cb)
+{
+       int err;
+       int done = cb->args[0];
+       int last_addr = cb->args[1];
+       struct tipc_node *node;
+       struct tipc_nl_msg msg;
+
+       if (done)
+               return 0;
+
+       msg.skb = skb;
+       msg.portid = NETLINK_CB(cb->skb).portid;
+       msg.seq = cb->nlh->nlmsg_seq;
+
+       rcu_read_lock();
+
+       if (last_addr && !tipc_node_find(last_addr)) {
+               rcu_read_unlock();
+               /* We never set seq or call nl_dump_check_consistent() this
+                * means that setting prev_seq here will cause the consistence
+                * check to fail in the netlink callback handler. Resulting in
+                * the NLMSG_DONE message having the NLM_F_DUMP_INTR flag set if
+                * the node state changed while we released the lock.
+                */
+               cb->prev_seq = 1;
+               return -EPIPE;
+       }
+
+       list_for_each_entry_rcu(node, &tipc_node_list, list) {
+               if (last_addr) {
+                       if (node->addr == last_addr)
+                               last_addr = 0;
+                       else
+                               continue;
+               }
+
+               tipc_node_lock(node);
+               err = __tipc_nl_add_node(&msg, node);
+               if (err) {
+                       last_addr = node->addr;
+                       tipc_node_unlock(node);
+                       goto out;
+               }
+
+               tipc_node_unlock(node);
+       }
+       done = 1;
+out:
+       cb->args[0] = done;
+       cb->args[1] = last_addr;
+       rcu_read_unlock();
+
+       return skb->len;
+}

diff --git a/net/tipc/node.h b/net/tipc/node.h
index 04e91458bb29a17916964e65fbca8a99a35a7f0d..005fbcef32123b37f063ceaf29e6843889f7b69a 100644 (file)
--- a/net/tipc/node.h
+++ b/net/tipc/node.h
@@ -1,7 +1,7 @@
 /*
  * net/tipc/node.h: Include file for TIPC node management routines
  *
- * Copyright (c) 2000-2006, Ericsson AB
+ * Copyright (c) 2000-2006, 2014, Ericsson AB
  * Copyright (c) 2005, 2010-2014, Wind River Systems
  * All rights reserved.
  *
@@ -145,6 +145,8 @@ void tipc_node_unlock(struct tipc_node *node);
 int tipc_node_add_conn(u32 dnode, u32 port, u32 peer_port);
 void tipc_node_remove_conn(u32 dnode, u32 port);
 
+int tipc_nl_node_dump(struct sk_buff *skb, struct netlink_callback *cb);
+
 static inline void tipc_node_lock(struct tipc_node *node)
 {
        spin_lock_bh(&node->lock);