1 files changed, 130 insertions, 24 deletions

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 90cee4a6fce4..8d353ec77a66 100644
--- 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
@@ -107,9 +113,10 @@ struct tipc_node *tipc_node_create(u32 addr)
         spin_lock_init(&n_ptr->lock);
         INIT_HLIST_NODE(&n_ptr->hash);
         INIT_LIST_HEAD(&n_ptr->list);
-        INIT_LIST_HEAD(&n_ptr->nsub);
+        INIT_LIST_HEAD(&n_ptr->publ_list);
         INIT_LIST_HEAD(&n_ptr->conn_sks);
-        __skb_queue_head_init(&n_ptr->waiting_sks);
+        skb_queue_head_init(&n_ptr->waiting_sks);
+        __skb_queue_head_init(&n_ptr->bclink.deferred_queue);
 
         hlist_add_head_rcu(&n_ptr->hash, &node_htable[tipc_hashfn(addr)]);
 
@@ -219,11 +226,11 @@ void tipc_node_abort_sock_conns(struct list_head *conns)
 void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
 {
         struct tipc_link **active = &n_ptr->active_links[0];
-        u32 addr = n_ptr->addr;
 
         n_ptr->working_links++;
-        tipc_nametbl_publish(TIPC_LINK_STATE, addr, addr, TIPC_NODE_SCOPE,
-                             l_ptr->bearer_id, addr);
+        n_ptr->action_flags |= TIPC_NOTIFY_LINK_UP;
+        n_ptr->link_id = l_ptr->peer_bearer_id << 16 | l_ptr->bearer_id;
+
         pr_info("Established link <%s> on network plane %c\n",
                 l_ptr->name, l_ptr->net_plane);
 
@@ -284,10 +291,10 @@ static void node_select_active_links(struct tipc_node *n_ptr)
 void tipc_node_link_down(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
 {
         struct tipc_link **active;
-        u32 addr = n_ptr->addr;
 
         n_ptr->working_links--;
-        tipc_nametbl_withdraw(TIPC_LINK_STATE, addr, l_ptr->bearer_id, addr);
+        n_ptr->action_flags |= TIPC_NOTIFY_LINK_DOWN;
+        n_ptr->link_id = l_ptr->peer_bearer_id << 16 | l_ptr->bearer_id;
 
         if (!tipc_link_is_active(l_ptr)) {
                 pr_info("Lost standby link <%s> on network plane %c\n",
@@ -375,8 +382,7 @@ static void node_lost_contact(struct tipc_node *n_ptr)
 
         /* Flush broadcast link info associated with lost node */
         if (n_ptr->bclink.recv_permitted) {
-                kfree_skb_list(n_ptr->bclink.deferred_head);
-                n_ptr->bclink.deferred_size = 0;
+                __skb_queue_purge(&n_ptr->bclink.deferred_queue);
 
                 if (n_ptr->bclink.reasm_buf) {
                         kfree_skb(n_ptr->bclink.reasm_buf);
@@ -552,28 +558,30 @@ void tipc_node_unlock(struct tipc_node *node)
         LIST_HEAD(conn_sks);
         struct sk_buff_head waiting_sks;
         u32 addr = 0;
-        unsigned int flags = node->action_flags;
+        int flags = node->action_flags;
+        u32 link_id = 0;
 
-        if (likely(!node->action_flags)) {
+        if (likely(!flags)) {
                 spin_unlock_bh(&node->lock);
                 return;
         }
 
+        addr = node->addr;
+        link_id = node->link_id;
         __skb_queue_head_init(&waiting_sks);
-        if (node->action_flags & TIPC_WAKEUP_USERS) {
+
+        if (flags & TIPC_WAKEUP_USERS)
                 skb_queue_splice_init(&node->waiting_sks, &waiting_sks);
-                node->action_flags &= ~TIPC_WAKEUP_USERS;
-        }
-        if (node->action_flags & TIPC_NOTIFY_NODE_DOWN) {
-                list_replace_init(&node->nsub, &nsub_list);
+
+        if (flags & TIPC_NOTIFY_NODE_DOWN) {
+                list_replace_init(&node->publ_list, &nsub_list);
                 list_replace_init(&node->conn_sks, &conn_sks);
-                node->action_flags &= ~TIPC_NOTIFY_NODE_DOWN;
         }
-        if (node->action_flags & TIPC_NOTIFY_NODE_UP) {
-                node->action_flags &= ~TIPC_NOTIFY_NODE_UP;
-                addr = node->addr;
-        }
-        node->action_flags &= ~TIPC_WAKEUP_BCAST_USERS;
+        node->action_flags &= ~(TIPC_WAKEUP_USERS | TIPC_NOTIFY_NODE_DOWN |
+                                TIPC_NOTIFY_NODE_UP | TIPC_NOTIFY_LINK_UP |
+                                TIPC_NOTIFY_LINK_DOWN |
+                                TIPC_WAKEUP_BCAST_USERS);
+
         spin_unlock_bh(&node->lock);
 
         while (!skb_queue_empty(&waiting_sks))
@@ -583,11 +591,109 @@ void tipc_node_unlock(struct tipc_node *node)
                 tipc_node_abort_sock_conns(&conn_sks);
 
         if (!list_empty(&nsub_list))
-                tipc_nodesub_notify(&nsub_list);
+                tipc_publ_notify(&nsub_list, addr);
 
         if (flags & TIPC_WAKEUP_BCAST_USERS)
                 tipc_bclink_wakeup_users();
 
-        if (addr)
+        if (flags & TIPC_NOTIFY_NODE_UP)
                 tipc_named_node_up(addr);
+
+        if (flags & TIPC_NOTIFY_LINK_UP)
+                tipc_nametbl_publish(TIPC_LINK_STATE, addr, addr,
+                                     TIPC_NODE_SCOPE, link_id, addr);
+
+        if (flags & TIPC_NOTIFY_LINK_DOWN)
+                tipc_nametbl_withdraw(TIPC_LINK_STATE, addr,
+                                      link_id, addr);
+}
+
+/* Caller should hold node lock for the passed node */
+static 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;
 }