1 files changed, 103 insertions, 37 deletions

diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index dcc15bcd5692..376d2bb51d8d 100644
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -1,7 +1,7 @@
 /*
  * net/tipc/name_distr.c: TIPC name distribution code
  *
- * Copyright (c) 2000-2006, Ericsson AB
+ * Copyright (c) 2000-2006, 2014, Ericsson AB
  * Copyright (c) 2005, 2010-2011, Wind River Systems
  * All rights reserved.
  *
@@ -71,6 +71,21 @@ static struct publ_list *publ_lists[] = {
 };
 
 
+int sysctl_tipc_named_timeout __read_mostly = 2000;
+
+/**
+ * struct tipc_dist_queue - queue holding deferred name table updates
+ */
+static struct list_head tipc_dist_queue = LIST_HEAD_INIT(tipc_dist_queue);
+
+struct distr_queue_item {
+        struct distr_item i;
+        u32 dtype;
+        u32 node;
+        unsigned long expires;
+        struct list_head next;
+};
+
 /**
  * publ_to_item - add publication info to a publication message
  */
@@ -263,54 +278,105 @@ static void named_purge_publ(struct publication *publ)
 }
 
 /**
+ * tipc_update_nametbl - try to process a nametable update and notify
+ *                       subscribers
+ *
+ * tipc_nametbl_lock must be held.
+ * Returns the publication item if successful, otherwise NULL.
+ */
+static bool tipc_update_nametbl(struct distr_item *i, u32 node, u32 dtype)
+{
+        struct publication *publ = NULL;
+
+        if (dtype == PUBLICATION) {
+                publ = tipc_nametbl_insert_publ(ntohl(i->type), ntohl(i->lower),
+                                                ntohl(i->upper),
+                                                TIPC_CLUSTER_SCOPE, node,
+                                                ntohl(i->ref), ntohl(i->key));
+                if (publ) {
+                        tipc_nodesub_subscribe(&publ->subscr, node, publ,
+                                               (net_ev_handler)
+                                               named_purge_publ);
+                        return true;
+                }
+        } else if (dtype == WITHDRAWAL) {
+                publ = tipc_nametbl_remove_publ(ntohl(i->type), ntohl(i->lower),
+                                                node, ntohl(i->ref),
+                                                ntohl(i->key));
+                if (publ) {
+                        tipc_nodesub_unsubscribe(&publ->subscr);
+                        kfree(publ);
+                        return true;
+                }
+        } else {
+                pr_warn("Unrecognized name table message received\n");
+        }
+        return false;
+}
+
+/**
+ * tipc_named_add_backlog - add a failed name table update to the backlog
+ *
+ */
+static void tipc_named_add_backlog(struct distr_item *i, u32 type, u32 node)
+{
+        struct distr_queue_item *e;
+        unsigned long now = get_jiffies_64();
+
+        e = kzalloc(sizeof(*e), GFP_ATOMIC);
+        if (!e)
+                return;
+        e->dtype = type;
+        e->node = node;
+        e->expires = now + msecs_to_jiffies(sysctl_tipc_named_timeout);
+        memcpy(e, i, sizeof(*i));
+        list_add_tail(&e->next, &tipc_dist_queue);
+}
+
+/**
+ * tipc_named_process_backlog - try to process any pending name table updates
+ * from the network.
+ */
+void tipc_named_process_backlog(void)
+{
+        struct distr_queue_item *e, *tmp;
+        char addr[16];
+        unsigned long now = get_jiffies_64();
+
+        list_for_each_entry_safe(e, tmp, &tipc_dist_queue, next) {
+                if (time_after(e->expires, now)) {
+                        if (!tipc_update_nametbl(&e->i, e->node, e->dtype))
+                                continue;
+                } else {
+                        tipc_addr_string_fill(addr, e->node);
+                        pr_warn_ratelimited("Dropping name table update (%d) of {%u, %u, %u} from %s key=%u\n",
+                                            e->dtype, ntohl(e->i.type),
+                                            ntohl(e->i.lower),
+                                            ntohl(e->i.upper),
+                                            addr, ntohl(e->i.key));
+                }
+                list_del(&e->next);
+                kfree(e);
+        }
+}
+
+/**
  * tipc_named_rcv - process name table update message sent by another node
  */
 void tipc_named_rcv(struct sk_buff *buf)
 {
-        struct publication *publ;
         struct tipc_msg *msg = buf_msg(buf);
         struct distr_item *item = (struct distr_item *)msg_data(msg);
         u32 count = msg_data_sz(msg) / ITEM_SIZE;
+        u32 node = msg_orignode(msg);
 
         write_lock_bh(&tipc_nametbl_lock);
         while (count--) {
-                if (msg_type(msg) == PUBLICATION) {
-                        publ = tipc_nametbl_insert_publ(ntohl(item->type),
-                                                        ntohl(item->lower),
-                                                        ntohl(item->upper),
-                                                        TIPC_CLUSTER_SCOPE,
-                                                        msg_orignode(msg),
-                                                        ntohl(item->ref),
-                                                        ntohl(item->key));
-                        if (publ) {
-                                tipc_nodesub_subscribe(&publ->subscr,
-                                                       msg_orignode(msg),
-                                                       publ,
-                                                       (net_ev_handler)
-                                                       named_purge_publ);
-                        }
-                } else if (msg_type(msg) == WITHDRAWAL) {
-                        publ = tipc_nametbl_remove_publ(ntohl(item->type),
-                                                        ntohl(item->lower),
-                                                        msg_orignode(msg),
-                                                        ntohl(item->ref),
-                                                        ntohl(item->key));
-
-                        if (publ) {
-                                tipc_nodesub_unsubscribe(&publ->subscr);
-                                kfree(publ);
-                        } else {
-                                pr_err("Unable to remove publication by node 0x%x\n"
-                                       " (type=%u, lower=%u, ref=%u, key=%u)\n",
-                                       msg_orignode(msg), ntohl(item->type),
-                                       ntohl(item->lower), ntohl(item->ref),
-                                       ntohl(item->key));
-                        }
-                } else {
-                        pr_warn("Unrecognized name table message received\n");
-                }
+                if (!tipc_update_nametbl(item, node, msg_type(msg)))
+                        tipc_named_add_backlog(item, msg_type(msg), node);
                 item++;
         }
+        tipc_named_process_backlog();
         write_unlock_bh(&tipc_nametbl_lock);
         kfree_skb(buf);
 }