From patchwork Tue Dec 6 11:01:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 129629 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A5B931007D4 for ; Tue, 6 Dec 2011 22:23:45 +1100 (EST) Received: from localhost ([::1]:55123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXsnR-0004fa-Kt for incoming@patchwork.ozlabs.org; Tue, 06 Dec 2011 06:02:49 -0500 Received: from eggs.gnu.org ([140.186.70.92]:41160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXsn3-0003aO-Tq for qemu-devel@nongnu.org; Tue, 06 Dec 2011 06:02:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXsms-0005PG-Jm for qemu-devel@nongnu.org; Tue, 06 Dec 2011 06:02:20 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:56351) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXsms-0005L0-14 for qemu-devel@nongnu.org; Tue, 06 Dec 2011 06:02:14 -0500 Received: by mail-iy0-f173.google.com with SMTP id k32so11725126iak.4 for ; Tue, 06 Dec 2011 03:02:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=AAh5ZjFmMYoErGrNQSzjiG3lpod+Ma0B4UDwPgspAzg=; b=aKygb2Y6NzjvhYFl4KOzhS8aHkIkJP4vjkxW3GojEVe5EzmOUsvdKRM9ql17nIcQUU QPIpZhauTCIA/7L3oxrXDB2FfqSQjlXy/L+Oo5FlxMJggq0JYjmZm6MyGMDMA9LnDkKE 564POod4RLaHlLZHiLuypmmRXXcDuhB4+RfA0= Received: by 10.231.83.211 with SMTP id g19mr3261321ibl.26.1323169332837; Tue, 06 Dec 2011 03:02:12 -0800 (PST) Received: from localhost.localdomain (93-34-178-147.ip50.fastwebnet.it. [93.34.178.147]) by mx.google.com with ESMTPS id a2sm48932443igj.7.2011.12.06.03.02.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Dec 2011 03:02:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Dec 2011 12:01:32 +0100 Message-Id: <1323169292-21661-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1323169292-21661-1-git-send-email-pbonzini@redhat.com> References: <1323169292-21661-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 11/11] virtio-scsi: process control queue requests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- hw/virtio-scsi.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 120 insertions(+), 8 deletions(-) diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index dbb4003..601a646 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,98 @@ 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: + req->resp.tmf->response = VIRTIO_SCSI_S_FUNCTION_SUCCEEDED; + break; + + 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); } } @@ -283,7 +388,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); }