]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
tipc: fix uninitialized value for broadcast retransmission
authorHoang Le <hoang.h.le@dektech.com.au>
Wed, 19 Dec 2018 04:42:19 +0000 (11:42 +0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Dec 2018 19:53:10 +0000 (11:53 -0800)
When sending broadcast message on high load system, there are a lot of
unnecessary packets restranmission. That issue was caused by missing in
initial criteria for retransmission.

To prevent this happen, just initialize this criteria for retransmission
in next 10 milliseconds.

Fixes: 31c4f4cc32f7 ("tipc: improve broadcast retransmission algorithm")
Acked-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tipc/link.c

index 55c44d867d4ba8c8f4f9c278e764e07967f787eb..2792a3cae682205970046d51de55e6ae0e5ab772 100644 (file)
@@ -967,6 +967,10 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
                        }
                        __skb_dequeue(list);
                        __skb_queue_tail(transmq, skb);
+                       /* next retransmit attempt */
+                       if (link_is_bc_sndlink(l))
+                               TIPC_SKB_CB(skb)->nxt_retr =
+                                       jiffies + TIPC_BC_RETR_LIM;
                        __skb_queue_tail(xmitq, _skb);
                        TIPC_SKB_CB(skb)->ackers = l->ackers;
                        l->rcv_unacked = 0;
@@ -1014,6 +1018,10 @@ static void tipc_link_advance_backlog(struct tipc_link *l,
                hdr = buf_msg(skb);
                l->backlog[msg_importance(hdr)].len--;
                __skb_queue_tail(&l->transmq, skb);
+               /* next retransmit attempt */
+               if (link_is_bc_sndlink(l))
+                       TIPC_SKB_CB(skb)->nxt_retr = jiffies + TIPC_BC_RETR_LIM;
+
                __skb_queue_tail(xmitq, _skb);
                TIPC_SKB_CB(skb)->ackers = l->ackers;
                msg_set_seqno(hdr, seqno);