From patchwork Mon Dec 8 09:20:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 418644 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CBB161400D5 for ; Mon, 8 Dec 2014 20:26:09 +1100 (AEDT) Received: from localhost ([::1]:60830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XxuZy-0004bt-FN for incoming@patchwork.ozlabs.org; Mon, 08 Dec 2014 04:26:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XxuZa-0004LN-VC for qemu-devel@nongnu.org; Mon, 08 Dec 2014 04:25:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XxuZU-0007JC-AL for qemu-devel@nongnu.org; Mon, 08 Dec 2014 04:25:42 -0500 Received: from mail-pd0-f180.google.com ([209.85.192.180]:64954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XxuZU-0007J6-06 for qemu-devel@nongnu.org; Mon, 08 Dec 2014 04:25:36 -0500 Received: by mail-pd0-f180.google.com with SMTP id w10so1713914pde.11 for ; Mon, 08 Dec 2014 01:25:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id; bh=19Chq8rqRRx69yMjQ732Via3GEvUmEBT1jIQv3PDw1g=; b=Bm1+H9uww0tYLEXm7mfM9y3MxyaLDyYUe1n7uRr7H5OIRUkvhpIYzWr+1T3jITZbG3 Lc3fX3WnQNi4Mga2n+1ojB6tLi52bpmfRzMvqGNQBch41MzfJeBj89urhVxZ3iA0V6xs GQbVseJ5xwr/ed2sQgtTAhdzyDcNS83dzGk2fcBPBZOe4PW3JI5I4sFHsStqIChkJjLN 9t/TN0/SUBbpRpLpYIkm+Y6wAyGGLcKpBDJqK+IiGEPhFnufqN0Ybqxivuq35m+73P7G BIxqOY7je2fQBaWc4u6YO+14PuT6XMiTF/Ik+R7s5Sx+hUTnZ5FZS+rJ9rsOjVyUMeaG GgbQ== X-Received: by 10.66.160.2 with SMTP id xg2mr34007595pab.111.1418030732804; Mon, 08 Dec 2014 01:25:32 -0800 (PST) Received: from localhost ([183.38.7.156]) by mx.google.com with ESMTPSA id fa9sm22828173pab.36.2014.12.08.01.25.31 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 08 Dec 2014 01:25:32 -0800 (PST) From: Ming Lei To: qemu-devel@nongnu.org, Paolo Bonzini Date: Mon, 8 Dec 2014 17:20:57 +0800 Message-Id: <1418030457-10801-1-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.180 Cc: Ming Lei , Max Reitz Subject: [Qemu-devel] [PATCH] SCSI: splite write_zero in unit of at most INT_MAX bytes 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 Currently block can not handle big write well when write size is bigger than INT_MAX, so split the write zero into smaller size of chunks to meet block's requirement. This patch fixes one WRITE SAME 16 failure in linux VM side. Cc: Max Reitz Signed-off-by: Ming Lei --- hw/scsi/scsi-disk.c | 67 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 2f75d7d..a843f9b 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -42,6 +42,9 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0) #include #endif +/* bytes in one single write should be held in one 'int' variable */ +#define SCSI_WRITE_ZERO_MAX (INT_MAX) + #define SCSI_WRITE_SAME_MAX 524288 #define SCSI_DMA_BUF_SIZE 131072 #define SCSI_MAX_INQUIRY_LEN 256 @@ -1618,10 +1621,53 @@ typedef struct WriteSameCBData { SCSIDiskReq *r; int64_t sector; int nb_sectors; + int curr_sectors; + int flags; QEMUIOVector qiov; struct iovec iov; } WriteSameCBData; +static void scsi_write_zero_complete(void *opaque, int ret) +{ + WriteSameCBData *data = opaque; + SCSIDiskReq *r = data->r; + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); + + assert(r->req.aiocb != NULL); + r->req.aiocb = NULL; + block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct); + if (r->req.io_canceled) { + scsi_req_cancel_complete(&r->req); + goto done; + } + + if (ret < 0) { + if (scsi_handle_rw_error(r, -ret)) { + goto done; + } + } + + data->nb_sectors -= data->curr_sectors; + data->sector += data->curr_sectors; + data->curr_sectors = MIN(data->nb_sectors, SCSI_WRITE_ZERO_MAX / 512); + if (data->nb_sectors) { + block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, + data->curr_sectors * s->qdev.blocksize, + BLOCK_ACCT_WRITE); + r->req.aiocb = blk_aio_write_zeroes(s->qdev.conf.blk, + data->sector, + data->curr_sectors, + data->flags, scsi_write_zero_complete, data); + return; + } + + scsi_req_complete(&r->req, GOOD); + +done: + scsi_req_unref(&r->req); + g_free(data); +} + static void scsi_write_same_complete(void *opaque, int ret) { WriteSameCBData *data = opaque; @@ -1686,25 +1732,26 @@ static void scsi_disk_emulate_write_same(SCSIDiskReq *r, uint8_t *inbuf) return; } + data = g_new0(WriteSameCBData, 1); + data->r = r; + data->sector = r->req.cmd.lba * (s->qdev.blocksize / 512); + data->nb_sectors = nb_sectors * (s->qdev.blocksize / 512); + data->curr_sectors = MIN(data->nb_sectors, SCSI_WRITE_ZERO_MAX / 512); if (buffer_is_zero(inbuf, s->qdev.blocksize)) { - int flags = (req->cmd.buf[1] & 0x8) ? BDRV_REQ_MAY_UNMAP : 0; + data->flags = (req->cmd.buf[1] & 0x8) ? BDRV_REQ_MAY_UNMAP : 0; /* The request is used as the AIO opaque value, so add a ref. */ scsi_req_ref(&r->req); block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, - nb_sectors * s->qdev.blocksize, - BLOCK_ACCT_WRITE); + data->curr_sectors * s->qdev.blocksize, + BLOCK_ACCT_WRITE); r->req.aiocb = blk_aio_write_zeroes(s->qdev.conf.blk, - r->req.cmd.lba * (s->qdev.blocksize / 512), - nb_sectors * (s->qdev.blocksize / 512), - flags, scsi_aio_complete, r); + data->sector, + data->curr_sectors, + data->flags, scsi_write_zero_complete, data); return; } - data = g_new0(WriteSameCBData, 1); - data->r = r; - data->sector = r->req.cmd.lba * (s->qdev.blocksize / 512); - data->nb_sectors = nb_sectors * (s->qdev.blocksize / 512); data->iov.iov_len = MIN(data->nb_sectors * 512, SCSI_WRITE_SAME_MAX); data->iov.iov_base = buf = blk_blockalign(s->qdev.conf.blk, data->iov.iov_len);