Skip to content

Commit a836054

Browse files
josefbacikgregkh
authored andcommitted
scsi: target: tcm_loop: Drain commands in target_reset handler
[ Upstream commit 1333eee ] tcm_loop_target_reset() violates the SCSI EH contract: it returns SUCCESS without draining any in-flight commands. The SCSI EH documentation (scsi_eh.rst) requires that when a reset handler returns SUCCESS the driver has made lower layers "forget about timed out scmds" and is ready for new commands. Every other SCSI LLD (virtio_scsi, mpt3sas, ipr, scsi_debug, mpi3mr) enforces this by draining or completing outstanding commands before returning SUCCESS. Because tcm_loop_target_reset() doesn't drain, the SCSI EH reuses in-flight scsi_cmnd structures for recovery commands (e.g. TUR) while the target core still has async completion work queued for the old se_cmd. The memset in queuecommand zeroes se_lun and lun_ref_active, causing transport_lun_remove_cmd() to skip its percpu_ref_put(). The leaked LUN reference prevents transport_clear_lun_ref() from completing, hanging configfs LUN unlink forever in D-state: INFO: task rm:264 blocked for more than 122 seconds. rm D 0 264 258 0x00004000 Call Trace: __schedule+0x3d0/0x8e0 schedule+0x36/0xf0 transport_clear_lun_ref+0x78/0x90 [target_core_mod] core_tpg_remove_lun+0x28/0xb0 [target_core_mod] target_fabric_port_unlink+0x50/0x60 [target_core_mod] configfs_unlink+0x156/0x1f0 [configfs] vfs_unlink+0x109/0x290 do_unlinkat+0x1d5/0x2d0 Fix this by making tcm_loop_target_reset() actually drain commands: 1. Issue TMR_LUN_RESET via tcm_loop_issue_tmr() to drain all commands that the target core knows about (those not yet CMD_T_COMPLETE). 2. Use blk_mq_tagset_busy_iter() to iterate all started requests and flush_work() on each se_cmd — this drains any deferred completion work for commands that already had CMD_T_COMPLETE set before the TMR (which the TMR skips via __target_check_io_state()). This is the same pattern used by mpi3mr, scsi_debug, and libsas to drain outstanding commands during reset. Fixes: e0eb5d3 ("scsi: target: tcm_loop: Use block cmd allocator for se_cmds") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-6 Signed-off-by: Josef Bacik <josef@toxicpanda.com> Link: https://patch.msgid.link/27011aa34c8f6b1b94d2e3cf5655b6d037f53428.1773706803.git.josef@toxicpanda.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ce54802 commit a836054

1 file changed

Lines changed: 46 additions & 6 deletions

File tree

drivers/target/loopback/tcm_loop.c

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <linux/slab.h>
2727
#include <linux/types.h>
2828
#include <linux/configfs.h>
29+
#include <linux/blk-mq.h>
2930
#include <scsi/scsi.h>
3031
#include <scsi/scsi_tcq.h>
3132
#include <scsi/scsi_host.h>
@@ -268,15 +269,27 @@ static int tcm_loop_device_reset(struct scsi_cmnd *sc)
268269
return (ret == TMR_FUNCTION_COMPLETE) ? SUCCESS : FAILED;
269270
}
270271

272+
static bool tcm_loop_flush_work_iter(struct request *rq, void *data)
273+
{
274+
struct scsi_cmnd *sc = blk_mq_rq_to_pdu(rq);
275+
struct tcm_loop_cmd *tl_cmd = scsi_cmd_priv(sc);
276+
struct se_cmd *se_cmd = &tl_cmd->tl_se_cmd;
277+
278+
flush_work(&se_cmd->work);
279+
return true;
280+
}
281+
271282
static int tcm_loop_target_reset(struct scsi_cmnd *sc)
272283
{
273284
struct tcm_loop_hba *tl_hba;
274285
struct tcm_loop_tpg *tl_tpg;
286+
struct Scsi_Host *sh = sc->device->host;
287+
int ret;
275288

276289
/*
277290
* Locate the tcm_loop_hba_t pointer
278291
*/
279-
tl_hba = *(struct tcm_loop_hba **)shost_priv(sc->device->host);
292+
tl_hba = *(struct tcm_loop_hba **)shost_priv(sh);
280293
if (!tl_hba) {
281294
pr_err("Unable to perform device reset without active I_T Nexus\n");
282295
return FAILED;
@@ -285,11 +298,38 @@ static int tcm_loop_target_reset(struct scsi_cmnd *sc)
285298
* Locate the tl_tpg pointer from TargetID in sc->device->id
286299
*/
287300
tl_tpg = &tl_hba->tl_hba_tpgs[sc->device->id];
288-
if (tl_tpg) {
289-
tl_tpg->tl_transport_status = TCM_TRANSPORT_ONLINE;
290-
return SUCCESS;
291-
}
292-
return FAILED;
301+
if (!tl_tpg)
302+
return FAILED;
303+
304+
/*
305+
* Issue a LUN_RESET to drain all commands that the target core
306+
* knows about. This handles commands not yet marked CMD_T_COMPLETE.
307+
*/
308+
ret = tcm_loop_issue_tmr(tl_tpg, sc->device->lun, 0, TMR_LUN_RESET);
309+
if (ret != TMR_FUNCTION_COMPLETE)
310+
return FAILED;
311+
312+
/*
313+
* Flush any deferred target core completion work that may still be
314+
* queued. Commands that already had CMD_T_COMPLETE set before the TMR
315+
* are skipped by the TMR drain, but their async completion work
316+
* (transport_lun_remove_cmd → percpu_ref_put, release_cmd → scsi_done)
317+
* may still be pending in target_completion_wq.
318+
*
319+
* The SCSI EH will reuse in-flight scsi_cmnd structures for recovery
320+
* commands (e.g. TUR) immediately after this handler returns SUCCESS —
321+
* if deferred work is still pending, the memset in queuecommand would
322+
* zero the se_cmd while the work accesses it, leaking the LUN
323+
* percpu_ref and hanging configfs unlink forever.
324+
*
325+
* Use blk_mq_tagset_busy_iter() to find all started requests and
326+
* flush_work() on each — the same pattern used by mpi3mr, scsi_debug,
327+
* and other SCSI drivers to drain outstanding commands during reset.
328+
*/
329+
blk_mq_tagset_busy_iter(&sh->tag_set, tcm_loop_flush_work_iter, NULL);
330+
331+
tl_tpg->tl_transport_status = TCM_TRANSPORT_ONLINE;
332+
return SUCCESS;
293333
}
294334

295335
static const struct scsi_host_template tcm_loop_driver_template = {

0 commit comments

Comments
 (0)