LU-9119 lnet: increment per NI stats

Increment the per NI stats for messages being routed.
This will give a better view of the traffic distribution
over multiple peer interfaces.

Added extra trace messages to track the messages
sent and received.

Test-Parameters: trivial
Signed-off-by: Amir Shehata <amir.shehata@intel.com>
Change-Id: I213b1b36e9787d25705d91d091ad9e9c6a5b2ae8
Reviewed-on: https://review.whamcloud.com/26907
Tested-by: Jenkins
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Sonia Sharma <sonia.sharma@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index b05df55..9df8972 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -1903,6 +1903,16 @@ send:
 
        rc = lnet_post_send_locked(msg, 0);
 
+       if (!rc)
+               CDEBUG(D_NET, "TRACE: %s(%s:%s) -> %s(%s:%s) : %s\n",
+                      libcfs_nid2str(msg->msg_hdr.src_nid),
+                      libcfs_nid2str(msg->msg_txni->ni_nid),
+                      libcfs_nid2str(src_nid),
+                      libcfs_nid2str(msg->msg_hdr.dest_nid),
+                      libcfs_nid2str(dst_nid),
+                      libcfs_nid2str(msg->msg_txpeer->lpni_nid),
+                      lnet_msgtyp2str(msg->msg_type));
+
        lnet_net_unlock(cpt);
 
        return rc;
@@ -2379,6 +2389,12 @@ lnet_parse(struct lnet_ni *ni, struct lnet_hdr *hdr, lnet_nid_t from_nid,
        for_me = (ni->ni_nid == dest_nid);
        cpt = lnet_cpt_of_nid(from_nid, ni);
 
+       CDEBUG(D_NET, "TRACE: %s(%s) <- %s : %s\n",
+               libcfs_nid2str(dest_nid),
+               libcfs_nid2str(ni->ni_nid),
+               libcfs_nid2str(src_nid),
+               lnet_msgtyp2str(type));
+
        switch (type) {
        case LNET_MSG_ACK:
        case LNET_MSG_GET:

diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c
index ba04fd6..9dd1d1b 100644 (file)
--- a/lnet/lnet/lib-msg.c
+++ b/lnet/lnet/lib-msg.c
@@ -190,7 +190,7 @@ lnet_msg_decommit_tx(struct lnet_msg *msg, int status)
 
                counters->route_length += msg->msg_len;
                counters->route_count++;
-               goto out;
+               goto incr_stats;
 
        case LNET_EVENT_PUT:
                /* should have been decommitted */
@@ -216,6 +216,8 @@ lnet_msg_decommit_tx(struct lnet_msg *msg, int status)
        }
 
        counters->send_count++;
+
+incr_stats:
        if (msg->msg_txpeer)
                atomic_inc(&msg->msg_txpeer->lpni_stats.send_count);
        if (msg->msg_txni)
@@ -242,7 +244,7 @@ lnet_msg_decommit_rx(struct lnet_msg *msg, int status)
        default:
                LASSERT(ev->type == 0);
                LASSERT(msg->msg_routing);
-               goto out;
+               goto incr_stats;
 
        case LNET_EVENT_ACK:
                LASSERT(msg->msg_type == LNET_MSG_ACK);
@@ -271,6 +273,8 @@ lnet_msg_decommit_rx(struct lnet_msg *msg, int status)
        }
 
        counters->recv_count++;
+
+incr_stats:
        if (msg->msg_rxpeer)
                atomic_inc(&msg->msg_rxpeer->lpni_stats.recv_count);
        if (msg->msg_rxni)