From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 14/15] virtio-scsi: process control queue requests
Date: Mon, 16 Jan 2012 17:30:56 +0100 [thread overview]
Message-ID: <1326731457-9056-15-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1326731457-9056-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/virtio-scsi.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 117 insertions(+), 8 deletions(-)
diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c
index 21264a1..7ad60ec 100644
--- a/hw/virtio-scsi.c
+++ b/hw/virtio-scsi.c
@@ -134,6 +134,7 @@ typedef struct {
VirtQueue *cmd_vq;
uint32_t sense_size;
uint32_t cdb_size;
+ bool resetting;
} VirtIOSCSI;
typedef struct VirtIOSCSIReq {
@@ -236,15 +237,95 @@ static VirtIOSCSIReq *virtio_scsi_pop_req(VirtIOSCSI *s, VirtQueue *vq)
return req;
}
-static void virtio_scsi_fail_ctrl_req(VirtIOSCSIReq *req)
+static void virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req)
{
- if (req->req.tmf->type == VIRTIO_SCSI_T_TMF) {
- req->resp.tmf->response = VIRTIO_SCSI_S_FAILURE;
- } else {
- req->resp.an->response = VIRTIO_SCSI_S_FAILURE;
+ SCSIDevice *d = virtio_scsi_device_find(s, req->req.cmd->lun);
+ SCSIRequest *r, *next;
+ DeviceState *qdev;
+ int target;
+
+ switch (req->req.tmf->subtype) {
+ case VIRTIO_SCSI_T_TMF_ABORT_TASK:
+ case VIRTIO_SCSI_T_TMF_QUERY_TASK:
+ d = virtio_scsi_device_find(s, req->req.cmd->lun);
+ if (!d) {
+ goto fail;
+ }
+ if (d->lun != virtio_scsi_get_lun(req->req.cmd->lun)) {
+ req->resp.tmf->response = VIRTIO_SCSI_S_INCORRECT_LUN;
+ break;
+ }
+ QTAILQ_FOREACH_SAFE(r, &d->requests, next, next) {
+ if (r->tag == req->req.cmd->tag) {
+ break;
+ }
+ }
+ if (r && r->hba_private) {
+ if (req->req.tmf->subtype == VIRTIO_SCSI_T_TMF_ABORT_TASK) {
+ scsi_req_cancel(r);
+ }
+ req->resp.tmf->response = VIRTIO_SCSI_S_FUNCTION_SUCCEEDED;
+ } else {
+ req->resp.tmf->response = VIRTIO_SCSI_S_OK;
+ }
+ break;
+
+ case VIRTIO_SCSI_T_TMF_LOGICAL_UNIT_RESET:
+ d = virtio_scsi_device_find(s, req->req.cmd->lun);
+ if (!d) {
+ goto fail;
+ }
+ if (d->lun == virtio_scsi_get_lun(req->req.cmd->lun)) {
+ s->resetting++;
+ qdev_reset_all(&d->qdev);
+ s->resetting--;
+ }
+ break;
+
+ case VIRTIO_SCSI_T_TMF_ABORT_TASK_SET:
+ case VIRTIO_SCSI_T_TMF_CLEAR_TASK_SET:
+ case VIRTIO_SCSI_T_TMF_QUERY_TASK_SET:
+ d = virtio_scsi_device_find(s, req->req.cmd->lun);
+ if (!d) {
+ goto fail;
+ }
+ if (d->lun != virtio_scsi_get_lun(req->req.cmd->lun)) {
+ req->resp.tmf->response = VIRTIO_SCSI_S_INCORRECT_LUN;
+ break;
+ }
+ req->resp.tmf->response = VIRTIO_SCSI_S_OK;
+ QTAILQ_FOREACH_SAFE(r, &d->requests, next, next) {
+ if (r->hba_private) {
+ if (req->req.tmf->subtype != VIRTIO_SCSI_T_TMF_QUERY_TASK) {
+ scsi_req_cancel(r);
+ }
+ req->resp.tmf->response = VIRTIO_SCSI_S_FUNCTION_SUCCEEDED;
+ }
+ }
+ break;
+
+ case VIRTIO_SCSI_T_TMF_I_T_NEXUS_RESET:
+ target = req->req.cmd->lun[1];
+ s->resetting++;
+ QTAILQ_FOREACH(qdev, &s->bus.qbus.children, sibling) {
+ d = DO_UPCAST(SCSIDevice, qdev, qdev);
+ if (d->channel == 0 && d->id == target) {
+ qdev_reset_all(&d->qdev);
+ }
+ }
+ s->resetting--;
+ break;
+
+ case VIRTIO_SCSI_T_TMF_CLEAR_ACA:
+ default:
+ req->resp.tmf->response = VIRTIO_SCSI_S_FUNCTION_REJECTED;
+ break;
}
- virtio_scsi_complete_req(req);
+ return;
+
+fail:
+ req->resp.tmf->response = VIRTIO_SCSI_S_BAD_TARGET;
}
static void virtio_scsi_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
@@ -253,7 +334,31 @@ static void virtio_scsi_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
VirtIOSCSIReq *req;
while ((req = virtio_scsi_pop_req(s, vq))) {
- virtio_scsi_fail_ctrl_req(req);
+ int out_size, in_size;
+ if (req->elem.out_num < 1 || req->elem.in_num < 1) {
+ virtio_scsi_bad_req();
+ continue;
+ }
+
+ out_size = req->elem.out_sg[0].iov_len;
+ in_size = req->elem.in_sg[0].iov_len;
+ if (req->req.tmf->type == VIRTIO_SCSI_T_TMF) {
+ if (out_size < sizeof(VirtIOSCSICtrlTMFReq) ||
+ in_size < sizeof(VirtIOSCSICtrlTMFResp)) {
+ virtio_scsi_bad_req();
+ }
+ virtio_scsi_do_tmf(s, req);
+
+ } else if (req->req.tmf->type == VIRTIO_SCSI_T_AN_QUERY ||
+ req->req.tmf->type == VIRTIO_SCSI_T_AN_SUBSCRIBE) {
+ if (out_size < sizeof(VirtIOSCSICtrlANReq) ||
+ in_size < sizeof(VirtIOSCSICtrlANResp)) {
+ virtio_scsi_bad_req();
+ }
+ req->resp.an->event_actual = 0;
+ req->resp.an->response = VIRTIO_SCSI_S_OK;
+ }
+ virtio_scsi_complete_req(req);
}
}
@@ -287,7 +392,11 @@ static void virtio_scsi_request_cancelled(SCSIRequest *r)
if (!req) {
return;
}
- req->resp.cmd->response = VIRTIO_SCSI_S_ABORTED;
+ if (req->dev->resetting) {
+ req->resp.cmd->response = VIRTIO_SCSI_S_RESET;
+ } else {
+ req->resp.cmd->response = VIRTIO_SCSI_S_ABORTED;
+ }
virtio_scsi_complete_req(req);
}
--
1.7.7.1
next prev parent reply other threads:[~2012-01-16 16:31 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-16 16:30 [Qemu-devel] [PATCH v2 00/15] SCSI s/g + SCSI migration + virtio-scsi Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 01/15] dma-helpers: make QEMUSGList target independent Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 02/15] dma-helpers: add dma_buf_read and dma_buf_write Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 03/15] dma-helpers: add accounting wrappers Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 04/15] ahci: use new DMA helpers Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 05/15] scsi: pass residual amount to command_complete Paolo Bonzini
2012-02-10 11:44 ` Stefan Hajnoczi
2012-02-10 11:58 ` Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 06/15] scsi: add scatter/gather functionality Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 07/15] scsi-disk: enable " Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 08/15] scsi: add SCSIDevice vmstate definitions Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 09/15] scsi-generic: add migration support Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 10/15] scsi-disk: " Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 11/15] virtio-scsi: Add virtio-scsi stub device Paolo Bonzini
2012-02-10 12:41 ` Stefan Hajnoczi
2012-02-10 12:46 ` Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 12/15] virtio-scsi: Add basic request processing infrastructure Paolo Bonzini
2012-01-16 16:30 ` [Qemu-devel] [PATCH 13/15] virtio-scsi: add basic SCSI bus operation Paolo Bonzini
2012-01-16 16:30 ` Paolo Bonzini [this message]
2012-01-16 16:30 ` [Qemu-devel] [PATCH 15/15] virtio-scsi: add migration support Paolo Bonzini
2012-01-18 7:39 ` [Qemu-devel] [PATCH v2 00/15] SCSI s/g + SCSI migration + virtio-scsi Hu Tao
2012-01-19 15:53 ` Paolo Bonzini
2012-01-23 13:36 ` Paolo Bonzini
2012-01-30 9:33 ` Hu Tao
2012-01-31 12:36 ` Paolo Bonzini
2012-02-09 5:46 ` Hu Tao
2012-02-09 7:13 ` Paolo Bonzini
2012-02-09 8:08 ` Hu Tao
2012-02-10 14:01 ` Stefan Hajnoczi
2012-02-10 14:15 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1326731457-9056-15-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).