From nobody Mon Nov 10 19:45:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1558428475; cv=none; d=zoho.com; s=zohoarc; b=SfYXMkJlI2Ee4veAYvNLubBVx4anaubn6rlqOIttx+mM/CSc94pUUWMGgip2n6hIPgLBDIvinmJBvVXgFvxHsfo4Wmf3AAAkQE7ZOP4ejCs7KcDF51zv554KK4CW9E2PIihk3+ho23EAEofN4bza4YntGPbPOrIvuOk60OvHQFM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558428475; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ZKjqVidJKD4woq0O024FPHL9vIRXwiXFciGdi9UVZtk=; b=ap0XQpZ2SpZAg3IsDgVyjOA6Py2bnFFuqxb3Mzps37H9anDMDFoK9orNmDdN7jIP2vUQGHHcZT7SKFuE6h5J4GDU3AvVk+ms+ePYUbPQzAVrYzCtJ2/KxAQOyQFmp0s9X2N+6HIKGBf4FVieVqO/9Iiv1jpiZ0cH8U6qz6jK9n0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558428475074755.2002839372614; Tue, 21 May 2019 01:47:55 -0700 (PDT) Received: from localhost ([127.0.0.1]:49025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hT0R3-0004oz-0u for importer@patchew.org; Tue, 21 May 2019 04:47:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hT0Oo-0003an-U4 for qemu-devel@nongnu.org; Tue, 21 May 2019 04:45:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hT0Oo-0004Gv-1R for qemu-devel@nongnu.org; Tue, 21 May 2019 04:45:30 -0400 Received: from relay.sw.ru ([185.231.240.75]:60606) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hT0Ol-0004AJ-Jz; Tue, 21 May 2019 04:45:27 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hT0Oh-0003ut-LA; Tue, 21 May 2019 11:45:23 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Tue, 21 May 2019 11:45:21 +0300 Message-Id: <20190521084522.15050-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190521084522.15050-1-vsementsov@virtuozzo.com> References: <20190521084522.15050-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [RFC PATCH 2/3] block/qcow2: refactor qcow2_co_preadv to use buffer-based io X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, mreitz@redhat.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use buffer based io in encrypted case. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/qcow2.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index de524d870b..5b4e5e7537 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2047,19 +2047,15 @@ static coroutine_fn int qcow2_co_preadv(BlockDriver= State *bs, uint64_t offset, } =20 assert(cur_bytes <=3D QCOW_MAX_CRYPT_CLUSTERS * s->cluster= _size); - qemu_iovec_reset(&hd_qiov); - qemu_iovec_add(&hd_qiov, cluster_data, cur_bytes); - } =20 - BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO); - ret =3D bdrv_co_preadv(s->data_file, - cluster_offset + offset_in_cluster, - cur_bytes, &hd_qiov, 0); - if (ret < 0) { - goto fail; - } - if (bs->encrypted) { - assert(s->crypto); + BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO); + ret =3D bdrv_co_pread(s->data_file, + cluster_offset + offset_in_cluster, + cur_bytes, cluster_data, 0); + if (ret < 0) { + goto fail; + } + assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); assert((cur_bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); if (qcow2_co_decrypt(bs, cluster_offset, offset, @@ -2068,6 +2064,14 @@ static coroutine_fn int qcow2_co_preadv(BlockDriverS= tate *bs, uint64_t offset, goto fail; } qemu_iovec_from_buf(qiov, bytes_done, cluster_data, cur_by= tes); + } else { + BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO); + ret =3D bdrv_co_preadv(s->data_file, + cluster_offset + offset_in_cluster, + cur_bytes, &hd_qiov, 0); + if (ret < 0) { + goto fail; + } } break; =20 --=20 2.18.0