Revert "rds: make sure base connection is up on both sides"

This reverts commit cf80f396af3a ("rds: make sure base connection is up on
both sides") 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

Signed-off-by: Wei Lin Guay <wei.lin.guay@oracle.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Reviewed-by: Avinash Repaka <avinash.repaka@oracle.com>

diff --git a/net/rds/connection.c b/net/rds/connection.c
index af7c14dfb01423a23753c42eaed75b5579a6b702..f267c66a7590c3bd12cc7f3fd2b5d0a1b1f79bfc 100644 (file)
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -781,7 +781,6 @@ static char *conn_drop_reasons[] = {
        [DR_IB_CONN_DROP_RACE]          = "race between ESTABLISHED event and drop",
        [DR_IB_NOT_CONNECTING_STATE]    = "conn is not in CONNECTING state",
        [DR_IB_QP_EVENT]                = "qp event",
-       [DR_IB_BASE_CONN_DOWN]          = "base conn down",
        [DR_IB_REQ_WHILE_CONN_UP]       = "incoming REQ in CONN_UP state",
        [DR_IB_REQ_WHILE_CONNECTING]    = "incoming REQ in CONNECTING state",
        [DR_IB_PAS_SETUP_QP_FAIL]       = "passive setup_qp failure",

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 6a47845872624f67e3aca0ff7936f655330faf57..70e8d400fa80d77de3f896a7f38d7543f699a0a7 100644 (file)
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -900,20 +900,6 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id,
                }
        }
 
-       /*
-        * Make sure to have zero lane connection up on both sides,
-        * to avoid establishing connection on non-ideal path records.
-        */
-       if (dp->dp_tos && rds_conn_state(conn->c_base_conn) != RDS_CONN_UP) {
-               printk(KERN_INFO "RDS/IB: connection "
-                               "<%u.%u.%u.%u,%u.%u.%u.%u,%d> "
-                               "incoming REQ with base connection down, retry\n",
-                               NIPQUAD(conn->c_laddr),
-                               NIPQUAD(conn->c_faddr),
-                               conn->c_tos);
-               rds_conn_drop(conn, DR_IB_BASE_CONN_DOWN);
-       }
-
        /*
         * The connection request may occur while the
         * previous connection exist, e.g. in case of failover.

diff --git a/net/rds/rds.h b/net/rds/rds.h
index 8aef3237442abc099fe1cf819023fa687ed68b06..316e2b52fc7da864cf3a8c3c27d2952a6053cfb7 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -163,7 +163,6 @@ enum rds_conn_drop_src {
        DR_IB_CONN_DROP_RACE,
        DR_IB_NOT_CONNECTING_STATE,
        DR_IB_QP_EVENT,
-       DR_IB_BASE_CONN_DOWN,
        DR_IB_REQ_WHILE_CONN_UP,
        DR_IB_REQ_WHILE_CONNECTING,
        DR_IB_PAS_SETUP_QP_FAIL,