tipc: Enhance sending of bulk name table messages

Modifies the initial transfer of name table entries to a new neighboring
node so that the messages are enqueued as a unit, rather than individually.

The revised algorithm now locates the link carrying the message only once,
and eliminates unnecessary checks for link congestion, message fragmentation,
and message bundling that are not required when sending these messages.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

1 files changed, 45 insertions, 0 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 74126db4597..2ea3f22b798 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -986,6 +986,51 @@ int tipc_link_send(struct sk_buff *buf, u32 dest, u32 selector)
 }
 
 /*
+ * tipc_link_send_names - send name table entries to new neighbor
+ *
+ * Send routine for bulk delivery of name table messages when contact
+ * with a new neighbor occurs. No link congestion checking is performed
+ * because name table messages *must* be delivered. The messages must be
+ * small enough not to require fragmentation.
+ * Called without any locks held.
+ */
+
+void tipc_link_send_names(struct list_head *message_list, u32 dest)
+{
+        struct tipc_node *n_ptr;
+        struct link *l_ptr;
+        struct sk_buff *buf;
+        struct sk_buff *temp_buf;
+
+        if (list_empty(message_list))
+                return;
+
+        read_lock_bh(&tipc_net_lock);
+        n_ptr = tipc_node_find(dest);
+        if (n_ptr) {
+                tipc_node_lock(n_ptr);
+                l_ptr = n_ptr->active_links[0];
+                if (l_ptr) {
+                        /* convert circular list to linear list */
+                        ((struct sk_buff *)message_list->prev)->next = NULL;
+                        link_add_chain_to_outqueue(l_ptr,
+                                (struct sk_buff *)message_list->next, 0);
+                        tipc_link_push_queue(l_ptr);
+                        INIT_LIST_HEAD(message_list);
+                }
+                tipc_node_unlock(n_ptr);
+        }
+        read_unlock_bh(&tipc_net_lock);
+
+        /* discard the messages if they couldn't be sent */
+
+        list_for_each_safe(buf, temp_buf, ((struct sk_buff *)message_list)) {
+                list_del((struct list_head *)buf);
+                buf_discard(buf);
+        }
+}
+
+/*
  * link_send_buf_fast: Entry for data messages where the
  * destination link is known and the header is complete,
  * inclusive total message length. Very time critical.