From d166798d64df88b873b331da2bc8e2ec3c7fca7f Mon Sep 17 00:00:00 2001 From: Wei Lin Guay Date: Wed, 30 Aug 2017 10:11:34 +0200 Subject: [PATCH] Revert "RDS: Ensure non-zero SL uses correct path before lane 0 connection is dropped" This reverts commit 5fe5f2d6e883 ("RDS: Ensure non-zero SL uses correct path before lane 0 connection is dropped") because RDS specific path record caching has been removed in commit 81be7fc4f495 ("net/rds: remove the RDS specific path record caching"). Thus, there is no dependency that TOS connections can only be re-established after the base connection (lane 0) is up. Orabug: 26124147 Acked-by: Santosh Shilimkar Suggested-by: Ajaykumar Hotchandani Signed-off-by: Wei Lin Guay Reviewed-by: Avinash Repaka --- net/rds/connection.c | 1 - net/rds/ib_cm.c | 13 ------------- net/rds/rds.h | 1 - net/rds/rds_single_path.h | 1 - 4 files changed, 16 deletions(-) diff --git a/net/rds/connection.c b/net/rds/connection.c index f267c66a7590..d476d5905197 100644 --- a/net/rds/connection.c +++ b/net/rds/connection.c @@ -152,7 +152,6 @@ static void __rds_conn_path_init(struct rds_connection *conn, cp->cp_reconnect_drops = 0; cp->cp_reconnect_err = 0; cp->cp_conn->c_proposed_version = RDS_PROTOCOL_VERSION; - cp->cp_route_resolved = 1; INIT_DELAYED_WORK(&cp->cp_send_w, rds_send_worker); INIT_DELAYED_WORK(&cp->cp_recv_w, rds_recv_worker); INIT_DELAYED_WORK(&cp->cp_conn_w, rds_connect_worker); diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index 70e8d400fa80..9ab0471d5ba1 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -253,8 +253,6 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even struct ib_qp_attr qp_attr; int err; - if (conn->c_route_resolved == 0) - conn->c_route_resolved = 1; if (event->param.conn.private_data_len >= sizeof(*dp)) { dp = event->param.conn.private_data; @@ -299,16 +297,6 @@ void rds_ib_cm_connect_complete(struct rds_connection *conn, struct rdma_cm_even return; } - /* Drop connection if connection state is not CONNECTING. - Potentially connection drop from some other place like rds_conn_probe_lanes() */ - if (!rds_conn_connecting(conn)) { - rds_rtd(RDS_RTD_CM, - "conn is in connecting state, conn: %p, calling rds_conn_drop\n", - conn); - rds_conn_drop(conn, DR_IB_NOT_CONNECTING_STATE); - return; - } - ic->i_sl = ic->i_cm_id->route.path_rec->sl; atomic_set(&ic->i_cq_quiesce, 0); @@ -1104,7 +1092,6 @@ int rds_ib_conn_path_connect(struct rds_conn_path *cp) struct sockaddr_in src, dest; int ret; - conn->c_route_resolved = 0; /* XXX I wonder what affect the port space has */ /* delegate cm event handler to rdma_transport */ ic->i_cm_id = rdma_create_id(rds_rdma_cm_event_handler, conn, diff --git a/net/rds/rds.h b/net/rds/rds.h index 316e2b52fc7d..623e5d1806a8 100644 --- a/net/rds/rds.h +++ b/net/rds/rds.h @@ -286,7 +286,6 @@ struct rds_conn_path { unsigned int cp_rdsinfo_pending; unsigned int cp_reconnect_racing; - unsigned int cp_route_resolved; enum rds_conn_drop_src cp_drop_source; diff --git a/net/rds/rds_single_path.h b/net/rds/rds_single_path.h index 1757a78a0fa2..314c7a57e50f 100644 --- a/net/rds/rds_single_path.h +++ b/net/rds/rds_single_path.h @@ -39,7 +39,6 @@ #define c_base_conn c_path[0].cp_base_conn #define c_acl_en c_path[0].cp_acl_en #define c_reconnect_err c_path[0].cp_reconnect_err -#define c_route_resolved c_path[0].cp_route_resolved #define c_reject_w c_path[0].cp_reject_w #endif /* _RDS_RDS_SINGLE_H */ -- 2.50.1