Commit 7fa7f91e authored by Pawel Wodkowski's avatar Pawel Wodkowski Committed by Jim Harris
Browse files

scsi: use SOFT reset when reseting bdev 



This fixes multiple SCSI reset issue.

Change-Id: Ie62e0c1850faff17d383bcea00071d63d6bfa7f4
Signed-off-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
parent c09faf35

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/iscsi_tgt/reset/reset.sh

+0 −2
Original line number Diff line number Diff line
@@ -67,11 +67,9 @@ trap "iscsicleanup; killprocess $pid; killprocess $fiopid; exit 1" SIGINT SIGTER 


# Do 3 resets while making sure iscsi_tgt and fio are still running

for i in 1 2 3; do

	sleep 1

	kill -s 0 $pid

	kill -s 0 $fiopid

	sg_reset -d /dev/$dev

	sleep 1

	kill -s 0 $pid

	kill -s 0 $fiopid

done

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

}