tipc: clean up skb list lock handling on send path

The policy for handling the skb list locks on the send and receive paths
is simple.

- On the send path we never need to grab the lock on the 'xmitq' list
  when the destination is an exernal node.

- On the receive path we always need to grab the lock on the 'inputq'
  list, irrespective of source node.

However, when transmitting node local messages those will eventually
end up on the receive path of a local socket, meaning that the argument
'xmitq' in tipc_node_xmit() will become the 'ínputq' argument in  the
function tipc_sk_rcv(). This has been handled by always initializing
the spinlock of the 'xmitq' list at message creation, just in case it
may end up on the receive path later, and despite knowing that the lock
in most cases never will be used.

This approach is inaccurate and confusing, and has also concealed the
fact that the stated 'no lock grabbing' policy for the send path is
violated in some cases.

We now clean up this by never initializing the lock at message creation,
instead doing this at the moment we find that the message actually will
enter the receive path. At the same time we fix the four locations
where we incorrectly access the spinlock on the send/error path.

This patch also reverts commit d12cffe9329f ("tipc: ensure head->lock
is initialised") which has now become redundant.

CC: Eric Dumazet <edumazet@google.com>
Reported-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 7 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index dd3155b14654..289e848084ac 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -959,7 +959,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
                 pr_warn("Too large msg, purging xmit list %d %d %d %d %d!\n",
                         skb_queue_len(list), msg_user(hdr),
                         msg_type(hdr), msg_size(hdr), mtu);
-                skb_queue_purge(list);
+                __skb_queue_purge(list);
                 return -EMSGSIZE;
         }
 
@@ -988,7 +988,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
                 if (likely(skb_queue_len(transmq) < maxwin)) {
                         _skb = skb_clone(skb, GFP_ATOMIC);
                         if (!_skb) {
-                                skb_queue_purge(list);
+                                __skb_queue_purge(list);
                                 return -ENOBUFS;
                         }
                         __skb_dequeue(list);
@@ -1668,7 +1668,7 @@ void tipc_link_create_dummy_tnl_msg(struct tipc_link *l,
         struct sk_buff *skb;
         u32 dnode = l->addr;
 
-        skb_queue_head_init(&tnlq);
+        __skb_queue_head_init(&tnlq);
         skb = tipc_msg_create(TUNNEL_PROTOCOL, FAILOVER_MSG,
                               INT_H_SIZE, BASIC_H_SIZE,
                               dnode, onode, 0, 0, 0);
@@ -1708,9 +1708,9 @@ void tipc_link_tnl_prepare(struct tipc_link *l, struct tipc_link *tnl,
         if (!tnl)
                 return;
 
-        skb_queue_head_init(&tnlq);
-        skb_queue_head_init(&tmpxq);
-        skb_queue_head_init(&frags);
+        __skb_queue_head_init(&tnlq);
+        __skb_queue_head_init(&tmpxq);
+        __skb_queue_head_init(&frags);
 
         /* At least one packet required for safe algorithm => add dummy */
         skb = tipc_msg_create(TIPC_LOW_IMPORTANCE, TIPC_DIRECT_MSG,
@@ -1720,7 +1720,7 @@ void tipc_link_tnl_prepare(struct tipc_link *l, struct tipc_link *tnl,
                 pr_warn("%sunable to create tunnel packet\n", link_co_err);
                 return;
         }
-        skb_queue_tail(&tnlq, skb);
+        __skb_queue_tail(&tnlq, skb);
         tipc_link_xmit(l, &tnlq, &tmpxq);
         __skb_queue_purge(&tmpxq);