Commit 14f4b54f authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Nicholas Bellinger
Browse files

Target/iscsi,iser: Avoid accepting transport connections during stop stage



When the target is in stop stage, iSER transport initiates RDMA disconnects.
The iSER initiator may wish to establish a new connection over the
still existing network portal. In this case iSER transport should not
accept and resume new RDMA connections. In order to learn that, iscsi_np
is added with enabled flag so the iSER transport can check when deciding
weather to accept and resume a new connection request.

The iscsi_np is enabled after successful transport setup, and disabled
before iscsi_np login threads are cleaned up.
Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Cc: stable@vger.kernel.org # 3.10+
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 531b7bf4
...@@ -562,7 +562,15 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event) ...@@ -562,7 +562,15 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
struct isert_device *device; struct isert_device *device;
struct ib_device *ib_dev = cma_id->device; struct ib_device *ib_dev = cma_id->device;
int ret = 0; int ret = 0;
u8 pi_support = np->tpg_np->tpg->tpg_attrib.t10_pi; u8 pi_support;
spin_lock_bh(&np->np_thread_lock);
if (!np->enabled) {
spin_unlock_bh(&np->np_thread_lock);
pr_debug("iscsi_np is not enabled, reject connect request\n");
return rdma_reject(cma_id, NULL, 0);
}
spin_unlock_bh(&np->np_thread_lock);
pr_debug("Entering isert_connect_request cma_id: %p, context: %p\n", pr_debug("Entering isert_connect_request cma_id: %p, context: %p\n",
cma_id, cma_id->context); cma_id, cma_id->context);
...@@ -653,6 +661,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event) ...@@ -653,6 +661,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
goto out_mr; goto out_mr;
} }
pi_support = np->tpg_np->tpg->tpg_attrib.t10_pi;
if (pi_support && !device->pi_capable) { if (pi_support && !device->pi_capable) {
pr_err("Protection information requested but not supported\n"); pr_err("Protection information requested but not supported\n");
ret = -EINVAL; ret = -EINVAL;
......
...@@ -775,6 +775,7 @@ struct iscsi_np { ...@@ -775,6 +775,7 @@ struct iscsi_np {
int np_ip_proto; int np_ip_proto;
int np_sock_type; int np_sock_type;
enum np_thread_state_table np_thread_state; enum np_thread_state_table np_thread_state;
bool enabled;
enum iscsi_timer_flags_table np_login_timer_flags; enum iscsi_timer_flags_table np_login_timer_flags;
u32 np_exports; u32 np_exports;
enum np_flags_table np_flags; enum np_flags_table np_flags;
......
...@@ -984,6 +984,7 @@ int iscsi_target_setup_login_socket( ...@@ -984,6 +984,7 @@ int iscsi_target_setup_login_socket(
} }
np->np_transport = t; np->np_transport = t;
np->enabled = true;
return 0; return 0;
} }
......
...@@ -184,6 +184,7 @@ static void iscsit_clear_tpg_np_login_thread( ...@@ -184,6 +184,7 @@ static void iscsit_clear_tpg_np_login_thread(
return; return;
} }
tpg_np->tpg_np->enabled = false;
iscsit_reset_np_thread(tpg_np->tpg_np, tpg_np, tpg, shutdown); iscsit_reset_np_thread(tpg_np->tpg_np, tpg_np, tpg, shutdown);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment