From nobody Sun Nov 24 03:14:22 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=1727614949; cv=none; d=zohomail.com; s=zohoarc; b=Xs0OaoELsUbEucxPBjYnCyE64rd3AATR9YcX/YS4B7/M9PvosBx9w1AhHnULtChtbWo6/zky2MsB0DWCAnoZlq0n7N/Y6ai1L1bWiBSjAXz6grtHo6XUSsXS0Xk7z1dkpMwv8nVZ4z8gF93xPb6rTFhpLuJUJeYm5dxnVDHuUbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727614949; 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=yy2THaii5qPg6y1D/FYztwxVzNAoto7QEe6ZghTIh44=; b=bSCw5DdO0VYSO+jULZDGmOc/XjPGrRjI3IvV7KFtHFIoO7+9qd/02RHsnkPBxlKGsoS4kBytuT7vG6aLQ9+CyI6l6xRyfiBzd33wR0l8zpDRQsQhHvna3LRBmDFlYOT8yKq0hxshW5IcAE+gUTyF1phDGFQ/1PbuXCt3hKVOuVQ= 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 1727614949909227.3752181485454; Sun, 29 Sep 2024 06:02:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sutYW-0002Yu-S5; Sun, 29 Sep 2024 09:01:45 -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 1sutYV-0002Se-4F; Sun, 29 Sep 2024 09:01:43 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sutYR-00043B-CZ; Sun, 29 Sep 2024 09:01:42 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a8d6ac24a3bso646477766b.1; Sun, 29 Sep 2024 06:01:38 -0700 (PDT) Received: from groves.fkb.profitbricks.net (ip5f5af605.dynamic.kabel-deutschland.de. [95.90.246.5]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a93c27776cesm373146966b.40.2024.09.29.06.01.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Sep 2024 06:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727614897; x=1728219697; 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=yy2THaii5qPg6y1D/FYztwxVzNAoto7QEe6ZghTIh44=; b=RfbdOsNEGIt3jaXY6zDPGAJqFaGUaSwsJoKe+RmQD0wzwM7073zzRM9IYNWyoKmkK6 nrlgfdNkkVP5Qn5cmtXyChB0T1eSlzWB+6W4o+iw8Q3BwBGPe6VOcsvgpbYRTzyPDwA3 xtFUULkmm3mpfqFX7KS16eYUtrQ0tbG+AMyAZztASzJcDTTjO1rQeEe80cd5RyAvjp3i vsk2pz7eg2DtI1u6WU9z6eTcRSw0XBM4UKTX+VX5ArPcHKtH9Sb04BzMt7EeYGyKA03D cQZUAUqYdeZS+mBV/RWdwH7E9o+2bwgSneOHUq/iJYKhToma+iOb7407AO9GtPjsINOB 7+cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727614897; x=1728219697; 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=yy2THaii5qPg6y1D/FYztwxVzNAoto7QEe6ZghTIh44=; b=JRjabTWcYNhUF5NLAJ8ytPVgHBo4coGWUueruLSgrMnd5u9ARV8QjBi2Z4s/H787fr nCUpdytmQBaN/RVakAV9v5NRMYE5A5LekAID7qjMm28TmQOUVw9c+h4wlY9Wp3wEEq8L wI5Kp9zUZ52hPd9L0Txg72sqZdpVUY6d2+zTJlvYt1bLxx1mpxqNgWRbvaXh32KCft71 lG2gUr0Ys5kjnWxI6WJJabw6Zl6Z9WPxJvw5UtgPm0HmrYtj6kzKSoNc4ZyvSjV6LHXf s0a1yrIWqT56NpkgEW6r80BXjYb076XR4ofDCjzchrKNqjdCx6XJwlIWG13osTT9bip2 1qpQ== X-Forwarded-Encrypted: i=1; AJvYcCWO69cMDLRFLEHlQecu5hif1TqyUIFVv0B8K6SNKGq02hAmDyM/OQQ7eb7Z2g9xovBEDjNC1D78jB4V@nongnu.org X-Gm-Message-State: AOJu0Yxqe1CuM02dOtaMUtJwJ4nwAr2BH9xxoVTOruD13UwWygLlnvhs ahAnP1jTrQY5G3MU/IGvDCcdhA7QauxBl+yAfTP6hZkiS6PNFWcv5JCIlqRz X-Google-Smtp-Source: AGHT+IHOVOa+zHUcioai7yNykVqiMq8v3OOENFNCX2NIEJt080MT4GHZE8X8hRzvEySAwdZJyFS05w== X-Received: by 2002:a17:906:4fcb:b0:a8d:2fdb:b449 with SMTP id a640c23a62f3a-a93b15f935bmr1419086966b.16.1727614897050; Sun, 29 Sep 2024 06:01:37 -0700 (PDT) From: Sam Li X-Google-Original-From: Sam Li To: qemu-devel@nongnu.org Cc: Markus Armbruster , stefanha@redhat.com, Kevin Wolf , Eric Blake , dmitry.fomichev@wdc.com, Hanna Reitz , dlemoal@kernel.org, qemu-block@nongnu.org, hare@suse.de, Sam Li Subject: [PATCH v8 2/4] qcow2: add configurations for zoned format extension Date: Sun, 29 Sep 2024 15:01:31 +0200 Message-Id: <20240929130133.535568-3-jia.li@ionos.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240929130133.535568-1-jia.li@ionos.com> References: <20240929130133.535568-1-jia.li@ionos.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=2a00:1450:4864:20::62d; envelope-from=faithilikerun@gmail.com; helo=mail-ej1-x62d.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, 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: 1727614951760116600 Content-Type: text/plain; charset="utf-8" From: Sam Li 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 image with zoned format feature, use command like this: qemu-img create -f qcow2 zbc.qcow2 -o size=3D768M \ -o zone.size=3D64M -o zone.capacity=3D64M -o zone.conventional_zones=3D0 \ -o zone.max_append_bytes=3D4096 -o zone.max_open_zones=3D6 \ -o zone.max_active_zones=3D8 -o zone.mode=3Dhost-managed Signed-off-by: Sam Li --- block/qcow2.c | 264 ++++++++++++++++++++++++++++++- block/qcow2.h | 32 +++- docs/interop/qcow2.txt | 107 ++++++++++++- include/block/block_int-common.h | 15 +- qapi/block-core.json | 69 +++++++- 5 files changed, 480 insertions(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 803ca73a2f..f0fd9d79a2 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, @@ -194,6 +195,74 @@ qcow2_extract_crypto_opts(QemuOpts *opts, const char *= fmt, Error **errp) return cryptoopts_qdict; } =20 +/* + * Passing by the zoned device configurations by a zoned_header struct, ch= eck + * if the zone device options are under constraints. Return false when some + * option is invalid + */ +static inline bool +qcow2_check_zone_options(Qcow2ZonedHeaderExtension *zone_opt, Error **errp) +{ + if (zone_opt) { + uint32_t sequential_zones; + + if (zone_opt->zone_size =3D=3D 0) { + error_setg(errp, "Zoned extension header zone_size field " + "can not be 0"); + return false; + } + + if (zone_opt->zone_capacity > zone_opt->zone_size) { + error_setg(errp, "zone capacity %" PRIu64 "B exceeds zone size= " + "%" PRIu64 "B", zone_opt->zone_capacity, + zone_opt->zone_size); + return false; + } + + if (zone_opt->max_append_bytes + BDRV_SECTOR_SIZE >=3D + zone_opt->zone_capacity) { + error_setg(errp, "max append bytes %" PRIu64 "B exceeds zone " + "capacity %" PRIu32 "B by more than block size", + zone_opt->zone_capacity, + zone_opt->max_append_bytes); + return false; + } + + if (zone_opt->conventional_zones >=3D zone_opt->nr_zones) { + error_setg(errp, "Conventional_zones %" PRIu32 " exceeds " + "nr_zones %" PRIu32 ".", + zone_opt->conventional_zones, zone_opt->nr_zones); + return false; + } + + if (zone_opt->max_active_zones > zone_opt->nr_zones) { + error_setg(errp, "Max_active_zones %" PRIu32 " exceeds " + "nr_zones %" PRIu32 ". Set it to nr_zones.", + zone_opt->max_active_zones, zone_opt->nr_zones); + zone_opt->max_active_zones =3D zone_opt->nr_zones; + } + + sequential_zones =3D zone_opt->nr_zones - zone_opt->conventional_z= ones; + if (zone_opt->max_open_zones > sequential_zones) { + error_setg(errp, "Max_open_zones field can not be larger than" + "the number of SWR zones. Set it to number of SWR" + "zones %" PRIu32 ".", sequential_zones); + zone_opt->max_open_zones =3D sequential_zones; + } + if (zone_opt->max_open_zones > zone_opt->max_active_zones) { + error_setg(errp, "Max_open_zones %" PRIu32 " exceeds " + "max_active_zones %" PRIu32 ". Set it to " + "max_active_zones.", + zone_opt->max_open_zones, + zone_opt->max_active_zones); + zone_opt->max_open_zones =3D zone_opt->max_active_zones; + } + + return true; + } + return false; +} + /* * read qcow2 extension and fill bs * start reading from start_offset @@ -211,6 +280,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; @@ -432,6 +502,51 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t s= tart_offset, break; } =20 + case QCOW2_EXT_MAGIC_ZONED_FORMAT: + { + if (ext.len < sizeof(zoned_ext)) { + /* Missing fields */ + error_setg(errp, "zoned_ext: len=3D%" PRIu32 " too small " + "(<%zu)", ext.len, sizeof(zoned_ext)); + 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; + } + + zoned_ext.zone_size =3D be64_to_cpu(zoned_ext.zone_size); + zoned_ext.zone_capacity =3D be64_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.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; + } + if (!qcow2_check_zone_options(&zoned_ext, errp)) { + 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 @@ -1982,6 +2097,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 @@ -3081,6 +3205,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, @@ -3126,6 +3255,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_be64(s->zoned_header.zone_size), + .zone_capacity =3D cpu_to_be64(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); @@ -3500,6 +3654,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options= , Error **errp) ERRP_GUARD(); BlockdevCreateOptionsQcow2 *qcow2_opts; QDict *options; + Qcow2ZoneCreateOptions *zone_struct; + Qcow2ZoneHostManaged *zone_host_managed; =20 /* * Open the image file and write a minimal qcow2 header. @@ -3526,6 +3682,8 @@ qcow2_co_create(BlockdevCreateOptions *create_options= , Error **errp) =20 assert(create_options->driver =3D=3D BLOCKDEV_DRIVER_QCOW2); qcow2_opts =3D &create_options->u.qcow2; + zone_struct =3D create_options->u.qcow2.zone; + zone_host_managed =3D &create_options->u.qcow2.zone->u.host_managed; =20 bs =3D bdrv_co_open_blockdev_ref(qcow2_opts->file, errp); if (bs =3D=3D NULL) { @@ -3739,6 +3897,14 @@ qcow2_co_create(BlockdevCreateOptions *create_option= s, Error **errp) header->incompatible_features |=3D cpu_to_be64(QCOW2_INCOMPAT_DATA_FILE); } + if (zone_struct && zone_struct->mode =3D=3D QCOW2_ZONE_MODEL_HOST_MANA= GED) { + /* + * The incompatible bit must be set when the zone model is + * 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); @@ -3796,10 +3962,9 @@ qcow2_co_create(BlockdevCreateOptions *create_option= s, Error **errp) bdrv_graph_co_rdlock(); ret =3D qcow2_alloc_clusters(blk_bs(blk), 3 * cluster_size); if (ret < 0) { - bdrv_graph_co_rdunlock(); error_setg_errno(errp, -ret, "Could not allocate clusters for qcow= 2 " "header and refcount table"); - goto out; + goto unlock; =20 } else if (ret !=3D 0) { error_report("Huh, first cluster in empty image is already in use?= "); @@ -3807,11 +3972,62 @@ 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 (zone_struct && zone_struct->mode =3D=3D QCOW2_ZONE_MODEL_HOST_MANA= GED) { + s->zoned_header.zoned =3D BLK_Z_HM; + + if (!zone_host_managed->has_size) { + s->zoned_header.zone_size =3D DEFAULT_ZONE_SIZE; + } else { + s->zoned_header.zone_size =3D zone_host_managed->size; + } + s->zoned_header.nr_zones =3D DIV_ROUND_UP(qcow2_opts->size, + s->zoned_header.zone_size); + + if (zone_host_managed->has_capacity) { + s->zoned_header.zone_capacity =3D zone_host_managed->capacity; + } else { + s->zoned_header.zone_capacity =3D s->zoned_header.zone_size; + } + + if (zone_host_managed->has_conventional_zones) { + s->zoned_header.conventional_zones =3D + zone_host_managed->conventional_zones; + } + + if (zone_host_managed->has_max_active_zones) { + s->zoned_header.max_active_zones =3D + zone_host_managed->max_active_zones; + + if (zone_host_managed->has_max_open_zones) { + s->zoned_header.max_open_zones =3D + zone_host_managed->max_open_zones; + } else { + s->zoned_header.max_open_zones =3D + zone_host_managed->max_active_zones; + } + } + + if (zone_host_managed->has_max_append_bytes) { + s->zoned_header.max_append_bytes =3D + zone_host_managed->max_append_bytes; + } else { + s->zoned_header.max_append_bytes =3D DEFAULT_MAX_APPEND_BYTES; + } + + if (!qcow2_check_zone_options(&s->zoned_header, errp)) { + s->zoned_header.zoned =3D BLK_Z_NONE; + ret =3D -EINVAL; + goto unlock; + } + } 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(); @@ -3885,6 +4101,9 @@ qcow2_co_create(BlockdevCreateOptions *create_options= , Error **errp) } =20 ret =3D 0; + goto out; +unlock: + bdrv_graph_co_rdunlock(); out: blk_co_unref(blk); bdrv_co_unref(bs); @@ -3945,6 +4164,10 @@ 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_CONVENTIONAL_ZONES, "zone.conventional-zones" }, + { BLOCK_OPT_MAX_OPEN_ZONES, "zone.max-open-zones" }, + { BLOCK_OPT_MAX_ACTIVE_ZONES, "zone.max-active-zones" }, + { BLOCK_OPT_MAX_APPEND_BYTES, "zone.max-append-bytes" }, { NULL, NULL }, }; =20 @@ -6113,6 +6336,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 modes, mode choice: host-managed", \ + }, \ + { \ + .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_SIZE, \ + .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 a9e3481c6e..cc9bff0473 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -128,6 +128,9 @@ =20 #define DEFAULT_CLUSTER_SIZE 65536 =20 +#define DEFAULT_ZONE_SIZE (256 * MiB) +#define DEFAULT_MAX_APPEND_BYTES (64 * KiB) + #define QCOW2_OPT_DATA_FILE "data-file" #define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts" #define QCOW2_OPT_DISCARD_REQUEST "pass-discard-request" @@ -236,6 +239,27 @@ typedef struct Qcow2CryptoHeaderExtension { uint64_t length; } QEMU_PACKED Qcow2CryptoHeaderExtension; =20 +typedef struct Qcow2ZonedHeaderExtension { + /* Zoned device attributes */ + uint8_t zoned; + uint8_t reserved[3]; + uint64_t zone_size; + uint64_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 +280,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 */ @@ -422,6 +449,9 @@ typedef struct BDRVQcow2State { * is to convert the image with the desired compression type set. */ Qcow2CompressionType compression_type; + + /* States of zoned device */ + Qcow2ZonedHeaderExtension zoned_header; } BDRVQcow2State; =20 typedef struct Qcow2COWRegion { diff --git a/docs/interop/qcow2.txt b/docs/interop/qcow2.txt index 2c4618375a..18834a9a7c 100644 --- a/docs/interop/qcow2.txt +++ b/docs/interop/qcow2.txt @@ -125,7 +125,26 @@ 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 an emulated zoned device. The + zoned extension must be present. + Implementations that do not support zoned + emulation cannot open this file because it + generally only make sense to interpret the + data along with the zone information and + write pointers. + + It is unsafe when any qcow2 user without + knowing the zoned extension reads or edits + a file with the zoned extension. The write + pointer tracking can be corrupted when a + writer edits a file, like overwriting beyo= nd + the write pointer locations. Or a reader t= ries + to access a file without knowing write + pointers where the software setup will cau= se + invalid reads. + + Bits 6-63: Reserved (set to 0) =20 80 - 87: compatible_features Bitmask of compatible features. An implementation can @@ -249,6 +268,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 +351,91 @@ 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 must be present if the incompatible bit is set, and +omitted when the incompatible bit is clear. It contains fields for +emulating the zoned storage model (https://zonedstorage.io/). When the +zone model mode is not host-managed, it is regarded as incompatible +and reports an error to users. + +The write pointers for each zone are stored in an area called zonedmeta +clusters. It is 8 bytes per zone. The offset and size of the zonedmeta +are kept in the zoned extension header. + +The fields of the zoned extension are: + Byte 0: zoned + The byte represents the zoned model of the device. 0 is= for + a non-zoned device (all other information in this header + is ignored). 1 is for a host-managed device, which only + allows for sequential writes within each zone. Other + values may be added later, the implementation must refu= se + to open a device containing an unknown zone model. + + 1 - 3: Reserved, must be zero. + + 4 - 11: zone_size + Total size of each zone, in bytes. The 64-bit field is = to + satisfy the virtio-blk zone_size range and emulate a re= ad + zoned device, whose maximum zone size can be as large as + 2TB. + + The value must be power of 2. Linux currently requires + the zone size to be a power of 2 number of LBAs. Qcow2 + following this is mainly to allow emulating a real + ZNS drive configuration. It is not relevant to the clus= ter + size. + + 12 - 19: zone_capacity + The number of writable bytes within the zones. The bytes + between zone capacity and zone size are unusable: reads + will return 0s and writes will fail. + + A zone capacity is always smaller or equal to the zone + size. It is for emulating a real ZNS drive configuratio= n, + which has the constraint of aligning to some hardware e= rase + block size. + + 20 - 23: conventional_zones + The number of conventional zones. The conventional zones + allow sequential writes and random writes. While the + sequential zones only allow sequential writes. + + 24 - 27: nr_zones + The number of zones. It is the sum of conventional zones + and sequential zones. The maximum value for nr_zones is + (2^32 - 1)/8 =3D 536870911. + + 28 - 31: max_active_zones + The number of the zones that can be in the implicit ope= n, + explicit open or closed state. The max active zones can= not + be larger than the max open zones. + + 32 - 35: max_open_zones + The maximal number of open (implicitly open or explicit= ly + open) zones. It cannot be larger than the number of SWR + zones of the device. + + If the limits of open zones or active zones are equal to + the total number of SWR zones, then it's the same as ha= ving + no limits therefore max open zones and max active zones= are + set to 0. + + 36 - 39: 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 and l= ess + than the zone capacity. + + 40 - 47: 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 whose size is the number of zones + multiplied by the zone size. + + 48 - 55: 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 ebb4e56a50..e1001ad9a3 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.mode" +#define BLOCK_OPT_ZONE_SIZE "zone.size" +#define BLOCK_OPT_ZONE_CAPACITY "zone.capacity" +#define BLOCK_OPT_CONVENTIONAL_ZONES "zone.conventional_zones" +#define BLOCK_OPT_MAX_APPEND_BYTES "zone.max_append_bytes" +#define BLOCK_OPT_MAX_ACTIVE_ZONES "zone.max_active_zones" +#define BLOCK_OPT_MAX_OPEN_ZONES "zone.max_open_zones" =20 #define BLOCK_PROBE_BUF_SIZE 512 =20 @@ -881,7 +888,13 @@ typedef struct BlockLimits { BlockZoneModel zoned; =20 /* zone size expressed in bytes */ - uint32_t zone_size; + uint64_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. + */ + uint64_t zone_capacity; =20 /* total number of zones */ uint32_t nr_zones; diff --git a/qapi/block-core.json b/qapi/block-core.json index 9f6dd59298..43500da1bb 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -5073,6 +5073,69 @@ { 'enum': 'Qcow2CompressionType', 'data': [ 'zlib', { 'name': 'zstd', 'if': 'CONFIG_ZSTD' } ] } =20 +## +# @Qcow2ZoneModel: +# +# Zoned device model used in qcow2 image file +# +# @host-managed: The host-managed model only allows sequential write over = the +# device zones. +# +# Since 8.2 +## +{ 'enum': 'Qcow2ZoneModel', + 'data': [ 'host-managed'] } + +## +# @Qcow2ZoneHostManaged: +# +# The host-managed zone model. It only allows sequential writes. +# +# @size: Total number of bytes within zones (default 256 MB). +# +# @capacity: The number of usable logical blocks within zones +# in bytes. A zone capacity is always smaller or equal to the +# zone size (default to zone size). +# +# @conventional-zones: The number of conventional zones of the +# zoned device (default 0). +# +# @max-open-zones: The maximal number of open zones. It is less than +# or equal to the number of sequential write required zones of +# the device (default 0). +# +# @max-active-zones: The maximal number of zones in the implicit +# open, explicit open or closed state. It is less than or equal +# to the max open zones (default 0). +# +# @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 and less than the zone capacity (default 64 KB). +# +# Since 8.2 +## +{ 'struct': 'Qcow2ZoneHostManaged', + 'data': { '*size': 'size', + '*capacity': 'size', + '*conventional-zones': 'uint32', + '*max-open-zones': 'uint32', + '*max-active-zones': 'uint32', + '*max-append-bytes': 'size' } } + +## +# @Qcow2ZoneCreateOptions: +# +# The zone device model for the qcow2 image. +# +# @mode: The zone device model modes. +# +# Since 8.2 +## +{ 'union': 'Qcow2ZoneCreateOptions', + 'base': { 'mode': 'Qcow2ZoneModel' }, + 'discriminator': 'mode', + 'data': { 'host-managed': 'Qcow2ZoneHostManaged' } } + ## # @BlockdevCreateOptionsQcow2: # @@ -5115,6 +5178,9 @@ # @compression-type: The image cluster compression method # (default: zlib, since 5.1) # +# @zone: The zone device model modes. The default is that the device is +# not zoned. (since 8.2) +# # Since: 2.12 ## { 'struct': 'BlockdevCreateOptionsQcow2', @@ -5131,7 +5197,8 @@ '*preallocation': 'PreallocMode', '*lazy-refcounts': 'bool', '*refcount-bits': 'int', - '*compression-type':'Qcow2CompressionType' } } + '*compression-type':'Qcow2CompressionType', + '*zone': 'Qcow2ZoneCreateOptions' } } =20 ## # @BlockdevCreateOptionsQed: --=20 2.34.1