From nobody Mon Apr 29 15:01:13 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631795043673158.35127943773512; Thu, 16 Sep 2021 05:24:03 -0700 (PDT) Received: from localhost ([::1]:47544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQqQs-0004Zg-Mw for importer@patchew.org; Thu, 16 Sep 2021 08:24:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQqOV-000310-Jm for qemu-devel@nongnu.org; Thu, 16 Sep 2021 08:21:37 -0400 Received: from kerio.kamp.de ([195.62.97.192]:39686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQqOS-0001D9-O9 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 08:21:35 -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; Thu, 16 Sep 2021 14:21:22 +0200 Received: (qmail 40586 invoked from network); 16 Sep 2021 12:21:22 -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; 16 Sep 2021 12:21:22 -0000 Received: by lieven-pc (Postfix, from userid 1060) id 851DB13D87D; Thu, 16 Sep 2021 14:21:22 +0200 (CEST) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Subject: [PATCH V3] block/rbd: implement bdrv_co_block_status Date: Thu, 16 Sep 2021 14:21:16 +0200 Message-Id: <20210916122116.802-1-pl@kamp.de> X-Mailer: git-send-email 2.17.1 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=unavailable 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, idryomov@gmail.com, mreitz@redhat.com, dillaman@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1631795045729100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" the qemu rbd driver currently lacks support for bdrv_co_block_status. This results mainly in incorrect progress during block operations (e.g. qemu-img convert with an rbd image as source). This patch utilizes the rbd_diff_iterate2 call from librbd to detect allocated and unallocated (all zero areas). To avoid querying the ceph OSDs for the answer this is only done if the image has the fast-diff feature which depends on the object-map and exclusive-lock features. In this case it is guaranteed that the information is present in memory in the librbd client and thus very fast. If fast-diff is not available all areas are reported to be allocated which is the current behaviour if bdrv_co_block_status is not implemented. Signed-off-by: Peter Lieven --- V2->V3: - check rbd_flags every time (they can change during runtime) [Ilya] - also check for fast-diff invalid flag [Ilya] - *map and *file cant be NULL [Ilya] - set ret =3D BDRV_BLOCK_ZERO | BDRV_BLOCK_OFFSET_VALID in case of an unallocated area [Ilya] - typo: catched -> caught [Ilya] - changed wording about fast-diff, object-map and exclusive lock in commit msg [Ilya] V1->V2: - add commit comment [Stefano] - use failed_post_open [Stefano] - remove redundant assert [Stefano] - add macro+comment for the magic -9000 value [Stefano] - always set *file if its non NULL [Stefano] block/rbd.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/block/rbd.c b/block/rbd.c index dcf82b15b8..3cb24f9981 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -1259,6 +1259,131 @@ static ImageInfoSpecific *qemu_rbd_get_specific_inf= o(BlockDriverState *bs, return spec_info; } =20 +typedef struct rbd_diff_req { + uint64_t offs; + uint64_t bytes; + int exists; +} rbd_diff_req; + +/* + * rbd_diff_iterate2 allows to interrupt the exection by returning a negat= ive + * value in the callback routine. Choose a value that does not conflict wi= th + * an existing exitcode and return it if we want to prematurely stop the + * execution because we detected a change in the allocation status. + */ +#define QEMU_RBD_EXIT_DIFF_ITERATE2 -9000 + +static int qemu_rbd_co_block_status_cb(uint64_t offs, size_t len, + int exists, void *opaque) +{ + struct rbd_diff_req *req =3D opaque; + + assert(req->offs + req->bytes <=3D offs); + + if (req->exists && offs > req->offs + req->bytes) { + /* + * we started in an allocated area and jumped over an unallocated = area, + * req->bytes contains the length of the allocated area before the + * unallocated area. stop further processing. + */ + return QEMU_RBD_EXIT_DIFF_ITERATE2; + } + if (req->exists && !exists) { + /* + * we started in an allocated area and reached a hole. req->bytes + * contains the length of the allocated area before the hole. + * stop further processing. + */ + return QEMU_RBD_EXIT_DIFF_ITERATE2; + } + if (!req->exists && exists && offs > req->offs) { + /* + * we started in an unallocated area and hit the first allocated + * block. req->bytes must be set to the length of the unallocated = area + * before the allocated area. stop further processing. + */ + req->bytes =3D offs - req->offs; + return QEMU_RBD_EXIT_DIFF_ITERATE2; + } + + /* + * assert that we caught all cases above and allocation state has not + * changed during callbacks. + */ + assert(exists =3D=3D req->exists || !req->bytes); + req->exists =3D exists; + + /* + * assert that we either return an unallocated block or have got callb= acks + * for all allocated blocks present. + */ + assert(!req->exists || offs =3D=3D req->offs + req->bytes); + req->bytes =3D offs + len - req->offs; + + return 0; +} + +static int coroutine_fn qemu_rbd_co_block_status(BlockDriverState *bs, + bool want_zero, int64_t o= ffset, + int64_t bytes, int64_t *p= num, + int64_t *map, + BlockDriverState **file) +{ + BDRVRBDState *s =3D bs->opaque; + int ret, r; + struct rbd_diff_req req =3D { .offs =3D offset }; + uint64_t features, flags; + + assert(offset + bytes <=3D s->image_size); + + /* default to all sectors allocated */ + ret =3D BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID; + *map =3D offset; + *file =3D bs; + *pnum =3D bytes; + + /* check if RBD image supports fast-diff */ + r =3D rbd_get_features(s->image, &features); + if (r < 0) { + goto out; + } + if (!(features & RBD_FEATURE_FAST_DIFF)) { + goto out; + } + + /* check if RBD fast-diff result is valid */ + r =3D rbd_get_flags(s->image, &flags); + if (r < 0) { + goto out; + } + if (flags & RBD_FLAG_FAST_DIFF_INVALID) { + goto out; + } + + r =3D rbd_diff_iterate2(s->image, NULL, offset, bytes, true, true, + qemu_rbd_co_block_status_cb, &req); + if (r < 0 && r !=3D QEMU_RBD_EXIT_DIFF_ITERATE2) { + goto out; + } + assert(req.bytes <=3D bytes); + if (!req.exists) { + if (r =3D=3D 0 && !req.bytes) { + /* + * rbd_diff_iterate2 does not invoke callbacks for unallocated= areas + * except for the case where an overlay has a hole where the p= arent + * has not. This here catches the case where no callback was + * invoked at all. + */ + req.bytes =3D bytes; + } + ret =3D BDRV_BLOCK_ZERO | BDRV_BLOCK_OFFSET_VALID; + } + *pnum =3D req.bytes; + +out: + return ret; +} + static int64_t qemu_rbd_getlength(BlockDriverState *bs) { BDRVRBDState *s =3D bs->opaque; @@ -1494,6 +1619,7 @@ static BlockDriver bdrv_rbd =3D { #ifdef LIBRBD_SUPPORTS_WRITE_ZEROES .bdrv_co_pwrite_zeroes =3D qemu_rbd_co_pwrite_zeroes, #endif + .bdrv_co_block_status =3D qemu_rbd_co_block_status, =20 .bdrv_snapshot_create =3D qemu_rbd_snap_create, .bdrv_snapshot_delete =3D qemu_rbd_snap_remove, --=20 2.17.1