tipc: Fix premature broadcast advertisement by sending node (5b1f7bde) · Commits · 戴 / test

Prevent a TIPC node from sending out a LINK_STATE message advertising a broadcast message that it is in the process of sending, but has not yet actually sent. Previously, it was possible for a link timeout to occur in between the time the broadcast link updated its "last message sent" counter and the time the broadcast message was passed to the broadcast bearer for transmission. This ensures that the code which issues the LINK_STATE message isn't informed of the new message until the broadcast bearer has had a chance to send it. Note: The "last message sent" value is stored in the "fsm_msg_count" field of the link structure used by the broadcast link. Since the broadcast link doesn't utilize the normal link FSM, this field can be re-used rather than adding a new field to the broadcast link. Signed-off-by:

Allan Stephens <allan.stephens@windriver.com> Signed-off-by:

Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/tipc/bcast.c

+19 −11

Original line number	Diff line number	Diff line
		@@ -143,6 +143,19 @@ static void bcbuf_decr_acks(struct sk_buff *buf)
		}


		static void bclink_set_last_sent(void)
		{
		if (bcl->next_out)
		bcl->fsm_msg_cnt = mod(buf_seqno(bcl->next_out) - 1);
		else
		bcl->fsm_msg_cnt = mod(bcl->next_out_no - 1);
		}

		u32 tipc_bclink_get_last_sent(void)
		{
		return bcl->fsm_msg_cnt;
		}

		/**
		* bclink_set_gap - set gap according to contents of current deferred pkt queue
		*
		@@ -237,8 +250,10 @@ void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked)

		/* Try resolving broadcast link congestion, if necessary */

		if (unlikely(bcl->next_out))
		if (unlikely(bcl->next_out)) {
		tipc_link_push_queue(bcl);
		bclink_set_last_sent();
		}
		if (unlikely(released && !list_empty(&bcl->waiting_ports)))
		tipc_link_wakeup_ports(bcl, 0);
		spin_unlock_bh(&bc_lock);
		@@ -394,8 +409,10 @@ int tipc_bclink_send_msg(struct sk_buff *buf)
		res = tipc_link_send_buf(bcl, buf);
		if (unlikely(res == -ELINKCONG))
		buf_discard(buf);
		else
		else {
		bcl->stats.sent_info++;
		bclink_set_last_sent();
		}

		if (bcl->out_queue_size > bcl->stats.max_queue_sz)
		bcl->stats.max_queue_sz = bcl->out_queue_size;
		@@ -529,15 +546,6 @@ receive:
		tipc_node_unlock(node);
		}

		u32 tipc_bclink_get_last_sent(void)
		{
		u32 last_sent = mod(bcl->next_out_no - 1);

		if (bcl->next_out)
		last_sent = mod(buf_seqno(bcl->next_out) - 1);
		return last_sent;
		}

		u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr)
		{
		return (n_ptr->bclink.supported &&

Admin message