projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 13e8e92f GKH |
1 | From foo@baz Mon Sep 17 12:22:41 CEST 2018 |
| 2 | From: Mike Christie <mchristi@redhat.com> | |
| 3 | Date: Thu, 2 Aug 2018 12:12:20 -0500 | |
| 4 | Subject: scsi: target: fix __transport_register_session locking | |
| 5 | ||
| 6 | From: Mike Christie <mchristi@redhat.com> | |
| 7 | ||
| 8 | [ Upstream commit 6a64f6e1591322beb8ce16e952a53582caf2a15c ] | |
| 9 | ||
| 10 | When __transport_register_session is called from transport_register_session | |
| 11 | irqs will already have been disabled, so we do not want the unlock irq call | |
| 12 | to enable them until the higher level has done the final | |
| 13 | spin_unlock_irqrestore/ spin_unlock_irq. | |
| 14 | ||
| 15 | This has __transport_register_session use the save/restore call. | |
| 16 | ||
| 17 | Signed-off-by: Mike Christie <mchristi@redhat.com> | |
| 18 | Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com> | |
| 19 | Reviewed-by: Christoph Hellwig <hch@lst.de> | |
| 20 | Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> | |
| 21 | Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> | |
| 22 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 23 | --- | |
| 24 | drivers/target/target_core_transport.c | 5 +++-- | |
| 25 | 1 file changed, 3 insertions(+), 2 deletions(-) | |
| 26 | ||
| 27 | --- a/drivers/target/target_core_transport.c | |
| 28 | +++ b/drivers/target/target_core_transport.c | |
| 29 | @@ -316,6 +316,7 @@ void __transport_register_session( | |
| 30 | { | |
| 31 | const struct target_core_fabric_ops *tfo = se_tpg->se_tpg_tfo; | |
| 32 | unsigned char buf[PR_REG_ISID_LEN]; | |
| 33 | + unsigned long flags; | |
| 34 | ||
| 35 | se_sess->se_tpg = se_tpg; | |
| 36 | se_sess->fabric_sess_ptr = fabric_sess_ptr; | |
| 37 | @@ -352,7 +353,7 @@ void __transport_register_session( | |
| 38 | se_sess->sess_bin_isid = get_unaligned_be64(&buf[0]); | |
| 39 | } | |
| 40 | ||
| 41 | - spin_lock_irq(&se_nacl->nacl_sess_lock); | |
| 42 | + spin_lock_irqsave(&se_nacl->nacl_sess_lock, flags); | |
| 43 | /* | |
| 44 | * The se_nacl->nacl_sess pointer will be set to the | |
| 45 | * last active I_T Nexus for each struct se_node_acl. | |
| 46 | @@ -361,7 +362,7 @@ void __transport_register_session( | |
| 47 | ||
| 48 | list_add_tail(&se_sess->sess_acl_list, | |
| 49 | &se_nacl->acl_sess_list); | |
| 50 | - spin_unlock_irq(&se_nacl->nacl_sess_lock); | |
| 51 | + spin_unlock_irqrestore(&se_nacl->nacl_sess_lock, flags); | |
| 52 | } | |
| 53 | list_add_tail(&se_sess->sess_list, &se_tpg->tpg_sess_list); | |
| 54 |