tipc: handle collisions of 32-bit node address hash values

When a 32-bit node address is generated from a 128-bit identifier,
there is a risk of collisions which must be discovered and handled.

We do this as follows:
- We don't apply the generated address immediately to the node, but do
  instead initiate a 1 sec trial period to allow other cluster members
  to discover and handle such collisions.

- During the trial period the node periodically sends out a new type
  of message, DSC_TRIAL_MSG, using broadcast or emulated broadcast,
  to all the other nodes in the cluster.

- When a node is receiving such a message, it must check that the
  presented 32-bit identifier either is unused, or was used by the very
  same peer in a previous session. In both cases it accepts the request
  by not responding to it.

- If it finds that the same node has been up before using a different
  address, it responds with a DSC_TRIAL_FAIL_MSG containing that
  address.

- If it finds that the address has already been taken by some other
  node, it generates a new, unused address and returns it to the
  requester.

- During the trial period the requesting node must always be prepared
  to accept a failure message, i.e., a message where a peer suggests a
  different (or equal)  address to the one tried. In those cases it
  must apply the suggested value as trial address and restart the trial
  period.

This algorithm ensures that in the vast majority of cases a node will
have the same address before and after a reboot. If a legacy user
configures the address explicitly, there will be no trial period and
messages, so this protocol addition is completely backwards compatible.

Acked-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>

1 files changed, 17 insertions, 9 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index bcd76b1e440c..1289b4ba404f 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -434,15 +434,16 @@ char *tipc_link_name(struct tipc_link *l)
  */
 bool tipc_link_create(struct net *net, char *if_name, int bearer_id,
                       int tolerance, char net_plane, u32 mtu, int priority,
-                      int window, u32 session, u32 self, u32 peer,
-                      u16 peer_caps,
+                      int window, u32 session, u32 self,
+                      u32 peer, u8 *peer_id, u16 peer_caps,
                       struct tipc_link *bc_sndlink,
                       struct tipc_link *bc_rcvlink,
                       struct sk_buff_head *inputq,
                       struct sk_buff_head *namedq,
                       struct tipc_link **link)
 {
-        char *self_str = tipc_own_id_string(net);
+        char peer_str[NODE_ID_STR_LEN] = {0,};
+        char self_str[NODE_ID_STR_LEN] = {0,};
         struct tipc_link *l;
 
         l = kzalloc(sizeof(*l), GFP_ATOMIC);
@@ -451,11 +452,18 @@ bool tipc_link_create(struct net *net, char *if_name, int bearer_id,
         *link = l;
         l->session = session;
 
-        /* Note: peer i/f name is completed by reset/activate message */
-        if (strlen(self_str) > 16)
-                sprintf(l->name, "%x:%s-%x:unknown", self, if_name, peer);
-        else
-                sprintf(l->name, "%s:%s-%x:unknown", self_str, if_name, peer);
+        /* Set link name for unicast links only */
+        if (peer_id) {
+                tipc_nodeid2string(self_str, tipc_own_id(net));
+                if (strlen(self_str) > 16)
+                        sprintf(self_str, "%x", self);
+                tipc_nodeid2string(peer_str, peer_id);
+                if (strlen(peer_str) > 16)
+                        sprintf(peer_str, "%x", peer);
+        }
+        /* Peer i/f name will be completed by reset/activate message */
+        sprintf(l->name, "%s:%s-%s:unknown", self_str, if_name, peer_str);
+
         strcpy(l->if_name, if_name);
         l->addr = peer;
         l->peer_caps = peer_caps;
@@ -503,7 +511,7 @@ bool tipc_link_bc_create(struct net *net, u32 ownnode, u32 peer,
         struct tipc_link *l;
 
         if (!tipc_link_create(net, "", MAX_BEARERS, 0, 'Z', mtu, 0, window,
-                              0, ownnode, peer, peer_caps, bc_sndlink,
+                              0, ownnode, peer, NULL, peer_caps, bc_sndlink,
                               NULL, inputq, namedq, link))
                 return false;