From nobody Tue Feb 10 07:41:14 2026 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=1611660736; cv=none; d=zohomail.com; s=zohoarc; b=CoYM6bgF4UwNe8eVOG3SfGg0jchL5Wnxo8E/+yr5s6xN5T+mhmjeoSvGz3EwvptCSUSJhf4duqGvSVIoUGgrXjNt8tS7n3LL/H52BcWgLu5LD7kt9nlZvtvIKeNYhgO4jWQBMGLSr7f8ngM71cEk+tzlbegJcFfbIU3khYMx++4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611660736; 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=i9/uauTsSfqXimPV2hWHsUCSXQrbzTVSUKfSB75Sjvw=; b=V9J45yWJ/mG3wTLoWY01quTkVSx9NP4tzpKM93OLbpOr3LhCK0CIxEIwLwHC+HkmRXS+XwnOVcWLssz9nrHxtmrqwyBY6fSLJoi8xi10ETAwYf0jErb0QQyCzvodd7IyKFrW567jPi4J2az/lGdka2E8/x7cfe0xDIc69lcM7jE= 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 161166073618866.79177911379713; Tue, 26 Jan 2021 03:32:16 -0800 (PST) Received: from localhost ([::1]:47350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4MZy-0000SC-QV for importer@patchew.org; Tue, 26 Jan 2021 06:32:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4MU2-0003rn-NK for qemu-devel@nongnu.org; Tue, 26 Jan 2021 06:26:06 -0500 Received: from kerio.kamp.de ([195.62.97.192]:33572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4MU0-0002xf-Of for qemu-devel@nongnu.org; Tue, 26 Jan 2021 06:26:06 -0500 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; Tue, 26 Jan 2021 12:25:44 +0100 Received: (qmail 32749 invoked from network); 26 Jan 2021 11:25:48 -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; 26 Jan 2021 11:25:48 -0000 Received: by lieven-pc (Postfix, from userid 1060) id DB32613DC8C; Tue, 26 Jan 2021 12:25:47 +0100 (CET) X-Footer: a2FtcC5kZQ== From: Peter Lieven To: qemu-block@nongnu.org Subject: [PATCH V2 6/7] block/rbd: add write zeroes support Date: Tue, 26 Jan 2021 12:25:39 +0100 Message-Id: <20210126112540.11880-7-pl@kamp.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210126112540.11880-1-pl@kamp.de> References: <20210126112540.11880-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, 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 | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/block/rbd.c b/block/rbd.c index d11a3c6dd1..35dc1dc90e 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 { @@ -695,6 +696,9 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *o= ptions, int flags, } =20 s->aio_context =3D bdrv_get_aio_context(bs); +#ifdef LIBRBD_SUPPORTS_WRITE_ZEROES + bs->supported_zero_flags =3D BDRV_REQ_MAY_UNMAP; +#endif =20 /* When extending regular files, we get zeros from the OS */ bs->supported_truncate_flags =3D BDRV_REQ_ZERO_WRITE; @@ -808,6 +812,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; } @@ -878,6 +894,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; @@ -1110,6 +1141,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