1 files changed, 96 insertions, 85 deletions

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 8d353ec77a66..ee5d33cfcf80 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -40,17 +40,9 @@
 #include "name_distr.h"
 #include "socket.h"
 
-#define NODE_HTABLE_SIZE 512
-
 static void node_lost_contact(struct tipc_node *n_ptr);
 static void node_established_contact(struct tipc_node *n_ptr);
 
-static struct hlist_head node_htable[NODE_HTABLE_SIZE];
-LIST_HEAD(tipc_node_list);
-static u32 tipc_num_nodes;
-static u32 tipc_num_links;
-static DEFINE_SPINLOCK(node_list_lock);
-
 struct tipc_sock_conn {
         u32 port;
         u32 peer_port;
@@ -78,15 +70,17 @@ static unsigned int tipc_hashfn(u32 addr)
 /*
  * tipc_node_find - locate specified node object, if it exists
  */
-struct tipc_node *tipc_node_find(u32 addr)
+struct tipc_node *tipc_node_find(struct net *net, u32 addr)
 {
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
         struct tipc_node *node;
 
-        if (unlikely(!in_own_cluster_exact(addr)))
+        if (unlikely(!in_own_cluster_exact(net, addr)))
                 return NULL;
 
         rcu_read_lock();
-        hlist_for_each_entry_rcu(node, &node_htable[tipc_hashfn(addr)], hash) {
+        hlist_for_each_entry_rcu(node, &tn->node_htable[tipc_hashfn(addr)],
+                                 hash) {
                 if (node->addr == addr) {
                         rcu_read_unlock();
                         return node;
@@ -96,20 +90,22 @@ struct tipc_node *tipc_node_find(u32 addr)
         return NULL;
 }
 
-struct tipc_node *tipc_node_create(u32 addr)
+struct tipc_node *tipc_node_create(struct net *net, u32 addr)
 {
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
         struct tipc_node *n_ptr, *temp_node;
 
-        spin_lock_bh(&node_list_lock);
+        spin_lock_bh(&tn->node_list_lock);
 
         n_ptr = kzalloc(sizeof(*n_ptr), GFP_ATOMIC);
         if (!n_ptr) {
-                spin_unlock_bh(&node_list_lock);
+                spin_unlock_bh(&tn->node_list_lock);
                 pr_warn("Node creation failed, no memory\n");
                 return NULL;
         }
 
         n_ptr->addr = addr;
+        n_ptr->net = net;
         spin_lock_init(&n_ptr->lock);
         INIT_HLIST_NODE(&n_ptr->hash);
         INIT_LIST_HEAD(&n_ptr->list);
@@ -118,9 +114,9 @@ struct tipc_node *tipc_node_create(u32 addr)
         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)]);
+        hlist_add_head_rcu(&n_ptr->hash, &tn->node_htable[tipc_hashfn(addr)]);
 
-        list_for_each_entry_rcu(temp_node, &tipc_node_list, list) {
+        list_for_each_entry_rcu(temp_node, &tn->node_list, list) {
                 if (n_ptr->addr < temp_node->addr)
                         break;
         }
@@ -128,40 +124,41 @@ struct tipc_node *tipc_node_create(u32 addr)
         n_ptr->action_flags = TIPC_WAIT_PEER_LINKS_DOWN;
         n_ptr->signature = INVALID_NODE_SIG;
 
-        tipc_num_nodes++;
+        tn->num_nodes++;
 
-        spin_unlock_bh(&node_list_lock);
+        spin_unlock_bh(&tn->node_list_lock);
         return n_ptr;
 }
 
-static void tipc_node_delete(struct tipc_node *n_ptr)
+static void tipc_node_delete(struct tipc_net *tn, struct tipc_node *n_ptr)
 {
         list_del_rcu(&n_ptr->list);
         hlist_del_rcu(&n_ptr->hash);
         kfree_rcu(n_ptr, rcu);
 
-        tipc_num_nodes--;
+        tn->num_nodes--;
 }
 
-void tipc_node_stop(void)
+void tipc_node_stop(struct net *net)
 {
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
         struct tipc_node *node, *t_node;
 
-        spin_lock_bh(&node_list_lock);
-        list_for_each_entry_safe(node, t_node, &tipc_node_list, list)
-                tipc_node_delete(node);
-        spin_unlock_bh(&node_list_lock);
+        spin_lock_bh(&tn->node_list_lock);
+        list_for_each_entry_safe(node, t_node, &tn->node_list, list)
+                tipc_node_delete(tn, node);
+        spin_unlock_bh(&tn->node_list_lock);
 }
 
-int tipc_node_add_conn(u32 dnode, u32 port, u32 peer_port)
+int tipc_node_add_conn(struct net *net, u32 dnode, u32 port, u32 peer_port)
 {
         struct tipc_node *node;
         struct tipc_sock_conn *conn;
 
-        if (in_own_node(dnode))
+        if (in_own_node(net, dnode))
                 return 0;
 
-        node = tipc_node_find(dnode);
+        node = tipc_node_find(net, dnode);
         if (!node) {
                 pr_warn("Connecting sock to node 0x%x failed\n", dnode);
                 return -EHOSTUNREACH;
@@ -179,15 +176,15 @@ int tipc_node_add_conn(u32 dnode, u32 port, u32 peer_port)
         return 0;
 }
 
-void tipc_node_remove_conn(u32 dnode, u32 port)
+void tipc_node_remove_conn(struct net *net, u32 dnode, u32 port)
 {
         struct tipc_node *node;
         struct tipc_sock_conn *conn, *safe;
 
-        if (in_own_node(dnode))
+        if (in_own_node(net, dnode))
                 return;
 
-        node = tipc_node_find(dnode);
+        node = tipc_node_find(net, dnode);
         if (!node)
                 return;
 
@@ -201,18 +198,20 @@ void tipc_node_remove_conn(u32 dnode, u32 port)
         tipc_node_unlock(node);
 }
 
-void tipc_node_abort_sock_conns(struct list_head *conns)
+void tipc_node_abort_sock_conns(struct net *net, struct list_head *conns)
 {
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
         struct tipc_sock_conn *conn, *safe;
         struct sk_buff *buf;
 
         list_for_each_entry_safe(conn, safe, conns, list) {
-                buf = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, TIPC_CONN_MSG,
-                                      SHORT_H_SIZE, 0, tipc_own_addr,
-                                      conn->peer_node, conn->port,
-                                      conn->peer_port, TIPC_ERR_NO_NODE);
+                buf = tipc_msg_create(net, TIPC_CRITICAL_IMPORTANCE,
+                                      TIPC_CONN_MSG, SHORT_H_SIZE, 0,
+                                      tn->own_addr, conn->peer_node,
+                                      conn->port, conn->peer_port,
+                                      TIPC_ERR_NO_NODE);
                 if (likely(buf))
-                        tipc_sk_rcv(buf);
+                        tipc_sk_rcv(net, buf);
                 list_del(&conn->list);
                 kfree(conn);
         }
@@ -231,8 +230,8 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
         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);
+        pr_debug("Established link <%s> on network plane %c\n",
+                 l_ptr->name, l_ptr->net_plane);
 
         if (!active[0]) {
                 active[0] = active[1] = l_ptr;
@@ -240,7 +239,7 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
                 goto exit;
         }
         if (l_ptr->priority < active[0]->priority) {
-                pr_info("New link <%s> becomes standby\n", l_ptr->name);
+                pr_debug("New link <%s> becomes standby\n", l_ptr->name);
                 goto exit;
         }
         tipc_link_dup_queue_xmit(active[0], l_ptr);
@@ -248,9 +247,9 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
                 active[0] = l_ptr;
                 goto exit;
         }
-        pr_info("Old link <%s> becomes standby\n", active[0]->name);
+        pr_debug("Old link <%s> becomes standby\n", active[0]->name);
         if (active[1] != active[0])
-                pr_info("Old link <%s> becomes standby\n", active[1]->name);
+                pr_debug("Old link <%s> becomes standby\n", active[1]->name);
         active[0] = active[1] = l_ptr;
 exit:
         /* Leave room for changeover header when returning 'mtu' to users: */
@@ -290,6 +289,7 @@ 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_net *tn = net_generic(n_ptr->net, tipc_net_id);
         struct tipc_link **active;
 
         n_ptr->working_links--;
@@ -297,12 +297,12 @@ void tipc_node_link_down(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
         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",
-                        l_ptr->name, l_ptr->net_plane);
+                pr_debug("Lost standby link <%s> on network plane %c\n",
+                         l_ptr->name, l_ptr->net_plane);
                 return;
         }
-        pr_info("Lost link <%s> on network plane %c\n",
-                l_ptr->name, l_ptr->net_plane);
+        pr_debug("Lost link <%s> on network plane %c\n",
+                 l_ptr->name, l_ptr->net_plane);
 
         active = &n_ptr->active_links[0];
         if (active[0] == l_ptr)
@@ -324,7 +324,7 @@ void tipc_node_link_down(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
         }
 
         /* Loopback link went down? No fragmentation needed from now on. */
-        if (n_ptr->addr == tipc_own_addr) {
+        if (n_ptr->addr == tn->own_addr) {
                 n_ptr->act_mtus[0] = MAX_MSG_SIZE;
                 n_ptr->act_mtus[1] = MAX_MSG_SIZE;
         }
@@ -342,24 +342,27 @@ int tipc_node_is_up(struct tipc_node *n_ptr)
 
 void tipc_node_attach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
 {
+        struct tipc_net *tn = net_generic(n_ptr->net, tipc_net_id);
+
         n_ptr->links[l_ptr->bearer_id] = l_ptr;
-        spin_lock_bh(&node_list_lock);
-        tipc_num_links++;
-        spin_unlock_bh(&node_list_lock);
+        spin_lock_bh(&tn->node_list_lock);
+        tn->num_links++;
+        spin_unlock_bh(&tn->node_list_lock);
         n_ptr->link_cnt++;
 }
 
 void tipc_node_detach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
 {
+        struct tipc_net *tn = net_generic(n_ptr->net, tipc_net_id);
         int i;
 
         for (i = 0; i < MAX_BEARERS; i++) {
                 if (l_ptr != n_ptr->links[i])
                         continue;
                 n_ptr->links[i] = NULL;
-                spin_lock_bh(&node_list_lock);
-                tipc_num_links--;
-                spin_unlock_bh(&node_list_lock);
+                spin_lock_bh(&tn->node_list_lock);
+                tn->num_links--;
+                spin_unlock_bh(&tn->node_list_lock);
                 n_ptr->link_cnt--;
         }
 }
@@ -368,8 +371,8 @@ static void node_established_contact(struct tipc_node *n_ptr)
 {
         n_ptr->action_flags |= TIPC_NOTIFY_NODE_UP;
         n_ptr->bclink.oos_state = 0;
-        n_ptr->bclink.acked = tipc_bclink_get_last_sent();
-        tipc_bclink_add_node(n_ptr->addr);
+        n_ptr->bclink.acked = tipc_bclink_get_last_sent(n_ptr->net);
+        tipc_bclink_add_node(n_ptr->net, n_ptr->addr);
 }
 
 static void node_lost_contact(struct tipc_node *n_ptr)
@@ -377,8 +380,8 @@ static void node_lost_contact(struct tipc_node *n_ptr)
         char addr_string[16];
         u32 i;
 
-        pr_info("Lost contact with %s\n",
-                tipc_addr_string_fill(addr_string, n_ptr->addr));
+        pr_debug("Lost contact with %s\n",
+                 tipc_addr_string_fill(addr_string, n_ptr->addr));
 
         /* Flush broadcast link info associated with lost node */
         if (n_ptr->bclink.recv_permitted) {
@@ -389,7 +392,7 @@ static void node_lost_contact(struct tipc_node *n_ptr)
                         n_ptr->bclink.reasm_buf = NULL;
                 }
 
-                tipc_bclink_remove_node(n_ptr->addr);
+                tipc_bclink_remove_node(n_ptr->net, n_ptr->addr);
                 tipc_bclink_acknowledge(n_ptr, INVALID_LINK_SEQ);
 
                 n_ptr->bclink.recv_permitted = false;
@@ -414,8 +417,10 @@ static void node_lost_contact(struct tipc_node *n_ptr)
                                TIPC_NOTIFY_NODE_DOWN;
 }
 
-struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space)
+struct sk_buff *tipc_node_get_nodes(struct net *net, const void *req_tlv_area,
+                                    int req_tlv_space)
 {
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
         u32 domain;
         struct sk_buff *buf;
         struct tipc_node *n_ptr;
@@ -430,20 +435,20 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space)
                 return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
                                                    " (network address)");
 
-        spin_lock_bh(&node_list_lock);
-        if (!tipc_num_nodes) {
-                spin_unlock_bh(&node_list_lock);
+        spin_lock_bh(&tn->node_list_lock);
+        if (!tn->num_nodes) {
+                spin_unlock_bh(&tn->node_list_lock);
                 return tipc_cfg_reply_none();
         }
 
         /* For now, get space for all other nodes */
-        payload_size = TLV_SPACE(sizeof(node_info)) * tipc_num_nodes;
+        payload_size = TLV_SPACE(sizeof(node_info)) * tn->num_nodes;
         if (payload_size > 32768u) {
-                spin_unlock_bh(&node_list_lock);
+                spin_unlock_bh(&tn->node_list_lock);
                 return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
                                                    " (too many nodes)");
         }
-        spin_unlock_bh(&node_list_lock);
+        spin_unlock_bh(&tn->node_list_lock);
 
         buf = tipc_cfg_reply_alloc(payload_size);
         if (!buf)
@@ -451,7 +456,7 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space)
 
         /* Add TLVs for all nodes in scope */
         rcu_read_lock();
-        list_for_each_entry_rcu(n_ptr, &tipc_node_list, list) {
+        list_for_each_entry_rcu(n_ptr, &tn->node_list, list) {
                 if (!tipc_in_scope(domain, n_ptr->addr))
                         continue;
                 node_info.addr = htonl(n_ptr->addr);
@@ -463,8 +468,10 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space)
         return buf;
 }
 
-struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space)
+struct sk_buff *tipc_node_get_links(struct net *net, const void *req_tlv_area,
+                                    int req_tlv_space)
 {
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
         u32 domain;
         struct sk_buff *buf;
         struct tipc_node *n_ptr;
@@ -479,32 +486,32 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space)
                 return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
                                                    " (network address)");
 
-        if (!tipc_own_addr)
+        if (!tn->own_addr)
                 return tipc_cfg_reply_none();
 
-        spin_lock_bh(&node_list_lock);
+        spin_lock_bh(&tn->node_list_lock);
         /* Get space for all unicast links + broadcast link */
-        payload_size = TLV_SPACE((sizeof(link_info)) * (tipc_num_links + 1));
+        payload_size = TLV_SPACE((sizeof(link_info)) * (tn->num_links + 1));
         if (payload_size > 32768u) {
-                spin_unlock_bh(&node_list_lock);
+                spin_unlock_bh(&tn->node_list_lock);
                 return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
                                                    " (too many links)");
         }
-        spin_unlock_bh(&node_list_lock);
+        spin_unlock_bh(&tn->node_list_lock);
 
         buf = tipc_cfg_reply_alloc(payload_size);
         if (!buf)
                 return NULL;
 
         /* Add TLV for broadcast link */
-        link_info.dest = htonl(tipc_cluster_mask(tipc_own_addr));
+        link_info.dest = htonl(tipc_cluster_mask(tn->own_addr));
         link_info.up = htonl(1);
         strlcpy(link_info.str, tipc_bclink_name, TIPC_MAX_LINK_NAME);
         tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info));
 
         /* Add TLVs for any other links in scope */
         rcu_read_lock();
-        list_for_each_entry_rcu(n_ptr, &tipc_node_list, list) {
+        list_for_each_entry_rcu(n_ptr, &tn->node_list, list) {
                 u32 i;
 
                 if (!tipc_in_scope(domain, n_ptr->addr))
@@ -534,10 +541,11 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space)
  *
  * Returns 0 on success
  */
-int tipc_node_get_linkname(u32 bearer_id, u32 addr, char *linkname, size_t len)
+int tipc_node_get_linkname(struct net *net, u32 bearer_id, u32 addr,
+                           char *linkname, size_t len)
 {
         struct tipc_link *link;
-        struct tipc_node *node = tipc_node_find(addr);
+        struct tipc_node *node = tipc_node_find(net, addr);
 
         if ((bearer_id >= MAX_BEARERS) || !node)
                 return -EINVAL;
@@ -554,6 +562,7 @@ int tipc_node_get_linkname(u32 bearer_id, u32 addr, char *linkname, size_t len)
 
 void tipc_node_unlock(struct tipc_node *node)
 {
+        struct net *net = node->net;
         LIST_HEAD(nsub_list);
         LIST_HEAD(conn_sks);
         struct sk_buff_head waiting_sks;
@@ -585,26 +594,26 @@ void tipc_node_unlock(struct tipc_node *node)
         spin_unlock_bh(&node->lock);
 
         while (!skb_queue_empty(&waiting_sks))
-                tipc_sk_rcv(__skb_dequeue(&waiting_sks));
+                tipc_sk_rcv(net, __skb_dequeue(&waiting_sks));
 
         if (!list_empty(&conn_sks))
-                tipc_node_abort_sock_conns(&conn_sks);
+                tipc_node_abort_sock_conns(net, &conn_sks);
 
         if (!list_empty(&nsub_list))
-                tipc_publ_notify(&nsub_list, addr);
+                tipc_publ_notify(net, &nsub_list, addr);
 
         if (flags & TIPC_WAKEUP_BCAST_USERS)
-                tipc_bclink_wakeup_users();
+                tipc_bclink_wakeup_users(net);
 
         if (flags & TIPC_NOTIFY_NODE_UP)
-                tipc_named_node_up(addr);
+                tipc_named_node_up(net, addr);
 
         if (flags & TIPC_NOTIFY_LINK_UP)
-                tipc_nametbl_publish(TIPC_LINK_STATE, addr, addr,
+                tipc_nametbl_publish(net, TIPC_LINK_STATE, addr, addr,
                                      TIPC_NODE_SCOPE, link_id, addr);
 
         if (flags & TIPC_NOTIFY_LINK_DOWN)
-                tipc_nametbl_withdraw(TIPC_LINK_STATE, addr,
+                tipc_nametbl_withdraw(net, TIPC_LINK_STATE, addr,
                                       link_id, addr);
 }
 
@@ -645,6 +654,8 @@ msg_full:
 int tipc_nl_node_dump(struct sk_buff *skb, struct netlink_callback *cb)
 {
         int err;
+        struct net *net = sock_net(skb->sk);
+        struct tipc_net *tn = net_generic(net, tipc_net_id);
         int done = cb->args[0];
         int last_addr = cb->args[1];
         struct tipc_node *node;
@@ -659,7 +670,7 @@ int tipc_nl_node_dump(struct sk_buff *skb, struct netlink_callback *cb)
 
         rcu_read_lock();
 
-        if (last_addr && !tipc_node_find(last_addr)) {
+        if (last_addr && !tipc_node_find(net, 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
@@ -671,7 +682,7 @@ int tipc_nl_node_dump(struct sk_buff *skb, struct netlink_callback *cb)
                 return -EPIPE;
         }
 
-        list_for_each_entry_rcu(node, &tipc_node_list, list) {
+        list_for_each_entry_rcu(node, &tn->node_list, list) {
                 if (last_addr) {
                         if (node->addr == last_addr)
                                 last_addr = 0;