Commit a91e342e authored by Nicholas Bellinger's avatar Nicholas Bellinger Committed by Greg Kroah-Hartman

iscsi-target: Fix potential dead-lock during node acl delete

commit 26a99c19 upstream.

This patch is a iscsi-target specific bug-fix for a dead-lock
that can occur during explicit struct se_node_acl->acl_group
se_session deletion via configfs rmdir(2), when iscsi-target
time2retain timer is still active.

It changes iscsi-target to obtain se_portal_group->session_lock
internally using spin_in_locked() to check for the specific
se_node_acl configfs shutdown rmdir(2) case.

Note this patch is intended for stable, and the subsequent
v4.5-rc patch converts target_core_tpg.c to use proper
se_sess->sess_kref reference counting for both se_node_acl
deletion + se_node_acl->queue_depth se_session restart.
Reported-by: default avatar: Sagi Grimberg <sagig@mellanox.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Andy Grover <agrover@redhat.com>
Cc: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e008e30f
...@@ -1876,7 +1876,8 @@ static void lio_tpg_release_fabric_acl( ...@@ -1876,7 +1876,8 @@ static void lio_tpg_release_fabric_acl(
} }
/* /*
* Called with spin_lock_bh(struct se_portal_group->session_lock) held.. * Called with spin_lock_irq(struct se_portal_group->session_lock) held
* or not held.
* *
* Also, this function calls iscsit_inc_session_usage_count() on the * Also, this function calls iscsit_inc_session_usage_count() on the
* struct iscsi_session in question. * struct iscsi_session in question.
...@@ -1884,19 +1885,32 @@ static void lio_tpg_release_fabric_acl( ...@@ -1884,19 +1885,32 @@ static void lio_tpg_release_fabric_acl(
static int lio_tpg_shutdown_session(struct se_session *se_sess) static int lio_tpg_shutdown_session(struct se_session *se_sess)
{ {
struct iscsi_session *sess = se_sess->fabric_sess_ptr; struct iscsi_session *sess = se_sess->fabric_sess_ptr;
struct se_portal_group *se_tpg = se_sess->se_tpg;
bool local_lock = false;
if (!spin_is_locked(&se_tpg->session_lock)) {
spin_lock_irq(&se_tpg->session_lock);
local_lock = true;
}
spin_lock(&sess->conn_lock); spin_lock(&sess->conn_lock);
if (atomic_read(&sess->session_fall_back_to_erl0) || if (atomic_read(&sess->session_fall_back_to_erl0) ||
atomic_read(&sess->session_logout) || atomic_read(&sess->session_logout) ||
(sess->time2retain_timer_flags & ISCSI_TF_EXPIRED)) { (sess->time2retain_timer_flags & ISCSI_TF_EXPIRED)) {
spin_unlock(&sess->conn_lock); spin_unlock(&sess->conn_lock);
if (local_lock)
spin_unlock_irq(&sess->conn_lock);
return 0; return 0;
} }
atomic_set(&sess->session_reinstatement, 1); atomic_set(&sess->session_reinstatement, 1);
spin_unlock(&sess->conn_lock); spin_unlock(&sess->conn_lock);
iscsit_stop_time2retain_timer(sess); iscsit_stop_time2retain_timer(sess);
spin_unlock_irq(&se_tpg->session_lock);
iscsit_stop_session(sess, 1, 1); iscsit_stop_session(sess, 1, 1);
if (!local_lock)
spin_lock_irq(&se_tpg->session_lock);
return 1; return 1;
} }
......
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