LU-12756 lnet: Introduce lnet_msg_is_response

[fs/lustre-release.git] / lnet / lnet / lib-move.c

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index c36a886..332c038 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -63,6 +63,12 @@ struct lnet_send_data {
        __u32 sd_send_case;
 };
 
+static inline bool
+lnet_msg_is_response(struct lnet_msg *msg)
+{
+       return msg->msg_type == LNET_MSG_ACK || msg->msg_type == LNET_MSG_REPLY;
+}
+
 static inline struct lnet_comm_count *
 get_stats_counts(struct lnet_element_stats *stats,
                 enum lnet_stats_type stats_type)
@@ -827,8 +833,7 @@ lnet_peer_alive_locked(struct lnet_ni *ni, struct lnet_peer_ni *lpni,
                return 1;
 
        /* always send any responses */
-       if (msg->msg_type == LNET_MSG_ACK ||
-           msg->msg_type == LNET_MSG_REPLY)
+       if (lnet_msg_is_response(msg))
                return 1;
 
        if (!lnet_is_peer_deadline_passed(lpni, now))
@@ -1842,17 +1847,14 @@ lnet_handle_send(struct lnet_send_data *sd)
 }
 
 static inline void
-lnet_set_non_mr_pref_nid(struct lnet_send_data *sd)
+lnet_set_non_mr_pref_nid(struct lnet_peer_ni *lpni, struct lnet_ni *lni,
+                        struct lnet_msg *msg)
 {
-       if (sd->sd_send_case & NMR_DST &&
-           sd->sd_msg->msg_type != LNET_MSG_REPLY &&
-           sd->sd_msg->msg_type != LNET_MSG_ACK &&
-           sd->sd_best_lpni->lpni_pref_nnids == 0) {
+       if (!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(sd->sd_best_ni->ni_nid),
-                      libcfs_nid2str(sd->sd_best_lpni->lpni_nid));
-               lnet_peer_ni_set_non_mr_pref_nid(sd->sd_best_lpni,
-                                                sd->sd_best_ni->ni_nid);
+                      libcfs_nid2str(lni->ni_nid),
+                      libcfs_nid2str(lpni->lpni_nid));
+               lnet_peer_ni_set_non_mr_pref_nid(lpni, lni->ni_nid);
        }
 }
 
@@ -1877,10 +1879,7 @@ lnet_handle_spec_local_nmr_dst(struct lnet_send_data *sd)
                return -EINVAL;
        }
 
-       /*
-        * the preferred NID will only be set for NMR peers
-        */
-       lnet_set_non_mr_pref_nid(sd);
+       lnet_set_non_mr_pref_nid(sd->sd_best_lpni, sd->sd_best_ni, sd->sd_msg);
 
        return lnet_handle_send(sd);
 }
@@ -2181,10 +2180,11 @@ lnet_handle_spec_router_dst(struct lnet_send_data *sd)
 
        if (sd->sd_send_case & NMR_DST)
                /*
-               * since the final destination is non-MR let's set its preferred
-               * NID before we send
-               */
-               lnet_set_non_mr_pref_nid(sd);
+                * since the final destination is non-MR let's set its preferred
+                * NID before we send
+                */
+               lnet_set_non_mr_pref_nid(sd->sd_best_lpni, sd->sd_best_ni,
+                                        sd->sd_msg);
 
        /*
         * We're going to send to the gw found so let's set its
@@ -2238,14 +2238,11 @@ lnet_find_best_ni_on_local_net(struct lnet_peer *peer, int md_cpt,
 }
 
 static struct lnet_ni *
-lnet_find_existing_preferred_best_ni(struct lnet_send_data *sd)
+lnet_find_existing_preferred_best_ni(struct lnet_peer_ni *lpni, int cpt)
 {
        struct lnet_ni *best_ni = NULL;
-       struct lnet_peer_net *peer_net;
-       struct lnet_peer *peer = sd->sd_peer;
-       struct lnet_peer_ni *best_lpni = sd->sd_best_lpni;
-       struct lnet_peer_ni *lpni;
-       int cpt = sd->sd_cpt;
+       struct lnet_peer_net *peer_net = lpni->lpni_peer_net;
+       struct lnet_peer_ni *lpni_entry;
 
        /*
         * We must use a consistent source address when sending to a
@@ -2257,18 +2254,13 @@ lnet_find_existing_preferred_best_ni(struct lnet_send_data *sd)
         * So we need to pick the NI the peer prefers for this
         * particular network.
         */
-
-       /* Get the target peer_ni */
-       peer_net = lnet_peer_get_net_locked(peer,
-                       LNET_NIDNET(best_lpni->lpni_nid));
-       LASSERT(peer_net != NULL);
-       list_for_each_entry(lpni, &peer_net->lpn_peer_nis,
-                               lpni_peer_nis) {
-               if (lpni->lpni_pref_nnids == 0)
+       LASSERT(peer_net);
+       list_for_each_entry(lpni_entry, &peer_net->lpn_peer_nis,
+                           lpni_peer_nis) {
+               if (lpni_entry->lpni_pref_nnids == 0)
                        continue;
-               LASSERT(lpni->lpni_pref_nnids == 1);
-               best_ni = lnet_nid2ni_locked(
-                               lpni->lpni_pref.nid, cpt);
+               LASSERT(lpni_entry->lpni_pref_nnids == 1);
+               best_ni = lnet_nid2ni_locked(lpni_entry->lpni_pref.nid, cpt);
                break;
        }
 
@@ -2293,7 +2285,8 @@ lnet_select_preferred_best_ni(struct lnet_send_data *sd)
         * particular network.
         */
 
-       best_ni = lnet_find_existing_preferred_best_ni(sd);
+       best_ni = lnet_find_existing_preferred_best_ni(sd->sd_best_lpni,
+                                                      sd->sd_cpt);
 
        /* if best_ni is still not set just pick one */
        if (!best_ni) {
@@ -2313,7 +2306,7 @@ lnet_select_preferred_best_ni(struct lnet_send_data *sd)
        sd->sd_best_ni = best_ni;
 
        /* Set preferred NI if necessary. */
-       lnet_set_non_mr_pref_nid(sd);
+       lnet_set_non_mr_pref_nid(sd->sd_best_lpni, sd->sd_best_ni, sd->sd_msg);
 
        return 0;
 }
@@ -2546,9 +2539,10 @@ lnet_handle_any_router_nmr_dst(struct lnet_send_data *sd)
        struct lnet_peer *gw_peer = NULL;
 
        /*
-        * Let's set if we have a preferred NI to talk to this NMR peer
+        * Let's see if we have a preferred NI to talk to this NMR peer
         */
-       sd->sd_best_ni = lnet_find_existing_preferred_best_ni(sd);
+       sd->sd_best_ni = lnet_find_existing_preferred_best_ni(sd->sd_best_lpni,
+                                                             sd->sd_cpt);
 
        /*
         * find the router and that'll find the best NI if we didn't find
@@ -2563,7 +2557,7 @@ lnet_handle_any_router_nmr_dst(struct lnet_send_data *sd)
         * set the best_ni we've chosen as the preferred one for
         * this peer
         */
-       lnet_set_non_mr_pref_nid(sd);
+       lnet_set_non_mr_pref_nid(sd->sd_best_lpni, sd->sd_best_ni, sd->sd_msg);
 
        /* we'll be sending to the gw */
        sd->sd_best_lpni = gw_lpni;
@@ -2716,8 +2710,7 @@ again:
        else
                send_case |= MR_DST;
 
-       if (msg->msg_type == LNET_MSG_REPLY ||
-           msg->msg_type == LNET_MSG_ACK)
+       if (lnet_msg_is_response(msg))
                send_case |= SND_RESP;
 
        /* assign parameters to the send_data */