tipc: move protocol message sending away from link FSM

The implementation of the link FSM currently takes decisions about and
sends out link protocol messages. This is unnecessary, since such
actions are not the result of any link state change, and are even
decided based on non-FSM state information ("silent_intv_cnt").

We now move the sending of unicast link protocol messages to the
function tipc_link_timeout(), and the initial broadcast synchronization
message to tipc_node_link_up(). The latter is done because a link
instance should not need to know whether it is the first or second
link to a destination. Such information is now restricted to and
handled by the link aggregation layer in node.c

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

diff --git a/net/tipc/link.c b/net/tipc/link.c
index d5f4005f388f06f96f195c02d773c3e0f962736f..9a3ccf910c491b66320ef29060ebb8ab72d31757 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -134,8 +134,6 @@ static void tipc_link_build_proto_msg(struct tipc_link *l, int mtyp, bool probe,
                                      struct sk_buff_head *xmitq);
 static void link_reset_statistics(struct tipc_link *l_ptr);
 static void link_print(struct tipc_link *l_ptr, const char *str);
-static void tipc_link_build_bcast_sync_msg(struct tipc_link *l,
-                                          struct sk_buff_head *xmitq);
 static void tipc_link_sync_rcv(struct tipc_node *n, struct sk_buff *buf);
 static int tipc_link_input(struct tipc_link *l, struct sk_buff *skb);
 static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb);
@@ -245,8 +243,8 @@ struct tipc_link *tipc_link_create(struct tipc_node *n_ptr,
  * Give a newly added peer node the sequence number where it should
  * start receiving and acking broadcast packets.
  */
-static void tipc_link_build_bcast_sync_msg(struct tipc_link *l,
-                                          struct sk_buff_head *xmitq)
+void tipc_link_build_bcast_sync_msg(struct tipc_link *l,
+                                   struct sk_buff_head *xmitq)
 {
        struct sk_buff *skb;
        struct sk_buff_head list;
@@ -272,7 +270,7 @@ static void tipc_link_build_bcast_sync_msg(struct tipc_link *l,
 static int tipc_link_fsm_evt(struct tipc_link *l, int evt,
                             struct sk_buff_head *xmitq)
 {
-       int mtyp = 0, rc = 0;
+       int rc = 0;
        struct tipc_link *pl;
        enum {
                LINK_RESET     = 1,
@@ -380,17 +378,7 @@ static int tipc_link_fsm_evt(struct tipc_link *l, int evt,
        }
        if (actions & LINK_ACTIVATE)
                rc = TIPC_LINK_UP_EVT;
-       if (actions & (SND_STATE | SND_PROBE))
-               mtyp = STATE_MSG;
-       if (actions & SND_RESET)
-               mtyp = RESET_MSG;
-       if (actions & SND_ACTIVATE)
-               mtyp = ACTIVATE_MSG;
-       if (actions & (SND_PROBE | SND_STATE | SND_RESET | SND_ACTIVATE))
-               tipc_link_build_proto_msg(l, mtyp, actions & SND_PROBE,
-                                         0, 0, 0, xmitq);
-       if (actions & SND_BCAST_SYNC)
-               tipc_link_build_bcast_sync_msg(l, xmitq);
+
        return rc;
 }
 
@@ -440,16 +428,37 @@ static void link_profile_stats(struct tipc_link *l)
 int tipc_link_timeout(struct tipc_link *l, struct sk_buff_head *xmitq)
 {
        int rc = 0;
+       int mtyp = STATE_MSG;
+       bool xmit = false;
+       bool prb = false;
 
        if (l->exec_mode == TIPC_LINK_BLOCKED)
                return rc;
 
        link_profile_stats(l);
-       if (l->silent_intv_cnt)
-               rc = tipc_link_fsm_evt(l, SILENCE_EVT, xmitq);
-       else if (link_working(l) && tipc_bclink_acks_missing(l->owner))
-               tipc_link_build_proto_msg(l, STATE_MSG, 0, 0, 0, 0, xmitq);
-       l->silent_intv_cnt++;
+
+       if (l->state == TIPC_LINK_WORKING) {
+               if (!l->silent_intv_cnt) {
+                       if (tipc_bclink_acks_missing(l->owner))
+                               xmit = true;
+               } else if (l->silent_intv_cnt <= l->abort_limit) {
+                       xmit = true;
+                       prb = true;
+               } else {
+                       l->exec_mode = TIPC_LINK_BLOCKED;
+                       rc |= TIPC_LINK_DOWN_EVT;
+               }
+               l->silent_intv_cnt++;
+       } else if (l->state == TIPC_LINK_RESETTING) {
+               xmit = true;
+               mtyp = RESET_MSG;
+       } else if (l->state == TIPC_LINK_ESTABLISHING) {
+               xmit = true;
+               mtyp = ACTIVATE_MSG;
+       }
+       if (xmit)
+               tipc_link_build_proto_msg(l, mtyp, prb, 0, 0, 0, xmitq);
+
        return rc;
 }
 

diff --git a/net/tipc/link.h b/net/tipc/link.h
index e377d9ba41c580cf8c332a3c76aef1d5d9db3335..b317c4df90795796dc15aad274d419833c990986 100644 (file)
--- a/net/tipc/link.h
+++ b/net/tipc/link.h
@@ -212,6 +212,8 @@ struct tipc_link *tipc_link_create(struct tipc_node *n,
                                   struct sk_buff_head *namedq);
 void tipc_link_tnl_prepare(struct tipc_link *l, struct tipc_link *tnl,
                           int mtyp, struct sk_buff_head *xmitq);
+void tipc_link_build_bcast_sync_msg(struct tipc_link *l,
+                                   struct sk_buff_head *xmitq);
 void tipc_link_reset_fragments(struct tipc_link *l_ptr);
 int tipc_link_is_up(struct tipc_link *l_ptr);
 int tipc_link_is_active(struct tipc_link *l_ptr);

diff --git a/net/tipc/node.c b/net/tipc/node.c
index b0372bb107f67531533402a5848be3ade62d3b32..9e20acffb3d4d583ad75ded52a1884b64193055d 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -335,6 +335,7 @@ static void tipc_node_link_up(struct tipc_node *n, int bearer_id,
                *slot0 = bearer_id;
                *slot1 = bearer_id;
                nl->exec_mode = TIPC_LINK_OPEN;
+               tipc_link_build_bcast_sync_msg(nl, xmitq);
                node_established_contact(n);
                return;
        }