From nobody Sun Oct 5 19:22:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518723535197720.2341559704405; Thu, 15 Feb 2018 11:38:55 -0800 (PST) Received: from localhost ([::1]:52761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emPMn-0007AA-NL for importer@patchew.org; Thu, 15 Feb 2018 14:38:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emPDA-0006Gs-3p for qemu-devel@nongnu.org; Thu, 15 Feb 2018 14:28:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emPD8-0000mV-GN for qemu-devel@nongnu.org; Thu, 15 Feb 2018 14:28:52 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:38956 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emPD2-0000j8-88; Thu, 15 Feb 2018 14:28:44 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D6AE481638F1; Thu, 15 Feb 2018 19:28:43 +0000 (UTC) Received: from red.redhat.com (ovpn-122-122.rdu2.redhat.com [10.10.122.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C0D5F41A0; Thu, 15 Feb 2018 19:28:40 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 13:28:24 -0600 Message-Id: <20180215192829.9944-2-eblake@redhat.com> In-Reply-To: <20180215192829.9944-1-eblake@redhat.com> References: <20180215192829.9944-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 15 Feb 2018 19:28:43 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 15 Feb 2018 19:28:43 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eblake@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 1/6] block: Support byte-based aio callbacks 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 Zheng , Stefan Hajnoczi , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We are gradually moving away from sector-based interfaces, towards byte-based. Add new sector-based aio callbacks for read and write, to match the fact that bdrv_aio_pdiscard is already byte-based. Ideally, drivers should be converted to use coroutine callbacks rather than aio; but that is not quite as trivial (if we do that conversion, the null-aio driver will disappear), so for the short term, converting the signature but keeping things with aio is easier. Once all drivers are converted, the sector-based aio callbacks will be removed. Signed-off-by: Eric Blake --- include/block/block_int.h | 6 ++++++ block/io.c | 37 +++++++++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index 5ae7738cf8d..c882dc4232d 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -137,9 +137,15 @@ struct BlockDriver { BlockAIOCB *(*bdrv_aio_readv)(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockCompletionFunc *cb, void *opaque); + BlockAIOCB *(*bdrv_aio_preadv)(BlockDriverState *bs, + uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags, + BlockCompletionFunc *cb, void *opaque); BlockAIOCB *(*bdrv_aio_writev)(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockCompletionFunc *cb, void *opaque); + BlockAIOCB *(*bdrv_aio_pwritev)(BlockDriverState *bs, + uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags, + BlockCompletionFunc *cb, void *opaque); BlockAIOCB *(*bdrv_aio_flush)(BlockDriverState *bs, BlockCompletionFunc *cb, void *opaque); BlockAIOCB *(*bdrv_aio_pdiscard)(BlockDriverState *bs, diff --git a/block/io.c b/block/io.c index 4d3d1f640a3..84a4caa72b7 100644 --- a/block/io.c +++ b/block/io.c @@ -934,9 +934,11 @@ static int coroutine_fn bdrv_driver_preadv(BlockDriver= State *bs, sector_num =3D offset >> BDRV_SECTOR_BITS; nb_sectors =3D bytes >> BDRV_SECTOR_BITS; - assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); - assert((bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); - assert((bytes >> BDRV_SECTOR_BITS) <=3D BDRV_REQUEST_MAX_SECTORS); + if (!drv->bdrv_aio_preadv) { + assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); + assert((bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); + assert((bytes >> BDRV_SECTOR_BITS) <=3D BDRV_REQUEST_MAX_SECTORS); + } if (drv->bdrv_co_readv) { return drv->bdrv_co_readv(bs, sector_num, nb_sectors, qiov); @@ -946,8 +948,13 @@ static int coroutine_fn bdrv_driver_preadv(BlockDriver= State *bs, .coroutine =3D qemu_coroutine_self(), }; - acb =3D bs->drv->bdrv_aio_readv(bs, sector_num, qiov, nb_sectors, - bdrv_co_io_em_complete, &co); + if (drv->bdrv_aio_preadv) { + acb =3D bs->drv->bdrv_aio_preadv(bs, offset, bytes, qiov, flag= s, + bdrv_co_io_em_complete, &co); + } else { + acb =3D bs->drv->bdrv_aio_readv(bs, sector_num, qiov, nb_secto= rs, + bdrv_co_io_em_complete, &co); + } if (acb =3D=3D NULL) { return -EIO; } else { @@ -982,9 +989,11 @@ static int coroutine_fn bdrv_driver_pwritev(BlockDrive= rState *bs, sector_num =3D offset >> BDRV_SECTOR_BITS; nb_sectors =3D bytes >> BDRV_SECTOR_BITS; - assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); - assert((bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); - assert((bytes >> BDRV_SECTOR_BITS) <=3D BDRV_REQUEST_MAX_SECTORS); + if (!drv->bdrv_aio_pwritev) { + assert((offset & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); + assert((bytes & (BDRV_SECTOR_SIZE - 1)) =3D=3D 0); + assert((bytes >> BDRV_SECTOR_BITS) <=3D BDRV_REQUEST_MAX_SECTORS); + } if (drv->bdrv_co_writev_flags) { ret =3D drv->bdrv_co_writev_flags(bs, sector_num, nb_sectors, qiov, @@ -999,8 +1008,16 @@ static int coroutine_fn bdrv_driver_pwritev(BlockDriv= erState *bs, .coroutine =3D qemu_coroutine_self(), }; - acb =3D bs->drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sectors, - bdrv_co_io_em_complete, &co); + if (drv->bdrv_aio_pwritev) { + acb =3D bs->drv->bdrv_aio_pwritev(bs, offset, bytes, qiov, + flags & bs->supported_write_fl= ags, + bdrv_co_io_em_complete, &co); + flags &=3D ~bs->supported_write_flags; + } else { + assert(!bs->supported_write_flags); + acb =3D bs->drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sect= ors, + bdrv_co_io_em_complete, &co); + } if (acb =3D=3D NULL) { ret =3D -EIO; } else { --=20 2.14.3