From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCSuP-0006as-Ct for qemu-devel@nongnu.org; Mon, 13 Jun 2016 10:32:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCSuK-0005PT-AW for qemu-devel@nongnu.org; Mon, 13 Jun 2016 10:32:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40179) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCSuK-0005PJ-2l for qemu-devel@nongnu.org; Mon, 13 Jun 2016 10:32:04 -0400 References: <1464686130-12265-1-git-send-email-den@openvz.org> <1464686130-12265-3-git-send-email-den@openvz.org> From: Eric Blake Message-ID: <575EC3E2.1010304@redhat.com> Date: Mon, 13 Jun 2016 08:32:02 -0600 MIME-Version: 1.0 In-Reply-To: <1464686130-12265-3-git-send-email-den@openvz.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="9w4cPTbelLtntvw0sfr55ptSvxkjmJrMT" Subject: Re: [Qemu-devel] [PATCH 02/11] block/io: add bdrv_co_write_compressed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" , qemu-devel@nongnu.org Cc: Pavel Butsykin , Jeff Cody , Markus Armbruster , John Snow , Stefan Hajnoczi , Kevin Wolf This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --9w4cPTbelLtntvw0sfr55ptSvxkjmJrMT Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 05/31/2016 03:15 AM, Denis V. Lunev wrote: > From: Pavel Butsykin >=20 > This patch just adds the interface to the bdrv_co_pwritev_compressed, > which is currently not used but will be useful for safe implementation = of the > bdrv_co_write_compressed callback in format drivers. >=20 > Signed-off-by: Pavel Butsykin > Signed-off-by: Denis V. Lunev > CC: Jeff Cody > CC: Markus Armbruster > CC: Eric Blake > CC: John Snow > CC: Stefan Hajnoczi > CC: Kevin Wolf > --- > block/io.c | 78 +++++++++++++++++++++++++++++++++++++++= ++++---- > include/block/block_int.h | 5 +++ > qemu-img.c | 2 +- > 3 files changed, 78 insertions(+), 7 deletions(-) >=20 > diff --git a/block/io.c b/block/io.c > index c5bb6ae..54cd9a4 100644 > --- a/block/io.c > +++ b/block/io.c > @@ -1779,8 +1779,8 @@ int bdrv_is_allocated_above(BlockDriverState *top= , > return 0; > } > =20 > -int bdrv_pwrite_compressed(BlockDriverState *bs, int64_t offset, > - const void *buf, int count) > +int coroutine_fn bdrv_co_pwritev_compressed(BlockDriverState *bs, > + int64_t offset, unsigned int bytes, QEMUIOVector *qiov) Why the rename s/count/bytes/? Would it be better to get the name right in 1/11? > { > BlockDriver *drv =3D bs->drv; > int ret; > @@ -1788,18 +1788,84 @@ int bdrv_pwrite_compressed(BlockDriverState *bs= , int64_t offset, > if (!drv) { > return -ENOMEDIUM; > } > - if (!drv->bdrv_write_compressed) { > + > + if (!drv->bdrv_co_write_compressed) { > return -ENOTSUP; This is a (temporary) regression - since none of the drivers have =2Ebdrv_co_write_compressed yet, you will always fail. Rather, the transition period should support both interfaces at once... > } > - ret =3D bdrv_check_byte_request(bs, offset, count); > + > + ret =3D bdrv_check_byte_request(bs, offset, bytes); > if (ret < 0) { > return ret; > } > =20 > assert(QLIST_EMPTY(&bs->dirty_bitmaps)); > + assert(qemu_in_coroutine()); > + > + return drv->bdrv_co_write_compressed(bs, offset >> BDRV_SECTOR_BIT= S, > + bytes >> BDRV_SECTOR_BITS, qi= ov); =2E..and call into either the old or the new interface according to what is present. > +int bdrv_pwrite_compressed(BlockDriverState *bs, int64_t offset, > + const void *buf, int count) > +{ > + BdrvWriteCompressedCo data; > + QEMUIOVector qiov; > + BlockDriver *drv =3D bs->drv; > + struct iovec iov =3D { > + .iov_base =3D (void *)buf, > + .iov_len =3D count, > + }; > + qemu_iovec_init_external(&qiov, &iov, 1); > =20 > - return drv->bdrv_write_compressed(bs, offset >> BDRV_SECTOR_BITS, = buf, > - count >> BDRV_SECTOR_BITS); > + data =3D (BdrvWriteCompressedCo) { > + .bs =3D bs, > + .offset =3D offset, > + .qiov =3D &qiov, > + .ret =3D -EINPROGRESS, > + }; > + > + if (!drv) { > + return -ENOMEDIUM; > + } > + > + if (drv->bdrv_write_compressed) { > + int ret =3D bdrv_check_byte_request(bs, offset, count); > + if (ret < 0) { > + return ret; > + } > + assert(QLIST_EMPTY(&bs->dirty_bitmaps)); > + return drv->bdrv_write_compressed(bs, offset >> BDRV_SECTOR_BI= TS, buf, > + count >> BDRV_SECTOR_BITS); > + } Oh, you're catering to the old code up front, without a coroutine, and only the new code gets coroutine treatment. Maybe it's okay after all. > + > + if (qemu_in_coroutine()) { > + /* Fast-path if already in coroutine context */ > + bdrv_write_compressed_co_entry(&data); > + } else { > + AioContext *aio_context =3D bdrv_get_aio_context(bs); > + > + Coroutine *co =3D qemu_coroutine_create(bdrv_write_compressed_= co_entry); > + qemu_coroutine_enter(co, &data); > + while (data.ret =3D=3D -EINPROGRESS) { > + aio_poll(aio_context, true); > + } > + } > + return data.ret; > } > =20 > int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf, > diff --git a/include/block/block_int.h b/include/block/block_int.h > index 30a9717..ccba9c9 100644 > --- a/include/block/block_int.h > +++ b/include/block/block_int.h > @@ -207,6 +207,9 @@ struct BlockDriver { > int (*bdrv_write_compressed)(BlockDriverState *bs, int64_t sector_= num, > const uint8_t *buf, int nb_sectors); > =20 > + int coroutine_fn (*bdrv_co_write_compressed)(BlockDriverState *bs,= Might be better to name this bdrv_co_pwrite_compressed if we want to make it byte-based... > + int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); =2E..it seems odd that you have to add a new sector-based interface given= that you are trying to convert to byte-based. > + > int (*bdrv_snapshot_create)(BlockDriverState *bs, > QEMUSnapshotInfo *sn_info); > int (*bdrv_snapshot_goto)(BlockDriverState *bs, > @@ -535,6 +538,8 @@ int coroutine_fn bdrv_co_preadv(BlockDriverState *b= s, > int coroutine_fn bdrv_co_pwritev(BlockDriverState *bs, > int64_t offset, unsigned int bytes, QEMUIOVector *qiov, > BdrvRequestFlags flags); > +int coroutine_fn bdrv_co_pwritev_compressed(BlockDriverState *bs, > + int64_t offset, unsigned int bytes, QEMUIOVector *qiov); > =20 > int get_tmp_filename(char *filename, int size); > BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size, > diff --git a/qemu-img.c b/qemu-img.c > index eb744d4..ab54027 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -2024,7 +2024,7 @@ static int img_convert(int argc, char **argv) > const char *preallocation =3D > qemu_opt_get(opts, BLOCK_OPT_PREALLOC); > =20 > - if (!drv->bdrv_write_compressed) { > + if (!drv->bdrv_write_compressed && !drv->bdrv_co_write_compres= sed) { > error_report("Compression not supported for this file form= at"); > ret =3D -1; > goto out; >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --9w4cPTbelLtntvw0sfr55ptSvxkjmJrMT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJXXsPiAAoJEKeha0olJ0NqQBQH/A1A6jdNLdK4nSchdN89q1Wx 9wJ2Zc/7l2eyCxeRPmk4YMxVA8ZGCqAdfNLrLxwA3tlIzpOugVxze0wiw9ScnJMu GoQTMI1zcCtachlAXvL/dci87RHcl00xfFxpUZSTYo5xD78QJKwjG6JPPYpXin/k Kb+pz9hScgCfKUKrJB4gGatrcTZLA0cMrSGKCtHcn7M+1AoQKlRl7znFGS123scn itUmMwm+Wqokvu7PDsw10G4kdS61ETnaUpC0KqFRpFktjmx+h6NuAVwVAkk48qyb s0SyUPoHahf1gx7cNU+qHlaqSKAJQuz/++QHAY2jhzMFvmB0R923eOQCvorBJpo= =HWdd -----END PGP SIGNATURE----- --9w4cPTbelLtntvw0sfr55ptSvxkjmJrMT--