From patchwork Tue Nov 15 17:00:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 125823 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 38607B7134 for ; Wed, 16 Nov 2011 04:00:45 +1100 (EST) Received: from localhost ([::1]:52485 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQMNG-0001i6-0n for incoming@patchwork.ozlabs.org; Tue, 15 Nov 2011 12:00:42 -0500 Received: from eggs.gnu.org ([140.186.70.92]:47489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQMN0-0001YU-O4 for qemu-devel@nongnu.org; Tue, 15 Nov 2011 12:00:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQMMx-0000AQ-1C for qemu-devel@nongnu.org; Tue, 15 Nov 2011 12:00:26 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:64093) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQMMw-000087-Fx for qemu-devel@nongnu.org; Tue, 15 Nov 2011 12:00:22 -0500 Received: by mail-gx0-f173.google.com with SMTP id r4so1894156ggn.4 for ; Tue, 15 Nov 2011 09:00:22 -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=EpcWJNHhtJDo1DBChvaUyCKY/4JyoKytnImzVPPpMc4=; b=Pq2iKYIp24o523BLdzRb+OdRJ5Wv9INFAI6LtzJNR7kYbM1oV+ryOa28DtqGHYv70F NfNW2vP/YIaswEmWJXKB998KR0APDZJSq1xUO3DDGfbiBOQ3e4CbmAl2cxHJb7vGPr9V p3h2uoqEi7r+v5ysz9OY7E8F/LJwwDelEL9W4= Received: by 10.101.134.40 with SMTP id l40mr8409779ann.71.1321376422144; Tue, 15 Nov 2011 09:00:22 -0800 (PST) Received: from localhost.localdomain (93-34-207-114.ip51.fastwebnet.it. [93.34.207.114]) by mx.google.com with ESMTPS id w17sm1428939anl.13.2011.11.15.09.00.20 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Nov 2011 09:00:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 15 Nov 2011 18:00:04 +0100 Message-Id: <1321376405-22776-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1321376405-22776-1-git-send-email-pbonzini@redhat.com> References: <1321376405-22776-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.161.173 Cc: stefanha@linux.vnet.ibm.com, mst@redhat.com Subject: [Qemu-devel] [PATCH 3/4] 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 Signed-off-by: Paolo Bonzini --- hw/virtio-scsi.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 88 insertions(+), 11 deletions(-) diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index 7e6348a..5fc3c00 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -119,6 +119,7 @@ typedef struct { DeviceState *qdev; VirtIOSCSIConf *conf; + SCSIBus bus; VirtQueue *ctrl_vq; VirtQueue *event_vq; VirtQueue *cmd_vq; @@ -149,6 +150,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] < 0x7F)) { + return NULL; + } + return scsi_device_find(&s->bus, 0, lun[1], virtio_scsi_get_lun(lun)); +} + static void virtio_scsi_complete_req(VirtIOSCSIReq *req) { VirtQueue *vq = req->vq; @@ -228,6 +245,36 @@ static void virtio_scsi_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) } } +static void virtio_scsi_command_complete(SCSIRequest *r, uint32_t status, + int32_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; + if (resid) { + req->resp.cmd->response = VIRTIO_SCSI_S_UNDERRUN; + } + } else { + req->resp.cmd->resid = 0; + scsi_req_get_sense(r, req->resp.cmd->sense, VIRTIO_SCSI_SENSE_SIZE); + } + virtio_scsi_complete_req(req); +} + +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(VirtIOSCSI *s, VirtIOSCSIReq *req) { req->resp.cmd->response = VIRTIO_SCSI_S_FAILURE; @@ -238,8 +285,10 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq) { VirtIOSCSI *s = (VirtIOSCSI *)vdev; VirtIOSCSIReq *req; + int n; while ((req = virtio_scsi_parse_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(); @@ -257,17 +306,31 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq) 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) { + virtio_scsi_fail_cmd_req(s, req); + scsi_req_cancel(req->sreq); + continue; + } + } + + n = scsi_req_enqueue(req->sreq, &req->qsgl); + if (n) { + scsi_req_continue(req->sreq); + } } } @@ -290,6 +353,15 @@ static uint32_t virtio_scsi_get_features(VirtIODevice *vdev, return requested_features; } +static struct SCSIBusInfo virtio_scsi_scsi_info = { + .tcq = true, + .max_target = 255, + .max_lun = 16383, + + .complete = virtio_scsi_command_complete, + .cancel = virtio_scsi_request_cancelled, +}; + VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *proxyconf) { VirtIOSCSI *s; @@ -316,6 +388,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 */ /* TODO boot device path */