From patchwork Wed Feb 22 14:33:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 142483 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 93589B6FA8 for ; Thu, 23 Feb 2012 02:15:30 +1100 (EST) Received: from localhost ([::1]:55981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0Duh-0005Wm-C9 for incoming@patchwork.ozlabs.org; Wed, 22 Feb 2012 10:15:27 -0500 Received: from eggs.gnu.org ([140.186.70.92]:37781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0DHU-0004Ne-2I for qemu-devel@nongnu.org; Wed, 22 Feb 2012 09:35:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0DHJ-0002Tk-Pt for qemu-devel@nongnu.org; Wed, 22 Feb 2012 09:34:55 -0500 Received: from mail-pz0-f45.google.com ([209.85.210.45]:44009) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0DHJ-0002Mp-JB for qemu-devel@nongnu.org; Wed, 22 Feb 2012 09:34:45 -0500 Received: by mail-pz0-f45.google.com with SMTP id p14so104760dad.4 for ; Wed, 22 Feb 2012 06:34:45 -0800 (PST) Received-SPF: pass (google.com: domain of paolo.bonzini@gmail.com designates 10.68.74.72 as permitted sender) client-ip=10.68.74.72; Authentication-Results: mr.google.com; spf=pass (google.com: domain of paolo.bonzini@gmail.com designates 10.68.74.72 as permitted sender) smtp.mail=paolo.bonzini@gmail.com; dkim=pass header.i=paolo.bonzini@gmail.com Received: from mr.google.com ([10.68.74.72]) by 10.68.74.72 with SMTP id r8mr82634619pbv.86.1329921285235 (num_hops = 1); Wed, 22 Feb 2012 06:34:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=q8WEfAtqRKkqtSalXVoGL7ySkaEnyGJPvHyyDiTKpfc=; b=OGBv8sS/3vBbJTYz2d0p9JwGrfCDssHmNf2Gqh5T9ceYpja0YZC1UBilc4Ufsf7+Jw sxdna2HRaGG4elLJrpfdKtUikt+35gQ6pE6rbY2nMD2S6JhHRhh3ljoMKG887aW5O/6f ++KUBWKyR/CbfxscOm9V/w+Tl4tjiWmHN1BGs= Received: by 10.68.74.72 with SMTP id r8mr68024265pbv.86.1329921285042; Wed, 22 Feb 2012 06:34:45 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id q1sm19120759pbv.49.2012.02.22.06.34.40 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Feb 2012 06:34:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 22 Feb 2012 15:33:51 +0100 Message-Id: <1329921236-23461-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1329921236-23461-1-git-send-email-pbonzini@redhat.com> References: <1329921236-23461-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Subject: [Qemu-devel] [PATCH v4 13/18] virtio-scsi: add basic SCSI bus operation 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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- hw/virtio-scsi.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 98 insertions(+), 13 deletions(-) diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index a9f883c..f4eb8c7 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -128,6 +128,7 @@ typedef struct { DeviceState *qdev; VirtIOSCSIConf *conf; + SCSIBus bus; VirtQueue *ctrl_vq; VirtQueue *event_vq; VirtQueue *cmd_vq; @@ -156,6 +157,22 @@ typedef struct VirtIOSCSIReq { } resp; } VirtIOSCSIReq; +static inline int virtio_scsi_get_lun(uint8_t *lun) +{ + return ((lun[2] << 8) | lun[3]) & 0x3FFF; +} + +static inline SCSIDevice *virtio_scsi_device_find(VirtIOSCSI *s, uint8_t *lun) +{ + if (lun[0] != 1) { + return NULL; + } + if (lun[2] != 0 && !(lun[2] >= 0x40 && lun[2] < 0x80)) { + return NULL; + } + return scsi_device_find(&s->bus, 0, lun[1], virtio_scsi_get_lun(lun)); +} + static void virtio_scsi_complete_req(VirtIOSCSIReq *req) { VirtIOSCSI *s = req->dev; @@ -240,7 +257,42 @@ static void virtio_scsi_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) } } -static void virtio_scsi_fail_cmd_req(VirtIOSCSI *s, VirtIOSCSIReq *req) +static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status, + size_t resid) +{ + VirtIOSCSIReq *req = r->hba_private; + + req->resp.cmd->response = VIRTIO_SCSI_S_OK; + req->resp.cmd->status = status; + if (req->resp.cmd->status == GOOD) { + req->resp.cmd->resid = resid; + } else { + req->resp.cmd->resid = 0; + req->resp.cmd->sense_len = + scsi_req_get_sense(r, req->resp.cmd->sense, VIRTIO_SCSI_SENSE_SIZE); + } + virtio_scsi_complete_req(req); +} + +static QEMUSGList *virtio_scsi_get_sg_list(SCSIRequest *r) +{ + VirtIOSCSIReq *req = r->hba_private; + + return &req->qsgl; +} + +static void virtio_scsi_request_cancelled(SCSIRequest *r) +{ + VirtIOSCSIReq *req = r->hba_private; + + if (!req) { + return; + } + req->resp.cmd->response = VIRTIO_SCSI_S_ABORTED; + virtio_scsi_complete_req(req); +} + +static void virtio_scsi_fail_cmd_req(VirtIOSCSIReq *req) { req->resp.cmd->response = VIRTIO_SCSI_S_FAILURE; virtio_scsi_complete_req(req); @@ -250,8 +302,10 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq) { VirtIOSCSI *s = (VirtIOSCSI *)vdev; VirtIOSCSIReq *req; + int n; while ((req = virtio_scsi_pop_req(s, vq))) { + SCSIDevice *d; int out_size, in_size; if (req->elem.out_num < 1 || req->elem.in_num < 1) { virtio_scsi_bad_req(); @@ -265,21 +319,36 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq) } if (req->elem.out_num > 1 && req->elem.in_num > 1) { - virtio_scsi_fail_cmd_req(s, req); + virtio_scsi_fail_cmd_req(req); continue; } - req->resp.cmd->resid = 0; - req->resp.cmd->status_qualifier = 0; - req->resp.cmd->status = CHECK_CONDITION; - req->resp.cmd->sense_len = 4; - req->resp.cmd->sense[0] = 0xf0; /* Fixed format current sense */ - req->resp.cmd->sense[1] = ILLEGAL_REQUEST; - req->resp.cmd->sense[2] = 0x20; - req->resp.cmd->sense[3] = 0x00; - req->resp.cmd->response = VIRTIO_SCSI_S_OK; - - virtio_scsi_complete_req(req); + d = virtio_scsi_device_find(s, req->req.cmd->lun); + if (!d) { + req->resp.cmd->response = VIRTIO_SCSI_S_BAD_TARGET; + virtio_scsi_complete_req(req); + continue; + } + req->sreq = scsi_req_new(d, req->req.cmd->tag, + virtio_scsi_get_lun(req->req.cmd->lun), + req->req.cmd->cdb, req); + + if (req->sreq->cmd.mode != SCSI_XFER_NONE) { + int req_mode = + (req->elem.in_num > 1 ? SCSI_XFER_FROM_DEV : SCSI_XFER_TO_DEV); + + if (req->sreq->cmd.mode != req_mode || + req->sreq->cmd.xfer > req->qsgl.size) { + req->resp.cmd->response = VIRTIO_SCSI_S_OVERRUN; + virtio_scsi_complete_req(req); + continue; + } + } + + n = scsi_req_enqueue(req->sreq); + if (n) { + scsi_req_continue(req->sreq); + } } } @@ -331,6 +400,17 @@ static void virtio_scsi_reset(VirtIODevice *vdev) s->cdb_size = VIRTIO_SCSI_CDB_SIZE; } +static struct SCSIBusInfo virtio_scsi_scsi_info = { + .tcq = true, + .max_channel = VIRTIO_SCSI_MAX_CHANNEL, + .max_target = VIRTIO_SCSI_MAX_TARGET, + .max_lun = VIRTIO_SCSI_MAX_LUN, + + .complete = virtio_scsi_command_complete, + .cancel = virtio_scsi_request_cancelled, + .get_sg_list = virtio_scsi_get_sg_list, +}; + VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *proxyconf) { VirtIOSCSI *s; @@ -355,6 +435,11 @@ VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *proxyconf) s->cmd_vq = virtio_add_queue(&s->vdev, VIRTIO_SCSI_VQ_SIZE, virtio_scsi_handle_cmd); + scsi_bus_new(&s->bus, dev, &virtio_scsi_scsi_info); + if (!dev->hotplugged) { + scsi_bus_legacy_handle_cmdline(&s->bus); + } + /* TODO savevm */ return &s->vdev;