Commit 6ca9818d authored by Wenchao Hao's avatar Wenchao Hao Committed by Martin K. Petersen

scsi: Revert "scsi: core: Do not increase scsi_device's iorequest_cnt if dispatch failed"

The "atomic_inc(&cmd->device->iorequest_cnt)" in scsi_queue_rq() would
cause kernel panic because cmd->device may be freed after returning from
scsi_dispatch_cmd().

This reverts commit cfee29ff.
Signed-off-by: default avatarWenchao Hao <haowenchao2@huawei.com>
Reported-by: default avatarMing Lei <ming.lei@redhat.com>
Closes: https://lore.kernel.org/r/ZF+zB+bB7iqe0wGd@ovpn-8-17.pek2.redhat.com
Link: https://lore.kernel.org/r/20230515070156.1790181-2-haowenchao2@huawei.comReviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4e81a6cb
...@@ -1463,6 +1463,8 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd) ...@@ -1463,6 +1463,8 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
struct Scsi_Host *host = cmd->device->host; struct Scsi_Host *host = cmd->device->host;
int rtn = 0; int rtn = 0;
atomic_inc(&cmd->device->iorequest_cnt);
/* check if the device is still usable */ /* check if the device is still usable */
if (unlikely(cmd->device->sdev_state == SDEV_DEL)) { if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
/* in SDEV_DEL we error all commands. DID_NO_CONNECT /* in SDEV_DEL we error all commands. DID_NO_CONNECT
...@@ -1761,7 +1763,6 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx, ...@@ -1761,7 +1763,6 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,
goto out_dec_host_busy; goto out_dec_host_busy;
} }
atomic_inc(&cmd->device->iorequest_cnt);
return BLK_STS_OK; return BLK_STS_OK;
out_dec_host_busy: out_dec_host_busy:
......
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