Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 637ab21e authored by Asias He's avatar Asias He Committed by Nicholas Bellinger
Browse files

tcm_vhost: Add vhost_scsi_send_bad_target() helper 



Share the send bad target code with other use cases.

Signed-off-by: default avatarAsias He <asias@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 7ea206cf

drivers/vhost/tcm_vhost.c

+18 −13
Original line number Diff line number Diff line
@@ -578,6 +578,23 @@ static void tcm_vhost_submission_work(struct work_struct *work) 
	}

}



static void vhost_scsi_send_bad_target(struct vhost_scsi *vs,

	struct vhost_virtqueue *vq, int head, unsigned out)

{

	struct virtio_scsi_cmd_resp __user *resp;

	struct virtio_scsi_cmd_resp rsp;

	int ret;



	memset(&rsp, 0, sizeof(rsp));

	rsp.response = VIRTIO_SCSI_S_BAD_TARGET;

	resp = vq->iov[out].iov_base;

	ret = __copy_to_user(resp, &rsp, sizeof(rsp));

	if (!ret)

		vhost_add_used_and_signal(&vs->dev, vq, head, 0);

	else

		pr_err("Faulted on virtio_scsi_cmd_resp\n");

}



static void vhost_scsi_handle_vq(struct vhost_scsi *vs,

	struct vhost_virtqueue *vq)

{
@@ -673,19 +690,7 @@ static void vhost_scsi_handle_vq(struct vhost_scsi *vs, 


		/* Target does not exist, fail the request */

		if (unlikely(!tv_tpg)) {

			struct virtio_scsi_cmd_resp __user *resp;

			struct virtio_scsi_cmd_resp rsp;



			memset(&rsp, 0, sizeof(rsp));

			rsp.response = VIRTIO_SCSI_S_BAD_TARGET;

			resp = vq->iov[out].iov_base;

			ret = __copy_to_user(resp, &rsp, sizeof(rsp));

			if (!ret)

				vhost_add_used_and_signal(&vs->dev,

							  vq, head, 0);

			else

				pr_err("Faulted on virtio_scsi_cmd_resp\n");



			vhost_scsi_send_bad_target(vs, vq, head, out);

			continue;

		}