From patchwork Thu Apr 19 14:29:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 153807 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A783EB7000 for ; Fri, 20 Apr 2012 01:11:00 +1000 (EST) Received: from localhost ([::1]:37065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKsNm-0000fl-3H for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2012 10:30:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKsNR-0008JG-GU for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:30:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKsNK-00055i-O0 for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:30:29 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:63839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKsNK-0004Mc-FT for qemu-devel@nongnu.org; Thu, 19 Apr 2012 10:30:22 -0400 Received: by mail-pb0-f45.google.com with SMTP id uo5so12014088pbc.4 for ; Thu, 19 Apr 2012 07:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=dB7QPpIsRA+/A9gyqttmfRLSwyXb9wTurBEjxzz949o=; b=09wb6ZKgayLMAlSZWDdHtVfKNP5FSRdBx8k/SHscjNJcNRuIvmX/e/04gbGr8dLNNj UtkeD8kAimazAgkl26goT2lNzsEOwF+yVzrDlIrwCmimLgs8URX9B5b0N8+3TwazJSWN csFD7YkLNhMJ0scmps+/pJtoFodj+rNx7nts2jvvaogpiRxtW9a6FjFOplmClymmP8ES 1FuqnO38hzuO4FmgxnO/K5YZkGpzuOA2U6swA+d6+aM/2l6btdj5K477QfS3Ee5vHNXY 98ZhKRxFzWxBGeWZ4cBEIzCo/CmvFdCGKrNFSQwpcahXLoSGnb4G41LX1jWehYIQ4A7h KllA== Received: by 10.68.231.195 with SMTP id ti3mr4905098pbc.132.1334845821636; Thu, 19 Apr 2012 07:30:21 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id r6sm2401487pbl.24.2012.04.19.07.30.18 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 07:30:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 Apr 2012 16:29:31 +0200 Message-Id: <1334845776-11664-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.9.3 In-Reply-To: <1334845776-11664-1-git-send-email-pbonzini@redhat.com> References: <1334845776-11664-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.160.45 Subject: [Qemu-devel] [PATCH 11/16] scsi: support FUA on reads 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 To force unit access on reads, flush the cache *before* doing the read. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 52 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 428d831..30ed3af 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -278,12 +278,48 @@ done: } } +/* Actually issue a read to the block device. */ +static void scsi_do_read(void *opaque, int ret) +{ + SCSIDiskReq *r = opaque; + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + uint32_t n; + + if (r->req.aiocb != NULL) { + r->req.aiocb = NULL; + bdrv_acct_done(s->qdev.conf.bs, &r->acct); + } + + if (ret < 0) { + if (scsi_handle_rw_error(r, -ret)) { + goto done; + } + } + + if (r->req.sg) { + dma_acct_start(s->qdev.conf.bs, &r->acct, r->req.sg, BDRV_ACCT_READ); + r->req.resid -= r->req.sg->size; + r->req.aiocb = dma_bdrv_read(s->qdev.conf.bs, r->req.sg, r->sector, + scsi_dma_complete, r); + } else { + n = scsi_init_iovec(r, SCSI_DMA_BUF_SIZE); + bdrv_acct_start(s->qdev.conf.bs, &r->acct, n * BDRV_SECTOR_SIZE, BDRV_ACCT_READ); + r->req.aiocb = bdrv_aio_readv(s->qdev.conf.bs, r->sector, &r->qiov, n, + scsi_read_complete, r); + } + +done: + if (!r->req.io_canceled) { + scsi_req_unref(&r->req); + } +} + /* Read more data from scsi device into buffer. */ static void scsi_read_data(SCSIRequest *req) { SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req); SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - uint32_t n; + bool first; if (r->sector_count == (uint32_t)-1) { DPRINTF("Read buf_len=%zd\n", r->iov.iov_len); @@ -315,17 +351,13 @@ static void scsi_read_data(SCSIRequest *req) return; } + first = !r->started; r->started = true; - if (r->req.sg) { - dma_acct_start(s->qdev.conf.bs, &r->acct, r->req.sg, BDRV_ACCT_READ); - r->req.resid -= r->req.sg->size; - r->req.aiocb = dma_bdrv_read(s->qdev.conf.bs, r->req.sg, r->sector, - scsi_dma_complete, r); + if (first && scsi_is_cmd_fua(&r->req.cmd)) { + bdrv_acct_start(s->qdev.conf.bs, &r->acct, 0, BDRV_ACCT_FLUSH); + r->req.aiocb = bdrv_aio_flush(s->qdev.conf.bs, scsi_do_read, r); } else { - n = scsi_init_iovec(r, SCSI_DMA_BUF_SIZE); - bdrv_acct_start(s->qdev.conf.bs, &r->acct, n * BDRV_SECTOR_SIZE, BDRV_ACCT_READ); - r->req.aiocb = bdrv_aio_readv(s->qdev.conf.bs, r->sector, &r->qiov, n, - scsi_read_complete, r); + scsi_do_read(r, 0); } }