Commit cb8ef134 authored Aug 02, 2018 by Mike Christie Committed by Greg Kroah-Hartman Sep 26, 2018

scsi: target: fix __transport_register_session locking



[ Upstream commit 6a64f6e1591322beb8ce16e952a53582caf2a15c ]

When __transport_register_session is called from transport_register_session
irqs will already have been disabled, so we do not want the unlock irq call
to enable them until the higher level has done the final
spin_unlock_irqrestore/ spin_unlock_irq.

This has __transport_register_session use the save/restore call.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 209c27b0

drivers/target/target_core_transport.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -323,6 +323,7 @@ void __transport_register_session(
		void *fabric_sess_ptr)
		{
		unsigned char buf[PR_REG_ISID_LEN];
		unsigned long flags;

		se_sess->se_tpg = se_tpg;
		se_sess->fabric_sess_ptr = fabric_sess_ptr;
		@@ -345,7 +346,7 @@ void __transport_register_session(
		}
		kref_get(&se_nacl->acl_kref);

		spin_lock_irq(&se_nacl->nacl_sess_lock);
		spin_lock_irqsave(&se_nacl->nacl_sess_lock, flags);
		/*
		* The se_nacl->nacl_sess pointer will be set to the
		* last active I_T Nexus for each struct se_node_acl.
		@@ -354,7 +355,7 @@ void __transport_register_session(

		list_add_tail(&se_sess->sess_acl_list,
		&se_nacl->acl_sess_list);
		spin_unlock_irq(&se_nacl->nacl_sess_lock);
		spin_unlock_irqrestore(&se_nacl->nacl_sess_lock, flags);
		}
		list_add_tail(&se_sess->sess_list, &se_tpg->tpg_sess_list);