Commit 425b902b authored Mar 30, 2017 by Piotr Pelplinski

scsi: use SOFT reset when reseting bdev



This fixes multiple SCSI reset issue.
This patch does not remove sleep in iSCSI tests.

Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Signed-off-by: Piotr Pelplinski <piotr.pelplinski@intel.com>
Change-Id: I5e9f3705e5dc34004b9d1b9e40fbdcb04a3bee4e

parent 509fedf0

lib/scsi/scsi_bdev.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1247,9 +1247,6 @@ spdk_bdev_scsi_task_complete(struct spdk_bdev_io *bdev_io, enum spdk_bdev_io_sta
		} else if (task->type == SPDK_SCSI_TASK_TYPE_MANAGE) {
		if (status == SPDK_BDEV_IO_STATUS_SUCCESS)
		task->response = SPDK_SCSI_TASK_MGMT_RESP_SUCCESS;
		if (task->function == SPDK_SCSI_TASK_FUNC_LUN_RESET) {
		spdk_scsi_lun_clear_all(task->lun);
		}
		}
		if (bdev_io->type == SPDK_BDEV_IO_TYPE_READ && task->iovs != bdev_io->u.read.iovs) {
		assert(task->iovcnt == bdev_io->u.read.iovcnt);
		@@ -1966,6 +1963,6 @@ spdk_bdev_scsi_execute(struct spdk_bdev bdev, struct spdk_scsi_task task)
		int
		spdk_bdev_scsi_reset(struct spdk_bdev bdev, struct spdk_scsi_task task)
		{
		return spdk_bdev_reset(bdev, SPDK_BDEV_RESET_HARD,
		return spdk_bdev_reset(bdev, SPDK_BDEV_RESET_SOFT,
		spdk_bdev_scsi_task_complete, task);
		}

test/vhost/fiotest/common.sh

+0 −1

Original line number	Diff line number	Diff line
		@@ -740,7 +740,6 @@ function vm_reset_scsi_devices()
		for disk in "${@:2}"; do
		echo "INFO: VM$1 Performing device reset on disk $disk"
		vm_ssh $1 sg_reset /dev/$disk -vNd
		sleep 2
		done
		}