Commit 78d2a8d0 authored by Ming Lei's avatar Ming Lei Committed by Zheng Qixing
Browse files

scsi: core: Add scsi_device_busy() wrapper 

mainline inclusion
from mainline-v5.13-rc1
commit 8278807a
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IB4C27

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8278807abd338f2246b6ae8057f2ec61a80a5614

-------------------------------------------

Add scsi_device_busy() helper to prepare drivers for tracking device queue
depth via sbitmap_queue.

Link: https://lore.kernel.org/r/20210122023317.687987-12-ming.lei@redhat.com


Cc: Omar Sandoval <osandov@fb.com>
Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Cc: Sumanesh Samanta <sumanesh.samanta@broadcom.com>
Cc: Ewan D. Milne <emilne@redhat.com>
Tested-by: default avatarSumanesh Samanta <sumanesh.samanta@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarZheng Qixing <zhengqixing@huawei.com>
parent 52403b8f

drivers/message/fusion/mptsas.c

+1 −1
Original line number Diff line number Diff line
@@ -3756,7 +3756,7 @@ mptsas_send_link_status_event(struct fw_event_work *fw_event) 
						printk(MYIOC_s_DEBUG_FMT

						"SDEV OUTSTANDING CMDS"

						"%d\n", ioc->name,

						atomic_read(&sdev->device_busy)));

						scsi_device_busy(sdev)));

				}



			}

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+1 −1
Original line number Diff line number Diff line
@@ -3255,7 +3255,7 @@ scsih_dev_reset(struct scsi_cmnd *scmd) 
		MPI2_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET, 0, 0,

		tr_timeout, tr_method);

	/* Check for busy commands after reset */

	if (r == SUCCESS && atomic_read(&scmd->device->device_busy))

	if (r == SUCCESS && scsi_device_busy(scmd->device))

		r = FAILED;

 out:

	sdev_printk(KERN_INFO, scmd->device, "device reset: %s scmd(0x%p)\n",

drivers/scsi/scsi_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static void scsi_single_lun_run(struct scsi_device *current_sdev) 


static inline bool scsi_device_is_busy(struct scsi_device *sdev)

{

	if (atomic_read(&sdev->device_busy) >= sdev->queue_depth)

	if (scsi_device_busy(sdev) >= sdev->queue_depth)

		return true;

	if (atomic_read(&sdev->device_blocked) > 0)

		return true;
@@ -1642,7 +1642,7 @@ static int scsi_mq_get_budget(struct request_queue *q) 
	 * the .restarts flag, and the request queue will be run for handling

	 * this request, see scsi_end_request().

	 */

	if (unlikely(atomic_read(&sdev->device_busy) == 0 &&

	if (unlikely(scsi_device_busy(sdev) == 0 &&

				!scsi_device_blocked(sdev)))

		blk_mq_delay_run_hw_queues(sdev->request_queue, SCSI_QUEUE_DELAY);

	return -1;

drivers/scsi/scsi_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ sdev_show_device_busy(struct device *dev, struct device_attribute *attr, 
		char *buf)

{

	struct scsi_device *sdev = to_scsi_device(dev);

	return snprintf(buf, 20, "%d\n", atomic_read(&sdev->device_busy));

	return snprintf(buf, 20, "%d\n", scsi_device_busy(sdev));

}

static DEVICE_ATTR(device_busy, S_IRUGO, sdev_show_device_busy, NULL);

drivers/scsi/sg.c

+1 −1
Original line number Diff line number Diff line
@@ -2517,7 +2517,7 @@ static int sg_proc_seq_show_dev(struct seq_file *s, void *v) 
			      scsidp->id, scsidp->lun, (int) scsidp->type,

			      1,

			      (int) scsidp->queue_depth,

			      (int) atomic_read(&scsidp->device_busy),

			      (int) scsi_device_busy(scsidp),

			      (int) scsi_device_online(scsidp));

	}

	read_unlock_irqrestore(&sg_index_lock, iflags);