tipc: guarantee delivery of UP event before first broadcast

The following scenario is possible:
- A user joins a group, and immediately sends out a broadcast message
  to its members.
- The broadcast message, following a different data path than the
  initial JOIN message sent out during the joining procedure, arrives
  to a receiver before the latter..
- The receiver drops the message, since it is not ready to accept any
  messages until the JOIN has arrived.

We avoid this by treating group protocol JOIN messages like unicast
messages.
- We let them pass through the recipient's multicast input queue, just
  like ordinary unicasts.
- We force the first following broadacst to be sent as replicated
  unicast and being acknowledged by the recipient before accepting
  any more broadcast transmissions.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 70a21499804d0e1c98a18857ad3ae258ef1eed8e..723dd6998684d96ab88fbbe195f9ef958e32a94a 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1039,6 +1039,7 @@ int tipc_link_retrans(struct tipc_link *l, struct tipc_link *nacker,
 static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb,
                            struct sk_buff_head *inputq)
 {
+       struct sk_buff_head *mc_inputq = l->bc_rcvlink->inputq;
        struct tipc_msg *hdr = buf_msg(skb);
 
        switch (msg_user(hdr)) {
@@ -1047,12 +1048,14 @@ static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb,
        case TIPC_HIGH_IMPORTANCE:
        case TIPC_CRITICAL_IMPORTANCE:
                if (unlikely(msg_in_group(hdr) || msg_mcast(hdr))) {
-                       skb_queue_tail(l->bc_rcvlink->inputq, skb);
+                       skb_queue_tail(mc_inputq, skb);
                        return true;
                }
-       case GROUP_PROTOCOL:
        case CONN_MANAGER:
                return true;
+       case GROUP_PROTOCOL:
+               skb_queue_tail(mc_inputq, skb);
+               return true;
        case NAME_DISTRIBUTOR:
                l->bc_rcvlink->state = LINK_ESTABLISHED;
                skb_queue_tail(l->namedq, skb);

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index b1f1c3c2b1e2a4e03b9ad585ebada685677ab916..2bbab4fe2f53361866e282e7e401d33250b74cdc 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2762,6 +2762,10 @@ static int tipc_sk_join(struct tipc_sock *tsk, struct tipc_group_req *mreq)
        rc = tipc_sk_publish(tsk, mreq->scope, &seq);
        if (rc)
                tipc_group_delete(net, grp);
+
+       /* Eliminate any risk that a broadcast overtakes the sent JOIN */
+       tsk->mc_method.rcast = true;
+       tsk->mc_method.mandatory = true;
        return rc;
 }