From nobody Wed Nov 27 12:22:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1698668414; cv=none; d=zohomail.com; s=zohoarc; b=UAHBux6sCNmRF7JmE6SExH5exgGyf4o35h7mHgei1Umfs0QE9gB6NKlX4pVAleLAioUr+aGTvh6VHJcgY0bBlOr44aVbOhOpCRD+aqQOPqN5UvIKUOwp4Q23hQ/XeJ90d2uvKHDREASMUT7AE/HLOZVLTquFKGMKYK7jWb5i7OA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698668414; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dqILtahsmpKEGgPpWoojJBg/GYJJwPwwT5GHSZIcz4Y=; b=UqvUyH8fCOS3TJw4h+1Nu2S43XzFY3iyljokkHbPsUV7ZDXXcMZRVIxZE6+Ck68pBaELW8Q/479xLhyYts/plM3y9sOSF4oXvpyKW3y07Nv9wWZtivpzDHwvIT+kt35NPvrUI53Lmh+cYCR6MH7pKzhlI1CP/1szDFnOAHbqyOY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1698668414200498.22106316110603; Mon, 30 Oct 2023 05:20:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxREm-0005ci-JS; Mon, 30 Oct 2023 08:19:20 -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 1qxREe-0005c3-14; Mon, 30 Oct 2023 08:19:12 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxREc-0006Bv-GO; Mon, 30 Oct 2023 08:19:11 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1cc3bb32b5dso12863635ad.3; Mon, 30 Oct 2023 05:19:09 -0700 (PDT) Received: from fedlinux.. ([106.84.131.249]) by smtp.gmail.com with ESMTPSA id f12-20020a170902684c00b001b9f032bb3dsm6362339pln.3.2023.10.30.05.19.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 05:19:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698668347; x=1699273147; 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=dqILtahsmpKEGgPpWoojJBg/GYJJwPwwT5GHSZIcz4Y=; b=Tx3NZ38g4S/4Jlv0oA7PBFibB1UsYrNXj5P1uyXlDm0efgzNKd4TdMICCObHRp4V2m ndQdULLN2l2Dffo2cyBjI7WkhSqFkoCfMRimPKs5vUdPK5U7Y0OHEV/ZdostIqYLXkdQ 0IsSLNaxANVMHEmltOgmObkXQ6cj/8DRt0G+SdULg7MkZ0YfX49GhvM63hdFenQJEEa0 DQv4erwqpt18XaKQQUJ/Cl3SU0IuwW5AArTLmTozNpYOHA4YYlxhd72tcYld9r7Jt0wK GUKCGpVYFDkn0cUzIa3tR+36O3/j6CgnirZHBtolWzXtj6BJUv9rve7n9W5nD8y/IOTY jIuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698668347; x=1699273147; 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=dqILtahsmpKEGgPpWoojJBg/GYJJwPwwT5GHSZIcz4Y=; b=SBMVe6zYb73sCIbguNED+CxApB+TWj5+5p5yLC/ZWGftwxgZldbfT+TLuQj3cvzbmD D/7Vm2+LejLxkH4EIavMszTbuB7UyotlpVe9TFiP7obFIhdLvyZ9S3gEn9R4DEuf+RnE P95ZpeM6lyi/1J5+rKcwvhV6SMhnzbyk3aPnWXj5lfaz0vtnjw4TQky/fqIiMsIHscXf djUScfQBWQ6/Aty6u/D0lpsMdAyMg/EzaRu3MjbQmnr22TcQSHl5ru/p07EzQFS+pAUr //rZnNWuPsiPuMaC5fglcLCOmGus/6saIUR4khcKwbpt2iWEGmDpXiRJIBIGHHmsa5DA Y8jA== X-Gm-Message-State: AOJu0YyQh3/Ws9WH6aCycU1oEf0zdtuWz8DIoOxzRC+KjvhRqchAgssk 8hTdehu+uH1t8gQ4wtRKxp8UxgABbXEv8dJf X-Google-Smtp-Source: AGHT+IELIk39dQ8I+/8XH1ldBHGVAT5ilFu5+9R/H06FQc4IabfhyosN5eObo0xWoYlwabxDzlgu0g== X-Received: by 2002:a17:903:41c4:b0:1cc:4a84:27fa with SMTP id u4-20020a17090341c400b001cc4a8427famr2823084ple.9.1698668346909; Mon, 30 Oct 2023 05:19:06 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: Kevin Wolf , Hanna Reitz , Eric Blake , dlemoal@kernel.org, hare@suse.de, dmitry.fomichev@wdc.com, stefanha@redhat.com, qemu-block@nongnu.org, Markus Armbruster , Sam Li Subject: [PATCH v5 1/4] docs/qcow2: add the zoned format feature Date: Mon, 30 Oct 2023 20:18:44 +0800 Message-Id: <20231030121847.4522-2-faithilikerun@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231030121847.4522-1-faithilikerun@gmail.com> References: <20231030121847.4522-1-faithilikerun@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::633; envelope-from=faithilikerun@gmail.com; helo=mail-pl1-x633.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1698668416180100007 Content-Type: text/plain; charset="utf-8" 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-bloc= k-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 tha= t are supported for it. filename`` to check if the NOCOW flag is set or not (Capital 'C' is NOCOW flag). =20 + .. 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 re= al + 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 sta= te. + + .. option:: max_append_sectors + + The maximal number of 512-byte sectors in a zone append request. + .. program:: image-formats .. option:: qed =20 --=20 2.40.1 From nobody Wed Nov 27 12:22:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1698668441; cv=none; d=zohomail.com; s=zohoarc; b=DEvX16oVA+yx9zNKmhMc5KjuUlEsujQtM8LAUfXUttfF8MhHrDDGHxKxdbtctlERe2aaYNB4ugKVXBkuYtQruOolLD1mjdUfymVDuH4JUPO5oG2QLb/3CHqSBzP3KxovQpxW/ZmtsIzQ2ZCwURLXJsTL65Ah+nPVC/hHJNWH5c8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698668441; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=O1bNYmfcnXdBjlRzPOZMlrrzOqpF37vHFP+aGLUFfgk=; b=FDJO4ijEsRqCPhEiClJFloCh9cZ21EHS41E7JCZG3KUt8ap9OQi9+feb9zaNeoJFke68twwX2LzY3KINGG8ROwTfkKZPMqk2LQRclLpotO8VMhZaMDWTAiiLvBc89qxDwa0lZ/tL4xw9FO7dZGdKxx1MTxQHGlrSSoSKpxjfrmw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1698668441801976.7177667368063; Mon, 30 Oct 2023 05:20:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxREr-0005ec-Tr; Mon, 30 Oct 2023 08:19:25 -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 1qxREq-0005da-7t; Mon, 30 Oct 2023 08:19:24 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxREm-0006ET-My; Mon, 30 Oct 2023 08:19:23 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1cc34c3420bso6575695ad.3; Mon, 30 Oct 2023 05:19:19 -0700 (PDT) Received: from fedlinux.. ([106.84.131.249]) by smtp.gmail.com with ESMTPSA id f12-20020a170902684c00b001b9f032bb3dsm6362339pln.3.2023.10.30.05.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 05:19:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698668358; x=1699273158; 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=O1bNYmfcnXdBjlRzPOZMlrrzOqpF37vHFP+aGLUFfgk=; b=B14fJbUg5kI7AW9ayK5Fd+xuenR5n5AlnRzoSNaMhRshDYb631/ICut2ftCYvayyv0 W4/9HaIy91lxxVVui9+xFzK/o8ssoaF3VaE0xI8cJtq3SJHLIyzyId1Np2p+451G7NRv FisIQ4Cc0LmxhqX6EyonahKJVkqLNeIlxz6UPGjLgrfiSI4PaTkIr8bjzmUp4nx5r1Kr L+jMg1eHrjLAZWQY032OKQp+lsL1SN0Kv6MvsvuwsAA+w0a/7Sa2Po8P4xOxBU6RgePk IvikdMoXrb05lkiVIeZgB723ykMcZHM5nyr2yYNCLwPI/CiLYKzxCjbMgR5LkkEhBRyF mlqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698668358; x=1699273158; 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=O1bNYmfcnXdBjlRzPOZMlrrzOqpF37vHFP+aGLUFfgk=; b=I+AO2DZh9pVCakjQLHpNFCaqyCSmAWNf/K4fUDr5PLTACrf1UvLow00judw4DtrfFZ kDmPRUpuTOSRw8tCam7sM7NMy6qttlYk8m87FZv4pRf+afbmMifcHDVpajUk/n4qj89q 9OsR5GqRgtkSimiERpB74bKE5G+acUh7G8IKIPW1nRsSZhK7oWNPeG8M2nCW3V25rqts zhuCAyDbLM4RKQY38MUMaapDypYN8DMHxA5WS6NMAggfo8F/+TctQO2c3PDfFB25qKKw sNoyNJkUc3oRpGSl4o3TbI1ertnYFpqIH3CGZYy3WfqSkvgINfPqhBtbVvlljRBi06vi r8fg== X-Gm-Message-State: AOJu0YwIsOS9ttyFBuaI7OVSLgAGYgMff1BjIJZLDUiBTZY8qR9iaAdF UtK11jZvls5JJ5zJea+sPR+JQ2jYzFOyOBDs X-Google-Smtp-Source: AGHT+IFyVaezSHyOwGFVKj5iC8BOYL1s4ItfX9HNLL27KaL3KcNhpj0bBgRtz+gSNIq2Ym3kKTKu4w== X-Received: by 2002:a17:902:e1cd:b0:1c9:9e33:3a7d with SMTP id t13-20020a170902e1cd00b001c99e333a7dmr6087724pla.20.1698668357015; Mon, 30 Oct 2023 05:19:17 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: Kevin Wolf , Hanna Reitz , Eric Blake , dlemoal@kernel.org, hare@suse.de, dmitry.fomichev@wdc.com, stefanha@redhat.com, qemu-block@nongnu.org, Markus Armbruster , Sam Li Subject: [PATCH v5 2/4] qcow2: add configurations for zoned format extension Date: Mon, 30 Oct 2023 20:18:45 +0800 Message-Id: <20231030121847.4522-3-faithilikerun@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231030121847.4522-1-faithilikerun@gmail.com> References: <20231030121847.4522-1-faithilikerun@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::633; envelope-from=faithilikerun@gmail.com; helo=mail-pl1-x633.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1698668442653100001 Content-Type: text/plain; charset="utf-8" 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 bytes, 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=3D768M -o zone_size=3D64M -o zone_capacity=3D64M -o conventional_zones=3D0 -o max_append_bytes=3D4096 -o max_open_zones=3D0 -o max_active_zones=3D0 -o zone_model=3Dhost-managed Signed-off-by: Sam Li fix config? --- block/qcow2.c | 205 ++++++++++++++++++++++++++++++- block/qcow2.h | 37 +++++- docs/interop/qcow2.txt | 67 +++++++++- include/block/block_int-common.h | 13 ++ qapi/block-core.json | 45 ++++++- 5 files changed, 362 insertions(+), 5 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index aa01d9e7b5..cd53268ca7 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 0x007a6264 =20 static int coroutine_fn qcow2_co_preadv_compressed(BlockDriverState *bs, @@ -210,6 +211,7 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t st= art_offset, uint64_t offset; int ret; Qcow2BitmapHeaderExt bitmaps_ext; + Qcow2ZonedHeaderExtension zoned_ext; =20 if (need_update_header !=3D NULL) { *need_update_header =3D false; @@ -431,6 +433,63 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t s= tart_offset, break; } =20 + case QCOW2_EXT_MAGIC_ZONED_FORMAT: + { + if (ext.len !=3D sizeof(zoned_ext)) { + error_setg(errp, "zoned_ext: Invalid extension length"); + return -EINVAL; + } + ret =3D 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; + } + + if (s->incompatible_features & QCOW2_INCOMPAT_ZONED_FORMAT) { + warn_report("A program lacking zoned format support " + "may modify this file and zoned metadata are " + "now considered inconsistent"); + error_printf("The zoned metadata is corrupted.\n"); + } + + zoned_ext.zone_size =3D be32_to_cpu(zoned_ext.zone_size); + zoned_ext.zone_capacity =3D be32_to_cpu(zoned_ext.zone_capacit= y); + zoned_ext.conventional_zones =3D + be32_to_cpu(zoned_ext.conventional_zones); + zoned_ext.nr_zones =3D be32_to_cpu(zoned_ext.nr_zones); + zoned_ext.max_open_zones =3D be32_to_cpu(zoned_ext.max_open_zo= nes); + zoned_ext.max_active_zones =3D + be32_to_cpu(zoned_ext.max_active_zones); + zoned_ext.max_append_bytes =3D + be32_to_cpu(zoned_ext.max_append_bytes); + s->zoned_header =3D zoned_ext; + + /* refuse to open broken images */ + if (zoned_ext.zone_size =3D=3D 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 fie= ld " + "can not be larger that zone_size field"); + return -EINVAL; + } + if (zoned_ext.nr_zones !=3D 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=3D%" PRIu32 "\n", offset); +#endif + break; + } + default: /* unknown magic - save it in case we need to rewrite the head= er */ /* If you add a new feature, make sure to also update the fast @@ -1967,6 +2026,15 @@ static void qcow2_refresh_limits(BlockDriverState *b= s, Error **errp) } bs->bl.pwrite_zeroes_alignment =3D s->subcluster_size; bs->bl.pdiscard_alignment =3D s->cluster_size; + bs->bl.zoned =3D s->zoned_header.zoned; + bs->bl.nr_zones =3D s->zoned_header.nr_zones; + bs->bl.max_append_sectors =3D s->zoned_header.max_append_bytes + >> BDRV_SECTOR_BITS; + bs->bl.max_active_zones =3D s->zoned_header.max_active_zones; + bs->bl.max_open_zones =3D s->zoned_header.max_open_zones; + bs->bl.zone_size =3D s->zoned_header.zone_size; + bs->bl.zone_capacity =3D s->zoned_header.zone_capacity; + bs->bl.write_granularity =3D BDRV_SECTOR_SIZE; } =20 static int GRAPH_UNLOCKED @@ -3062,6 +3130,11 @@ int qcow2_update_header(BlockDriverState *bs) .bit =3D QCOW2_INCOMPAT_EXTL2_BITNR, .name =3D "extended L2 entries", }, + { + .type =3D QCOW2_FEAT_TYPE_INCOMPATIBLE, + .bit =3D QCOW2_INCOMPAT_ZONED_FORMAT_BITNR, + .name =3D "zoned format", + }, { .type =3D QCOW2_FEAT_TYPE_COMPATIBLE, .bit =3D QCOW2_COMPAT_LAZY_REFCOUNTS_BITNR, @@ -3107,6 +3180,31 @@ int qcow2_update_header(BlockDriverState *bs) buflen -=3D ret; } =20 + /* Zoned devices header extension */ + if (s->zoned_header.zoned =3D=3D BLK_Z_HM) { + Qcow2ZonedHeaderExtension zoned_header =3D { + .zoned =3D s->zoned_header.zoned, + .zone_size =3D cpu_to_be32(s->zoned_header.zone_size), + .zone_capacity =3D cpu_to_be32(s->zoned_header.zone_capac= ity), + .conventional_zones =3D + cpu_to_be32(s->zoned_header.conventional_zones), + .nr_zones =3D cpu_to_be32(s->zoned_header.nr_zones), + .max_open_zones =3D cpu_to_be32(s->zoned_header.max_open_z= ones), + .max_active_zones =3D + cpu_to_be32(s->zoned_header.max_active_zones), + .max_append_bytes =3D + cpu_to_be32(s->zoned_header.max_append_bytes) + }; + ret =3D header_ext_add(buf, QCOW2_EXT_MAGIC_ZONED_FORMAT, + &zoned_header, sizeof(zoned_header), + buflen); + if (ret < 0) { + goto fail; + } + buf +=3D ret; + buflen -=3D ret; + } + /* Keep unknown header extensions */ QLIST_FOREACH(uext, &s->unknown_header_ext, next) { ret =3D header_ext_add(buf, uext->magic, uext->data, uext->len, bu= flen); @@ -3718,6 +3816,10 @@ qcow2_co_create(BlockdevCreateOptions *create_option= s, Error **errp) header->incompatible_features |=3D cpu_to_be64(QCOW2_INCOMPAT_DATA_FILE); } + if (qcow2_opts->zone_model !=3D QCOW2_ZONE_MODEL_HOST_MANAGED) { + header->incompatible_features |=3D + cpu_to_be64(QCOW2_INCOMPAT_ZONED_FORMAT); + } if (qcow2_opts->data_file_raw) { header->autoclear_features |=3D cpu_to_be64(QCOW2_AUTOCLEAR_DATA_FILE_RAW); @@ -3786,11 +3888,70 @@ qcow2_co_create(BlockdevCreateOptions *create_optio= ns, Error **errp) } =20 /* Set the external data file if necessary */ + BDRVQcow2State *s =3D blk_bs(blk)->opaque; if (data_bs) { - BDRVQcow2State *s =3D blk_bs(blk)->opaque; s->image_data_file =3D g_strdup(data_bs->filename); } =20 + if (qcow2_opts->zone_model =3D=3D QCOW2_ZONE_MODEL_HOST_MANAGED) { + if (!qcow2_opts->has_zone_size) { + error_setg(errp, "Missing zone_size parameter"); + ret =3D -EINVAL; + goto out; + } + + if (qcow2_opts->zone_size =3D=3D 0) { + s->zoned_header.zoned =3D BLK_Z_NONE; + error_setg(errp, "Zoned devices can not allow a larger-than-ze= ro " + "zone_size"); + ret =3D -EINVAL; + goto out; + } + + s->zoned_header.zoned =3D BLK_Z_HM; + s->zoned_header.zone_size =3D qcow2_opts->zone_size; + s->zoned_header.nr_zones =3D 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 =3D BLK_Z_NONE; + error_setg(errp, "zone capacity %" PRIu64 "B exceeds zone = size " + "%" PRIu64"B", qcow2_opts->zone_capacity, + qcow2_opts->zone_size); + ret =3D -EINVAL; + goto out; + } + s->zoned_header.zone_capacity =3D qcow2_opts->zone_capacity; + } else { + s->zoned_header.zone_capacity =3D qcow2_opts->zone_size; + } + + if (qcow2_opts->has_conventional_zones) { + s->zoned_header.conventional_zones =3D qcow2_opts->conventiona= l_zones; + } + + if (qcow2_opts->has_max_active_zones) { + if (qcow2_opts->max_open_zones > qcow2_opts->max_active_zones)= { + s->zoned_header.zoned =3D 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 =3D -EINVAL; + goto out; + } + if (qcow2_opts->has_max_open_zones) { + s->zoned_header.max_open_zones =3D qcow2_opts->max_active_= zones; + } else { + s->zoned_header.max_open_zones =3D qcow2_opts->max_active_= zones; + } + } + s->zoned_header.max_append_bytes =3D qcow2_opts->max_append_bytes; + } else { + s->zoned_header.zoned =3D BLK_Z_NONE; + } + /* Create a full header (including things like feature table) */ ret =3D qcow2_update_header(blk_bs(blk)); bdrv_graph_co_rdunlock(); @@ -3921,6 +4082,13 @@ qcow2_co_create_opts(BlockDriver *drv, const char *f= ilename, QemuOpts *opts, { BLOCK_OPT_COMPAT_LEVEL, "version" }, { BLOCK_OPT_DATA_FILE_RAW, "data-file-raw" }, { BLOCK_OPT_COMPRESSION_TYPE, "compression-type" }, + { BLOCK_OPT_ZONE_MODEL, "zone-model"}, + { BLOCK_OPT_CONVENTIONAL_ZONES, "conventional-zones"}, + { BLOCK_OPT_MAX_OPEN_ZONES, "max-open-zones"}, + { BLOCK_OPT_MAX_ACTIVE_ZONES, "max-active-zones"}, + { BLOCK_OPT_MAX_APPEND_BYTES, "max-append-bytes"}, + { BLOCK_OPT_ZONE_SIZE, "zone-size"}, + { BLOCK_OPT_ZONE_CAPACITY, "zone-capacity"}, { NULL, NULL }, }; =20 @@ -6087,6 +6255,41 @@ static QemuOptsList qcow2_create_opts =3D { .help =3D "Compression method used for image cluster " \ "compression", \ .def_value_str =3D "zlib" \ + }, \ + { \ + .name =3D BLOCK_OPT_ZONE_MODEL, \ + .type =3D QEMU_OPT_STRING, \ + .help =3D "zone model", \ + }, \ + { \ + .name =3D BLOCK_OPT_ZONE_SIZE, \ + .type =3D QEMU_OPT_SIZE, \ + .help =3D "zone size", \ + }, \ + { \ + .name =3D BLOCK_OPT_ZONE_CAPACITY, \ + .type =3D QEMU_OPT_SIZE, \ + .help =3D "zone capacity", \ + }, \ + { \ + .name =3D BLOCK_OPT_CONVENTIONAL_ZONES, \ + .type =3D QEMU_OPT_NUMBER, \ + .help =3D "numbers of conventional zones", \ + }, \ + { \ + .name =3D BLOCK_OPT_MAX_APPEND_BYTES, \ + .type =3D QEMU_OPT_NUMBER, \ + .help =3D "max append bytes", \ + }, \ + { \ + .name =3D BLOCK_OPT_MAX_ACTIVE_ZONES, \ + .type =3D QEMU_OPT_NUMBER, \ + .help =3D "max active zones", \ + }, \ + { \ + .name =3D BLOCK_OPT_MAX_OPEN_ZONES, \ + .type =3D QEMU_OPT_NUMBER, \ + .help =3D "max open zones", \ }, QCOW_COMMON_OPTIONS, { /* end of list */ } diff --git a/block/qcow2.h b/block/qcow2.h index 29958c512b..6e5d90afd2 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -236,6 +236,27 @@ typedef struct Qcow2CryptoHeaderExtension { uint64_t length; } QEMU_PACKED Qcow2CryptoHeaderExtension; =20 +typedef struct Qcow2ZonedHeaderExtension { + /* Zoned device attributes */ + uint8_t zoned; + uint8_t reserved[3]; + uint32_t zone_size; + uint32_t zone_capacity; + uint32_t conventional_zones; + uint32_t nr_zones; + uint32_t max_active_zones; + uint32_t max_open_zones; + uint32_t max_append_bytes; + uint64_t zonedmeta_size; + uint64_t zonedmeta_offset; +} QEMU_PACKED Qcow2ZonedHeaderExtension; + +typedef struct Qcow2ZoneListEntry { + QLIST_ENTRY(Qcow2ZoneListEntry) exp_open_zone_entry; + QLIST_ENTRY(Qcow2ZoneListEntry) imp_open_zone_entry; + QLIST_ENTRY(Qcow2ZoneListEntry) closed_zone_entry; +} Qcow2ZoneListEntry; + typedef struct Qcow2UnknownHeaderExtension { uint32_t magic; uint32_t len; @@ -256,17 +277,20 @@ enum { QCOW2_INCOMPAT_DATA_FILE_BITNR =3D 2, QCOW2_INCOMPAT_COMPRESSION_BITNR =3D 3, QCOW2_INCOMPAT_EXTL2_BITNR =3D 4, + QCOW2_INCOMPAT_ZONED_FORMAT_BITNR =3D 5, QCOW2_INCOMPAT_DIRTY =3D 1 << QCOW2_INCOMPAT_DIRTY_BITNR, QCOW2_INCOMPAT_CORRUPT =3D 1 << QCOW2_INCOMPAT_CORRUPT_BITNR, QCOW2_INCOMPAT_DATA_FILE =3D 1 << QCOW2_INCOMPAT_DATA_FILE_BITN= R, QCOW2_INCOMPAT_COMPRESSION =3D 1 << QCOW2_INCOMPAT_COMPRESSION_BI= TNR, QCOW2_INCOMPAT_EXTL2 =3D 1 << QCOW2_INCOMPAT_EXTL2_BITNR, + QCOW2_INCOMPAT_ZONED_FORMAT =3D 1 << QCOW2_INCOMPAT_ZONED_FORMAT_B= ITNR, =20 QCOW2_INCOMPAT_MASK =3D QCOW2_INCOMPAT_DIRTY | QCOW2_INCOMPAT_CORRUPT | QCOW2_INCOMPAT_DATA_FILE | QCOW2_INCOMPAT_COMPRESSION - | QCOW2_INCOMPAT_EXTL2, + | QCOW2_INCOMPAT_EXTL2 + | QCOW2_INCOMPAT_ZONED_FORMAT, }; =20 /* Compatible feature bits */ @@ -285,7 +309,6 @@ enum { QCOW2_AUTOCLEAR_DATA_FILE_RAW =3D 1 << QCOW2_AUTOCLEAR_DATA_FILE= _RAW_BITNR, =20 QCOW2_AUTOCLEAR_MASK =3D QCOW2_AUTOCLEAR_BITMAPS - | QCOW2_AUTOCLEAR_DATA_FILE_RAW, }; =20 enum qcow2_discard_type { @@ -422,6 +445,16 @@ 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(, Qcow2ZoneListEntry) exp_open_zones; + QLIST_HEAD(, Qcow2ZoneListEntry) imp_open_zones; + QLIST_HEAD(, Qcow2ZoneListEntry) closed_zones; + Qcow2ZoneListEntry *zone_list_entries; + uint32_t nr_zones_exp_open; + uint32_t nr_zones_imp_open; + uint32_t nr_zones_closed; } BDRVQcow2State; =20 typedef struct Qcow2COWRegion { diff --git a/docs/interop/qcow2.txt b/docs/interop/qcow2.txt index 2c4618375a..b210bc4580 100644 --- a/docs/interop/qcow2.txt +++ b/docs/interop/qcow2.txt @@ -125,7 +125,18 @@ the next fields through header_length. allows subcluster-based allocation. See the Extended L2 Entries section for more detai= ls. =20 - Bits 5-63: Reserved (set to 0) + Bit 5: Zoned extension bit. If this bit is set th= en + the file is a zoned device file with + host-managed model. + + It is unsafe when any qcow2 writer which d= oes + not understand zone information edits a fi= le + with the zoned extension. The write pointer + tracking is corrupted between different ve= rsion + of qcow2 writes. In such cases, the file c= an + no longer be seen as a zoned device. + + Bits 6-63: Reserved (set to 0) =20 80 - 87: compatible_features Bitmask of compatible features. An implementation can @@ -249,6 +260,7 @@ be stored. Each extension has a structure like the foll= owing: 0x23852875 - Bitmaps extension 0x0537be77 - Full disk encryption header pointer 0x44415441 - External data file name string + 0x007a6264 - Zoned extension other - Unknown header extension, can be safe= ly ignored =20 @@ -331,6 +343,59 @@ 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. =20 +=3D=3D Zoned extension =3D=3D + +The zoned extension is an optional header extension. It contains fields for +emulating the zoned stroage model (https://zonedstorage.io/). + +When the device model is not recognized as host-managed, it is regared as +incompatible and report an error to users. + +The fields of the zoned extension are: + Byte 0: zoned + This bit represents zone model of devices. 1 is for + host-managed, which only allows sequential writes. + And 0 is for non-zoned devices without such constraints. + + 1 - 3: Reserved, must be zero. + + 4 - 7: zone_size + Total size of each zones, in bytes. It is less than 4GB + in the contained image for simplicity. + + 8 - 11: zone_capacity + The number of writable bytes within the zones. + A zone capacity is always smaller or equal to the + zone size. + + 12 - 15: conventional_zones + The number of conventional zones. + + 16 - 19: nr_zones + The number of zones. It is the sum of conventional zones + and sequential zones. + + 20 - 23: max_active_zones + The number of the zones that are in the implicit open, + explicit open or closed state. + + 24 - 27: max_open_zones + The maximal number of open (implicitly open or explicit= ly + open) zones. + + 28 - 31: max_append_bytes + The number of bytes of a zone append request that can be + issued to the device. It must be 512-byte aligned. + + 32 - 39: zonedmeta_size + The size of zoned metadata in bytes. It contains no more + than 4GB. The zoned metadata structure is the write + pointers for each zone. + + 40 - 47: zonedmeta_offset + The offset of zoned metadata structure in the contained + image, in bytes. + =3D=3D Full disk encryption header pointer =3D=3D =20 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-com= mon.h index b8d9d24f39..4b94e55eb4 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_ZONE_MODEL "zone_model" +#define BLOCK_OPT_ZONE_SIZE "zone_size" +#define BLOCK_OPT_ZONE_CAPACITY "zone_capacity" +#define BLOCK_OPT_CONVENTIONAL_ZONES "conventional_zones" +#define BLOCK_OPT_MAX_APPEND_BYTES "max_append_bytes" +#define BLOCK_OPT_MAX_ACTIVE_ZONES "max_active_zones" +#define BLOCK_OPT_MAX_OPEN_ZONES "max_open_zones" =20 #define BLOCK_PROBE_BUF_SIZE 512 =20 @@ -883,6 +890,12 @@ typedef struct BlockLimits { /* zone size expressed in bytes */ uint32_t zone_size; =20 + /* + * 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; =20 diff --git a/qapi/block-core.json b/qapi/block-core.json index 89751d81f2..884e058046 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4981,6 +4981,21 @@ { 'enum': 'Qcow2CompressionType', 'data': [ 'zlib', { 'name': 'zstd', 'if': 'CONFIG_ZSTD' } ] } =20 +## +# @Qcow2ZoneModel: +# +# Zoned device model used in qcow2 image file +# +# @non-zoned: non-zoned model is for regular block devices +# +# @host-managed: host-managed model only allows sequential write over the +# device zones +# +# Since 8.2 +## +{ 'enum': 'Qcow2ZoneModel', + 'data': ['non-zoned', 'host-managed'] } + ## # @BlockdevCreateOptionsQcow2: # @@ -5023,6 +5038,27 @@ # @compression-type: The image cluster compression method # (default: zlib, since 5.1) # +# @zone-model: @Qcow2ZoneModel. The zone device model. +# (default: non-zoned, since 8.2) +# +# @zone-size: Total number of bytes within zones (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) +# +# @conventional-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 maximal number of zones in the implicit +# open, explicit open or closed state (since 8.2) +# +# @max-append-bytes: The maximal number of bytes of a zone +# append request that can be issued to the device. It must be +# 512-byte aligned (since 8.2) +# # Since: 2.12 ## { 'struct': 'BlockdevCreateOptionsQcow2', @@ -5039,7 +5075,14 @@ '*preallocation': 'PreallocMode', '*lazy-refcounts': 'bool', '*refcount-bits': 'int', - '*compression-type':'Qcow2CompressionType' } } + '*compression-type':'Qcow2CompressionType', + '*zone-model': 'Qcow2ZoneModel', + '*zone-size': 'size', + '*zone-capacity': 'size', + '*conventional-zones': 'uint32', + '*max-open-zones': 'uint32', + '*max-active-zones': 'uint32', + '*max-append-bytes': 'uint32' } } =20 ## # @BlockdevCreateOptionsQed: --=20 2.40.1 From nobody Wed Nov 27 12:22:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1698668414; cv=none; d=zohomail.com; s=zohoarc; b=PU6fbAOlSiCaVf4Qkhqd7Jd1z/NDIT25TYxuegkI4NYMRQBG9VZVkBWVqhnld0cHlUct4oZd11JSTCd06Y0MAb9hT0wrpYz5P14AwOb9XZhjU5Q0ns+g/ghGGH72jxY/dXA8/nYfqy1CHo0UNhv+VU8j09VcmF6VxTcykxMoH1Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698668414; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OC3fkTuGjsQIcBRMPU9hrS1BELvhLQgySXPcRBuAlB4=; b=hJ24N6aMjqIZYUxjrTBFGavw8lvPXI7dmn9v7kQwGoObkKPQOkJyiMAxDjB2ZGgh9cBG1zco1s/Zfgl+SeeC3f62cfKMkO61fKkiWLOM9OTLKA0kZjs3vF1MQshgIScOB43AB07BNUuAsGlz6AiJunDlB20gNfPfiRl+qUF1xSY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1698668414520685.1394934466563; Mon, 30 Oct 2023 05:20:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxREz-0005fd-Lj; Mon, 30 Oct 2023 08:19:33 -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 1qxREx-0005fP-RQ; Mon, 30 Oct 2023 08:19:32 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxREs-0006GG-WC; Mon, 30 Oct 2023 08:19:30 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1cc5916d578so2954855ad.2; Mon, 30 Oct 2023 05:19:26 -0700 (PDT) Received: from fedlinux.. ([106.84.131.249]) by smtp.gmail.com with ESMTPSA id f12-20020a170902684c00b001b9f032bb3dsm6362339pln.3.2023.10.30.05.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 05:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698668365; x=1699273165; 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=OC3fkTuGjsQIcBRMPU9hrS1BELvhLQgySXPcRBuAlB4=; b=NbMzteuYcTSbL3ZrAf1gtvd04Tnvx+t7g0DrWJ1m/i4L/2PkJhJw+vZ1vjwO9WY4cg D6GR3crS6tGKDzj+33WKtJa/4taH5UnuDD/xFcidkcsucb2SWHO95bqpYtHcDM8/9BJR FKCbBCFHYkCp9XOyCARZJy8x8LgOv0CGer0RgH2MjjIp8uf9rWV+KdcCQ7CHkwUZsLov 4r/b88e9Qqfuyy1pM+v/9MRGm/ntskjKhmkgPhPO1VcECCK8sWAE/9vtevl4whYI42Wb rnZS5dqfSYgapbPhjITQcmKvIrm1jCryzYbtjrtfTxgVUcdZWIEB/KD9q/SyrjAcRT85 ouFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698668365; x=1699273165; 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=OC3fkTuGjsQIcBRMPU9hrS1BELvhLQgySXPcRBuAlB4=; b=ljsMjXjQLi+/PTVPP7vdJewHoZQDDRX3m386rtRJUc2Ckpym20Gt8SbdHXU5oQYdpI wzjzDxnQ8a0ZqrRiBBR/Kzz7iTJpsGWJBV1lNR6hMgouHhxuIi1FxwzLEXViwLs6zfRL urF5RQVoLgPaMPZPLHSKVI0wL/8FQZ6xAZTeJ39cxJeVSjVDIbn3QDZ26m3zxDBuYm+G BMvJzXVieg1YK5gyNJVLsuYVBo+ra+n+MJTFowXnZykY7ZbIr5mBWbSabmOR+nIiVKDZ 82c1UnBzO2n8A/UwEM6IG/DHysNI3aXSsR7kibrb9/Blz7hW1cAH6E+UubcMWiw+Na0R rc1g== X-Gm-Message-State: AOJu0YxlPpBdeJL8s7DcefwzscVh2q2c2tiNh8FTA3MH15sfIm3bSTFN l3PdPc4RUSWmW9BdZ1bFxAfLo/dPTT+LbAOw X-Google-Smtp-Source: AGHT+IFciLVwHhNZJUs2iHqPcAXQKcHWRFu2mdyC6OHCCCwk2bp4oaLWNatubYxsNp+SEawzQlveJg== X-Received: by 2002:a17:902:b783:b0:1c9:ff46:163d with SMTP id e3-20020a170902b78300b001c9ff46163dmr9921900pls.38.1698668364296; Mon, 30 Oct 2023 05:19:24 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: Kevin Wolf , Hanna Reitz , Eric Blake , dlemoal@kernel.org, hare@suse.de, dmitry.fomichev@wdc.com, stefanha@redhat.com, qemu-block@nongnu.org, Markus Armbruster , Sam Li Subject: [PATCH v5 3/4] qcow2: add zoned emulation capability Date: Mon, 30 Oct 2023 20:18:46 +0800 Message-Id: <20231030121847.4522-4-faithilikerun@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231030121847.4522-1-faithilikerun@gmail.com> References: <20231030121847.4522-1-faithilikerun@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::62e; envelope-from=faithilikerun@gmail.com; helo=mail-pl1-x62e.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1698668416258100012 Content-Type: text/plain; charset="utf-8" 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. It is managed by active zone lists following LRU policy. Signed-off-by: Sam Li --- block/qcow2.c | 731 ++++++++++++++++++++++++++++++++++++++++++- block/trace-events | 2 + include/qemu/queue.h | 1 + 3 files changed, 732 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index cd53268ca7..b0f9023fd9 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -194,6 +194,178 @@ qcow2_extract_crypto_opts(QemuOpts *opts, const char = *fmt, Error **errp) return cryptoopts_qdict; } =20 +#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_zone_state(BlockDriverState *bs, + uint32_t index) +{ + BDRVQcow2State *s =3D bs->opaque; + Qcow2ZoneListEntry *zone_entry =3D &s->zone_list_entries[index]; + uint64_t zone_wp =3D bs->wps->wp[index]; + uint64_t zone_start; + + if (QCOW2_ZT_IS_CONV(zone_wp)) { + return BLK_ZS_NOT_WP; + } + + if (QLIST_IS_INSERTED(zone_entry, exp_open_zone_entry)) { + return BLK_ZS_EOPEN; + } + if (QLIST_IS_INSERTED(zone_entry, imp_open_zone_entry)) { + return BLK_ZS_IOPEN; + } + + zone_start =3D index * bs->bl.zone_size; + if (zone_wp =3D=3D zone_start) { + return BLK_ZS_EMPTY; + } + if (zone_wp >=3D zone_start + bs->bl.zone_capacity) { + return BLK_ZS_FULL; + } + if (zone_wp > zone_start) { + return BLK_ZS_CLOSED; + } + return BLK_ZS_NOT_WP; +} + +/* + * Write the new wp value to the dedicated location of the image file. + */ +static int qcow2_write_wp_at(BlockDriverState *bs, uint64_t *wp, + uint32_t index) { + BDRVQcow2State *s =3D bs->opaque; + uint64_t wpv =3D *wp; + int ret; + + ret =3D 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 =3D wpv; + error_report("Failed to write metadata with file"); + return ret; +} + +static bool qcow2_can_activate_zone(BlockDriverState *bs) +{ + BDRVQcow2State *s =3D bs->opaque; + /* When the max active zone is zero, there is no limit on active zones= */ + if (!s->zoned_header.max_active_zones) { + return true; + } + + /* The active zones are zones with the states of open and closed */ + 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; +} + +/* + * This function manages open zones under active zones limit. It checks + * if a zone can transition to open state while maintaining max open and + * active zone limits. + */ +static bool qcow2_can_open_zone(BlockDriverState *bs) +{ + BDRVQcow2State *s =3D bs->opaque; + Qcow2ZoneListEntry *zone_entry; + + /* When the max open zone is zero, there is no limit on open zones */ + if (!s->zoned_header.max_open_zones) { + return true; + } + + /* + * The open zones are zones with the states of explicitly and + * implicitly open. + */ + if (s->nr_zones_imp_open + s->nr_zones_exp_open < + s->zoned_header.max_open_zones) { + return true; + } + + /* + * Zones are managed once at a time. Thus, the number of implicitly op= en + * zone can never be over the open zone limit. When the active zone li= mit + * is not reached, close only one implicitly open zone. + */ + if (qcow2_can_activate_zone(bs)) { + /* + * The LRU policy is used for handling active zone lists. When + * removing a random zone entry, we discard the least recently used + * list item. The list item at the last is the least recently used + * one. The zone list maintained this property by removing the last + * entry and inserting before the first entry. + */ + zone_entry =3D QLIST_LAST(&s->imp_open_zones, imp_open_zone_entry); + QLIST_REMOVE(zone_entry, 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 on open, closed, active + * zones. + */ +static int qcow2_check_zone_resources(BlockDriverState *bs, + BlockZoneState zs) +{ + switch (zs) { + case BLK_ZS_EMPTY: + if (!qcow2_can_activate_zone(bs)) { + error_report("No enough active zones"); + return -EINVAL; + } + break; + case BLK_ZS_CLOSED: + if (!qcow2_can_open_zone(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 =3D bs->opaque; + uint64_t wps_size =3D s->zoned_header.zonedmeta_size; + g_autofree uint64_t *temp =3D NULL; + temp =3D g_new(uint64_t, wps_size); + ret =3D 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 @@ -463,7 +635,25 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t s= tart_offset, be32_to_cpu(zoned_ext.max_active_zones); zoned_ext.max_append_bytes =3D be32_to_cpu(zoned_ext.max_append_bytes); + zoned_ext.zonedmeta_offset =3D + be64_to_cpu(zoned_ext.zonedmeta_offset); + zoned_ext.zonedmeta_size =3D be64_to_cpu(zoned_ext.zonedmeta_s= ize); s->zoned_header =3D zoned_ext; + bs->wps =3D g_malloc(sizeof(BlockZoneWps) + + s->zoned_header.zonedmeta_size); + ret =3D qcow2_refresh_zonedmeta(bs); + if (ret < 0) { + error_setg_errno(errp, -ret, "zonedmeta: " + "Could not update zoned meta"= ); + return ret; + } + + s->zone_list_entries =3D g_new0(Qcow2ZoneListEntry, + zoned_ext.nr_zones); + QLIST_INIT(&s->exp_open_zones); + QLIST_INIT(&s->imp_open_zones); + QLIST_INIT(&s->closed_zones); + qemu_co_mutex_init(&bs->wps->colock); =20 /* refuse to open broken images */ if (zoned_ext.zone_size =3D=3D 0) { @@ -2734,9 +2924,37 @@ qcow2_co_pwritev_part(BlockDriverState *bs, int64_t = offset, int64_t bytes, uint64_t host_offset; QCowL2Meta *l2meta =3D NULL; AioTaskPool *aio =3D NULL; + int64_t start_offset, start_bytes; + BlockZoneState zs; + int64_t end; + uint64_t *wp; + int64_t zone_size =3D bs->bl.zone_size; + int index; =20 trace_qcow2_writev_start_req(qemu_coroutine_self(), offset, bytes); =20 + start_offset =3D offset; + start_bytes =3D bytes; + if (bs->bl.zoned =3D=3D BLK_Z_HM) { + /* + * The offset should not less than the wp of that zone where + * offset starts. + */ + index =3D start_offset / zone_size; + wp =3D &bs->wps->wp[index]; + if (offset < *wp) { + return -EINVAL; + } + + /* Only allow writes when there are zone resources left */ + zs =3D qcow2_get_zone_state(bs, index); + if (zs =3D=3D BLK_ZS_CLOSED || zs =3D=3D BLK_ZS_EMPTY) { + if (qcow2_check_zone_resources(bs, zs) < 0) { + return -EINVAL; + } + } + } + while (bytes !=3D 0 && aio_task_pool_status(aio) =3D=3D 0) { =20 l2meta =3D NULL; @@ -2782,6 +3000,58 @@ qcow2_co_pwritev_part(BlockDriverState *bs, int64_t = offset, int64_t bytes, qiov_offset +=3D cur_bytes; trace_qcow2_writev_done_part(qemu_coroutine_self(), cur_bytes); } + + if (bs->bl.zoned =3D=3D BLK_Z_HM) { + index =3D start_offset / zone_size; + wp =3D &bs->wps->wp[index]; + zs =3D qcow2_get_zone_state(bs, index); + uint64_t wpv =3D *wp; + if (!QCOW2_ZT_IS_CONV(wpv)) { + /* align up (start_offset, zone_size), the start offset is not + * necessarily power of two. */ + end =3D ((start_offset + zone_size) / zone_size) * zone_size; + if (start_offset + start_bytes <=3D end) { + *wp =3D start_offset + start_bytes; + } else { + ret =3D -EINVAL; + goto fail_nometa; + } + + ret =3D qcow2_write_wp_at(bs, wp, index); + if (ret < 0) { + goto fail_nometa; + } + + /* + * The zone state transitions to implicit open when the origin= al + * state is empty or closed. When the wp reaches the end, the + * open states (explicit open, implicit open) become full. + */ + Qcow2ZoneListEntry *zone_entry =3D &s->zone_list_entries[index= ]; + if (!(*wp & (zone_size - 1))) { + /* Being aligned to zone size implies full state */ + if (QLIST_IS_INSERTED(zone_entry, exp_open_zone_entry)) { + QLIST_REMOVE(zone_entry, exp_open_zone_entry); + s->nr_zones_exp_open--; + } else if (QLIST_IS_INSERTED(zone_entry, imp_open_zone_ent= ry)) { + QLIST_REMOVE(zone_entry, imp_open_zone_entry); + s->nr_zones_imp_open--; + trace_qcow2_imp_open_zones(0x24, + s->nr_zones_imp_open); + } + } else { + if (zs =3D=3D BLK_ZS_CLOSED || zs =3D=3D BLK_ZS_EMPTY) { + QLIST_INSERT_HEAD(&s->imp_open_zones, zone_entry, + imp_open_zone_entry); + s->nr_zones_imp_open++; + + if (zs =3D=3D BLK_ZS_CLOSED) { + s->nr_zones_closed--; + } + } + } + } + } ret =3D 0; =20 qemu_co_mutex_lock(&s->lock); @@ -2840,6 +3110,26 @@ static int GRAPH_RDLOCK qcow2_inactivate(BlockDriver= State *bs) return result; } =20 +static void qcow2_zoned_close(BDRVQcow2State *s) +{ + Qcow2ZoneListEntry *zone_entry, *next; + + QLIST_FOREACH_SAFE(zone_entry, &s->imp_open_zones, imp_open_zone_entry, + next) { + QLIST_REMOVE(zone_entry, imp_open_zone_entry); + s->nr_zones_imp_open--; + trace_qcow2_imp_open_zones(0x22, s->nr_zones_imp_open); + } + + QLIST_FOREACH_SAFE(zone_entry, &s->exp_open_zones, exp_open_zone_entry, + next) { + QLIST_REMOVE(zone_entry, exp_open_zone_entry); + s->nr_zones_exp_open--; + } + + assert(s->nr_zones_imp_open + s->nr_zones_exp_open =3D=3D 0); +} + static void coroutine_mixed_fn GRAPH_RDLOCK qcow2_do_close(BlockDriverState *bs, bool close_data_file) { @@ -2879,6 +3169,8 @@ qcow2_do_close(BlockDriverState *bs, bool close_data_= file) =20 qcow2_refcount_close(bs); qcow2_free_snapshots(bs); + qcow2_zoned_close(s); + g_free(bs->wps); } =20 static void GRAPH_UNLOCKED qcow2_close(BlockDriverState *bs) @@ -3193,7 +3485,10 @@ int qcow2_update_header(BlockDriverState *bs) .max_active_zones =3D cpu_to_be32(s->zoned_header.max_active_zones), .max_append_bytes =3D - cpu_to_be32(s->zoned_header.max_append_bytes) + cpu_to_be32(s->zoned_header.max_append_bytes), + .zonedmeta_offset =3D + cpu_to_be64(s->zoned_header.zonedmeta_offset), + .zonedmeta_size =3D cpu_to_be64(s->zoned_header.zonedmeta_= size), }; ret =3D header_ext_add(buf, QCOW2_EXT_MAGIC_ZONED_FORMAT, &zoned_header, sizeof(zoned_header), @@ -3598,7 +3893,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 =3D QCOW2_COMPRESSION_TYPE_ZLIB; =20 assert(create_options->driver =3D=3D BLOCKDEV_DRIVER_QCOW2); @@ -3948,6 +4244,46 @@ qcow2_co_create(BlockdevCreateOptions *create_option= s, Error **errp) } } s->zoned_header.max_append_bytes =3D qcow2_opts->max_append_bytes; + + uint32_t nrz =3D s->zoned_header.nr_zones; + zoned_meta_size =3D sizeof(uint64_t) * nrz; + g_autofree uint64_t *meta =3D NULL; + meta =3D g_new0(uint64_t, nrz); + + for (i =3D 0; i < s->zoned_header.conventional_zones; ++i) { + meta[i] =3D i * s->zoned_header.zone_size; + meta[i] |=3D 1ULL << 59; + } + + for (; i < nrz; ++i) { + meta[i] =3D i * s->zoned_header.zone_size; + } + + offset =3D 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 =3D offset; + s->zoned_header.zonedmeta_size =3D zoned_meta_size; + + zoned_clusterlen =3D size_to_clusters(s, zoned_meta_size) + * s->cluster_size; + assert(qcow2_pre_write_overlap_check(bs, 0, offset, + zoned_clusterlen,false) =3D= =3D 0); + ret =3D bdrv_pwrite_zeroes(blk_bs(blk)->file, offset, + zoned_clusterlen, 0); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not zero fill zoned metada= ta"); + goto out; + } + ret =3D bdrv_pwrite(blk_bs(blk)->file, offset, zoned_meta_size, me= ta, 0); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not write zoned metadata " + "to disk"); + goto out; + } } else { s->zoned_header.zoned =3D BLK_Z_NONE; } @@ -4287,6 +4623,393 @@ qcow2_co_pdiscard(BlockDriverState *bs, int64_t off= set, int64_t bytes) return ret; } =20 +static int coroutine_fn +qcow2_co_zone_report(BlockDriverState *bs, int64_t offset, + unsigned int *nr_zones, BlockZoneDescriptor *zones) +{ + BDRVQcow2State *s =3D bs->opaque; + uint64_t zone_size =3D s->zoned_header.zone_size; + int64_t capacity =3D bs->total_sectors << BDRV_SECTOR_BITS; + int64_t size =3D bs->bl.nr_zones * zone_size; + unsigned int nrz =3D *nr_zones; + int i =3D 0; + int si; + + if (offset >=3D 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 zo= nes" + "%" PRId32 "", nrz, bs->bl.nr_zones); + return -EINVAL; + } + + if (zone_size > 0) { + si =3D offset / zone_size; + qemu_co_mutex_lock(&bs->wps->colock); + for (; i < nrz; ++i) { + if (i + si >=3D bs->bl.nr_zones) { + break; + } + + zones[i].start =3D (si + i) * zone_size; + + /* The last zone can be smaller than the zone size */ + if ((si + i + 1) =3D=3D bs->bl.nr_zones && size > capacity) { + uint32_t l =3D zone_size - (size - capacity); + zones[i].length =3D l; + zones[i].cap =3D l; + } else { + zones[i].length =3D zone_size; + zones[i].cap =3D zone_size; + } + + uint64_t wp =3D bs->wps->wp[si + i]; + if (QCOW2_ZT_IS_CONV(wp)) { + zones[i].type =3D BLK_ZT_CONV; + zones[i].state =3D BLK_ZS_NOT_WP; + /* Clear the zone type bit */ + wp &=3D ~(1ULL << 59); + } else { + zones[i].type =3D BLK_ZT_SWR; + zones[i].state =3D qcow2_get_zone_state(bs, si + i); + } + zones[i].wp =3D wp; + } + qemu_co_mutex_unlock(&bs->wps->colock); + } + *nr_zones =3D i; + return 0; +} + +static int qcow2_open_zone(BlockDriverState *bs, uint32_t index) { + BDRVQcow2State *s =3D bs->opaque; + int ret; + + qemu_co_mutex_lock(&bs->wps->colock); + uint64_t *wp =3D &bs->wps->wp[index]; + BlockZoneState zs =3D qcow2_get_zone_state(bs, index); + + switch(zs) { + case BLK_ZS_EMPTY: + ret =3D qcow2_check_zone_resources(bs, BLK_ZS_EMPTY); + if (ret < 0) { + goto unlock; + } + break; + case BLK_ZS_IOPEN: + QLIST_REMOVE(&s->zone_list_entries[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 =3D 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 =3D -EINVAL; + goto unlock; + } + + ret =3D qcow2_write_wp_at(bs, wp, index); + if (!ret) { + QLIST_INSERT_HEAD(&s->exp_open_zones, &s->zone_list_entries[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 =3D bs->opaque; + int ret; + + qemu_co_mutex_lock(&bs->wps->colock); + BlockZoneState zs =3D qcow2_get_zone_state(bs, index); + + switch(zs) { + case BLK_ZS_EMPTY: + break; + case BLK_ZS_IOPEN: + QLIST_REMOVE(&s->zone_list_entries[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->zone_list_entries[index], exp_open_zone_entry); + s->nr_zones_exp_open--; + break; + case BLK_ZS_CLOSED: + ret =3D 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 =3D -EINVAL; + goto unlock; + } + + if (qcow2_get_zone_state(bs, index) =3D=3D BLK_ZS_CLOSED) { + s->nr_zones_closed++; + } + ret =3D 0; + +unlock: + qemu_co_mutex_unlock(&bs->wps->colock); + return ret; +} + +static int qcow2_finish_zone(BlockDriverState *bs, uint32_t index) { + BDRVQcow2State *s =3D bs->opaque; + int ret; + + qemu_co_mutex_lock(&bs->wps->colock); + uint64_t *wp =3D &bs->wps->wp[index]; + BlockZoneState zs =3D qcow2_get_zone_state(bs, index); + + switch(zs) { + case BLK_ZS_EMPTY: + ret =3D qcow2_check_zone_resources(bs, BLK_ZS_EMPTY); + if (ret < 0) { + goto unlock; + } + break; + case BLK_ZS_IOPEN: + QLIST_REMOVE(&s->zone_list_entries[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->zone_list_entries[index], exp_open_zone_entry); + s->nr_zones_exp_open--; + break; + case BLK_ZS_CLOSED: + ret =3D qcow2_check_zone_resources(bs, BLK_ZS_CLOSED); + if (ret < 0) { + goto unlock; + } + s->nr_zones_closed--; + break; + case BLK_ZS_FULL: + ret =3D 0; + goto unlock; + default: + ret =3D -EINVAL; + goto unlock; + } + + *wp =3D ((uint64_t)index + 1) * s->zoned_header.zone_size; + ret =3D 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 =3D bs->opaque; + int nrz =3D bs->bl.nr_zones; + int zone_size =3D bs->bl.zone_size; + int n, ret =3D 0; + + qemu_co_mutex_lock(&bs->wps->colock); + uint64_t *wp =3D &bs->wps->wp[index]; + if (len =3D=3D bs->total_sectors << BDRV_SECTOR_BITS) { + n =3D nrz; + index =3D 0; + } else { + n =3D len / zone_size; + } + + for (int i =3D 0; i < n; ++i) { + uint64_t *wp_i =3D (uint64_t *)(wp + i); + uint64_t wpi_v =3D *wp_i; + if (QCOW2_ZT_IS_CONV(wpi_v)) { + continue; + } + =20 + BlockZoneState zs =3D qcow2_get_zone_state(bs, index + i); + switch (zs) { + case BLK_ZS_EMPTY: + break; + case BLK_ZS_IOPEN: + QLIST_REMOVE(&s->zone_list_entries[index + i], imp_open_zone_e= ntry); + 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->zone_list_entries[index + i], exp_open_zone_e= ntry); + s->nr_zones_exp_open--; + break; + case BLK_ZS_CLOSED: + s->nr_zones_closed--; + break; + case BLK_ZS_FULL: + break; + default: + ret =3D -EINVAL; + goto unlock; + } + + if (zs =3D=3D BLK_ZS_EMPTY) { + continue; + } + + *wp_i =3D ((uint64_t)index + i) * zone_size; + ret =3D qcow2_write_wp_at(bs, wp_i, index + i); + if (ret < 0) { + goto unlock; + } + /* clear data */ + ret =3D 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, BlockZone= Op op, + int64_t offset, int64_t len) +{ + BDRVQcow2State *s =3D bs->opaque; + int ret =3D 0; + int64_t capacity =3D bs->total_sectors << BDRV_SECTOR_BITS; + int64_t zone_size =3D s->zoned_header.zone_size; + int64_t zone_size_mask =3D zone_size - 1; + uint32_t index =3D offset / zone_size; + BlockZoneWps *wps =3D bs->wps; + + if (offset >=3D 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 siz= e" + " %" 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 =3D wps->wp[index]; + if (QCOW2_ZT_IS_CONV(wpv) && len !=3D capacity) { + error_report("zone mgmt operations are not allowed for " + "conventional zones"); + ret =3D -EIO; + goto unlock; + } + qemu_co_mutex_unlock(&wps->colock); + + switch(op) { + case BLK_ZO_OPEN: + ret =3D qcow2_open_zone(bs, index); + break; + case BLK_ZO_CLOSE: + ret =3D qcow2_close_zone(bs, index); + break; + case BLK_ZO_FINISH: + ret =3D qcow2_finish_zone(bs, index); + break; + case BLK_ZO_RESET: + ret =3D qcow2_reset_zone(bs, index, len); + break; + default: + error_report("Unsupported zone op: 0x%x", op); + ret =3D -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 =3D=3D 0); + int64_t capacity =3D bs->total_sectors << BDRV_SECTOR_BITS; + uint32_t index; + int ret; + int64_t zone_size_mask =3D bs->bl.zone_size - 1; + int64_t iov_len =3D 0; + int64_t len =3D 0; + + if (*offset >=3D 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 off= set */ + if (*offset & zone_size_mask) { + error_report("sector offset %" PRId64 " is not aligned to zone siz= e " + "%" PRId32 "", *offset / 512, bs->bl.zone_size / 512); + return -EINVAL; + } + + int64_t wg =3D bs->bl.write_granularity; + int64_t wg_mask =3D wg - 1; + for (int i =3D 0; i < qiov->niov; i++) { + iov_len =3D qiov->iov[i].iov_len; + if (iov_len & wg_mask) { + error_report("len of IOVector[%d] %" PRId64 " is not aligned t= o " + "block size %" PRId64 "", i, iov_len, wg); + return -EINVAL; + } + } + len =3D qiov->size; + index =3D *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 =3D bs->wps->wp[index]; + ret =3D qcow2_co_pwritev_part(bs, wp_i, len, qiov, 0, 0); + if (ret =3D=3D 0) { + *offset =3D 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, @@ -6337,6 +7060,10 @@ BlockDriver bdrv_qcow2 =3D { .bdrv_co_pwritev_part =3D qcow2_co_pwritev_part, .bdrv_co_flush_to_os =3D qcow2_co_flush_to_os, =20 + .bdrv_co_zone_report =3D qcow2_co_zone_report, + .bdrv_co_zone_mgmt =3D qcow2_co_zone_mgmt, + .bdrv_co_zone_append =3D qcow2_co_zone_append, + .bdrv_co_pwrite_zeroes =3D qcow2_co_pwrite_zeroes, .bdrv_co_pdiscard =3D qcow2_co_pdiscard, .bdrv_co_copy_range_from =3D qcow2_co_copy_range_from, diff --git a/block/trace-events b/block/trace-events index 8e789e1f12..e35222e079 100644 --- a/block/trace-events +++ b/block/trace-events @@ -82,6 +82,8 @@ qcow2_writev_data(void *co, uint64_t offset) "co %p offse= t 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 0= x%" 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" =20 # qcow2-cluster.c qcow2_alloc_clusters_offset(void *co, uint64_t offset, int bytes) "co %p o= ffset 0x%" PRIx64 " bytes %d" diff --git a/include/qemu/queue.h b/include/qemu/queue.h index e029e7bf66..3f0a48740e 100644 --- a/include/qemu/queue.h +++ b/include/qemu/queue.h @@ -179,6 +179,7 @@ struct { = \ #define QLIST_EMPTY(head) ((head)->lh_first =3D=3D NULL) #define QLIST_FIRST(head) ((head)->lh_first) #define QLIST_NEXT(elm, field) ((elm)->field.le_next) +#define QLIST_LAST(head, field) (*(head)->lh_first->field.le_prev) =20 =20 /* --=20 2.40.1 From nobody Wed Nov 27 12:22:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1698668414; cv=none; d=zohomail.com; s=zohoarc; b=B1Ms7Z+TWgFHuMIUiLVkACsJNTQ31NXsKFXllBGersAJx6o7zIEQki9SOjK3bJexdkJqMPGox32uj1nESJkJbRxuNWhygIb4DT363F7uU2xg5NOz9aPZ4oHfg+Tw60UDNjXvXX9jO+DQMOeFZGrxylcw6JW0WodhSrhjDHE/ufU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698668414; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Er12uk2M0+XKc5bO2YYphblvAWD7VWdRzL6z5aMLKbU=; b=Pit8bwDZV/lKYo2sSd0FB8E+QlZPnT8/D+eqAk/i1t5C6qNba86sXS4vXM0gZ/jWh0riWH6LTXe/f6jT7irzHIssprpSr6KSo9tsCamHdHb7NKFn/23FXF4T0eFmno4/4Eg3wXthdV6G1a6ymfb/wZiucRyX0tGqGHa4gsC+NG4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1698668414401328.50763017870383; Mon, 30 Oct 2023 05:20:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxRF6-0005gy-G9; Mon, 30 Oct 2023 08:19:40 -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 1qxRF5-0005gg-5H; Mon, 30 Oct 2023 08:19:39 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxRF0-0006Gf-1a; Mon, 30 Oct 2023 08:19:37 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1cc29f39e7aso12964835ad.0; Mon, 30 Oct 2023 05:19:33 -0700 (PDT) Received: from fedlinux.. ([106.84.131.249]) by smtp.gmail.com with ESMTPSA id f12-20020a170902684c00b001b9f032bb3dsm6362339pln.3.2023.10.30.05.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 05:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698668372; x=1699273172; 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=Er12uk2M0+XKc5bO2YYphblvAWD7VWdRzL6z5aMLKbU=; b=IHIh7r9Cd4GvfyKTbNNRUa713rWb+xEQ6qzUvxvfp1Zyx7MJlz3Qf9h1ywSnJVpW6l 9fT+5anIUC9sssUmLtstYD5Zsh5SgauVt3gPAuJyybfmUl/KIfrGyq+mFDht3LJG/RZl w0yxO8yG2Gt3HNZawzJefcLjyXXSBVdPgh7N86uojERLdW/laFduuqIdRJjDazl7Bhuv USUFV8Gq0Ve6k96aT9wD16B65PN61OVMzUbgoFjqwGF0ndh87aY/PohHiYjlW9C+9znB 3pljPrAW9QTe1wdd67sc85FemcMiXr0ON9Tro4TLnWbNT5qD8iJnnD1S/lq3DNDN9Qd3 FSrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698668372; x=1699273172; 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=Er12uk2M0+XKc5bO2YYphblvAWD7VWdRzL6z5aMLKbU=; b=Tmly4AtV1TikbMVjIfZxRZil/4bG+h1BhyaRyNsFqdbO67cZRkuQAIVzvrmhzjWu8b FsdfPa9PnvnWZ9XqaJ2KpUMrf+KhZVEDtMggM64GdIg33CyR85GaaQIfFXOjz/CLV0KA efYOxyBahdS6JsHpVVaCvEKcVFw9s/u9M1lOEkwb9V/iuaeFWZIbV4zwaEVE69KYJBrw 6n3oEz2DLvlyE52hu3bbH3sFARwQg1caOTA1to9YeLb+OEiJY3uwcz6P3qvlsa4jIXNh 2b+Y82I5W5D4bkviKUOXjDHL/4LDGJuClObQc3joLCoCIxytZMHP1P4QAcAYiM6hSNvJ kw3Q== X-Gm-Message-State: AOJu0YypJKGWAdLODMDRyYN0pkWW8R2V+9rZt0dehtCOtIPxEcO/BLmf D5rMYokdxdpN4BeaD92eVki1gjEypE5R1q6z X-Google-Smtp-Source: AGHT+IGnjfx8eguSzWALmKVy59oPtCj+8eSIY0nXFC/RA/S3/R9NP4e1UURBNacY86R9Bu64dBVYAQ== X-Received: by 2002:a17:903:42cd:b0:1cc:3ae2:493f with SMTP id jy13-20020a17090342cd00b001cc3ae2493fmr2861251plb.65.1698668371252; Mon, 30 Oct 2023 05:19:31 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: Kevin Wolf , Hanna Reitz , Eric Blake , dlemoal@kernel.org, hare@suse.de, dmitry.fomichev@wdc.com, stefanha@redhat.com, qemu-block@nongnu.org, Markus Armbruster , Sam Li Subject: [PATCH v5 4/4] iotests: test the zoned format feature for qcow2 file Date: Mon, 30 Oct 2023 20:18:47 +0800 Message-Id: <20231030121847.4522-5-faithilikerun@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231030121847.4522-1-faithilikerun@gmail.com> References: <20231030121847.4522-1-faithilikerun@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::62a; envelope-from=faithilikerun@gmail.com; helo=mail-pl1-x62a.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1698668416241100010 Content-Type: text/plain; charset="utf-8" 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 | 126 +++++++++++++++++++++++ tests/qemu-iotests/tests/zoned-qcow2.out | 118 +++++++++++++++++++++ 2 files changed, 244 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/test= s/zoned-qcow2 new file mode 100755 index 0000000000..7749329480 --- /dev/null +++ b/tests/qemu-iotests/tests/zoned-qcow2 @@ -0,0 +1,126 @@ +#!/usr/bin/env bash +# +# Test zone management operations for qcow2 file. +# + +seq=3D"$(basename $0)" +echo "QA output created by $seq" +status=3D1 # failure is the default! + +file_name=3D"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 "=3D=3D=3D Initial image setup =3D=3D=3D" +echo + +$QEMU_IMG create -f qcow2 $file_name -o size=3D768M -o zone_size=3D64M \ +-o zone_capacity=3D64M -o conventional_zones=3D0 -o max_append_bytes=3D131= 072 \ +-o max_open_zones=3D0 -o max_active_zones=3D0 -o zone_model=3Dhost-managed + +IMG=3D"--image-opts -n driver=3Dqcow2,file.driver=3Dfile,file.filename=3D$= file_name" +QEMU_IO_OPTIONS=3D$QEMU_IO_OPTIONS_NO_FMT + +echo +echo "=3D=3D=3D Testing a qcow2 img with zoned format =3D=3D=3D" +echo +echo "case 1: test zone operations one by one" + +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 zones[-1]:" # zones[-1] dictates the last zone +$QEMU_IO $IMG -c "zrp 0x2C000000 2" # 0x2C000000 / 512 =3D 0x160000 +echo +echo +echo "(2) open zones[0], zones[1], zones[-1] then close, finish, reset:" +$QEMU_IO $IMG << EOF +zo 0 0x4000000 # 0x4000000 / 512 =3D 0x20000 +zrp 0 1 +zo 0x4000000 0x4000000 +zrp 0x4000000 1 +zo 0x2C000000 0x4000000 +zrp 0x2C000000 2 +zc 0 0x4000000 +zrp 0 1 +zc 0x2C000000 0x4000000 +zrp 0x2C000000 2 +zf 0 0x4000000 +zrp 0 1 +zf 64M 64M +zrp 0x4000000 2 +zf 0x2C000000 0x4000000 +zrp 0x2C000000 2 +zrs 0 0x4000000 +zrp 0 1 +zrs 0x4000000 0x4000000 +zrp 0x4000000 1 +zrs 0x2C000000 0x4000000 +zrp 0x2C000000 2 +EOF + +echo +echo "(3) append write with (4k, 8k) data" +$QEMU_IO $IMG -c "zrp 0 12" # the physical block size of the device is 4096 +echo "Append write zones[0], zones[1] twice" +$QEMU_IO $IMG << EOF +zap -p 0 0x1000 0x2000 +zrp 0 1 +zap -p 0 0x1000 0x2000 +zrp 0 1 +zap -p 0x4000000 0x1000 0x2000 +zrp 0x4000000 1 +zap -p 0x4000000 0x1000 0x2000 +zrp 0x4000000 1 +EOF + +echo +echo "Reset all:" +$QEMU_IO $IMG -c "zrs 0 768M" -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 << EOF +zap -p 0 0x1000 0x1000 # wrote (4k, 4k): +zrp 0 1 +zap -p 0 0x1000 0x3ffd000 +zrp 0 1 +EOF + +echo "Reset zones[0]:" +$QEMU_IO $IMG -c "zrs 0 64M" -c "zrp 0 1" + +echo "(2) write in zones[0], zones[3], zones[8], and then reset all" +$QEMU_IO $IMG << EOF +zap -p 0 0x1000 0x1000 +zap -p 0xc000000 0x1000 0x1000 +zap -p 0x20000000 0x1000 0x1000 +zrp 0 12 +zrs 0 768M +zrp 0 12 +EOF + +# success, all done +echo "*** done" +rm -f $seq.full +status=3D0 diff --git a/tests/qemu-iotests/tests/zoned-qcow2.out b/tests/qemu-iotests/= tests/zoned-qcow2.out new file mode 100644 index 0000000000..aec43f0d5b --- /dev/null +++ b/tests/qemu-iotests/tests/zoned-qcow2.out @@ -0,0 +1,118 @@ +QA output created by zoned-qcow2 + +=3D=3D=3D Initial image setup =3D=3D=3D + +Formatting 'zbc.qcow2', fmt=3Dqcow2 cluster_size=3D65536 extended_l2=3Doff= compression_type=3Dzlib zone_model=3Dhost-managed zone_size=3D67108864 zon= e_capacity=3D67108864 conventional_zones=3D0 max_append_bytes=3D131072 max_= active_zones=3D0 max_open_zones=3D0 size=3D805306368 lazy_refcounts=3Doff r= efcount_bits=3D16 + +=3D=3D=3D Testing a qcow2 img with zoned format =3D=3D=3D + +case 1: test zone operations one by one +(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 zones[-1]: +start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000, zcond:1, [type: = 2] + + +(2) open zones[0], zones[1], zones[-1] then close, finish, reset: +qemu-io> bad argument count 8 to zo, expected 2 arguments +qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2] +qemu-io> qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, = zcond:3, [type: 2] +qemu-io> qemu-io> start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000= , zcond:3, [type: 2] +qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1,= [type: 2] +qemu-io> qemu-io> start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000= , zcond:1, [type: 2] +qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x20000, zcon= d:14, [type: 2] +qemu-io> qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x40000, = zcond:14, [type: 2] +start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40000, zcond:1, [type: 2] +qemu-io> qemu-io> start: 0x160000, len 0x20000, cap 0x20000, wptr 0x180000= , zcond:14, [type: 2] +qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1,= [type: 2] +qemu-io> qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20000, = zcond:1, [type: 2] +qemu-io> qemu-io> start: 0x160000, len 0x20000, cap 0x20000, wptr 0x160000= , zcond:1, [type: 2] +qemu-io> +(3) 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], zones[1] twice +qemu-io> After zap done, the append sector is 0x0 +qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x18, zcond:2, [type: = 2] +qemu-io> After zap done, the append sector is 0x18 +qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x30, zcond:2, [type: = 2] +qemu-io> After zap done, the append sector is 0x20000 +qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20018, zcond:2, = [type: 2] +qemu-io> After zap done, the append sector is 0x20018 +qemu-io> start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20030, zcond:2, = [type: 2] +qemu-io> +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 +qemu-io> bad argument count 8 to zap, expected between 3 and 4 arguments +qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2] +qemu-io> zone append failed: Operation not supported +qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:1, [type: 2] +qemu-io> 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 +qemu-io> After zap done, the append sector is 0x0 +qemu-io> After zap done, the append sector is 0x60000 +qemu-io> After zap done, the append sector is 0x100000 +qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x10, zcond:2, [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:2, [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:2, [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] +qemu-io> qemu-io> 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] +qemu-io> *** done --=20 2.40.1