From 4596ea5c247c9371f37ffb3bf6121ba5374f7334 Mon Sep 17 00:00:00 2001 From: Chris Horn Date: Sun, 28 Jun 2020 12:35:43 -0500 Subject: [PATCH] LU-13736 lnet: Do not set preferred NI for MR peer The preferred NI exists to ensure that a consistent source address is used when communicating with a non-multi-rail peer. We needn't ever set a preferred NI for a MR peer. HPE-bug-id: LUS-9058 Signed-off-by: Chris Horn Change-Id: I836a314dbf02d35199c3da2ccea6fb0acbb94b54 Reviewed-on: https://review.whamcloud.com/39229 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Serguei Smirnov Reviewed-by: Neil Brown Reviewed-by: Oleg Drokin --- lnet/lnet/lib-move.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index cec2fd5..8ef55e7 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -1816,7 +1816,8 @@ static inline void lnet_set_non_mr_pref_nid(struct lnet_peer_ni *lpni, struct lnet_ni *lni, struct lnet_msg *msg) { - if (!lnet_msg_is_response(msg) && lpni->lpni_pref_nnids == 0) { + if (!lnet_peer_is_multi_rail(lpni->lpni_peer_net->lpn_peer) && + !lnet_msg_is_response(msg) && lpni->lpni_pref_nnids == 0) { CDEBUG(D_NET, "Setting preferred local NID %s on NMR peer %s\n", libcfs_nid2str(lni->ni_nid), libcfs_nid2str(lpni->lpni_nid)); -- 1.8.3.1