From patchwork Thu Sep 8 15:25:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 113920 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 A3945B6F81 for ; Fri, 9 Sep 2011 01:46:45 +1000 (EST) Received: from localhost ([::1]:53418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1gUP-00053l-G4 for incoming@patchwork.ozlabs.org; Thu, 08 Sep 2011 11:26:05 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1gUA-0004YI-SB for qemu-devel@nongnu.org; Thu, 08 Sep 2011 11:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R1gU0-0000wp-Vx for qemu-devel@nongnu.org; Thu, 08 Sep 2011 11:25:50 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]:51390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1gU0-0000tp-Ol for qemu-devel@nongnu.org; Thu, 08 Sep 2011 11:25:40 -0400 Received: by mail-ew0-f45.google.com with SMTP id 24so460535ewy.4 for ; Thu, 08 Sep 2011 08:25:40 -0700 (PDT) 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=xOkeM9Xcyg2vK0v1VcDmeocvxMlKC8eUXwLJPSnskFI=; b=uR6SW4DsJkMoCxldrninA2//mIKCSEs3SfiZxED2V8ovC4sql0ENgDpLnzvPil5qj5 0mzwOeUWoAOItaMcnu7J1F7WB7AW8W2PekEKQiVM1gkVHptOGgY9MsCzighqPXh+AlaU Et5a59o3sBn82q2fS1PYWFOLqwwNLzD0K/zqk= Received: by 10.52.24.170 with SMTP id v10mr64627vdf.102.1315495539835; Thu, 08 Sep 2011 08:25:39 -0700 (PDT) Received: from localhost.localdomain (93-34-199-31.ip51.fastwebnet.it [93.34.199.31]) by mx.google.com with ESMTPS id by14sm2810776vdb.22.2011.09.08.08.25.37 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Sep 2011 08:25:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 8 Sep 2011 17:25:05 +0200 Message-Id: <1315495505-28906-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1315495505-28906-1-git-send-email-pbonzini@redhat.com> References: <1315495505-28906-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.215.45 Subject: [Qemu-devel] [PATCH 12/12] nbd: split requests 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 qemu-nbd has a limit of slightly less than 1M per request. Work around this in the nbd block driver. Signed-off-by: Paolo Bonzini --- block/nbd.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 46 insertions(+), 6 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 5a75263..468a517 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -213,8 +213,9 @@ static int nbd_open(BlockDriverState *bs, const char* filename, int flags) return result; } -static int nbd_co_readv(BlockDriverState *bs, int64_t sector_num, - int nb_sectors, QEMUIOVector *qiov) +static int nbd_co_readv_1(BlockDriverState *bs, int64_t sector_num, + int nb_sectors, QEMUIOVector *qiov, + int offset) { BDRVNBDState *s = bs->opaque; struct nbd_request request; @@ -241,7 +242,7 @@ static int nbd_co_readv(BlockDriverState *bs, int64_t sector_num, reply.error = EIO; goto done; } - if (qemu_co_recvv(s->sock, qiov->iov, request.len, 0) != request.len) { + if (qemu_co_recvv(s->sock, qiov->iov, request.len, offset) != request.len) { reply.error = EIO; } @@ -251,8 +252,9 @@ done: } -static int nbd_co_writev(BlockDriverState *bs, int64_t sector_num, - int nb_sectors, QEMUIOVector *qiov) +static int nbd_co_writev_1(BlockDriverState *bs, int64_t sector_num, + int nb_sectors, QEMUIOVector *qiov, + int offset) { BDRVNBDState *s = bs->opaque; struct nbd_request request; @@ -273,7 +275,7 @@ static int nbd_co_writev(BlockDriverState *bs, int64_t sector_num, reply.error = errno; goto done; } - ret = qemu_co_sendv(s->sock, qiov->iov, request.len, 0); + ret = qemu_co_sendv(s->sock, qiov->iov, request.len, offset); if (ret != request.len) { reply.error = EIO; goto done; @@ -291,6 +293,44 @@ done: return -reply.error; } +/* qemu-nbd has a limit of slightly less than 1M per request. For safety, + * transfer at most 512K per request. */ +#define NBD_MAX_SECTORS 1024 + +static int nbd_co_readv(BlockDriverState *bs, int64_t sector_num, + int nb_sectors, QEMUIOVector *qiov) +{ + int offset = 0; + int ret; + while (nb_sectors > NBD_MAX_SECTORS) { + ret = nbd_co_readv_1(bs, sector_num, NBD_MAX_SECTORS, qiov, offset); + if (ret < 0) { + return ret; + } + offset += NBD_MAX_SECTORS * 512; + sector_num += NBD_MAX_SECTORS; + nb_sectors -= NBD_MAX_SECTORS; + } + return nbd_co_readv_1(bs, sector_num, nb_sectors, qiov, offset); +} + +static int nbd_co_writev(BlockDriverState *bs, int64_t sector_num, + int nb_sectors, QEMUIOVector *qiov) +{ + int offset = 0; + int ret; + while (nb_sectors > NBD_MAX_SECTORS) { + ret = nbd_co_writev_1(bs, sector_num, NBD_MAX_SECTORS, qiov, offset); + if (ret < 0) { + return ret; + } + offset += NBD_MAX_SECTORS * 512; + sector_num += NBD_MAX_SECTORS; + nb_sectors -= NBD_MAX_SECTORS; + } + return nbd_co_writev_1(bs, sector_num, nb_sectors, qiov, offset); +} + static int nbd_co_flush(BlockDriverState *bs) { BDRVNBDState *s = bs->opaque;