tipc: improve link congestion algorithm

The link congestion algorithm used until now implies two problems.

- It is too generous towards lower-level messages in situations of high
  load by giving "absolute" bandwidth guarantees to the different
  priority levels. LOW traffic is guaranteed 10%, MEDIUM is guaranted
  20%, HIGH is guaranteed 30%, and CRITICAL is guaranteed 40% of the
  available bandwidth. But, in the absence of higher level traffic, the
  ratio between two distinct levels becomes unreasonable. E.g. if there
  is only LOW and MEDIUM traffic on a system, the former is guaranteed
  1/3 of the bandwidth, and the latter 2/3. This again means that if
  there is e.g. one LOW user and 10 MEDIUM users, the  former will have
  33.3% of the bandwidth, and the others will have to compete for the
  remainder, i.e. each will end up with 6.7% of the capacity.

- Packets of type MSG_BUNDLER are created at SYSTEM importance level,
  but only after the packets bundled into it have passed the congestion
  test for their own respective levels. Since bundled packets don't
  result in incrementing the level counter for their own importance,
  only occasionally for the SYSTEM level counter, they do in practice
  obtain SYSTEM level importance. Hence, the current implementation
  provides a gap in the congestion algorithm that in the worst case
  may lead to a link reset.

We now refine the congestion algorithm as follows:

- A message is accepted to the link backlog only if its own level
  counter, and all superior level counters, permit it.

- The importance of a created bundle packet is set according to its
  contents. A bundle packet created from messges at levels LOW to
  CRITICAL is given importance level CRITICAL, while a bundle created
  from a SYSTEM level message is given importance SYSTEM. In the latter
  case only subsequent SYSTEM level messages are allowed to be bundled
  into it.

This solves the first problem described above, by making the bandwidth
guarantee relative to the total number of users at all levels; only
the upper limit for each level remains absolute. In the example
described above, the single LOW user would use 1/11th of the bandwidth,
the same as each of the ten MEDIUM users, but he still has the same
guarantee against starvation as the latter ones.

The fix also solves the second problem. If the CRITICAL level is filled
up by bundle packets of that level, no lower level packets will be
accepted any more.

Suggested-by: Gergely Kiss <gergely.kiss@ericsson.com>
Reviewed-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>

3 files changed, 22 insertions, 10 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index a5ea19e9690f..c1aba697776f 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -645,7 +645,7 @@ int __tipc_link_xmit(struct net *net, struct tipc_link *link,
 {
         struct tipc_msg *msg = buf_msg(skb_peek(list));
         unsigned int maxwin = link->window;
-        unsigned int imp = msg_importance(msg);
+        unsigned int i, imp = msg_importance(msg);
         uint mtu = link->mtu;
         u16 ack = mod(link->rcv_nxt - 1);
         u16 seqno = link->snd_nxt;
@@ -655,10 +655,11 @@ int __tipc_link_xmit(struct net *net, struct tipc_link *link,
         struct sk_buff_head *backlogq = &link->backlogq;
         struct sk_buff *skb, *tmp;
 
-        /* Match backlog limit against msg importance: */
-        if (unlikely(link->backlog[imp].len >= link->backlog[imp].limit))
-                return link_schedule_user(link, list);
-
+        /* Match msg importance against this and all higher backlog limits: */
+        for (i = imp; i <= TIPC_SYSTEM_IMPORTANCE; i++) {
+                if (unlikely(link->backlog[i].len >= link->backlog[i].limit))
+                        return link_schedule_user(link, list);
+        }
         if (unlikely(msg_size(msg) > mtu)) {
                 __skb_queue_purge(list);
                 return -EMSGSIZE;
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index c3e96e815418..ff7362d40cb3 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -365,6 +365,9 @@ bool tipc_msg_bundle(struct sk_buff *bskb, struct sk_buff *skb, u32 mtu)
                 return false;
         if (unlikely(max < (start + msz)))
                 return false;
+        if ((msg_importance(msg) < TIPC_SYSTEM_IMPORTANCE) &&
+            (msg_importance(bmsg) == TIPC_SYSTEM_IMPORTANCE))
+                return false;
 
         skb_put(bskb, pad + msz);
         skb_copy_to_linear_data_offset(bskb, start, skb->data, msz);
@@ -448,6 +451,10 @@ bool tipc_msg_make_bundle(struct sk_buff **skb, u32 mtu, u32 dnode)
         bmsg = buf_msg(bskb);
         tipc_msg_init(msg_prevnode(msg), bmsg, MSG_BUNDLER, 0,
                       INT_H_SIZE, dnode);
+        if (msg_isdata(msg))
+                msg_set_importance(bmsg, TIPC_CRITICAL_IMPORTANCE);
+        else
+                msg_set_importance(bmsg, TIPC_SYSTEM_IMPORTANCE);
         msg_set_seqno(bmsg, msg_seqno(msg));
         msg_set_ack(bmsg, msg_ack(msg));
         msg_set_bcast_ack(bmsg, msg_bcast_ack(msg));
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 6ca2366f3a53..6caf16c475e0 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -352,18 +352,22 @@ static inline void msg_set_seqno(struct tipc_msg *m, u16 n)
  */
 static inline u32 msg_importance(struct tipc_msg *m)
 {
-        if (unlikely(msg_user(m) == MSG_FRAGMENTER))
+        int usr = msg_user(m);
+
+        if (likely((usr <= TIPC_CRITICAL_IMPORTANCE) && !msg_errcode(m)))
+                return usr;
+        if ((usr == MSG_FRAGMENTER) || (usr == MSG_BUNDLER))
                 return msg_bits(m, 5, 13, 0x7);
-        if (likely(msg_isdata(m) && !msg_errcode(m)))
-                return msg_user(m);
         return TIPC_SYSTEM_IMPORTANCE;
 }
 
 static inline void msg_set_importance(struct tipc_msg *m, u32 i)
 {
-        if (unlikely(msg_user(m) == MSG_FRAGMENTER))
+        int usr = msg_user(m);
+
+        if (likely((usr == MSG_FRAGMENTER) || (usr == MSG_BUNDLER)))
                 msg_set_bits(m, 5, 13, 0x7, i);
-        else if (likely(i < TIPC_SYSTEM_IMPORTANCE))
+        else if (i < TIPC_SYSTEM_IMPORTANCE)
                 msg_set_user(m, i);
         else
                 pr_warn("Trying to set illegal importance in message\n");