From nobody Tue May 14 08:34:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621434352; cv=none; d=zohomail.com; s=zohoarc; b=k404V/gag9+ZusjRCyXcTqBwYEKw+W5ZZzxUqEqKz3PIjpC+LqGmRTTyD/gBzwSeFII8EF2OKAjhbUSQaKEA0bXHB48aQMEQsQqhPrDhcaBGEaeWuqgBxn7ovkwWa4K3HmWcWaWh4Xwc2GfTrtnyYFg4fyvaxqtOSwTXA3vKVx0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621434352; 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; bh=nwkF1culZzLsImXd1FAbqIu6XBIiwrDCYQEyi4iAd2k=; b=JOB1AxGVK64nGCOL/o4zEmnUT7kLQq7OaXELXO5cz8ip6KezhMhEW61HiFn9zSIiBnjpXMyJ/WAR8XpC0CcpxhKnZy+Du0VOLES9tC9ewK+kH1qeFeAswE89NYCYa7er/DzNhtIaNme8A6WLx8zpe6FbMnbolh3fVnTIS0Uga8E= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621434352474845.3358735171697; Wed, 19 May 2021 07:25:52 -0700 (PDT) Received: from localhost ([::1]:56076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljN8x-0007Pi-Dk for importer@patchew.org; Wed, 19 May 2021 10:25:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7Q-0004ZV-7D for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:16 -0400 Received: from kerio.kamp.de ([195.62.97.192]:37902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7N-0005Ep-Lg for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:15 -0400 Received: from submission.kamp.de ([195.62.97.28]) by kerio.kamp.de with ESMTPS (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) for qemu-devel@nongnu.org; Wed, 19 May 2021 16:24:06 +0200 Received: (qmail 19133 invoked from network); 19 May 2021 14:24:09 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 19 May 2021 14:24:09 -0000 Received: by lieven-pc (Postfix, from userid 1060) id 68A1F13D862; Wed, 19 May 2021 16:24:09 +0200 (CEST) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Subject: [PATCH V3 1/6] block/rbd: bump librbd requirement to luminous release Date: Wed, 19 May 2021 16:23:54 +0200 Message-Id: <20210519142359.23083-2-pl@kamp.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210519142359.23083-1-pl@kamp.de> References: <20210519142359.23083-1-pl@kamp.de> Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=195.62.97.192; envelope-from=pl@kamp.de; helo=kerio.kamp.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, idryomov@redhat.com, berrange@redhat.com, Peter Lieven , qemu-devel@nongnu.org, ct@flyingcircus.io, pbonzini@redhat.com, mreitz@redhat.com, dillaman@redhat.com 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" even luminous (version 12.2) is unmaintained for over 3 years now. Bump the requirement to get rid of the ifdef'ry in the code. Qemu 6.1 dropped the support for RHEL-7 which was the last supported OS that required an older librbd. Signed-off-by: Peter Lieven --- block/rbd.c | 120 ++++------------------------------------------------ meson.build | 7 ++- 2 files changed, 13 insertions(+), 114 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 26f64cce7c..6b1cbe1d75 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -55,24 +55,10 @@ * leading "\". */ =20 -/* rbd_aio_discard added in 0.1.2 */ -#if LIBRBD_VERSION_CODE >=3D LIBRBD_VERSION(0, 1, 2) -#define LIBRBD_SUPPORTS_DISCARD -#else -#undef LIBRBD_SUPPORTS_DISCARD -#endif - #define OBJ_MAX_SIZE (1UL << OBJ_DEFAULT_OBJ_ORDER) =20 #define RBD_MAX_SNAPS 100 =20 -/* The LIBRBD_SUPPORTS_IOVEC is defined in librbd.h */ -#ifdef LIBRBD_SUPPORTS_IOVEC -#define LIBRBD_USE_IOVEC 1 -#else -#define LIBRBD_USE_IOVEC 0 -#endif - typedef enum { RBD_AIO_READ, RBD_AIO_WRITE, @@ -84,7 +70,6 @@ typedef struct RBDAIOCB { BlockAIOCB common; int64_t ret; QEMUIOVector *qiov; - char *bounce; RBDAIOCmd cmd; int error; struct BDRVRBDState *s; @@ -94,7 +79,6 @@ typedef struct RADOSCB { RBDAIOCB *acb; struct BDRVRBDState *s; int64_t size; - char *buf; int64_t ret; } RADOSCB; =20 @@ -342,13 +326,9 @@ static int qemu_rbd_set_keypairs(rados_t cluster, cons= t char *keypairs_json, =20 static void qemu_rbd_memset(RADOSCB *rcb, int64_t offs) { - if (LIBRBD_USE_IOVEC) { - RBDAIOCB *acb =3D rcb->acb; - iov_memset(acb->qiov->iov, acb->qiov->niov, offs, 0, - acb->qiov->size - offs); - } else { - memset(rcb->buf + offs, 0, rcb->size - offs); - } + RBDAIOCB *acb =3D rcb->acb; + iov_memset(acb->qiov->iov, acb->qiov->niov, offs, 0, + acb->qiov->size - offs); } =20 /* FIXME Deprecate and remove keypairs or make it available in QMP. */ @@ -504,13 +484,6 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb) =20 g_free(rcb); =20 - if (!LIBRBD_USE_IOVEC) { - if (acb->cmd =3D=3D RBD_AIO_READ) { - qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size= ); - } - qemu_vfree(acb->bounce); - } - acb->common.cb(acb->common.opaque, (acb->ret > 0 ? 0 : acb->ret)); =20 qemu_aio_unref(acb); @@ -878,28 +851,6 @@ static void rbd_finish_aiocb(rbd_completion_t c, RADOS= CB *rcb) rbd_finish_bh, rcb); } =20 -static int rbd_aio_discard_wrapper(rbd_image_t image, - uint64_t off, - uint64_t len, - rbd_completion_t comp) -{ -#ifdef LIBRBD_SUPPORTS_DISCARD - return rbd_aio_discard(image, off, len, comp); -#else - return -ENOTSUP; -#endif -} - -static int rbd_aio_flush_wrapper(rbd_image_t image, - rbd_completion_t comp) -{ -#ifdef LIBRBD_SUPPORTS_AIO_FLUSH - return rbd_aio_flush(image, comp); -#else - return -ENOTSUP; -#endif -} - static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, int64_t off, QEMUIOVector *qiov, @@ -922,21 +873,6 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, =20 rcb =3D g_new(RADOSCB, 1); =20 - if (!LIBRBD_USE_IOVEC) { - if (cmd =3D=3D RBD_AIO_DISCARD || cmd =3D=3D RBD_AIO_FLUSH) { - acb->bounce =3D NULL; - } else { - acb->bounce =3D qemu_try_blockalign(bs, qiov->size); - if (acb->bounce =3D=3D NULL) { - goto failed; - } - } - if (cmd =3D=3D RBD_AIO_WRITE) { - qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size); - } - rcb->buf =3D acb->bounce; - } - acb->ret =3D 0; acb->error =3D 0; acb->s =3D s; @@ -950,7 +886,7 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, } =20 switch (cmd) { - case RBD_AIO_WRITE: { + case RBD_AIO_WRITE: /* * RBD APIs don't allow us to write more than actual size, so in o= rder * to support growing images, we resize the image before write @@ -962,25 +898,16 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, goto failed_completion; } } -#ifdef LIBRBD_SUPPORTS_IOVEC - r =3D rbd_aio_writev(s->image, qiov->iov, qiov->niov, off, c); -#else - r =3D rbd_aio_write(s->image, off, size, rcb->buf, c); -#endif + r =3D rbd_aio_writev(s->image, qiov->iov, qiov->niov, off, c); break; - } case RBD_AIO_READ: -#ifdef LIBRBD_SUPPORTS_IOVEC - r =3D rbd_aio_readv(s->image, qiov->iov, qiov->niov, off, c); -#else - r =3D rbd_aio_read(s->image, off, size, rcb->buf, c); -#endif + r =3D rbd_aio_readv(s->image, qiov->iov, qiov->niov, off, c); break; case RBD_AIO_DISCARD: - r =3D rbd_aio_discard_wrapper(s->image, off, size, c); + r =3D rbd_aio_discard(s->image, off, size, c); break; case RBD_AIO_FLUSH: - r =3D rbd_aio_flush_wrapper(s->image, c); + r =3D rbd_aio_flush(s->image, c); break; default: r =3D -EINVAL; @@ -995,9 +922,6 @@ failed_completion: rbd_aio_release(c); failed: g_free(rcb); - if (!LIBRBD_USE_IOVEC) { - qemu_vfree(acb->bounce); - } =20 qemu_aio_unref(acb); return NULL; @@ -1023,7 +947,6 @@ static BlockAIOCB *qemu_rbd_aio_pwritev(BlockDriverSta= te *bs, RBD_AIO_WRITE); } =20 -#ifdef LIBRBD_SUPPORTS_AIO_FLUSH static BlockAIOCB *qemu_rbd_aio_flush(BlockDriverState *bs, BlockCompletionFunc *cb, void *opaque) @@ -1031,20 +954,6 @@ static BlockAIOCB *qemu_rbd_aio_flush(BlockDriverStat= e *bs, return rbd_start_aio(bs, 0, NULL, 0, cb, opaque, RBD_AIO_FLUSH); } =20 -#else - -static int qemu_rbd_co_flush(BlockDriverState *bs) -{ -#if LIBRBD_VERSION_CODE >=3D LIBRBD_VERSION(0, 1, 1) - /* rbd_flush added in 0.1.1 */ - BDRVRBDState *s =3D bs->opaque; - return rbd_flush(s->image); -#else - return 0; -#endif -} -#endif - static int qemu_rbd_getinfo(BlockDriverState *bs, BlockDriverInfo *bdi) { BDRVRBDState *s =3D bs->opaque; @@ -1210,7 +1119,6 @@ static int qemu_rbd_snap_list(BlockDriverState *bs, return snap_count; } =20 -#ifdef LIBRBD_SUPPORTS_DISCARD static BlockAIOCB *qemu_rbd_aio_pdiscard(BlockDriverState *bs, int64_t offset, int bytes, @@ -1220,9 +1128,7 @@ static BlockAIOCB *qemu_rbd_aio_pdiscard(BlockDriverS= tate *bs, return rbd_start_aio(bs, offset, NULL, bytes, cb, opaque, RBD_AIO_DISCARD); } -#endif =20 -#ifdef LIBRBD_SUPPORTS_INVALIDATE static void coroutine_fn qemu_rbd_co_invalidate_cache(BlockDriverState *bs, Error **errp) { @@ -1232,7 +1138,6 @@ static void coroutine_fn qemu_rbd_co_invalidate_cache= (BlockDriverState *bs, error_setg_errno(errp, -r, "Failed to invalidate the cache"); } } -#endif =20 static QemuOptsList qemu_rbd_create_opts =3D { .name =3D "rbd-create-opts", @@ -1290,23 +1195,14 @@ static BlockDriver bdrv_rbd =3D { .bdrv_aio_preadv =3D qemu_rbd_aio_preadv, .bdrv_aio_pwritev =3D qemu_rbd_aio_pwritev, =20 -#ifdef LIBRBD_SUPPORTS_AIO_FLUSH .bdrv_aio_flush =3D qemu_rbd_aio_flush, -#else - .bdrv_co_flush_to_disk =3D qemu_rbd_co_flush, -#endif - -#ifdef LIBRBD_SUPPORTS_DISCARD .bdrv_aio_pdiscard =3D qemu_rbd_aio_pdiscard, -#endif =20 .bdrv_snapshot_create =3D qemu_rbd_snap_create, .bdrv_snapshot_delete =3D qemu_rbd_snap_remove, .bdrv_snapshot_list =3D qemu_rbd_snap_list, .bdrv_snapshot_goto =3D qemu_rbd_snap_rollback, -#ifdef LIBRBD_SUPPORTS_INVALIDATE .bdrv_co_invalidate_cache =3D qemu_rbd_co_invalidate_cache, -#endif =20 .strong_runtime_opts =3D qemu_rbd_strong_runtime_opts, }; diff --git a/meson.build b/meson.build index 1559e8d873..644ef36476 100644 --- a/meson.build +++ b/meson.build @@ -721,13 +721,16 @@ if not get_option('rbd').auto() or have_block int main(void) { rados_t cluster; rados_create(&cluster, NULL); + #if LIBRBD_VERSION_CODE < LIBRBD_VERSION(1, 12, 0) + #error + #endif return 0; }''', dependencies: [librbd, librados]) rbd =3D declare_dependency(dependencies: [librbd, librados]) elif get_option('rbd').enabled() - error('could not link librados') + error('librados/librbd >=3D 12.0.0 required') else - warning('could not link librados, disabling') + warning('librados/librbd >=3D 12.0.0 not found, disabling rbd suppor= t') endif endif endif --=20 2.17.1 From nobody Tue May 14 08:34:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621434526; cv=none; d=zohomail.com; s=zohoarc; b=QldD++/56/jPdSCtb5UT8hGfo80vMYhanAwRvfMr1F+N5Vl2BUTIRc1rI7CsaI+d8TSaojFY4gMK9/hWs6wQMooK9+3p9tRPAqGi1etnOXUB6Zpl+uua1p3zgZFmU18cg/8PnbQ2NFl7fHRUeNfhPwi9WSMnixR8UMDozGh1PuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621434526; 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; bh=9P8fTx+Um8qIQ4WNasxZC35XlF1jRZSoF41/z1novOE=; b=OAeLqKeZ+LzE2DnRIkyX3TSgMS5ZgpIo3M1kGsQtOdXahe+oItGdpg8Re/lxHZdOFvaIDHeKifhoI0+5IiVdOJoRnzKK6iqBEM/VLvgYDASjMBl6ieQh7c2EYdjm3SX0cKI0UhAEie43OUJxbmBGPtUZz3OXeHe6PkWtX0Tw2zs= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621434526470921.2313716694439; Wed, 19 May 2021 07:28:46 -0700 (PDT) Received: from localhost ([::1]:37498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljNBk-00069w-5A for importer@patchew.org; Wed, 19 May 2021 10:28:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7e-0005LM-3l for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:30 -0400 Received: from kerio.kamp.de ([195.62.97.192]:37938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7c-0005K0-EY for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:29 -0400 Received: from submission.kamp.de ([195.62.97.28]) by kerio.kamp.de with ESMTPS (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) for qemu-devel@nongnu.org; Wed, 19 May 2021 16:24:06 +0200 Received: (qmail 19134 invoked from network); 19 May 2021 14:24:09 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 19 May 2021 14:24:09 -0000 Received: by lieven-pc (Postfix, from userid 1060) id 6CCB213DD23; Wed, 19 May 2021 16:24:09 +0200 (CEST) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Subject: [PATCH V3 2/6] block/rbd: store object_size in BDRVRBDState Date: Wed, 19 May 2021 16:23:55 +0200 Message-Id: <20210519142359.23083-3-pl@kamp.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210519142359.23083-1-pl@kamp.de> References: <20210519142359.23083-1-pl@kamp.de> Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=195.62.97.192; envelope-from=pl@kamp.de; helo=kerio.kamp.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, idryomov@redhat.com, berrange@redhat.com, Peter Lieven , qemu-devel@nongnu.org, ct@flyingcircus.io, pbonzini@redhat.com, mreitz@redhat.com, dillaman@redhat.com 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" Signed-off-by: Peter Lieven Reviewed-by: Ilya Dryomov --- block/rbd.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 6b1cbe1d75..b4caea4f1b 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -90,6 +90,7 @@ typedef struct BDRVRBDState { char *snap; char *namespace; uint64_t image_size; + uint64_t object_size; } BDRVRBDState; =20 static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx, @@ -675,6 +676,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *o= ptions, int flags, const QDictEntry *e; Error *local_err =3D NULL; char *keypairs, *secretid; + rbd_image_info_t info; int r; =20 keypairs =3D g_strdup(qdict_get_try_str(options, "=3Dkeyvalue-pairs")); @@ -739,13 +741,15 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict = *options, int flags, goto failed_open; } =20 - r =3D rbd_get_size(s->image, &s->image_size); + r =3D rbd_stat(s->image, &info, sizeof(info)); if (r < 0) { - error_setg_errno(errp, -r, "error getting image size from %s", + error_setg_errno(errp, -r, "error getting image info from %s", s->image_name); rbd_close(s->image); goto failed_open; } + s->image_size =3D info.size; + s->object_size =3D info.obj_size; =20 /* If we are using an rbd snapshot, we must be r/o, otherwise * leave as-is */ @@ -957,15 +961,7 @@ static BlockAIOCB *qemu_rbd_aio_flush(BlockDriverState= *bs, static int qemu_rbd_getinfo(BlockDriverState *bs, BlockDriverInfo *bdi) { BDRVRBDState *s =3D bs->opaque; - rbd_image_info_t info; - int r; - - r =3D rbd_stat(s->image, &info, sizeof(info)); - if (r < 0) { - return r; - } - - bdi->cluster_size =3D info.obj_size; + bdi->cluster_size =3D s->object_size; return 0; } =20 --=20 2.17.1 From nobody Tue May 14 08:34:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621434350; cv=none; d=zohomail.com; s=zohoarc; b=DMYUl6dpktB1xohbjl/uWCM3TzdR1r6VJo8Np/lelG58DdfZhW4Ot+5CxpCXKpm4lIEoCpYqOt2faUG6AxkiPqhyrruEdj8Rhoo1Cfp/VGn7gEUEKTewhnfPoLJstc/AQQez+glbTSj134v1R6Pcsi9MxRnDPgpMd9OmkyO7VtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621434350; 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; bh=lLyoEOJzo/79sOWOxk9wWZW+nKUib2Tp9aUk2n5xrk0=; b=Q+aFRqK2Yv8DpBLmIyHEXdDaIicmCmThV0493RMfZZO1EWqE7xkuJgLljxXkidZyAEu2qKjJNp0RhUkit7+IezEN8/rn1RKwuqRC7wwsk1r63t/ranHjeeDUtw4QoWJATOv1L1vZjYMNzmGMdEjZdjisDqOFR8gYGlb2KTNYn2I= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621434350697522.3873823971642; Wed, 19 May 2021 07:25:50 -0700 (PDT) Received: from localhost ([::1]:56024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljN8v-0007Nk-PI for importer@patchew.org; Wed, 19 May 2021 10:25:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7Q-0004az-M4 for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:16 -0400 Received: from kerio.kamp.de ([195.62.97.192]:37905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7N-0005Eu-NS for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:16 -0400 Received: from submission.kamp.de ([195.62.97.28]) by kerio.kamp.de with ESMTPS (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) for qemu-devel@nongnu.org; Wed, 19 May 2021 16:24:06 +0200 Received: (qmail 19142 invoked from network); 19 May 2021 14:24:09 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 19 May 2021 14:24:09 -0000 Received: by lieven-pc (Postfix, from userid 1060) id 706A713DD24; Wed, 19 May 2021 16:24:09 +0200 (CEST) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Subject: [PATCH V3 3/6] block/rbd: update s->image_size in qemu_rbd_getlength Date: Wed, 19 May 2021 16:23:56 +0200 Message-Id: <20210519142359.23083-4-pl@kamp.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210519142359.23083-1-pl@kamp.de> References: <20210519142359.23083-1-pl@kamp.de> Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=195.62.97.192; envelope-from=pl@kamp.de; helo=kerio.kamp.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, idryomov@redhat.com, berrange@redhat.com, Peter Lieven , qemu-devel@nongnu.org, ct@flyingcircus.io, pbonzini@redhat.com, mreitz@redhat.com, dillaman@redhat.com 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" in case the image size changed we should adjust our internally stored size = as well. Signed-off-by: Peter Lieven --- block/rbd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/rbd.c b/block/rbd.c index b4caea4f1b..97a2ae4c84 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -976,6 +976,7 @@ static int64_t qemu_rbd_getlength(BlockDriverState *bs) return r; } =20 + s->image_size =3D info.size; return info.size; } =20 --=20 2.17.1 From nobody Tue May 14 08:34:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621434490; cv=none; d=zohomail.com; s=zohoarc; b=VjVM7tP36AP1pcSKBhVoK4SfxXRw9RJU0RQIGv5SpLXE9aV7TgwnrAbebx/jkmb2vywVpPTYzjeC+H0DbrNe26/U//ZFeA3SRag2PPN9FH4xtgMzh6HLBM+rLG/iIldjXM94GPJgLs9/b9LO193WlClUninHpzivNLsQjwL3LBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621434490; 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; bh=+82uuixgnD0iB0kdghwIi5qhj88UN6gMvC+NEDGnz6g=; b=Aeha75WA+4H8OMJOknfE4D+Q8Ee4IBcwFgadmkBOhgt1nbiIPkUVzLrHBBKXeQTyw/EBGb51be8fhlR+axEPr8qzbn8s1s6Q1V+sYMB7xVRJ/H1ryvPKDNzvmpYo2AtEIChjiojbhzuJipi/0dYdoXHiGLOsjGg5MTG+BB/8ZK0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621434490621581.6783432144648; Wed, 19 May 2021 07:28:10 -0700 (PDT) Received: from localhost ([::1]:36080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljNB9-0005AC-Qn for importer@patchew.org; Wed, 19 May 2021 10:28:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7Q-0004ao-Im for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:16 -0400 Received: from kerio.kamp.de ([195.62.97.192]:37900) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7N-0005Eo-Lf for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:16 -0400 Received: from submission.kamp.de ([195.62.97.28]) by kerio.kamp.de with ESMTPS (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) for qemu-devel@nongnu.org; Wed, 19 May 2021 16:24:06 +0200 Received: (qmail 19136 invoked from network); 19 May 2021 14:24:09 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 19 May 2021 14:24:09 -0000 Received: by lieven-pc (Postfix, from userid 1060) id 7355313DD25; Wed, 19 May 2021 16:24:09 +0200 (CEST) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Subject: [PATCH V3 4/6] block/rbd: migrate from aio to coroutines Date: Wed, 19 May 2021 16:23:57 +0200 Message-Id: <20210519142359.23083-5-pl@kamp.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210519142359.23083-1-pl@kamp.de> References: <20210519142359.23083-1-pl@kamp.de> Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=195.62.97.192; envelope-from=pl@kamp.de; helo=kerio.kamp.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, idryomov@redhat.com, berrange@redhat.com, Peter Lieven , qemu-devel@nongnu.org, ct@flyingcircus.io, pbonzini@redhat.com, mreitz@redhat.com, dillaman@redhat.com 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" Signed-off-by: Peter Lieven --- block/rbd.c | 255 ++++++++++++++++++---------------------------------- 1 file changed, 87 insertions(+), 168 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 97a2ae4c84..0d8612a988 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -66,22 +66,6 @@ typedef enum { RBD_AIO_FLUSH } RBDAIOCmd; =20 -typedef struct RBDAIOCB { - BlockAIOCB common; - int64_t ret; - QEMUIOVector *qiov; - RBDAIOCmd cmd; - int error; - struct BDRVRBDState *s; -} RBDAIOCB; - -typedef struct RADOSCB { - RBDAIOCB *acb; - struct BDRVRBDState *s; - int64_t size; - int64_t ret; -} RADOSCB; - typedef struct BDRVRBDState { rados_t cluster; rados_ioctx_t io_ctx; @@ -93,6 +77,13 @@ typedef struct BDRVRBDState { uint64_t object_size; } BDRVRBDState; =20 +typedef struct RBDTask { + BlockDriverState *bs; + Coroutine *co; + bool complete; + int64_t ret; +} RBDTask; + static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx, BlockdevOptionsRbd *opts, bool cache, const char *keypairs, const char *secretid, @@ -325,13 +316,6 @@ static int qemu_rbd_set_keypairs(rados_t cluster, cons= t char *keypairs_json, return ret; } =20 -static void qemu_rbd_memset(RADOSCB *rcb, int64_t offs) -{ - RBDAIOCB *acb =3D rcb->acb; - iov_memset(acb->qiov->iov, acb->qiov->niov, offs, 0, - acb->qiov->size - offs); -} - /* FIXME Deprecate and remove keypairs or make it available in QMP. */ static int qemu_rbd_do_create(BlockdevCreateOptions *options, const char *keypairs, const char *password_s= ecret, @@ -450,46 +434,6 @@ exit: return ret; } =20 -/* - * This aio completion is being called from rbd_finish_bh() and runs in qe= mu - * BH context. - */ -static void qemu_rbd_complete_aio(RADOSCB *rcb) -{ - RBDAIOCB *acb =3D rcb->acb; - int64_t r; - - r =3D rcb->ret; - - if (acb->cmd !=3D RBD_AIO_READ) { - if (r < 0) { - acb->ret =3D r; - acb->error =3D 1; - } else if (!acb->error) { - acb->ret =3D rcb->size; - } - } else { - if (r < 0) { - qemu_rbd_memset(rcb, 0); - acb->ret =3D r; - acb->error =3D 1; - } else if (r < rcb->size) { - qemu_rbd_memset(rcb, r); - if (!acb->error) { - acb->ret =3D rcb->size; - } - } else if (!acb->error) { - acb->ret =3D r; - } - } - - g_free(rcb); - - acb->common.cb(acb->common.opaque, (acb->ret > 0 ? 0 : acb->ret)); - - qemu_aio_unref(acb); -} - static char *qemu_rbd_mon_host(BlockdevOptionsRbd *opts, Error **errp) { const char **vals; @@ -826,89 +770,50 @@ static int qemu_rbd_resize(BlockDriverState *bs, uint= 64_t size) return 0; } =20 -static const AIOCBInfo rbd_aiocb_info =3D { - .aiocb_size =3D sizeof(RBDAIOCB), -}; - -static void rbd_finish_bh(void *opaque) +static void qemu_rbd_finish_bh(void *opaque) { - RADOSCB *rcb =3D opaque; - qemu_rbd_complete_aio(rcb); + RBDTask *task =3D opaque; + task->complete =3D 1; + aio_co_wake(task->co); } =20 -/* - * This is the callback function for rbd_aio_read and _write - * - * Note: this function is being called from a non qemu thread so - * we need to be careful about what we do here. Generally we only - * schedule a BH, and do the rest of the io completion handling - * from rbd_finish_bh() which runs in a qemu context. - */ -static void rbd_finish_aiocb(rbd_completion_t c, RADOSCB *rcb) +static void qemu_rbd_completion_cb(rbd_completion_t c, RBDTask *task) { - RBDAIOCB *acb =3D rcb->acb; - - rcb->ret =3D rbd_aio_get_return_value(c); + task->ret =3D rbd_aio_get_return_value(c); rbd_aio_release(c); - - replay_bh_schedule_oneshot_event(bdrv_get_aio_context(acb->common.bs), - rbd_finish_bh, rcb); + aio_bh_schedule_oneshot(bdrv_get_aio_context(task->bs), + qemu_rbd_finish_bh, task); } =20 -static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, - int64_t off, - QEMUIOVector *qiov, - int64_t size, - BlockCompletionFunc *cb, - void *opaque, - RBDAIOCmd cmd) +static int coroutine_fn qemu_rbd_start_co(BlockDriverState *bs, + uint64_t offset, + uint64_t bytes, + QEMUIOVector *qiov, + int flags, + RBDAIOCmd cmd) { - RBDAIOCB *acb; - RADOSCB *rcb =3D NULL; + BDRVRBDState *s =3D bs->opaque; + RBDTask task =3D { .bs =3D bs, .co =3D qemu_coroutine_self() }; rbd_completion_t c; int r; =20 - BDRVRBDState *s =3D bs->opaque; + assert(!qiov || qiov->size =3D=3D bytes); =20 - acb =3D qemu_aio_get(&rbd_aiocb_info, bs, cb, opaque); - acb->cmd =3D cmd; - acb->qiov =3D qiov; - assert(!qiov || qiov->size =3D=3D size); - - rcb =3D g_new(RADOSCB, 1); - - acb->ret =3D 0; - acb->error =3D 0; - acb->s =3D s; - - rcb->acb =3D acb; - rcb->s =3D acb->s; - rcb->size =3D size; - r =3D rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb= , &c); + r =3D rbd_aio_create_completion(&task, + (rbd_callback_t) qemu_rbd_completion_cb,= &c); if (r < 0) { - goto failed; + return r; } =20 switch (cmd) { - case RBD_AIO_WRITE: - /* - * RBD APIs don't allow us to write more than actual size, so in o= rder - * to support growing images, we resize the image before write - * operations that exceed the current size. - */ - if (off + size > s->image_size) { - r =3D qemu_rbd_resize(bs, off + size); - if (r < 0) { - goto failed_completion; - } - } - r =3D rbd_aio_writev(s->image, qiov->iov, qiov->niov, off, c); - break; case RBD_AIO_READ: - r =3D rbd_aio_readv(s->image, qiov->iov, qiov->niov, off, c); + r =3D rbd_aio_readv(s->image, qiov->iov, qiov->niov, offset, c); + break; + case RBD_AIO_WRITE: + r =3D rbd_aio_writev(s->image, qiov->iov, qiov->niov, offset, c); break; case RBD_AIO_DISCARD: - r =3D rbd_aio_discard(s->image, off, size, c); + r =3D rbd_aio_discard(s->image, offset, bytes, c); break; case RBD_AIO_FLUSH: r =3D rbd_aio_flush(s->image, c); @@ -918,44 +823,69 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, } =20 if (r < 0) { - goto failed_completion; + error_report("rbd request failed early: cmd %d offset %" PRIu64 + " bytes %" PRIu64 " flags %d r %d (%s)", cmd, offset, + bytes, flags, r, strerror(-r)); + rbd_aio_release(c); + return r; } - return &acb->common; =20 -failed_completion: - rbd_aio_release(c); -failed: - g_free(rcb); + while (!task.complete) { + qemu_coroutine_yield(); + } =20 - qemu_aio_unref(acb); - return NULL; + if (task.ret < 0) { + error_report("rbd request failed: cmd %d offset %" PRIu64 " bytes = %" + PRIu64 " flags %d task.ret %" PRIi64 " (%s)", cmd, of= fset, + bytes, flags, task.ret, strerror(-task.ret)); + return task.ret; + } + + /* zero pad short reads */ + if (cmd =3D=3D RBD_AIO_READ && task.ret < qiov->size) { + qemu_iovec_memset(qiov, task.ret, 0, qiov->size - task.ret); + } + + return 0; +} + +static int +coroutine_fn qemu_rbd_co_preadv(BlockDriverState *bs, uint64_t offset, + uint64_t bytes, QEMUIOVector *qiov, + int flags) +{ + return qemu_rbd_start_co(bs, offset, bytes, qiov, flags, RBD_AIO_READ); } =20 -static BlockAIOCB *qemu_rbd_aio_preadv(BlockDriverState *bs, - uint64_t offset, uint64_t bytes, - QEMUIOVector *qiov, int flags, - BlockCompletionFunc *cb, - void *opaque) +static int +coroutine_fn qemu_rbd_co_pwritev(BlockDriverState *bs, uint64_t offset, + uint64_t bytes, QEMUIOVector *qiov, + int flags) { - return rbd_start_aio(bs, offset, qiov, bytes, cb, opaque, - RBD_AIO_READ); + BDRVRBDState *s =3D bs->opaque; + /* + * RBD APIs don't allow us to write more than actual size, so in order + * to support growing images, we resize the image before write + * operations that exceed the current size. + */ + if (offset + bytes > s->image_size) { + int r =3D qemu_rbd_resize(bs, offset + bytes); + if (r < 0) { + return r; + } + } + return qemu_rbd_start_co(bs, offset, bytes, qiov, flags, RBD_AIO_WRITE= ); } =20 -static BlockAIOCB *qemu_rbd_aio_pwritev(BlockDriverState *bs, - uint64_t offset, uint64_t bytes, - QEMUIOVector *qiov, int flags, - BlockCompletionFunc *cb, - void *opaque) +static int coroutine_fn qemu_rbd_co_flush(BlockDriverState *bs) { - return rbd_start_aio(bs, offset, qiov, bytes, cb, opaque, - RBD_AIO_WRITE); + return qemu_rbd_start_co(bs, 0, 0, NULL, 0, RBD_AIO_FLUSH); } =20 -static BlockAIOCB *qemu_rbd_aio_flush(BlockDriverState *bs, - BlockCompletionFunc *cb, - void *opaque) +static int coroutine_fn qemu_rbd_co_pdiscard(BlockDriverState *bs, + int64_t offset, int count) { - return rbd_start_aio(bs, 0, NULL, 0, cb, opaque, RBD_AIO_FLUSH); + return qemu_rbd_start_co(bs, offset, count, NULL, 0, RBD_AIO_DISCARD); } =20 static int qemu_rbd_getinfo(BlockDriverState *bs, BlockDriverInfo *bdi) @@ -1116,16 +1046,6 @@ static int qemu_rbd_snap_list(BlockDriverState *bs, return snap_count; } =20 -static BlockAIOCB *qemu_rbd_aio_pdiscard(BlockDriverState *bs, - int64_t offset, - int bytes, - BlockCompletionFunc *cb, - void *opaque) -{ - return rbd_start_aio(bs, offset, NULL, bytes, cb, opaque, - RBD_AIO_DISCARD); -} - static void coroutine_fn qemu_rbd_co_invalidate_cache(BlockDriverState *bs, Error **errp) { @@ -1189,11 +1109,10 @@ static BlockDriver bdrv_rbd =3D { .bdrv_co_truncate =3D qemu_rbd_co_truncate, .protocol_name =3D "rbd", =20 - .bdrv_aio_preadv =3D qemu_rbd_aio_preadv, - .bdrv_aio_pwritev =3D qemu_rbd_aio_pwritev, - - .bdrv_aio_flush =3D qemu_rbd_aio_flush, - .bdrv_aio_pdiscard =3D qemu_rbd_aio_pdiscard, + .bdrv_co_preadv =3D qemu_rbd_co_preadv, + .bdrv_co_pwritev =3D qemu_rbd_co_pwritev, + .bdrv_co_flush_to_disk =3D qemu_rbd_co_flush, + .bdrv_co_pdiscard =3D qemu_rbd_co_pdiscard, =20 .bdrv_snapshot_create =3D qemu_rbd_snap_create, .bdrv_snapshot_delete =3D qemu_rbd_snap_remove, --=20 2.17.1 From nobody Tue May 14 08:34:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621434511; cv=none; d=zohomail.com; s=zohoarc; b=MIaUs90A1NCLTxasT4DsCJz52/eiQzItwnW9B6168jL7Nwm/j+zS5sD4NLInnrOkcoPvCE5KDXKIxWEiocEEqdwoL0v1F2Q7zweJdoAaBipijg56+Fjgs5TVApR0fNz2MuYuzibtvmKh9BnKL8xqWXk0hkjaBmOxL2HJPTnMH68= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621434511; 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; bh=yxc72S07E+1ACCpxxnwg9JxdSKG22QubbIQnmyivnAI=; b=hU+5G//2rkNH/HipZm8nxQmCEC2qTdrfkkthB/BcKuzlf31TRkNi/77CoKC7f7a/Sj4MYeB3lQGNfPRW9pfJPyY7stSpO3nd1tQiA3ql9jNEoRPTg6Y5ORovmTSTYWcnU8tBEl5HJ47E7Rm4dvMyissYvnEdjDX23S4VpECMxNk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621434511043206.2043475912626; Wed, 19 May 2021 07:28:31 -0700 (PDT) Received: from localhost ([::1]:36486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljNBU-0005Qw-Ue for importer@patchew.org; Wed, 19 May 2021 10:28:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7T-0004ja-C6 for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:19 -0400 Received: from kerio.kamp.de ([195.62.97.192]:37919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7Q-0005IL-8B for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:18 -0400 Received: from submission.kamp.de ([195.62.97.28]) by kerio.kamp.de with ESMTPS (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) for qemu-devel@nongnu.org; Wed, 19 May 2021 16:24:06 +0200 Received: (qmail 19144 invoked from network); 19 May 2021 14:24:09 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 19 May 2021 14:24:09 -0000 Received: by lieven-pc (Postfix, from userid 1060) id 76B4313DD26; Wed, 19 May 2021 16:24:09 +0200 (CEST) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Subject: [PATCH V3 5/6] block/rbd: add write zeroes support Date: Wed, 19 May 2021 16:23:58 +0200 Message-Id: <20210519142359.23083-6-pl@kamp.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210519142359.23083-1-pl@kamp.de> References: <20210519142359.23083-1-pl@kamp.de> Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=195.62.97.192; envelope-from=pl@kamp.de; helo=kerio.kamp.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, idryomov@redhat.com, berrange@redhat.com, Peter Lieven , qemu-devel@nongnu.org, ct@flyingcircus.io, pbonzini@redhat.com, mreitz@redhat.com, dillaman@redhat.com 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" Signed-off-by: Peter Lieven --- block/rbd.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/block/rbd.c b/block/rbd.c index 0d8612a988..ee13f08a74 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -63,7 +63,8 @@ typedef enum { RBD_AIO_READ, RBD_AIO_WRITE, RBD_AIO_DISCARD, - RBD_AIO_FLUSH + RBD_AIO_FLUSH, + RBD_AIO_WRITE_ZEROES } RBDAIOCmd; =20 typedef struct BDRVRBDState { @@ -705,6 +706,10 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *= options, int flags, } } =20 +#ifdef LIBRBD_SUPPORTS_WRITE_ZEROES + bs->supported_zero_flags =3D BDRV_REQ_MAY_UNMAP; +#endif + /* When extending regular files, we get zeros from the OS */ bs->supported_truncate_flags =3D BDRV_REQ_ZERO_WRITE; =20 @@ -818,6 +823,18 @@ static int coroutine_fn qemu_rbd_start_co(BlockDriverS= tate *bs, case RBD_AIO_FLUSH: r =3D rbd_aio_flush(s->image, c); break; +#ifdef LIBRBD_SUPPORTS_WRITE_ZEROES + case RBD_AIO_WRITE_ZEROES: { + int zero_flags =3D 0; +#ifdef RBD_WRITE_ZEROES_FLAG_THICK_PROVISION + if (!(flags & BDRV_REQ_MAY_UNMAP)) { + zero_flags =3D RBD_WRITE_ZEROES_FLAG_THICK_PROVISION; + } +#endif + r =3D rbd_aio_write_zeroes(s->image, offset, bytes, c, zero_flags,= 0); + break; + } +#endif default: r =3D -EINVAL; } @@ -888,6 +905,21 @@ static int coroutine_fn qemu_rbd_co_pdiscard(BlockDriv= erState *bs, return qemu_rbd_start_co(bs, offset, count, NULL, 0, RBD_AIO_DISCARD); } =20 +#ifdef LIBRBD_SUPPORTS_WRITE_ZEROES +static int +coroutine_fn qemu_rbd_co_pwrite_zeroes(BlockDriverState *bs, int64_t offse= t, + int count, BdrvRequestFlags flags) +{ +#ifndef RBD_WRITE_ZEROES_FLAG_THICK_PROVISION + if (!(flags & BDRV_REQ_MAY_UNMAP)) { + return -ENOTSUP; + } +#endif + return qemu_rbd_start_co(bs, offset, count, NULL, flags, + RBD_AIO_WRITE_ZEROES); +} +#endif + static int qemu_rbd_getinfo(BlockDriverState *bs, BlockDriverInfo *bdi) { BDRVRBDState *s =3D bs->opaque; @@ -1113,6 +1145,9 @@ static BlockDriver bdrv_rbd =3D { .bdrv_co_pwritev =3D qemu_rbd_co_pwritev, .bdrv_co_flush_to_disk =3D qemu_rbd_co_flush, .bdrv_co_pdiscard =3D qemu_rbd_co_pdiscard, +#ifdef LIBRBD_SUPPORTS_WRITE_ZEROES + .bdrv_co_pwrite_zeroes =3D qemu_rbd_co_pwrite_zeroes, +#endif =20 .bdrv_snapshot_create =3D qemu_rbd_snap_create, .bdrv_snapshot_delete =3D qemu_rbd_snap_remove, --=20 2.17.1 From nobody Tue May 14 08:34:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1621434350; cv=none; d=zohomail.com; s=zohoarc; b=Xpm6LeOnyya1AxsnMHA9j3tfcta4Ov6tFpPkXKZJSL0U2OvlfHICRoa4NHOL0lNiX0FkOgfdn/RI8PbiGJN8JP/kmkvOWrUwXJS16IAQccXD9ywNHs3URY2mWdtLv3y7wkKuct4Pf36DK0yfrRj9NXFqtZUiezpfg7sXlM98FcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621434350; 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; bh=OOR9SgCTnNfecCFpKpxVM44J9w5YiPcsho9/ccaOpj4=; b=fGn3kWdCaxyQwypkRD+T3TADrSNTpSb3jLC2NuizbbVlVjmwCRx6IvLN5TqP40GavFefx8WyTQwTb7lbXK777TM0XE/OvMRM3dmajYABOKVEMtqGIL1w4xSmGOMJuroKaqJwvHmIRXdQAHV2kOb1E6/P7lPBgmfBlVO/HcYYgw0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621434350697678.4072105489129; Wed, 19 May 2021 07:25:50 -0700 (PDT) Received: from localhost ([::1]:55956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljN8v-0007Kz-PR for importer@patchew.org; Wed, 19 May 2021 10:25:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7P-0004YF-MZ for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:15 -0400 Received: from kerio.kamp.de ([195.62.97.192]:37903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljN7N-0005Et-NU for qemu-devel@nongnu.org; Wed, 19 May 2021 10:24:15 -0400 Received: from submission.kamp.de ([195.62.97.28]) by kerio.kamp.de with ESMTPS (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) for qemu-devel@nongnu.org; Wed, 19 May 2021 16:24:06 +0200 Received: (qmail 19145 invoked from network); 19 May 2021 14:24:09 -0000 Received: from lieven-pc.kamp-intra.net (HELO lieven-pc) (relay@kamp.de@::ffff:172.21.12.60) by submission.kamp.de with ESMTPS (DHE-RSA-AES256-GCM-SHA384 encrypted) ESMTPA; 19 May 2021 14:24:09 -0000 Received: by lieven-pc (Postfix, from userid 1060) id 79E9813DD27; Wed, 19 May 2021 16:24:09 +0200 (CEST) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Subject: [PATCH V3 6/6] block/rbd: drop qemu_rbd_refresh_limits Date: Wed, 19 May 2021 16:23:59 +0200 Message-Id: <20210519142359.23083-7-pl@kamp.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210519142359.23083-1-pl@kamp.de> References: <20210519142359.23083-1-pl@kamp.de> Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=195.62.97.192; envelope-from=pl@kamp.de; helo=kerio.kamp.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, idryomov@redhat.com, berrange@redhat.com, Peter Lieven , qemu-devel@nongnu.org, ct@flyingcircus.io, pbonzini@redhat.com, mreitz@redhat.com, dillaman@redhat.com 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" librbd supports 1 byte alignment for all aio operations. Currently, there is no API call to query limits from the ceph backend. So drop the bdrv_refresh_limits completely until there is such an API call. Signed-off-by: Peter Lieven Reviewed-by: Ilya Dryomov --- block/rbd.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index ee13f08a74..368a674aa0 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -228,14 +228,6 @@ done: return; } =20 - -static void qemu_rbd_refresh_limits(BlockDriverState *bs, Error **errp) -{ - /* XXX Does RBD support AIO on less than 512-byte alignment? */ - bs->bl.request_alignment =3D 512; -} - - static int qemu_rbd_set_auth(rados_t cluster, BlockdevOptionsRbd *opts, Error **errp) { @@ -1128,7 +1120,6 @@ static BlockDriver bdrv_rbd =3D { .format_name =3D "rbd", .instance_size =3D sizeof(BDRVRBDState), .bdrv_parse_filename =3D qemu_rbd_parse_filename, - .bdrv_refresh_limits =3D qemu_rbd_refresh_limits, .bdrv_file_open =3D qemu_rbd_open, .bdrv_close =3D qemu_rbd_close, .bdrv_reopen_prepare =3D qemu_rbd_reopen_prepare, --=20 2.17.1