rds: MPRDS messages delivered out of order

This reverts commit 9f85df8
as it causes out of order message delivery for MPRDS.

Orabug: 28838065

Signed-off-by: Ka-Cheong Poon <[email protected]>
Reviewed-by: Håkon Bugge <[email protected]>

Author: kcp-git

net/rds/send.c

@@ -1182,8 +1182,7 @@ static inline int rds_rdma_bytes(struct msghdr *msg, size_t *rdma_bytes)
 	return 0;
 }
 
-static int rds_send_mprds_hash(struct rds_sock *rs,
-			       struct rds_connection *conn, int nonblock)
+static int rds_send_mprds_hash(struct rds_sock *rs, struct rds_connection *conn)
 {
 	int hash;
 
@@ -1199,16 +1198,10 @@ static int rds_send_mprds_hash(struct rds_sock *rs,
 		 * used.  But if we are interrupted, we have to use the zero
 		 * c_path in case the connection ends up being non-MP capable.
 		 */
-		if (conn->c_npaths == 0) {
-			/* Cannot wait for the connection be made, so just use
-			 * the base c_path.
-			 */
-			if (nonblock)
-				return 0;
+		if (conn->c_npaths == 0)
 			if (wait_event_interruptible(conn->c_hs_waitq,
 						     conn->c_npaths != 0))
 				hash = 0;
-		}
 		if (conn->c_npaths == 1)
 			hash = 0;
 	}
@@ -1440,7 +1433,7 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
 	}
 
 	if (conn->c_trans->t_mp_capable)
-		cpath = &conn->c_path[rds_send_mprds_hash(rs, conn, nonblock)];
+		cpath = &conn->c_path[rds_send_mprds_hash(rs, conn)];
 	else
 		cpath = &conn->c_path[0];