Merge branch 'tipc-next'

Jon Maloy says:

====================
tipc: improve broadcast implementation

The TIPC broadcast link implementation is currently complex and hard to
follow. It also incurs some amount of code and structure duplication,
something that can be reduced significantly with a little effort.

This commit series introduces a number of improvements which address
both the locking structure, the code/structure duplication issue, and
the overall readbility of the code.

The series consists of three main parts:

1-7: Adaptation to the new link structure, and preparation for the next
     step. In particular, we want the broadcast transmission link to
     have a life cycle that is longer than any of its potential (unicast
     and broadcast receive links) users. This eliminates the need to
     always test for the presence of this link before accessing it.

8-10: This is what is really new in this series. Commit #9 is by far
      the largest and most important one, because it moves most of
      the broadcast functionality into link.c, partially reusing the
      fields and functionality of the unicast link. The removal of
      the "node_map" infrastructure in commit #10 is also an important
      achievement.

11-16: Some improvements leveraging the changes made in the previous
       commits.

The series needs commit 53387c4e22ac ("tipc: extend broadcast link window size")
and commit e53567948f82 ("tipc: conditionally expand buffer headroom over udp tunnel")
which are both present in 'net' but not yet in 'net-next', to apply cleanly.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 8 deletions

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 26d38b3d8760..8740930f0787 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -182,7 +182,6 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf)
         *buf = NULL;
         return 0;
 err:
-        pr_warn_ratelimited("Unable to build fragment list\n");
         kfree_skb(*buf);
         kfree_skb(*headbuf);
         *buf = *headbuf = NULL;
@@ -565,18 +564,22 @@ bool tipc_msg_lookup_dest(struct net *net, struct sk_buff *skb, int *err)
 /* tipc_msg_reassemble() - clone a buffer chain of fragments and
  *                         reassemble the clones into one message
  */
-struct sk_buff *tipc_msg_reassemble(struct sk_buff_head *list)
+bool tipc_msg_reassemble(struct sk_buff_head *list, struct sk_buff_head *rcvq)
 {
-        struct sk_buff *skb;
+        struct sk_buff *skb, *_skb;
         struct sk_buff *frag = NULL;
         struct sk_buff *head = NULL;
-        int hdr_sz;
+        int hdr_len;
 
         /* Copy header if single buffer */
         if (skb_queue_len(list) == 1) {
                 skb = skb_peek(list);
-                hdr_sz = skb_headroom(skb) + msg_hdr_sz(buf_msg(skb));
-                return __pskb_copy(skb, hdr_sz, GFP_ATOMIC);
+                hdr_len = skb_headroom(skb) + msg_hdr_sz(buf_msg(skb));
+                _skb = __pskb_copy(skb, hdr_len, GFP_ATOMIC);
+                if (!_skb)
+                        return false;
+                __skb_queue_tail(rcvq, _skb);
+                return true;
         }
 
         /* Clone all fragments and reassemble */
@@ -590,11 +593,12 @@ struct sk_buff *tipc_msg_reassemble(struct sk_buff_head *list)
                 if (!head)
                         goto error;
         }
-        return frag;
+        __skb_queue_tail(rcvq, frag);
+        return true;
 error:
         pr_warn("Failed do clone local mcast rcv buffer\n");
         kfree_skb(head);
-        return NULL;
+        return false;
 }
 
 /* tipc_skb_queue_sorted(); sort pkt into list according to sequence number