tipc: eliminate unnecessary call to broadcast ack function

The unicast packet header contains a broadcast acknowledge sequence
number, that may need to be conveyed to the broadcast link for proper
treatment. Currently, the function tipc_rcv(), which is on the most
critical data path, calls the function tipc_bclink_acknowledge() to
have this done. This call is made for each received packet, and results
in the unconditional grabbing of the broadcast link spinlock.

This is unnecessary, since we can see directly from tipc_rcv() if
the acknowledged number differs from what has been previously acked
from the node in question. In the vast majority of cases the numbers
won't differ, and there is nothing to update.

We now make the call to tipc_bclink_acknowledge() conditional
to that the two ack values differ.

Reviewed-by: Erik Hugne <erik.hugne@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>

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 3e41704832de6debbe92d0a46e0cbbaa4701e981..5ee5076a8b27d727ed19e5f4cefe2683a6f479f0 100644 (file)
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -215,7 +215,11 @@ void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked)
        struct net *net = n_ptr->net;
        struct tipc_net *tn = net_generic(net, tipc_net_id);
 
+       if (unlikely(!n_ptr->bclink.recv_permitted))
+               return;
+
        tipc_bclink_lock(net);
+
        /* Bail out if tx queue is empty (no clean up is required) */
        skb = skb_peek(&tn->bcl->outqueue);
        if (!skb)

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 56c39b1a53a9b1314080ae7ece5c23e01fd62c8a..2652c3286e2f6333d6f3b8a8da822acf31d07129 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1117,7 +1117,7 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b_ptr)
                ackd = msg_ack(msg);
 
                /* Release acked messages */
-               if (likely(n_ptr->bclink.recv_permitted))
+               if (unlikely(n_ptr->bclink.acked != msg_bcast_ack(msg)))
                        tipc_bclink_acknowledge(n_ptr, msg_bcast_ack(msg));
 
                released = 0;