From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RwzQd-0002s8-7Y for qemu-devel@nongnu.org; Mon, 13 Feb 2012 12:11:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RwzQV-0005Br-29 for qemu-devel@nongnu.org; Mon, 13 Feb 2012 12:11:03 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:65375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RwzQU-00057q-9n for qemu-devel@nongnu.org; Mon, 13 Feb 2012 12:10:54 -0500 Received: by mail-pw0-f45.google.com with SMTP id ro12so5449571pbb.4 for ; Mon, 13 Feb 2012 09:10:54 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 13 Feb 2012 18:10:13 +0100 Message-Id: <1329153022-31159-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1329153022-31159-1-git-send-email-pbonzini@redhat.com> References: <1329153022-31159-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 06/15] scsi: add scatter/gather functionality List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@gmail.com, christian.hoff@de.ibm.com, kvm@vger.kernel.org Scatter/gather functionality uses the newly added DMA helpers. The device can choose between doing DMA itself, or calling scsi_req_data as usual, which will use the newly added DMA helpers to copy piecewise to/from the destination area(s). Signed-off-by: Paolo Bonzini --- hw/scsi-bus.c | 28 ++++++++++++++++++++++++++-- hw/scsi.h | 3 +++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 6a069f4..69cb3fc 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -5,6 +5,7 @@ #include "qdev.h" #include "blockdev.h" #include "trace.h" +#include "dma.h" static char *scsibus_get_fw_dev_path(DeviceState *dev); static int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf); @@ -651,6 +652,11 @@ int32_t scsi_req_enqueue(SCSIRequest *req) assert(!req->enqueued); scsi_req_ref(req); + if (req->bus->info->get_sg_list) { + req->sg = req->bus->info->get_sg_list(req); + } else { + req->sg = NULL; + } req->enqueued = true; QTAILQ_INSERT_TAIL(&req->dev->requests, req, next); @@ -1275,14 +1281,32 @@ void scsi_req_continue(SCSIRequest *req) Once it completes, calling scsi_req_continue will restart I/O. */ void scsi_req_data(SCSIRequest *req, int len) { + uint8_t *buf; if (req->io_canceled) { trace_scsi_req_data_canceled(req->dev->id, req->lun, req->tag, len); return; } trace_scsi_req_data(req->dev->id, req->lun, req->tag, len); assert(req->cmd.mode != SCSI_XFER_NONE); - req->resid -= len; - req->bus->info->transfer_data(req, len); + if (!req->sg) { + req->resid -= len; + req->bus->info->transfer_data(req, len); + return; + } + + /* If the device calls scsi_req_data and the HBA specified a + * scatter/gather list, the transfer has to happen in a single + * step. */ + assert(!req->dma_started); + req->dma_started = true; + + buf = scsi_req_get_buf(req); + if (req->cmd.mode == SCSI_XFER_FROM_DEV) { + req->resid = dma_buf_read(buf, len, req->sg); + } else { + req->resid = dma_buf_write(buf, len, req->sg); + } + scsi_req_continue(req); } void scsi_req_print(SCSIRequest *req) diff --git a/hw/scsi.h b/hw/scsi.h index e1c52d2..811f61c 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -49,6 +49,8 @@ struct SCSIRequest { size_t resid; SCSICommand cmd; BlockDriverAIOCB *aiocb; + QEMUSGList *sg; + bool dma_started; uint8_t sense[SCSI_SENSE_BUF_SIZE]; uint32_t sense_len; bool enqueued; @@ -115,6 +117,7 @@ struct SCSIBusInfo { void (*transfer_data)(SCSIRequest *req, uint32_t arg); void (*complete)(SCSIRequest *req, uint32_t arg, size_t resid); void (*cancel)(SCSIRequest *req); + QEMUSGList *(*get_sg_list)(SCSIRequest *req); }; struct SCSIBus { -- 1.7.7.6