From patchwork Mon Sep 18 09:53:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Li X-Patchwork-Id: 13389358 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5551CCD13D1 for ; Mon, 18 Sep 2023 09:54:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiAwi-0002Iu-TS; Mon, 18 Sep 2023 05:53:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiAwh-0002IO-Kb; Mon, 18 Sep 2023 05:53:35 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiAwg-0002HO-0o; Mon, 18 Sep 2023 05:53:35 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6907e44665bso684871b3a.1; Mon, 18 Sep 2023 02:53:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695030812; x=1695635612; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QxSJRCnX8SN2drnrq6vb4a5EwxGykJ0hHcfM5c4bJm4=; b=ULzuGnAn68TlyDg0hqtn1lA980YFCK4e/P5kBNdT4sv9JbViy6wwBoeFuhm4NZA1mK zoER4ueeNov9sHSwF3yuAETaipATrmNAqc0KR4eUgURDzcQgmVuYXSCnVSCigieJ4NSA EPgIwm0mLl+h0akbn/1PTuDLZ+xo2kTwqgdI6vuWOFHNF+5X1ruJ3HsVh6AF1yVhWD/G DWZroBAq1mMfW9BrQJSsNKH69nwnfoWMZDZ/9oqLRufQfuIOjH4N3DATcAClacpIQkem cW77CuLIJeLXMsjM8ViMn1i8iie3E7pFgZ225XnlKN4OSXmLVxNdopmADYdLWIf4Hbmi qrvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695030812; x=1695635612; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QxSJRCnX8SN2drnrq6vb4a5EwxGykJ0hHcfM5c4bJm4=; b=OtqdPUF9E2sWhNSyGuEym1kbnAiELpHLPyhtoW+pXhliQRxTep6G7rROfnL3tyB+z4 Xv3gJ2fw9I2vbZqkseJAbdPkP6mO86BTrR+SOnf8vEy+jWCwHFGC1ofFpxyZC+46TD62 ncWsRE1Y5K5v2h0JCSZ0EImplhU6GTtF2z2csnfON1JnpRK7KhR3Tnku9B0LxQs4XtHp q780qeTeVjHWS+WcphpefqynpPz76ynLfVgMYARhIT4LUI+Rajdfq87pSE5UfGYYij7R no+qm5rwtuF87ufVgORUx4IoxRWpWPKbesYd7lJcZmK2C4Oq/KBsayvM90I/RElTx/LO xMyg== X-Gm-Message-State: AOJu0YwQffYV/Nf2pBbK25rVdVyzjCD8u9N5cKgwmKGEz8jsQPotAy0l ITMvjH+d9Cjif4eEDQPHRzXuLeFuCTadK+euWLs= X-Google-Smtp-Source: AGHT+IG+7vRRE6Vlo+Sd0sFdgQJ/l6uJ8qgAjOAslIPmhiw9zbLDY3uUv4zm4mLnqZqQDNQJNls74Q== X-Received: by 2002:a05:6a20:938a:b0:14e:9092:4291 with SMTP id x10-20020a056a20938a00b0014e90924291mr11477040pzh.7.1695030811529; Mon, 18 Sep 2023 02:53:31 -0700 (PDT) Received: from fedlinux.. ([106.84.131.213]) by smtp.gmail.com with ESMTPSA id y24-20020aa78558000000b0068fb8080939sm6780553pfn.65.2023.09.18.02.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 02:53:31 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: dmitry.fomichev@wdc.com, Markus Armbruster , Eric Blake , dlemoal@kernel.org, Hanna Reitz , stefanha@redhat.com, hare@suse.de, Kevin Wolf , qemu-block@nongnu.org, Sam Li Subject: [PATCH v4 1/4] docs/qcow2: add the zoned format feature Date: Mon, 18 Sep 2023 17:53:10 +0800 Message-Id: <20230918095313.5492-2-faithilikerun@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230918095313.5492-1-faithilikerun@gmail.com> References: <20230918095313.5492-1-faithilikerun@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=faithilikerun@gmail.com; helo=mail-pf1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Add the specs for the zoned format feature of the qcow2 driver. The qcow2 file can be taken as zoned device and passed through by virtio-blk device or NVMe ZNS device to the guest given zoned information. Signed-off-by: Sam Li Reviewed-by: Stefan Hajnoczi --- docs/system/qemu-block-drivers.rst.inc | 33 ++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/docs/system/qemu-block-drivers.rst.inc b/docs/system/qemu-block-drivers.rst.inc index 105cb9679c..4647c5fa29 100644 --- a/docs/system/qemu-block-drivers.rst.inc +++ b/docs/system/qemu-block-drivers.rst.inc @@ -172,6 +172,39 @@ This section describes each format and the options that are supported for it. filename`` to check if the NOCOW flag is set or not (Capital 'C' is NOCOW flag). + .. option:: zoned + 1 for host-managed zoned device and 0 for a non-zoned device. + + .. option:: zone_size + + The size of a zone in bytes. The device is divided into zones of this + size with the exception of the last zone, which may be smaller. + + .. option:: zone_capacity + + The initial capacity value, in bytes, for all zones. The capacity must + be less than or equal to zone size. If the last zone is smaller, then + its capacity is capped. + + The zone capacity is per zone and may be different between zones in real + devices. For simplicity, QCow2 sets all zones to the same capacity. + + .. option:: zone_nr_conv + + The number of conventional zones of the zoned device. + + .. option:: max_open_zones + + The maximal allowed open zones. + + .. option:: max_active_zones + + The limit of the zones with implicit open, explicit open or closed state. + + .. option:: max_append_sectors + + The maximal number of 512-byte sectors in a zone append request. + .. program:: image-formats .. option:: qed From patchwork Mon Sep 18 09:53:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Li X-Patchwork-Id: 13389360 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2B136CD37B0 for ; Mon, 18 Sep 2023 09:54:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiAwq-0002ST-R5; Mon, 18 Sep 2023 05:53:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiAwp-0002S4-06; Mon, 18 Sep 2023 05:53:43 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiAwm-0002I2-EM; Mon, 18 Sep 2023 05:53:42 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-68fbb10dea4so3210551b3a.3; Mon, 18 Sep 2023 02:53:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695030818; x=1695635618; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ih8AyOmnr3CyfcQasIsV2Iv3XHJed5/SL+/5cdvy8yo=; b=L2yk5U+jJ8Wx2t/MBwkEBW0WgnHiaXHeQa1GHSLYzH71y3kMphRwd1HySHLoOVDcHi QubsjP+TO5/vfdmE2f2UwMbwFxqM3YeQ2D67UwHgMm0ax/XwSCNqAwcI6WKMY4QTHVsW iz8oFHkIcgHF4OMQTzMpN3MABeZ1DZsQ1pKW0uiA1W3G/YLDZiqiyYdsofI+yNgR89K+ GBZSs4WY7vGjIPqSDUISzyd+escvHMjc/Eper054GFzaRNDrmUTmtuiwAriWxe8l3lba HtqDdYOYUemiOaUCyFLtCTxbioAfy7UEd1PO7Jzw6OTc8mbad22kfwJf2HBYH2+HF+pe Vf0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695030818; x=1695635618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ih8AyOmnr3CyfcQasIsV2Iv3XHJed5/SL+/5cdvy8yo=; b=enBuzuu7DwtWpfrKNNlBkzu6xHfGOAsLvk7AKyW13jeEBWZzSMJl9ePtNoRpo42e40 asYoFZtqdSpN6aA0aDaJWGNj116UddtufNWvkn1ZZqBbiLs0ejpYvtraXZIt6JSOmYKg y9wjfyFeVBlUUtj1axYsMHZuUGKMHCWNBXK6M2iAqoOhTCUaB2iIvONcanY7Rws2Qmg2 6rYn+qrf0a4N14Cev0/yJ8GBDuP9wYI6o2EQLmzVzoePYA/lIyR9P1cKBkL8aRYxqgwA z9twf6HAoqB5sq1/37OFMLm2iPTVp9frAY0+0QjKyVgOxx6tcqvbbdsPyEhLfgdNHKK0 dUmg== X-Gm-Message-State: AOJu0YzuEPTzfOMNQcngCw30gYho0mF+Fxq8RFfEd4ejmNhGAn9va7fM m6VFusktEBRmLzC5YBlySx9KXLNJAfVU6t0zcoA= X-Google-Smtp-Source: AGHT+IHBHcoR7fQjjitznIDAmSgBwUu2Ebkr2WtCVvPbPATlPFbSUa7074+9boVic8sq6TaQAEDNtg== X-Received: by 2002:a05:6a00:1ac6:b0:690:45cc:bd37 with SMTP id f6-20020a056a001ac600b0069045ccbd37mr8414944pfv.18.1695030817928; Mon, 18 Sep 2023 02:53:37 -0700 (PDT) Received: from fedlinux.. ([106.84.131.213]) by smtp.gmail.com with ESMTPSA id y24-20020aa78558000000b0068fb8080939sm6780553pfn.65.2023.09.18.02.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 02:53:37 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: dmitry.fomichev@wdc.com, Markus Armbruster , Eric Blake , dlemoal@kernel.org, Hanna Reitz , stefanha@redhat.com, hare@suse.de, Kevin Wolf , qemu-block@nongnu.org, Sam Li Subject: [PATCH v4 2/4] qcow2: add configurations for zoned format extension Date: Mon, 18 Sep 2023 17:53:11 +0800 Message-Id: <20230918095313.5492-3-faithilikerun@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230918095313.5492-1-faithilikerun@gmail.com> References: <20230918095313.5492-1-faithilikerun@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=faithilikerun@gmail.com; helo=mail-pf1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org To configure the zoned format feature on the qcow2 driver, it requires settings as: the device size, zone model, zone size, zone capacity, number of conventional zones, limits on zone resources (max append sectors, max open zones, and max_active_zones). To create a qcow2 file with zoned format, use command like this: $ qemu-img create -f qcow2 test.qcow2 -o size=768M -o zone_size=64M -o zone_capacity=64M -o nr_conv_zones=0 -o max_append_sectors=512 -o max_open_zones=0 -o max_active_zones=0 -o zone_model=1 Signed-off-by: Sam Li --- block/qcow2.c | 186 ++++++++++++++++++++++++++++++- block/qcow2.h | 28 +++++ docs/interop/qcow2.txt | 36 ++++++ include/block/block_int-common.h | 13 +++ qapi/block-core.json | 30 ++++- 5 files changed, 291 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index b48cd9ce63..521276fc51 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -73,6 +73,7 @@ typedef struct { #define QCOW2_EXT_MAGIC_CRYPTO_HEADER 0x0537be77 #define QCOW2_EXT_MAGIC_BITMAPS 0x23852875 #define QCOW2_EXT_MAGIC_DATA_FILE 0x44415441 +#define QCOW2_EXT_MAGIC_ZONED_FORMAT 0x7a6264 static int coroutine_fn qcow2_co_preadv_compressed(BlockDriverState *bs, @@ -210,6 +211,7 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, uint64_t offset; int ret; Qcow2BitmapHeaderExt bitmaps_ext; + Qcow2ZonedHeaderExtension zoned_ext; if (need_update_header != NULL) { *need_update_header = false; @@ -431,6 +433,55 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, break; } + case QCOW2_EXT_MAGIC_ZONED_FORMAT: + { + if (ext.len != sizeof(zoned_ext)) { + error_setg(errp, "zoned_ext: Invalid extension length"); + return -EINVAL; + } + ret = bdrv_pread(bs->file, offset, ext.len, &zoned_ext, 0); + if (ret < 0) { + error_setg_errno(errp, -ret, "zoned_ext: " + "Could not read ext header"); + return ret; + } + + zoned_ext.zone_size = be32_to_cpu(zoned_ext.zone_size); + zoned_ext.zone_capacity = be32_to_cpu(zoned_ext.zone_capacity); + zoned_ext.nr_conv_zones = be32_to_cpu(zoned_ext.nr_conv_zones); + zoned_ext.nr_zones = be32_to_cpu(zoned_ext.nr_zones); + zoned_ext.max_open_zones = be32_to_cpu(zoned_ext.max_open_zones); + zoned_ext.max_active_zones = + be32_to_cpu(zoned_ext.max_active_zones); + zoned_ext.max_append_sectors = + be32_to_cpu(zoned_ext.max_append_sectors); + s->zoned_header = zoned_ext; + + /* refuse to open broken images */ + if (zoned_ext.zone_size == 0) { + error_setg(errp, "Zoned extension header zone_size field " + "can not be 0"); + return -EINVAL; + } + if (zoned_ext.zone_capacity > zoned_ext.zone_size) { + error_setg(errp, "Zoned extension header zone_capacity field " + "can not be larger that zone_size field"); + return -EINVAL; + } + if (zoned_ext.nr_zones != DIV_ROUND_UP( + bs->total_sectors * BDRV_SECTOR_SIZE, zoned_ext.zone_size)) { + error_setg(errp, "Zoned extension header nr_zones field " + "is wrong"); + return -EINVAL; + } + +#ifdef DEBUG_EXT + printf("Qcow2: Got zoned format extension: " + "offset=%" PRIu32 "\n", offset); +#endif + break; + } + default: /* unknown magic - save it in case we need to rewrite the header */ /* If you add a new feature, make sure to also update the fast @@ -1967,6 +2018,14 @@ static void qcow2_refresh_limits(BlockDriverState *bs, Error **errp) } bs->bl.pwrite_zeroes_alignment = s->subcluster_size; bs->bl.pdiscard_alignment = s->cluster_size; + bs->bl.zoned = s->zoned_header.zoned; + bs->bl.nr_zones = s->zoned_header.nr_zones; + bs->bl.max_append_sectors = s->zoned_header.max_append_sectors; + bs->bl.max_active_zones = s->zoned_header.max_active_zones; + bs->bl.max_open_zones = s->zoned_header.max_open_zones; + bs->bl.zone_size = s->zoned_header.zone_size; + bs->bl.zone_capacity = s->zoned_header.zone_capacity; + bs->bl.write_granularity = BDRV_SECTOR_SIZE; } static int qcow2_reopen_prepare(BDRVReopenState *state, @@ -3089,6 +3148,30 @@ int qcow2_update_header(BlockDriverState *bs) buflen -= ret; } + /* Zoned devices header extension */ + if (s->zoned_header.zoned == BLK_Z_HM) { + Qcow2ZonedHeaderExtension zoned_header = { + .zoned = s->zoned_header.zoned, + .zone_size = cpu_to_be32(s->zoned_header.zone_size), + .zone_capacity = cpu_to_be32(s->zoned_header.zone_capacity), + .nr_conv_zones = cpu_to_be32(s->zoned_header.nr_conv_zones), + .nr_zones = cpu_to_be32(s->zoned_header.nr_zones), + .max_open_zones = cpu_to_be32(s->zoned_header.max_open_zones), + .max_active_zones = + cpu_to_be32(s->zoned_header.max_active_zones), + .max_append_sectors = + cpu_to_be32(s->zoned_header.max_append_sectors) + }; + ret = header_ext_add(buf, QCOW2_EXT_MAGIC_ZONED_FORMAT, + &zoned_header, sizeof(zoned_header), + buflen); + if (ret < 0) { + goto fail; + } + buf += ret; + buflen -= ret; + } + /* Keep unknown header extensions */ QLIST_FOREACH(uext, &s->unknown_header_ext, next) { ret = header_ext_add(buf, uext->magic, uext->data, uext->len, buflen); @@ -3768,11 +3851,70 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) } /* Set the external data file if necessary */ + BDRVQcow2State *s = blk_bs(blk)->opaque; if (data_bs) { - BDRVQcow2State *s = blk_bs(blk)->opaque; s->image_data_file = g_strdup(data_bs->filename); } + if (qcow2_opts->has_zone_model && qcow2_opts->zone_model == BLK_Z_HM) { + if (!qcow2_opts->has_zone_size) { + error_setg(errp, "Missing zone_size parameter"); + ret = -EINVAL; + goto out; + } + + if (qcow2_opts->zone_size == 0) { + s->zoned_header.zoned = BLK_Z_NONE; + error_setg(errp, "Zoned devices can not allow a larger-than-zero " + "zone_size"); + ret = -EINVAL; + goto out; + } + + s->zoned_header.zoned = qcow2_opts->zone_model; + s->zoned_header.zone_size = qcow2_opts->zone_size; + s->zoned_header.nr_zones = DIV_ROUND_UP(qcow2_opts->size, + qcow2_opts->zone_size); + + if (qcow2_opts->has_zone_capacity) { + if (qcow2_opts->zone_capacity > qcow2_opts->zone_size) { + s->zoned_header.zoned = BLK_Z_NONE; + error_setg(errp, "zone capacity %" PRIu64 "B exceeds zone size " + "%" PRIu64"B", qcow2_opts->zone_capacity, + qcow2_opts->zone_size); + ret = -EINVAL; + goto out; + } + s->zoned_header.zone_capacity = qcow2_opts->zone_capacity; + } else { + s->zoned_header.zone_capacity = qcow2_opts->zone_size; + } + + if (qcow2_opts->has_nr_conv_zones) { + s->zoned_header.nr_conv_zones = qcow2_opts->nr_conv_zones; + } + + if (qcow2_opts->has_max_active_zones) { + if (qcow2_opts->max_open_zones > qcow2_opts->max_active_zones) { + s->zoned_header.zoned = BLK_Z_NONE; + error_setg(errp, "max_open_zones %" PRIu32 " exceeds " + "max_active_zones %" PRIu32"", + qcow2_opts->max_open_zones, + qcow2_opts->max_active_zones); + ret = -EINVAL; + goto out; + } + if (qcow2_opts->has_max_open_zones) { + s->zoned_header.max_open_zones = qcow2_opts->max_active_zones; + } else { + s->zoned_header.max_open_zones = qcow2_opts->max_active_zones; + } + } + s->zoned_header.max_append_sectors = qcow2_opts->max_append_sectors; + } else { + s->zoned_header.zoned = BLK_Z_NONE; + } + /* Create a full header (including things like feature table) */ ret = qcow2_update_header(blk_bs(blk)); bdrv_graph_co_rdunlock(); @@ -3903,6 +4045,13 @@ qcow2_co_create_opts(BlockDriver *drv, const char *filename, QemuOpts *opts, { BLOCK_OPT_COMPAT_LEVEL, "version" }, { BLOCK_OPT_DATA_FILE_RAW, "data-file-raw" }, { BLOCK_OPT_COMPRESSION_TYPE, "compression-type" }, + { BLOCK_OPT_Z_MODEL, "zone-model"}, + { BLOCK_OPT_Z_NR_COV, "nr-conv-zones"}, + { BLOCK_OPT_Z_MOZ, "max-open-zones"}, + { BLOCK_OPT_Z_MAZ, "max-active-zones"}, + { BLOCK_OPT_Z_MAS, "max-append-sectors"}, + { BLOCK_OPT_Z_SIZE, "zone-size"}, + { BLOCK_OPT_Z_CAP, "zone-capacity"}, { NULL, NULL }, }; @@ -6067,6 +6216,41 @@ static QemuOptsList qcow2_create_opts = { .help = "Compression method used for image cluster " \ "compression", \ .def_value_str = "zlib" \ + }, \ + { \ + .name = BLOCK_OPT_Z_MODEL, \ + .type = QEMU_OPT_NUMBER, \ + .help = "zone model", \ + }, \ + { \ + .name = BLOCK_OPT_Z_SIZE, \ + .type = QEMU_OPT_SIZE, \ + .help = "zone size", \ + }, \ + { \ + .name = BLOCK_OPT_Z_CAP, \ + .type = QEMU_OPT_SIZE, \ + .help = "zone capacity", \ + }, \ + { \ + .name = BLOCK_OPT_Z_NR_COV, \ + .type = QEMU_OPT_NUMBER, \ + .help = "numbers of conventional zones", \ + }, \ + { \ + .name = BLOCK_OPT_Z_MAS, \ + .type = QEMU_OPT_NUMBER, \ + .help = "max append sectors", \ + }, \ + { \ + .name = BLOCK_OPT_Z_MAZ, \ + .type = QEMU_OPT_NUMBER, \ + .help = "max active zones", \ + }, \ + { \ + .name = BLOCK_OPT_Z_MOZ, \ + .type = QEMU_OPT_NUMBER, \ + .help = "max open zones", \ }, QCOW_COMMON_OPTIONS, { /* end of list */ } diff --git a/block/qcow2.h b/block/qcow2.h index f789ce3ae0..1929788494 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -236,6 +236,25 @@ typedef struct Qcow2CryptoHeaderExtension { uint64_t length; } QEMU_PACKED Qcow2CryptoHeaderExtension; +typedef struct Qcow2ZonedHeaderExtension { + /* Zoned device attributes */ + uint8_t zoned; + uint8_t reserved[3]; + uint32_t zone_size; + uint32_t zone_capacity; + uint32_t nr_conv_zones; + uint32_t nr_zones; + uint32_t max_active_zones; + uint32_t max_open_zones; + uint32_t max_append_sectors; +} QEMU_PACKED Qcow2ZonedHeaderExtension; + +typedef struct Qcow2Wp { + uint64_t wp; + QLIST_ENTRY(Qcow2Wp) exp_open_zone_entry; + QLIST_ENTRY(Qcow2Wp) imp_open_zone_entry; +} Qcow2Wp; + typedef struct Qcow2UnknownHeaderExtension { uint32_t magic; uint32_t len; @@ -422,6 +441,15 @@ typedef struct BDRVQcow2State { * is to convert the image with the desired compression type set. */ Qcow2CompressionType compression_type; + + /* States of zoned device */ + Qcow2ZonedHeaderExtension zoned_header; + QLIST_HEAD(, Qcow2Wp) exp_open_zones; + QLIST_HEAD(, Qcow2Wp) imp_open_zones; + Qcow2Wp *wp; + uint32_t nr_zones_exp_open; + uint32_t nr_zones_imp_open; + uint32_t nr_zones_closed; } BDRVQcow2State; typedef struct Qcow2COWRegion { diff --git a/docs/interop/qcow2.txt b/docs/interop/qcow2.txt index 2c4618375a..80314614aa 100644 --- a/docs/interop/qcow2.txt +++ b/docs/interop/qcow2.txt @@ -331,6 +331,42 @@ The fields of the bitmaps extension are: Offset into the image file at which the bitmap directory starts. Must be aligned to a cluster boundary. +== Zoned extension == + +The zoned extension is an optional header extension. It contains fields for +emulating the zoned stroage model (https://zonedstorage.io/). + +The fields of the zoned extension are: + Byte 0: zoned + Zoned model, 1 for host-managed and 0 for non-zoned devices. + + 1 - 3: Reserved, must be zero. + + 4 - 7: zone_size + Total number of logical blocks within the zones in bytes. + + 8 - 11: zone_capacity + The number of writable logical blocks within the zones in + bytes. A zone capacity is always smaller or equal to the + zone size. + + 12 - 15: nr_conv_zones + The number of conventional zones. + + 16 - 19: nr_zones + The number of zones. + + 20 - 23: max_active_zones + The limit of the zones that have the implicit open, + explicit open or closed state. + + 24 - 27: max_open_zones + The maximal allowed open zones. + + 28 - 35: max_append_sectors + The maximal number of 512-byte sectors of a zone + append request that can be issued to the device. + == Full disk encryption header pointer == The full disk encryption header must be present if, and only if, the diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h index 85be256c09..d169d15dd6 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -57,6 +57,13 @@ #define BLOCK_OPT_DATA_FILE_RAW "data_file_raw" #define BLOCK_OPT_COMPRESSION_TYPE "compression_type" #define BLOCK_OPT_EXTL2 "extended_l2" +#define BLOCK_OPT_Z_MODEL "zone_model" +#define BLOCK_OPT_Z_SIZE "zone_size" +#define BLOCK_OPT_Z_CAP "zone_capacity" +#define BLOCK_OPT_Z_NR_COV "nr_conv_zones" +#define BLOCK_OPT_Z_MAS "max_append_sectors" +#define BLOCK_OPT_Z_MAZ "max_active_zones" +#define BLOCK_OPT_Z_MOZ "max_open_zones" #define BLOCK_PROBE_BUF_SIZE 512 @@ -878,6 +885,12 @@ typedef struct BlockLimits { /* zone size expressed in bytes */ uint32_t zone_size; + /* + * the number of usable logical blocks within the zone, expressed + * in bytes. A zone capacity is smaller or equal to the zone size. + */ + uint32_t zone_capacity; + /* total number of zones */ uint32_t nr_zones; diff --git a/qapi/block-core.json b/qapi/block-core.json index 2b1d493d6e..2aad82c399 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -5021,6 +5021,27 @@ # @compression-type: The image cluster compression method # (default: zlib, since 5.1) # +# @zone-model: Zoned device model, 1 for host-managed and 0 for +# non-zoned devices (default: 0, since 8.2) +# +# @zone-size: Total number of logical blocks within zones in bytes +# (since 8.2) +# +# @zone-capacity: The number of usable logical blocks within zones +# in bytes. A zone capacity is always smaller or equal to the +# zone size. (since 8.2) +# +# @nr-conv-zones: The number of conventional zones of the zoned device +# (since 8.2) +# +# @max-open-zones: The maximal number of open zones (since 8.2) +# +# @max-active-zones: The limit of the zones that have the implicit +# open, explicit open or closed state (since 8.2) +# +# @max-append-sectors: The maximal number of 512-byte sectors of a zone +# append request that can be issued to the device. (since 8.2) +# # Since: 2.12 ## { 'struct': 'BlockdevCreateOptionsQcow2', @@ -5037,7 +5058,14 @@ '*preallocation': 'PreallocMode', '*lazy-refcounts': 'bool', '*refcount-bits': 'int', - '*compression-type':'Qcow2CompressionType' } } + '*compression-type':'Qcow2CompressionType', + '*zone-model': 'uint8', + '*zone-size': 'size', + '*zone-capacity': 'size', + '*nr-conv-zones': 'uint32', + '*max-open-zones': 'uint32', + '*max-active-zones': 'uint32', + '*max-append-sectors': 'uint32' } } ## # @BlockdevCreateOptionsQed: From patchwork Mon Sep 18 09:53:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Li X-Patchwork-Id: 13389362 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 08DF7C46CA1 for ; Mon, 18 Sep 2023 09:55:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiAyA-0004Pi-LA; Mon, 18 Sep 2023 05:55:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiAy5-0004P1-Qm; Mon, 18 Sep 2023 05:55:01 -0400 Received: from mail-ot1-x332.google.com ([2607:f8b0:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiAy2-0002WY-KD; Mon, 18 Sep 2023 05:55:01 -0400 Received: by mail-ot1-x332.google.com with SMTP id 46e09a7af769-6b9a2416b1cso2865261a34.2; Mon, 18 Sep 2023 02:54:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695030896; x=1695635696; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rkbsCzRQ4Ya9rip2bxRTcDVZqpx7tXdGqwmjjYvoZ6U=; b=TfNy/AGAIRkKmPolmwSSHFQp3HucJeRPOL6XYo54Fqr3VTU3g8XNOII48zMLTaNkuj ZujLsce5C4xzUG4PTYN8NXEnghU8a4YjsDOg6ehZfyA4J6YehUdwljc227pdY+sZKOjD /jlAnaSmcJzyb1cO7GYcQAeNtuBU8fNU8nsIk1K0S3NveP/c96TCEJxczb+Ro0vebojC jDflflGoJdqJ2DwGsg+b8A9ePB/Ph9G+JJbMUTbDXY5xGVoGqe0gsvQrcA2451ImNkj0 z57F+h/HwJi+lKe7sShLOk35N2ihrA4lFsXVao/JvxLxD0mhgsFqAsKIoZV7qJ+r2SzO h+8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695030896; x=1695635696; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rkbsCzRQ4Ya9rip2bxRTcDVZqpx7tXdGqwmjjYvoZ6U=; b=nJ3P0hI9vy7hfdSlg5lxV5svzGz0YR9aD8f6eYa/1+Aqh4CM9FBmnte0QA8PJcIvdh sbca4G7MAYRe7a3KFBPVFJPabDZ6AI4OK0jiXv8ywYTpTaVbVRJDamQc5cwsvWGEHO2j ekUxPg7zl8CvnfSNw+UaApfStvKujDlBU9AhK0j5De4xATHChhUpbV6Jcmy89ugSOSQ/ OxdRWxcTM+7hxsMmazC1ArCvpFGMZSo5C0lDZFNR4bw0Qgv/xOlvLbWxFA4uOrD7Plr6 dAfRQbvhRCEIKactPUBpnsrc3weFvbhSilYLOIweTwHE6iYoZfptL0LcQMOIZGpG8/f3 CM+w== X-Gm-Message-State: AOJu0Ywwyhpk31bKqoAE54/qg3dt7JdPZL1Qkk7U4iNasE29ZMtpyllA 9/PyzGUHcJHxXHIlCg2HRcmh5oUPANKba5zOXQw= X-Google-Smtp-Source: AGHT+IGNGsy8v/avVfMbSXGCBSAXOR8LWxIsz/M9LBWyGMqLI/Q6mwWGLMorRG5LL9sONUDu7roypQ== X-Received: by 2002:a05:6358:931b:b0:133:4ce:4e8c with SMTP id x27-20020a056358931b00b0013304ce4e8cmr9826213rwa.29.1695030896217; Mon, 18 Sep 2023 02:54:56 -0700 (PDT) Received: from fedlinux.. ([106.84.131.213]) by smtp.gmail.com with ESMTPSA id y24-20020aa78558000000b0068fb8080939sm6780553pfn.65.2023.09.18.02.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 02:54:55 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: dmitry.fomichev@wdc.com, Markus Armbruster , Eric Blake , dlemoal@kernel.org, Hanna Reitz , stefanha@redhat.com, hare@suse.de, Kevin Wolf , qemu-block@nongnu.org, Sam Li Subject: [PATCH v4 3/4] qcow2: add zoned emulation capability Date: Mon, 18 Sep 2023 17:53:12 +0800 Message-Id: <20230918095313.5492-4-faithilikerun@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230918095313.5492-1-faithilikerun@gmail.com> References: <20230918095313.5492-1-faithilikerun@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::332; envelope-from=faithilikerun@gmail.com; helo=mail-ot1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org By adding zone operations and zoned metadata, the zoned emulation capability enables full emulation support of zoned device using a qcow2 file. The zoned device metadata includes zone type, zoned device state and write pointer of each zone, which is stored to an array of unsigned integers. Each zone of a zoned device makes state transitions following the zone state machine. The zone state machine mainly describes five states, IMPLICIT OPEN, EXPLICIT OPEN, FULL, EMPTY and CLOSED. READ ONLY and OFFLINE states will generally be affected by device internal events. The operations on zones cause corresponding state changing. Zoned devices have a limit on zone resources, which puts constraints on write operations into zones. Signed-off-by: Sam Li --- block/qcow2.c | 709 ++++++++++++++++++++++++++++++++++++++++- block/qcow2.h | 2 + block/trace-events | 2 + docs/interop/qcow2.txt | 6 + 4 files changed, 717 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 521276fc51..8240f74de8 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -194,6 +194,156 @@ qcow2_extract_crypto_opts(QemuOpts *opts, const char *fmt, Error **errp) return cryptoopts_qdict; } +#define QCOW2_ZT_IS_CONV(wp) (wp & 1ULL << 59) + +/* + * To emulate a real zoned device, closed, empty and full states are + * preserved after a power cycle. Open states are in-memory and will + * be lost after closing the device. Read-only and offline states are + * device-internal events, which are not considered for simplicity. + */ +static inline BlockZoneState qcow2_get_zs(BlockDriverState *bs, + uint32_t index) +{ + BDRVQcow2State *s = bs->opaque; + uint64_t zone_wp; + uint64_t zone_start; + + if (QLIST_IS_INSERTED(&s->wp[index], exp_open_zone_entry)) { + return BLK_ZS_EOPEN; + } else if (QLIST_IS_INSERTED(&s->wp[index], imp_open_zone_entry)) { + return BLK_ZS_IOPEN; + } + + zone_start = index * bs->bl.zone_size; + zone_wp = bs->wps->wp[index]; + if (zone_wp == zone_start) { + return BLK_ZS_EMPTY; + } else if (zone_wp >= zone_start + bs->bl.zone_capacity) { + return BLK_ZS_FULL; + } else if (zone_wp > zone_start) { + return BLK_ZS_CLOSED; + } else { + return BLK_ZS_NOT_WP; + } +} + +/* + * Write the new wp value to the dedicated location of the disk file. + */ +static int qcow2_write_wp_at(BlockDriverState *bs, uint64_t *wp, + uint32_t index) { + BDRVQcow2State *s = bs->opaque; + uint64_t wpv = *wp; + int ret; + + ret = bdrv_pwrite(bs->file, s->zoned_header.zonedmeta_offset + + sizeof(uint64_t) * index, sizeof(uint64_t), wp, 0); + if (ret < 0) { + goto exit; + } + trace_qcow2_wp_tracking(index, *wp >> BDRV_SECTOR_BITS); + return ret; + +exit: + *wp = wpv; + error_report("Failed to write metadata with file"); + return ret; +} + +static bool qcow2_check_active_zones(BlockDriverState *bs) +{ + BDRVQcow2State *s = bs->opaque; + if (!s->zoned_header.max_active_zones) { + return true; + } + + if (s->nr_zones_exp_open + s->nr_zones_imp_open + s->nr_zones_closed + < s->zoned_header.max_active_zones) { + return true; + } + + return false; +} + +static bool qcow2_check_open_zones(BlockDriverState *bs) +{ + BDRVQcow2State *s = bs->opaque; + if (!s->zoned_header.max_open_zones) { + return true; + } + + if (s->nr_zones_exp_open + s->nr_zones_imp_open + < s->zoned_header.max_open_zones) { + return true; + } + + if(s->nr_zones_imp_open && qcow2_check_active_zones(bs)) { + /* + * close one implicitly open zone only when there is room left + * for active zones + */ + QLIST_REMOVE(&s->wp[0], imp_open_zone_entry); + s->nr_zones_imp_open--; + trace_qcow2_imp_open_zones(0x23, s->nr_zones_imp_open); + s->nr_zones_closed++; + return true; + } + + return false; +} + +/* + * The zoned device has limited zone resources of open, closed, active + * zones. This function manages open zones with the constraint of max + * active zones limit. It checks if a zone can transition to implicit open + * or explicit open while maintaining max open zone and max active zone + * limits. + * + * Implicit open state can change to closed only if there is no room of + * open zones. Meanwhile, it must be within the active zone limit. + */ +static int qcow2_check_zone_resources(BlockDriverState *bs, + BlockZoneState zs) +{ + switch (zs) { + case BLK_ZS_EMPTY: + if (!qcow2_check_active_zones(bs)) { + error_report("No enough active zones"); + return -EINVAL; + } + break; + case BLK_ZS_CLOSED: + if (!qcow2_check_open_zones(bs)) { + error_report("No enough open zones"); + return -EINVAL; + } + break; + default: + /* Other states will not affect zone resources management */ + return -EINVAL; + } + return 0; +} + +static inline int qcow2_refresh_zonedmeta(BlockDriverState *bs) +{ + int ret; + BDRVQcow2State *s = bs->opaque; + uint64_t wps_size = s->zoned_header.zonedmeta_size; + g_autofree uint64_t *temp = NULL; + temp = g_new(uint64_t, wps_size); + ret = bdrv_pread(bs->file, s->zoned_header.zonedmeta_offset, + wps_size, temp, 0); + if (ret < 0) { + error_report("Can not read metadata"); + return ret; + } + + memcpy(bs->wps->wp, temp, wps_size); + return 0; +} + /* * read qcow2 extension and fill bs * start reading from start_offset @@ -455,7 +605,28 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, be32_to_cpu(zoned_ext.max_active_zones); zoned_ext.max_append_sectors = be32_to_cpu(zoned_ext.max_append_sectors); + zoned_ext.zonedmeta_offset = + be64_to_cpu(zoned_ext.zonedmeta_offset); + zoned_ext.zonedmeta_size = be64_to_cpu(zoned_ext.zonedmeta_size); s->zoned_header = zoned_ext; + bs->wps = g_malloc(sizeof(BlockZoneWps) + + s->zoned_header.zonedmeta_size); + ret = qcow2_refresh_zonedmeta(bs); + if (ret < 0) { + error_setg_errno(errp, -ret, "zonedmeta: " + "Could not update zoned meta"); + return ret; + } + Qcow2Wp *q_wp; + s->wp = g_new0(Qcow2Wp, zoned_ext.nr_zones); + q_wp = s->wp; + for (int i = 0; i < zoned_ext.nr_zones; i++, q_wp++) { + q_wp->wp = bs->wps->wp[i]; + } + + QLIST_INIT(&s->exp_open_zones); + QLIST_INIT(&s->imp_open_zones); + qemu_co_mutex_init(&bs->wps->colock); /* refuse to open broken images */ if (zoned_ext.zone_size == 0) { @@ -2716,9 +2887,37 @@ qcow2_co_pwritev_part(BlockDriverState *bs, int64_t offset, int64_t bytes, uint64_t host_offset; QCowL2Meta *l2meta = NULL; AioTaskPool *aio = NULL; + int64_t start_offset, start_bytes; + BlockZoneState zs; + int64_t end; + uint64_t *wp; + int64_t zone_size = bs->bl.zone_size; + int index; trace_qcow2_writev_start_req(qemu_coroutine_self(), offset, bytes); + start_offset = offset; + start_bytes = bytes; + if (bs->bl.zoned == BLK_Z_HM) { + /* + * The offset should not less than the wp of that zone where + * offset starts. + */ + index = start_offset / zone_size; + wp = &bs->wps->wp[index]; + if (offset < *wp) { + return -EINVAL; + } + + /* Only allow writes when there are zone resources left */ + zs = qcow2_get_zs(bs, index); + if (zs == BLK_ZS_CLOSED || zs == BLK_ZS_EMPTY) { + if (qcow2_check_zone_resources(bs, zs) < 0) { + return -EINVAL; + } + } + } + while (bytes != 0 && aio_task_pool_status(aio) == 0) { l2meta = NULL; @@ -2764,6 +2963,57 @@ qcow2_co_pwritev_part(BlockDriverState *bs, int64_t offset, int64_t bytes, qiov_offset += cur_bytes; trace_qcow2_writev_done_part(qemu_coroutine_self(), cur_bytes); } + + if (bs->bl.zoned == BLK_Z_HM) { + index = start_offset / zone_size; + wp = &bs->wps->wp[index]; + zs = qcow2_get_zs(bs, index); + uint64_t wpv = *wp; + if (!QCOW2_ZT_IS_CONV(wpv)) { + /* align up (start_offset, zone_size), the start offset is not + * necessarily power of two. */ + end = ((start_offset + zone_size) / zone_size) * zone_size; + if (start_offset + start_bytes <= end) { + *wp = start_offset + start_bytes; + } else { + ret = -EINVAL; + goto fail_nometa; + } + + ret = qcow2_write_wp_at(bs, wp, index); + if (ret < 0) { + goto fail_nometa; + } + + /* + * The zone state transitions to implicit open when the original + * state is empty or closed. When the wp reaches the end, the + * open states (explicit open, implicit open) become full. + */ + if (!(*wp & (zone_size - 1))) { + Qcow2Wp *q_wp = &s->wp[index]; + /* Being aligned to zone size implies full state */ + if (QLIST_IS_INSERTED(q_wp, exp_open_zone_entry)) { + QLIST_REMOVE(q_wp, exp_open_zone_entry); + s->nr_zones_exp_open--; + } else if (QLIST_IS_INSERTED(q_wp, imp_open_zone_entry)) { + QLIST_REMOVE(q_wp, imp_open_zone_entry); + s->nr_zones_imp_open--; + trace_qcow2_imp_open_zones(0x24, s->nr_zones_imp_open); + } + } else { + if (zs == BLK_ZS_CLOSED || zs == BLK_ZS_EMPTY) { + QLIST_INSERT_HEAD(&s->imp_open_zones, &s->wp[index], + imp_open_zone_entry); + s->nr_zones_imp_open++; + + if (zs == BLK_ZS_CLOSED) { + s->nr_zones_closed--; + } + } + } + } + } ret = 0; qemu_co_mutex_lock(&s->lock); @@ -2822,6 +3072,25 @@ static int qcow2_inactivate(BlockDriverState *bs) return result; } +static void qcow2_zoned_close(BDRVQcow2State *s) +{ + Qcow2Wp *wp, *next; + + QLIST_FOREACH_SAFE(wp, &s->imp_open_zones, imp_open_zone_entry, next) { + QLIST_REMOVE(wp, imp_open_zone_entry); + s->nr_zones_imp_open--; + trace_qcow2_imp_open_zones(0x22, s->nr_zones_imp_open); + } + + QLIST_FOREACH_SAFE(wp, &s->exp_open_zones, exp_open_zone_entry, next) { + QLIST_REMOVE(wp, exp_open_zone_entry); + s->nr_zones_exp_open--; + } + + assert(s->nr_zones_imp_open + s->nr_zones_exp_open == 0); + g_free(s->wp); +} + static void qcow2_do_close(BlockDriverState *bs, bool close_data_file) { BDRVQcow2State *s = bs->opaque; @@ -2855,6 +3124,8 @@ static void qcow2_do_close(BlockDriverState *bs, bool close_data_file) qcow2_refcount_close(bs); qcow2_free_snapshots(bs); + qcow2_zoned_close(s); + g_free(bs->wps); } static void qcow2_close(BlockDriverState *bs) @@ -3160,7 +3431,9 @@ int qcow2_update_header(BlockDriverState *bs) .max_active_zones = cpu_to_be32(s->zoned_header.max_active_zones), .max_append_sectors = - cpu_to_be32(s->zoned_header.max_append_sectors) + cpu_to_be32(s->zoned_header.max_append_sectors), + .zonedmeta_offset = cpu_to_be64(s->zoned_header.zonedmeta_offset), + .zonedmeta_size = cpu_to_be64(s->zoned_header.zonedmeta_size) }; ret = header_ext_add(buf, QCOW2_EXT_MAGIC_ZONED_FORMAT, &zoned_header, sizeof(zoned_header), @@ -3565,7 +3838,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) int version; int refcount_order; uint64_t *refcount_table; - int ret; + uint64_t zoned_meta_size, zoned_clusterlen; + int ret, offset, i; uint8_t compression_type = QCOW2_COMPRESSION_TYPE_ZLIB; assert(create_options->driver == BLOCKDEV_DRIVER_QCOW2); @@ -3911,6 +4185,46 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp) } } s->zoned_header.max_append_sectors = qcow2_opts->max_append_sectors; + + uint32_t nrz = s->zoned_header.nr_zones; + zoned_meta_size = sizeof(uint64_t) * nrz; + g_autofree uint64_t *meta = NULL; + meta = g_new0(uint64_t, nrz); + + for (i = 0; i < s->zoned_header.nr_conv_zones; ++i) { + meta[i] = i * s->zoned_header.zone_size; + meta[i] |= 1ULL << 59; + } + + for (; i < nrz; ++i) { + meta[i] = i * s->zoned_header.zone_size; + } + + offset = qcow2_alloc_clusters(blk_bs(blk), zoned_meta_size); + if (offset < 0) { + error_setg_errno(errp, -offset, "Could not allocate clusters " + "for zoned metadata size"); + goto out; + } + s->zoned_header.zonedmeta_offset = offset; + s->zoned_header.zonedmeta_size = zoned_meta_size; + + zoned_clusterlen = size_to_clusters(s, zoned_meta_size) + * s->cluster_size; + assert(qcow2_pre_write_overlap_check(bs, 0, offset, + zoned_clusterlen,false) == 0); + ret = bdrv_pwrite_zeroes(blk_bs(blk)->file, offset, + zoned_clusterlen, 0); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not zero fill zoned metadata"); + goto out; + } + ret = bdrv_pwrite(blk_bs(blk)->file, offset, zoned_meta_size, meta, 0); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not write zoned metadata " + "to disk"); + goto out; + } } else { s->zoned_header.zoned = BLK_Z_NONE; } @@ -4249,6 +4563,393 @@ static coroutine_fn int qcow2_co_pdiscard(BlockDriverState *bs, return ret; } +static int coroutine_fn +qcow2_co_zone_report(BlockDriverState *bs, int64_t offset, + unsigned int *nr_zones, BlockZoneDescriptor *zones) +{ + BDRVQcow2State *s = bs->opaque; + uint64_t zone_size = s->zoned_header.zone_size; + int64_t capacity = bs->total_sectors << BDRV_SECTOR_BITS; + int64_t size = bs->bl.nr_zones * zone_size; + unsigned int nrz = *nr_zones; + int i = 0; + int si; + + if (offset >= capacity) { + error_report("offset %" PRId64 " is equal to or greater than the" + "device capacity %" PRId64 "", offset, capacity); + return -EINVAL; + } + + if (nrz > bs->bl.nr_zones) { + error_report("nr_zones %" PRId32 " should not exceed the device zones" + "%" PRId32 "", nrz, bs->bl.nr_zones); + return -EINVAL; + } + + if (zone_size > 0) { + si = offset / zone_size; + qemu_co_mutex_lock(&bs->wps->colock); + for (; i < nrz; ++i) { + if (i + si >= bs->bl.nr_zones) { + break; + } + + zones[i].start = (si + i) * zone_size; + + /* The last zone can be smaller than the zone size */ + if ((si + i + 1) == bs->bl.nr_zones && size > capacity) { + uint32_t l = zone_size - (size - capacity); + zones[i].length = l; + zones[i].cap = l; + } else { + zones[i].length = zone_size; + zones[i].cap = zone_size; + } + + uint64_t wp = bs->wps->wp[si + i]; + if (QCOW2_ZT_IS_CONV(wp)) { + zones[i].type = BLK_ZT_CONV; + zones[i].state = BLK_ZS_NOT_WP; + /* Clear the zone type bit */ + wp &= ~(1ULL << 59); + } else { + zones[i].type = BLK_ZT_SWR; + zones[i].state = qcow2_get_zs(bs, si + i); + } + zones[i].wp = wp; + } + qemu_co_mutex_unlock(&bs->wps->colock); + } + *nr_zones = i; + return 0; +} + +static int qcow2_open_zone(BlockDriverState *bs, uint32_t index) { + BDRVQcow2State *s = bs->opaque; + int ret; + + qemu_co_mutex_lock(&bs->wps->colock); + uint64_t *wp = &bs->wps->wp[index]; + BlockZoneState zs = qcow2_get_zs(bs, index); + + switch(zs) { + case BLK_ZS_EMPTY: + ret = qcow2_check_zone_resources(bs, BLK_ZS_EMPTY); + if (ret < 0) { + goto unlock; + } + break; + case BLK_ZS_IOPEN: + QLIST_REMOVE(&s->wp[index], imp_open_zone_entry); + s->nr_zones_imp_open--; + trace_qcow2_imp_open_zones(BLK_ZO_OPEN, s->nr_zones_imp_open); + break; + case BLK_ZS_EOPEN: + return 0; + case BLK_ZS_CLOSED: + ret = qcow2_check_zone_resources(bs, BLK_ZS_CLOSED); + if (ret < 0) { + goto unlock; + } + s->nr_zones_closed--; + break; + case BLK_ZS_FULL: + break; + default: + ret = -EINVAL; + goto unlock; + } + + ret = qcow2_write_wp_at(bs, wp, index); + if (!ret) { + QLIST_INSERT_HEAD(&s->exp_open_zones, &s->wp[index], + exp_open_zone_entry); + s->nr_zones_exp_open++; + } + +unlock: + qemu_co_mutex_unlock(&bs->wps->colock); + return ret; +} + +static int qcow2_close_zone(BlockDriverState *bs, uint32_t index) { + BDRVQcow2State *s = bs->opaque; + int ret; + + qemu_co_mutex_lock(&bs->wps->colock); + BlockZoneState zs = qcow2_get_zs(bs, index); + + switch(zs) { + case BLK_ZS_EMPTY: + break; + case BLK_ZS_IOPEN: + QLIST_REMOVE(&s->wp[index], imp_open_zone_entry); + s->nr_zones_imp_open--; + trace_qcow2_imp_open_zones(BLK_ZO_CLOSE, s->nr_zones_imp_open); + break; + case BLK_ZS_EOPEN: + QLIST_REMOVE(&s->wp[index], exp_open_zone_entry); + s->nr_zones_exp_open--; + break; + case BLK_ZS_CLOSED: + ret = qcow2_check_zone_resources(bs, BLK_ZS_CLOSED); + if (ret < 0) { + goto unlock; + } + s->nr_zones_closed--; + break; + case BLK_ZS_FULL: + break; + default: + ret = -EINVAL; + goto unlock; + } + + if (qcow2_get_zs(bs, index) == BLK_ZS_CLOSED) { + s->nr_zones_closed++; + } + ret = 0; + +unlock: + qemu_co_mutex_unlock(&bs->wps->colock); + return ret; +} + +static int qcow2_finish_zone(BlockDriverState *bs, uint32_t index) { + BDRVQcow2State *s = bs->opaque; + int ret; + + qemu_co_mutex_lock(&bs->wps->colock); + uint64_t *wp = &bs->wps->wp[index]; + BlockZoneState zs = qcow2_get_zs(bs, index); + + switch(zs) { + case BLK_ZS_EMPTY: + ret = qcow2_check_zone_resources(bs, BLK_ZS_EMPTY); + if (ret < 0) { + goto unlock; + } + break; + case BLK_ZS_IOPEN: + QLIST_REMOVE(&s->wp[index], imp_open_zone_entry); + s->nr_zones_imp_open--; + trace_qcow2_imp_open_zones(BLK_ZO_FINISH, s->nr_zones_imp_open); + break; + case BLK_ZS_EOPEN: + QLIST_REMOVE(&s->wp[index], exp_open_zone_entry); + s->nr_zones_exp_open--; + break; + case BLK_ZS_CLOSED: + ret = qcow2_check_zone_resources(bs, BLK_ZS_CLOSED); + if (ret < 0) { + goto unlock; + } + s->nr_zones_closed--; + break; + case BLK_ZS_FULL: + ret = 0; + goto unlock; + default: + ret = -EINVAL; + goto unlock; + } + + *wp = ((uint64_t)index + 1) * s->zoned_header.zone_size; + ret = qcow2_write_wp_at(bs, wp, index); + +unlock: + qemu_co_mutex_unlock(&bs->wps->colock); + return ret; +} + +static int qcow2_reset_zone(BlockDriverState *bs, uint32_t index, + int64_t len) { + BDRVQcow2State *s = bs->opaque; + int nrz = bs->bl.nr_zones; + int zone_size = bs->bl.zone_size; + int n, ret = 0; + + qemu_co_mutex_lock(&bs->wps->colock); + uint64_t *wp = &bs->wps->wp[index]; + if (len == bs->total_sectors << BDRV_SECTOR_BITS) { + n = nrz; + index = 0; + } else { + n = len / zone_size; + } + + for (int i = 0; i < n; ++i) { + uint64_t *wp_i = (uint64_t *)(wp + i); + uint64_t wpi_v = *wp_i; + if (QCOW2_ZT_IS_CONV(wpi_v)) { + continue; + } + + BlockZoneState zs = qcow2_get_zs(bs, index + i); + switch (zs) { + case BLK_ZS_EMPTY: + break; + case BLK_ZS_IOPEN: + QLIST_REMOVE(&s->wp[index + i], imp_open_zone_entry); + s->nr_zones_imp_open--; + trace_qcow2_imp_open_zones(BLK_ZO_RESET, s->nr_zones_imp_open); + break; + case BLK_ZS_EOPEN: + QLIST_REMOVE(&s->wp[index + i], exp_open_zone_entry); + s->nr_zones_exp_open--; + break; + case BLK_ZS_CLOSED: + s->nr_zones_closed--; + break; + case BLK_ZS_FULL: + break; + default: + ret = -EINVAL; + goto unlock; + } + + if (zs == BLK_ZS_EMPTY) { + continue; + } + + *wp_i = ((uint64_t)index + i) * zone_size; + ret = qcow2_write_wp_at(bs, wp_i, index + i); + if (ret < 0) { + goto unlock; + } + /* clear data */ + ret = qcow2_co_pwrite_zeroes(bs, *wp_i, zone_size, 0); + if (ret < 0) { + error_report("Failed to reset zone at 0x%" PRIx64 "", *wp_i); + } + } + +unlock: + qemu_co_mutex_unlock(&bs->wps->colock); + return ret; +} + +static int coroutine_fn qcow2_co_zone_mgmt(BlockDriverState *bs, BlockZoneOp op, + int64_t offset, int64_t len) +{ + BDRVQcow2State *s = bs->opaque; + int ret = 0; + int64_t capacity = bs->total_sectors << BDRV_SECTOR_BITS; + int64_t zone_size = s->zoned_header.zone_size; + int64_t zone_size_mask = zone_size - 1; + uint32_t index = offset / zone_size; + BlockZoneWps *wps = bs->wps; + + if (offset >= capacity) { + error_report("offset %" PRId64 " is equal to or greater than the" + "device capacity %" PRId64 "", offset, capacity); + return -EINVAL; + } + + if (offset & zone_size_mask) { + error_report("sector offset %" PRId64 " is not aligned to zone size" + " %" PRId64 "", offset / 512, zone_size / 512); + return -EINVAL; + } + + if (((offset + len) < capacity && len & zone_size_mask) || + offset + len > capacity) { + error_report("number of sectors %" PRId64 " is not aligned to zone" + " size %" PRId64 "", len / 512, zone_size / 512); + return -EINVAL; + } + + qemu_co_mutex_lock(&wps->colock); + uint64_t wpv = wps->wp[index]; + if (QCOW2_ZT_IS_CONV(wpv) && len != capacity) { + error_report("zone mgmt operations are not allowed for " + "conventional zones"); + ret = -EIO; + goto unlock; + } + qemu_co_mutex_unlock(&wps->colock); + + switch(op) { + case BLK_ZO_OPEN: + ret = qcow2_open_zone(bs, index); + break; + case BLK_ZO_CLOSE: + ret = qcow2_close_zone(bs, index); + break; + case BLK_ZO_FINISH: + ret = qcow2_finish_zone(bs, index); + break; + case BLK_ZO_RESET: + ret = qcow2_reset_zone(bs, index, len); + break; + default: + error_report("Unsupported zone op: 0x%x", op); + ret = -ENOTSUP; + break; + } + return ret; + +unlock: + qemu_co_mutex_unlock(&wps->colock); + return ret; +} + +static int coroutine_fn +qcow2_co_zone_append(BlockDriverState *bs, int64_t *offset, QEMUIOVector *qiov, + BdrvRequestFlags flags) +{ + assert(flags == 0); + int64_t capacity = bs->total_sectors << BDRV_SECTOR_BITS; + uint32_t index; + int ret; + int64_t zone_size_mask = bs->bl.zone_size - 1; + int64_t iov_len = 0; + int64_t len = 0; + + if (*offset >= capacity) { + error_report("*offset %" PRId64 " is equal to or greater than the" + "device capacity %" PRId64 "", *offset, capacity); + return -EINVAL; + } + + /* offset + len should not pass the end of that zone starting from offset */ + if (*offset & zone_size_mask) { + error_report("sector offset %" PRId64 " is not aligned to zone size " + "%" PRId32 "", *offset / 512, bs->bl.zone_size / 512); + return -EINVAL; + } + + int64_t wg = bs->bl.write_granularity; + int64_t wg_mask = wg - 1; + for (int i = 0; i < qiov->niov; i++) { + iov_len = qiov->iov[i].iov_len; + if (iov_len & wg_mask) { + error_report("len of IOVector[%d] %" PRId64 " is not aligned to " + "block size %" PRId64 "", i, iov_len, wg); + return -EINVAL; + } + } + len = qiov->size; + index = *offset / bs->bl.zone_size; + + if ((len >> BDRV_SECTOR_BITS) > bs->bl.max_append_sectors) { + return -ENOTSUP; + } + + qemu_co_mutex_lock(&bs->wps->colock); + uint64_t wp_i = bs->wps->wp[index]; + ret = qcow2_co_pwritev_part(bs, wp_i, len, qiov, 0, 0); + if (ret == 0) { + *offset = wp_i; + } else { + error_report("qcow2: zap failed"); + } + + qemu_co_mutex_unlock(&bs->wps->colock); + return ret; +} + static int coroutine_fn GRAPH_RDLOCK qcow2_co_copy_range_from(BlockDriverState *bs, BdrvChild *src, int64_t src_offset, @@ -6298,6 +6999,10 @@ BlockDriver bdrv_qcow2 = { .bdrv_co_pwritev_part = qcow2_co_pwritev_part, .bdrv_co_flush_to_os = qcow2_co_flush_to_os, + .bdrv_co_zone_report = qcow2_co_zone_report, + .bdrv_co_zone_mgmt = qcow2_co_zone_mgmt, + .bdrv_co_zone_append = qcow2_co_zone_append, + .bdrv_co_pwrite_zeroes = qcow2_co_pwrite_zeroes, .bdrv_co_pdiscard = qcow2_co_pdiscard, .bdrv_co_copy_range_from = qcow2_co_copy_range_from, diff --git a/block/qcow2.h b/block/qcow2.h index 1929788494..b0cd50dd33 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -247,6 +247,8 @@ typedef struct Qcow2ZonedHeaderExtension { uint32_t max_active_zones; uint32_t max_open_zones; uint32_t max_append_sectors; + uint64_t zonedmeta_offset; + uint64_t zonedmeta_size; } QEMU_PACKED Qcow2ZonedHeaderExtension; typedef struct Qcow2Wp { diff --git a/block/trace-events b/block/trace-events index 6f121b7636..ca589e303a 100644 --- a/block/trace-events +++ b/block/trace-events @@ -82,6 +82,8 @@ qcow2_writev_data(void *co, uint64_t offset) "co %p offset 0x%" PRIx64 qcow2_pwrite_zeroes_start_req(void *co, int64_t offset, int64_t bytes) "co %p offset 0x%" PRIx64 " bytes %" PRId64 qcow2_pwrite_zeroes(void *co, int64_t offset, int64_t bytes) "co %p offset 0x%" PRIx64 " bytes %" PRId64 qcow2_skip_cow(void *co, uint64_t offset, int nb_clusters) "co %p offset 0x%" PRIx64 " nb_clusters %d" +qcow2_wp_tracking(int index, uint64_t wp) "wps[%d]: 0x%" PRIx64 +qcow2_imp_open_zones(uint8_t op, int nrz) "nr_imp_open_zones after op 0x%x: %d" # qcow2-cluster.c qcow2_alloc_clusters_offset(void *co, uint64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d" diff --git a/docs/interop/qcow2.txt b/docs/interop/qcow2.txt index 80314614aa..a691a8aceb 100644 --- a/docs/interop/qcow2.txt +++ b/docs/interop/qcow2.txt @@ -367,6 +367,12 @@ The fields of the zoned extension are: The maximal number of 512-byte sectors of a zone append request that can be issued to the device. + 36 - 43: zonedmeta_offset + The offset of zoned metadata structure in the file in bytes. + + 44 - 51: zonedmeta_size + The size of zoned metadata in bytes. + == Full disk encryption header pointer == The full disk encryption header must be present if, and only if, the From patchwork Mon Sep 18 09:53:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Li X-Patchwork-Id: 13389361 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6265C46CA1 for ; Mon, 18 Sep 2023 09:55:20 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiAyG-0004Qp-07; Mon, 18 Sep 2023 05:55:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiAyE-0004QF-LE; Mon, 18 Sep 2023 05:55:10 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiAyB-0002YB-Pp; Mon, 18 Sep 2023 05:55:10 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-68fb898ab3bso3218472b3a.3; Mon, 18 Sep 2023 02:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695030905; x=1695635705; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5XEg6fx9X1yK3mjuewyeyVxc+jZW0WnORrc+Ci4vDo0=; b=Ei2rndtl3KGJcxUYKOZOwKW2BXcW9n6yzDvRiAzUX5I6eNVhYpBHc7a8qDM4qFc+tZ 5ymEaaN3b6rpHCAhPurAwmUWICbxZA18KxBA71hmHk9wWwR8/+v/iM84uzyKN+3fSrGR +Wq/esQNmGyB4BppP8wKvhsRERJigLa8Nan28I/sU3aQpvwpPAEI7cvQ28cnaVaboPrw BpB8LmDFwIu5aIJ+h0SBjpZDf+1x4xznaXy+sfWI6wjrLENNhD1TBjcFeXV+YE9p37Hz IJej7TNsdz6pEBrrQxR6g+u5bLZR50GhytU8eJbIHuLf/TXANohm6BRIrH7eGlKXLRFC dkqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695030905; x=1695635705; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5XEg6fx9X1yK3mjuewyeyVxc+jZW0WnORrc+Ci4vDo0=; b=gd0L4rb0lviiZ07q5KK6D6vSBehGjjB4Fxzn9da2rICVgpwkcsIitcGgrNDikLCCgp LtYbyY8c1cbSKKnAzJ1NHJrFBZMx1aQhQL/JqW1E1p2ySjZpmCdPdQZd2Gip02/+hmxS BwWulDA0T6yjK852rk1vB9yW7cUr8N85jEcbNzCTFKA1BvR8orXxsRVoLTjE4z/0iBJh MomUPHVSCTG0LJAFIsIfYTSgUH/KBm3dWwYStTNGP/P8o0ykS0oKverQe4BsRM9+k/Ev jOjr6R80sYPz1zsfcWcqxA0FMw+/Hnk5VLtQ5QsmxCAtv888mpESWQIxgbUyX/RHoNwI wPdQ== X-Gm-Message-State: AOJu0Yy8epa/1WvvwsBrXqwBJwR3Rik43P+WPfJw6Dyl1Uwqsc6cokhi vQkRIgMYN/bNYAVOpjxnrQJgb2DWgJcFh1i1+aI= X-Google-Smtp-Source: AGHT+IH/iZSniaAdBOFUw76BHi9AnBPpIShnLcJ5sb+lWghJHpgwci5W/KBMA8gt6Sj6BG04eQyL1A== X-Received: by 2002:a05:6a20:5652:b0:155:2359:e28c with SMTP id is18-20020a056a20565200b001552359e28cmr6967267pzc.9.1695030904139; Mon, 18 Sep 2023 02:55:04 -0700 (PDT) Received: from fedlinux.. ([106.84.131.213]) by smtp.gmail.com with ESMTPSA id y24-20020aa78558000000b0068fb8080939sm6780553pfn.65.2023.09.18.02.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 02:55:03 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: dmitry.fomichev@wdc.com, Markus Armbruster , Eric Blake , dlemoal@kernel.org, Hanna Reitz , stefanha@redhat.com, hare@suse.de, Kevin Wolf , qemu-block@nongnu.org, Sam Li Subject: [PATCH v4 4/4] iotests: test the zoned format feature for qcow2 file Date: Mon, 18 Sep 2023 17:53:13 +0800 Message-Id: <20230918095313.5492-5-faithilikerun@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230918095313.5492-1-faithilikerun@gmail.com> References: <20230918095313.5492-1-faithilikerun@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=faithilikerun@gmail.com; helo=mail-pf1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The zoned format feature can be tested by: $ tests/qemu-iotests/check -qcow2 zoned-qcow2 Signed-off-by: Sam Li Reviewed-by: Stefan Hajnoczi --- tests/qemu-iotests/tests/zoned-qcow2 | 129 ++++++++++++++++++++++ tests/qemu-iotests/tests/zoned-qcow2.out | 133 +++++++++++++++++++++++ 2 files changed, 262 insertions(+) create mode 100755 tests/qemu-iotests/tests/zoned-qcow2 create mode 100644 tests/qemu-iotests/tests/zoned-qcow2.out diff --git a/tests/qemu-iotests/tests/zoned-qcow2 b/tests/qemu-iotests/tests/zoned-qcow2 new file mode 100755 index 0000000000..22e34ff6a0 --- /dev/null +++ b/tests/qemu-iotests/tests/zoned-qcow2 @@ -0,0 +1,129 @@ +#!/usr/bin/env bash +# +# Test zone management operations for qcow2 file. +# + +seq="$(basename $0)" +echo "QA output created by $seq" +status=1 # failure is the default! + +file_name="zbc.qcow2" +_cleanup() +{ + _cleanup_test_img + _rm_test_img "$file_name" +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ../common.rc +. ../common.filter +. ../common.qemu + +# This test only runs on Linux hosts with qcow2 image files. +_supported_fmt qcow2 +_supported_proto file +_supported_os Linux + +echo +echo "=== Initial image setup ===" +echo + +$QEMU_IMG create -f qcow2 $file_name -o size=768M -o zone_size=64M \ +-o zone_capacity=64M -o nr_conv_zones=0 -o max_append_sectors=131072 \ +-o max_open_zones=0 -o max_active_zones=0 -o zone_model=1 + +IMG="--image-opts -n driver=qcow2,file.driver=file,file.filename=$file_name" +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT + +echo +echo "=== Testing a qcow2 img with zoned format ===" +echo +echo "case 1: test persistent zone states" + +echo "(1) report zones[0]:" +$QEMU_IO $IMG -c "zrp 0 1" +echo +echo "report zones[0~9]:" +$QEMU_IO $IMG -c "zrp 0 10" +echo +echo "report the last zone:" +$QEMU_IO $IMG -c "zrp 0x2C000000 2" # 0x2C000000 / 512 = 0x160000 +echo +echo +echo "(2) finish zones[0]:" +$QEMU_IO $IMG -c "zf 0 0x4000000" # 0x4000000 / 512 = 0x20000 +$QEMU_IO $IMG -c "zrp 0 1" +echo +echo "finish zones[1]" +$QEMU_IO $IMG -c "zf 64M 64M" +$QEMU_IO $IMG -c "zrp 0x4000000 1" +echo +echo "finish the last zone" +$QEMU_IO $IMG -c "zf 0x2C000000 0x4000000" +$QEMU_IO $IMG -c "zrp 0x2C000000 2" +echo +echo +echo "(3) reset zones[0]: full => empty" +$QEMU_IO $IMG -c "zrs 0 0x4000000" # 0x4000000 / 512 = 0x20000 +$QEMU_IO $IMG -c "zrp 0 1" +echo +echo "reset zones[1]:" +$QEMU_IO $IMG -c "zrs 0x4000000 0x4000000" +$QEMU_IO $IMG -c "zrp 0x4000000 1" +echo +echo "reset the last zone" +$QEMU_IO $IMG -c "zrs 0x2C000000 0x4000000" +$QEMU_IO $IMG -c "zrp 0x2C000000 2" +echo +echo +echo "(4) append write with (4k, 8k) data" # the physical block size of the device is 4096 +$QEMU_IO $IMG -c "zrp 0 12" +echo "Append write zones[0] one time:" +$QEMU_IO $IMG -c "zap -p 0 0x1000 0x2000" +$QEMU_IO $IMG -c "zrp 0 1" +echo +echo "Append write zones[0] twice:" +$QEMU_IO $IMG -c "zap -p 0 0x1000 0x2000" +$QEMU_IO $IMG -c "zrp 0 1" +echo +echo "Append write zones[1] one time:" +$QEMU_IO $IMG -c "zap -p 0x4000000 0x1000 0x2000" +$QEMU_IO $IMG -c "zrp 0x4000000 1" +echo +echo "Append write zones[1] twice:" +$QEMU_IO $IMG -c "zap -p 0x4000000 0x1000 0x2000" +$QEMU_IO $IMG -c "zrp 0x4000000 1" +echo +echo "Reset all:" +$QEMU_IO $IMG -c "zrs 0 768M" +$QEMU_IO $IMG -c "zrp 0 12" +echo +echo +echo "case 2: test a sets of ops that works or not" + +echo "(1) append write (4k, 4k) and then write to full" +$QEMU_IO $IMG -c "zap -p 0 0x1000 0x1000" +echo "wrote (4k, 4k):" +$QEMU_IO $IMG -c "zrp 0 1" +$QEMU_IO $IMG -c "zap -p 0 0x1000 0x3ffd000" +echo "wrote to full:" +$QEMU_IO $IMG -c "zrp 0 1" +echo "Reset zones[0]:" +$QEMU_IO $IMG -c "zrs 0 64M" +$QEMU_IO $IMG -c "zrp 0 1" + +echo "(2) write in zones[0], zones[3], zones[8], and then reset all" +$QEMU_IO $IMG -c "zap -p 0 0x1000 0x1000" +$QEMU_IO $IMG -c "zap -p 0xc000000 0x1000 0x1000" +$QEMU_IO $IMG -c "zap -p 0x20000000 0x1000 0x1000" +echo "wrote three zones:" +$QEMU_IO $IMG -c "zrp 0 12" +echo "Reset all:" +$QEMU_IO $IMG -c "zrs 0 768M" +$QEMU_IO $IMG -c "zrp 0 12" + +# success, all done +echo "*** done" +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/tests/zoned-qcow2.out b/tests/qemu-iotests/tests/zoned-qcow2.out new file mode 100644 index 0000000000..5aab6f1572 --- /dev/null +++ b/tests/qemu-iotests/tests/zoned-qcow2.out @@ -0,0 +1,133 @@ +QA output created by zoned-qcow2 + +=== Initial image setup === + +Formatting 'zbc.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib zone_model=1 zone_size=67108864 zone_capacity=67108864 nr_conv_zones=0 max_append_sectors=131072 max_active_zones=0 max_open_zones=0 size=805306368 lazy_refcounts=off refcount_bits=16 + +=== Testing a qcow2 img with zoned format === + +case 1: test persistent zone states +(1) report zones[0]: +start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2] + +report zones[0~9]: +start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2] +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2] +start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2] +start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2] +start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2] +start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2] +start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2] +start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2] +start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2] +start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2] + +report the last zone: +start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2] + + +(2) finish zones[0]: +start: 0x0, len 0x20000, cap 0x20000, wptr 0x20000, zcond:14, [type: 2] + +finish zones[1] +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:14, [type: 2] + +finish the last zone +start: 0x160000, len 0x20000, cap 0x20000, wptr 0x180000, zcond:14, [type: 2] + + +(3) reset zones[0]: full => empty +start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2] + +reset zones[1]: +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2] + +reset the last zone +start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2] + + +(4) append write with (4k, 8k) data +start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2] +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2] +start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2] +start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2] +start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2] +start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2] +start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2] +start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2] +start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2] +start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2] +start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2] +start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2] +Append write zones[0] one time: +After zap done, the append sector is 0x0 +start: 0x0, len 0x20000, cap 0x20000, wptr 0x18, zcond:4, [type: 2] + +Append write zones[0] twice: +After zap done, the append sector is 0x18 +start: 0x0, len 0x20000, cap 0x20000, wptr 0x30, zcond:4, [type: 2] + +Append write zones[1] one time: +After zap done, the append sector is 0x20000 +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20018, zcond:4, [type: 2] + +Append write zones[1] twice: +After zap done, the append sector is 0x20018 +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20030, zcond:4, [type: 2] + +Reset all: +start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2] +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2] +start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2] +start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2] +start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2] +start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2] +start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2] +start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2] +start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2] +start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2] +start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2] +start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2] + + +case 2: test a sets of ops that works or not +(1) append write (4k, 4k) and then write to full +After zap done, the append sector is 0x0 +wrote (4k, 4k): +start: 0x0, len 0x20000, cap 0x20000, wptr 0x10, zcond:4, [type: 2] +After zap done, the append sector is 0x10 +wrote to full: +start: 0x0, len 0x20000, cap 0x20000, wptr 0x20000, zcond:14, [type: 2] +Reset zones[0]: +start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2] +(2) write in zones[0], zones[3], zones[8], and then reset all +After zap done, the append sector is 0x0 +After zap done, the append sector is 0x60000 +After zap done, the append sector is 0x100000 +wrote three zones: +start: 0x0, len 0x20000, cap 0x20000, wptr 0x10, zcond:4, [type: 2] +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2] +start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2] +start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60010, zcond:4, [type: 2] +start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2] +start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2] +start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2] +start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2] +start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100010, zcond:4, [type: 2] +start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2] +start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2] +start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2] +Reset all: +start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2] +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, zcond:1, [type: 2] +start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2] +start: 0x60000, len 0x20000, cap 0x20000, wptr 0x60000, zcond:1, [type: 2] +start: 0x80000, len 0x20000, cap 0x20000, wptr 0x80000, zcond:1, [type: 2] +start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2] +start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2] +start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, [type: 2] +start: 0x100000, len 0x20000, cap 0x20000, wptr 0x100000, zcond:1, [type: 2] +start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120000, zcond:1, [type: 2] +start: 0x140000, len 0x20000, cap 0x20000, wptr 0x140000, zcond:1, [type: 2] +start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: 2] +*** done