rds:ib: Set RoCE ACK timeout before resolving route

The ACK timeout can now be used to estimate the PacketLifeTime
for RoCE. Set RoCE ACK timeout before resolving route in RDS,
so that the ACK timeout can be used for the PacketLifeTime for
the route.

Orabug: 30556591

Signed-off-by: Dag Moxnes <[email protected]>
Reviewed-by: Håkon Bugge <[email protected]>
Signed-off-by: Somasundaram Krishnasamy <[email protected]>

Orabug: 30820081

UEK5 => UEK6

(cherry picked from commit 5aa8e27)
cherry-pick-repo=UEK/production/linux-uek.git

Signed-off-by: Gerd Rausch <[email protected]>
Reviewed-by: Sharon Liu <[email protected]>

Author: Dag Moxnes

net/rds/ib_cm.c

@@ -1424,9 +1424,6 @@ int rds_ib_cm_initiate_connect(struct rdma_cm_id *cm_id, bool isv6)
 	rds_ib_cm_fill_conn_param(conn, &conn_param, &dp,
 				  conn->c_proposed_version, UINT_MAX, UINT_MAX,
 				  frag, isv6, seq);
-	if (rds_ib_sysctl_local_ack_timeout &&
-	    rdma_port_get_link_layer(cm_id->device, cm_id->port_num) == IB_LINK_LAYER_ETHERNET)
-		rdma_set_ack_timeout(cm_id, rds_ib_sysctl_local_ack_timeout);
 	ret = rdma_connect(cm_id, &conn_param);
 	if (ret) {
 		rds_rtd(RDS_RTD_CM, "RDS/IB: rdma_connect failed (%d)\n", ret);

net/rds/rdma_transport.c

@@ -165,6 +165,9 @@ static int rds_rdma_cm_event_handler_cmn(struct rdma_cm_id *cm_id,
 			    cm_id->route.addr.dev_addr.dst_dev_addr +
 			    rdma_addr_gid_offset(&cm_id->route.addr.dev_addr));
 		rdma_set_service_type(cm_id, conn->c_tos);
+		if (rds_ib_sysctl_local_ack_timeout &&
+		    rdma_port_get_link_layer(cm_id->device, cm_id->port_num) == IB_LINK_LAYER_ETHERNET)
+			rdma_set_ack_timeout(cm_id, rds_ib_sysctl_local_ack_timeout);
 
 		/* XXX do we need to clean up if this fails? */
 		ret = rdma_resolve_route(cm_id,