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/socket.c b/net/tipc/socket.c
index 83ae41d7e554..3b9f8cc328f5 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -809,7 +809,7 @@ static int tipc_sendmcast(struct  socket *sock, struct tipc_name_seq *seq,
         msg_set_nameupper(hdr, seq->upper);
 
         /* Build message as chain of buffers */
-        skb_queue_head_init(&pkts);
+        __skb_queue_head_init(&pkts);
         rc = tipc_msg_build(hdr, msg, 0, dlen, mtu, &pkts);
 
         /* Send message if build was successful */
@@ -853,7 +853,7 @@ static int tipc_send_group_msg(struct net *net, struct tipc_sock *tsk,
         msg_set_grp_bc_seqno(hdr, bc_snd_nxt);
 
         /* Build message as chain of buffers */
-        skb_queue_head_init(&pkts);
+        __skb_queue_head_init(&pkts);
         mtu = tipc_node_get_mtu(net, dnode, tsk->portid);
         rc = tipc_msg_build(hdr, m, 0, dlen, mtu, &pkts);
         if (unlikely(rc != dlen))
@@ -1058,7 +1058,7 @@ static int tipc_send_group_bcast(struct socket *sock, struct msghdr *m,
         msg_set_grp_bc_ack_req(hdr, ack);
 
         /* Build message as chain of buffers */
-        skb_queue_head_init(&pkts);
+        __skb_queue_head_init(&pkts);
         rc = tipc_msg_build(hdr, m, 0, dlen, mtu, &pkts);
         if (unlikely(rc != dlen))
                 return rc;
@@ -1387,7 +1387,7 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dlen)
         if (unlikely(rc))
                 return rc;
 
-        skb_queue_head_init(&pkts);
+        __skb_queue_head_init(&pkts);
         mtu = tipc_node_get_mtu(net, dnode, tsk->portid);
         rc = tipc_msg_build(hdr, m, 0, dlen, mtu, &pkts);
         if (unlikely(rc != dlen))
@@ -1445,7 +1445,7 @@ static int __tipc_sendstream(struct socket *sock, struct msghdr *m, size_t dlen)
         int send, sent = 0;
         int rc = 0;
 
-        skb_queue_head_init(&pkts);
+        __skb_queue_head_init(&pkts);
 
         if (unlikely(dlen > INT_MAX))
                 return -EMSGSIZE;
@@ -1805,7 +1805,7 @@ static int tipc_recvmsg(struct socket *sock, struct msghdr *m,
 
         /* Send group flow control advertisement when applicable */
         if (tsk->group && msg_in_group(hdr) && !grp_evt) {
-                skb_queue_head_init(&xmitq);
+                __skb_queue_head_init(&xmitq);
                 tipc_group_update_rcv_win(tsk->group, tsk_blocks(hlen + dlen),
                                           msg_orignode(hdr), msg_origport(hdr),
                                           &xmitq);
@@ -2674,7 +2674,7 @@ static void tipc_sk_timeout(struct timer_list *t)
         struct sk_buff_head list;
         int rc = 0;
 
-        skb_queue_head_init(&list);
+        __skb_queue_head_init(&list);
         bh_lock_sock(sk);
 
         /* Try again later if socket is busy */