From: Chris Horn <hornc@cray.com>
Date: Tue, 22 Oct 2019 02:36:57 +0000 (-0500)
Subject: LU-12756 lnet: Use info cached in lnet_msg on resend
X-Git-Tag: 2.13.53~104
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F36541%2F7;p=fs%2Flustre-release.git

LU-12756 lnet: Use info cached in lnet_msg on resend

The src_nid and rtr_nid supplied to lnet_send() are cached in the
lnet_msg object. Use this information when resending messages via
lnet_resend_pending_msgs_locked()

Test-Parameters: trivial
Signed-off-by: Chris Horn <hornc@cray.com>
Change-Id: I7a9f54d6d28f26492508f86e447fd01814874f35
Reviewed-on: https://review.whamcloud.com/36541
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alexey Lyashkov <alexey.lyashkov@hpe.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index 0742f2d..d4ece42 100644
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -3002,40 +3002,19 @@ lnet_resend_pending_msgs_locked(struct list_head *resendq, int cpt)
 			lnet_finalize(msg, -EFAULT);
 			lnet_net_lock(cpt);
 		} else {
-			struct lnet_peer *peer;
 			int rc;
-			lnet_nid_t src_nid = LNET_NID_ANY;
 
-			/*
-			 * if this message is not being routed and the
-			 * peer is non-MR then we must use the same
-			 * src_nid that was used in the original send.
-			 * Otherwise if we're routing the message (IE
-			 * we're a router) then we can use any of our
-			 * local interfaces. It doesn't matter to the
-			 * final destination.
-			 */
-			peer = lpni->lpni_peer_net->lpn_peer;
-			if (!msg->msg_routing &&
-			    !lnet_peer_is_multi_rail(peer))
-				src_nid = le64_to_cpu(msg->msg_hdr.src_nid);
-
-			/*
-			 * If we originally specified a src NID, then we
-			 * must attempt to reuse it in the resend as well.
-			 */
-			if (msg->msg_src_nid_param != LNET_NID_ANY)
-				src_nid = msg->msg_src_nid_param;
 			lnet_peer_ni_decref_locked(lpni);
 
 			lnet_net_unlock(cpt);
 			CDEBUG(D_NET, "resending %s->%s: %s recovery %d try# %d\n",
-			       libcfs_nid2str(src_nid),
+			       libcfs_nid2str(msg->msg_src_nid_param),
 			       libcfs_id2str(msg->msg_target),
 			       lnet_msgtyp2str(msg->msg_type),
 			       msg->msg_recovery,
 			       msg->msg_retry_count);
-			rc = lnet_send(src_nid, msg, LNET_NID_ANY);
+			rc = lnet_send(msg->msg_src_nid_param, msg,
+				       msg->msg_rtr_nid_param);
 			if (rc) {
 				CERROR("Error sending %s to %s: %d\n",
 				       lnet_msgtyp2str(msg->msg_type),