Commit 913257cb authored by Jim Harris's avatar Jim Harris
Browse files

Revert "scsi: use SOFT reset when reseting bdev" 



Some intermittent issues still observed with multiple
resets in quick succession.  Reverting for now while the
issue is more fully root caused.

This reverts commit 7fa7f91e.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I493b564e8a110bbfb7a6cc47107d53d6eca40053
parent f00d22bb

lib/scsi/scsi_bdev.c

+4 −1
Original line number Diff line number Diff line
@@ -1247,6 +1247,9 @@ 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);
@@ -1963,6 +1966,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_SOFT,

	return spdk_bdev_reset(bdev, SPDK_BDEV_RESET_HARD,

			       spdk_bdev_scsi_task_complete, task);

}

test/iscsi_tgt/reset/reset.sh

+2 −0
Original line number Diff line number Diff line
@@ -67,9 +67,11 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -740,6 +740,7 @@ 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

}