Skip to content

Commit abd6574

Browse files
biger410SherryYang1
authored andcommitted
scsi: target: core: Fix deadlock due to recursive locking
The following call trace shows a deadlock issue due to recursive locking of mutex "device_mutex". First lock acquire is in target_for_each_device() and second in target_free_device(). PID: 148266 TASK: ffff8be21ffb5d00 CPU: 10 COMMAND: "iscsi_ttx" #0 [ffffa2bfc9ec3b18] __schedule at ffffffffa8060e7f #1 [ffffa2bfc9ec3ba0] schedule at ffffffffa8061224 #2 [ffffa2bfc9ec3bb8] schedule_preempt_disabled at ffffffffa80615ee #3 [ffffa2bfc9ec3bc8] __mutex_lock at ffffffffa8062fd7 #4 [ffffa2bfc9ec3c40] __mutex_lock_slowpath at ffffffffa80631d3 #5 [ffffa2bfc9ec3c50] mutex_lock at ffffffffa806320c #6 [ffffa2bfc9ec3c68] target_free_device at ffffffffc0935998 [target_core_mod] #7 [ffffa2bfc9ec3c90] target_core_dev_release at ffffffffc092f975 [target_core_mod] #8 [ffffa2bfc9ec3ca0] config_item_put at ffffffffa79d250f #9 [ffffa2bfc9ec3cd0] config_item_put at ffffffffa79d2583 #10 [ffffa2bfc9ec3ce0] target_devices_idr_iter at ffffffffc0933f3a [target_core_mod] #11 [ffffa2bfc9ec3d00] idr_for_each at ffffffffa803f6fc #12 [ffffa2bfc9ec3d60] target_for_each_device at ffffffffc0935670 [target_core_mod] #13 [ffffa2bfc9ec3d98] transport_deregister_session at ffffffffc0946408 [target_core_mod] #14 [ffffa2bfc9ec3dc8] iscsit_close_session at ffffffffc09a44a6 [iscsi_target_mod] #15 [ffffa2bfc9ec3df0] iscsit_close_connection at ffffffffc09a4a88 [iscsi_target_mod] #16 [ffffa2bfc9ec3df8] finish_task_switch at ffffffffa76e5d07 #17 [ffffa2bfc9ec3e78] iscsit_take_action_for_connection_exit at ffffffffc0991c23 [iscsi_target_mod] #18 [ffffa2bfc9ec3ea0] iscsi_target_tx_thread at ffffffffc09a403b [iscsi_target_mod] #19 [ffffa2bfc9ec3f08] kthread at ffffffffa76d8080 #20 [ffffa2bfc9ec3f50] ret_from_fork at ffffffffa8200364 Fixes: 36d4cb4 ("scsi: target: Avoid that EXTENDED COPY commands trigger lock inversion") Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com> Link: https://lore.kernel.org/r/20230918225848.66463-1-junxiao.bi@oracle.com Reviewed-by: Mike Christie <michael.christie@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> (cherry picked from commit a154f5f) Orabug: 35761341 Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com> Signed-off-by: Sherry Yang <sherry.yang@oracle.com>
1 parent 9960829 commit abd6574

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

drivers/target/target_core_device.c

+4-7
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,6 @@ sector_t target_to_linux_sector(struct se_device *dev, sector_t lb)
868868
EXPORT_SYMBOL(target_to_linux_sector);
869869

870870
struct devices_idr_iter {
871-
struct config_item *prev_item;
872871
int (*fn)(struct se_device *dev, void *data);
873872
void *data;
874873
};
@@ -878,11 +877,9 @@ static int target_devices_idr_iter(int id, void *p, void *data)
878877
{
879878
struct devices_idr_iter *iter = data;
880879
struct se_device *dev = p;
880+
struct config_item *item;
881881
int ret;
882882

883-
config_item_put(iter->prev_item);
884-
iter->prev_item = NULL;
885-
886883
/*
887884
* We add the device early to the idr, so it can be used
888885
* by backend modules during configuration. We do not want
@@ -892,12 +889,13 @@ static int target_devices_idr_iter(int id, void *p, void *data)
892889
if (!target_dev_configured(dev))
893890
return 0;
894891

895-
iter->prev_item = config_item_get_unless_zero(&dev->dev_group.cg_item);
896-
if (!iter->prev_item)
892+
item = config_item_get_unless_zero(&dev->dev_group.cg_item);
893+
if (!item)
897894
return 0;
898895
mutex_unlock(&device_mutex);
899896

900897
ret = iter->fn(dev, iter->data);
898+
config_item_put(item);
901899

902900
mutex_lock(&device_mutex);
903901
return ret;
@@ -920,7 +918,6 @@ int target_for_each_device(int (*fn)(struct se_device *dev, void *data),
920918
mutex_lock(&device_mutex);
921919
ret = idr_for_each(&devices_idr, target_devices_idr_iter, &iter);
922920
mutex_unlock(&device_mutex);
923-
config_item_put(iter.prev_item);
924921
return ret;
925922
}
926923

0 commit comments

Comments
 (0)