From nobody Sun Jul 26 11:51:49 2026 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=1782479868; cv=none; d=zohomail.com; s=zohoarc; b=hyBO/ubMbSXMR7StkgPesmdW/7vsMaCNwS4RBHvA1QHUkwXjIh1j9hLqrhkN9TpR6DKDrgb0v//jBBbAi87u/Nz8d4H2XBQIOokpMsMa/P6m41AaZtlr2rowjY9JUQk73fI+DNVfFtEwkq1T1HxBPTC5Y7193sEmiZSkeTDktcg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782479868; 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=C5kEQqDASX85Z7nerxKTqOg4pt8TEJhHjvpM9aHYwqw=; b=MlYHMNCqO4M4pTCA7RG37Bu+xRBEGUkHjf0XJ0N3qRyuinFkwulFZCF16umS++9Q40ARNNCUp5DT8KXmENwubRhKCgWC1LdiMzue0ZFbmssUTXw+8mOTXk1dWVFyMGjssa36mnUg43TX7Q+Qi9N+YWrFH3cCxKsnoMdaDAN5M7E= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782479868252631.7300813654658; Fri, 26 Jun 2026 06:17:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wd6Pt-0008ES-9C; Fri, 26 Jun 2026 09:16:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wd6Pf-0008B9-7q for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:08 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wd6Pb-0000wx-4F for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:05 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4924944fe6bso6832835e9.0 for ; Fri, 26 Jun 2026 06:16:02 -0700 (PDT) Received: from dobby ([2a02:8109:a394:4800:b369:c9c1:81a0:4afc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46c2279b83fsm26093756f8f.29.2026.06.26.06.15.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 06:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782479761; x=1783084561; 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=C5kEQqDASX85Z7nerxKTqOg4pt8TEJhHjvpM9aHYwqw=; b=sWGXLvb1Y1FyL9LWtPnP9J1voERgrHWN0HhsqiDiexDWR1AeqJBeg00CQYOu0wnsbd MXem87QO7thu5mB4mq3e7fpcoOfey9MdJfDXveBeEcz6JLLcZ29rgPDpl9TxRcC/v5jv VEzB1Fxzg30aPO6LjzIdNfGFUpixt8mcikqh3N4ObRpJalnaFSep54q0cfeJvxj/kBcb kSH26eR24RHU6obZbKFkX+8Kr1aIcxdm6TeV24HlfG5cJdZFq/7LUqFS8SH6C08gkciO 8hxJ2hWxRBTP3/Rv30aDg2tAL4lKy3CENRxWKrsf/SK8oGzziR0ufh/4xI4BbYkfnhOB UyUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782479761; x=1783084561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C5kEQqDASX85Z7nerxKTqOg4pt8TEJhHjvpM9aHYwqw=; b=O/GN2UORYjF+XUJbqmEsBh8HPBXVeISRodOhBsjR5LipV1AzHigucNS24lRO44cEG7 Ef0nk/6MvXDtE2JNMaSSXW0MK+iBYaZ7fJJzynhSS6s1iRWgRYCZQ/Ov90HiJ/f98hpC 6P0w/cJxcwKAkVlyKgP9C5RrKQKGp91OEccG5BU0+DlbHQ9Lw1odq2Wfx9PVJ2KUHPj/ E61q6P+OgXz5PZtqr4UTpFK9KA5RTMGeZSVmhsVpV6zFm/hFoLzGeYk7gid029CnoXBD KZQ1Esz/WvqtoPzyDH1Hdw5TButunUR/4p0NAKsKt/TSYYuKTewex2V1E5rrCGtiQ6lO G4WA== X-Gm-Message-State: AOJu0YxYJELqvxzhoYlI2BuxOWqqXGym4qC8tm55nS5wyWJLrBtvnhE/ XONytem34n7NjigYKUeld0L4Uz/tGMZpZBnHScRUmNZBfQyrLEMiejZVMMVnhw== X-Gm-Gg: AfdE7cnKJWbnIAeBDvm7NOJ54hW9cb85V02gtdLKq1Jk52v6KGRiAfX9IGe6DwJEpIf f8leV+kF5tBcNlB0GUPJ77R44XGYXVvLSbmjUMKTDWaoOMtWnnBZZQuNMP+Q845V9gkYtHxAFFj YjEF0KiI9D7WfZi8NbzARH5YqwKhOV55JCPtPjnIKMDhESh4xqjRy5WfIZFffUfk+WELHuYTwBL SG9vjTgdEdM0zRNl5xxF2MOdOswCvD7OPw97BbRib4cOvBjYv3m1bnaBLGHH7DibmsqukPyrwCk pjQPXtgpWPD5kBWWfDFpfp0gG7aKangDs8ng2PKG8LbhvvqfbLDgReywOLT1D27OcI6Y1m+sROl TzXXHldrdWNUXiPGEixMdfMDKX2ZwS7JbSSklsVdajdQs7mAowYQdmHDTthrFSWNb8TQL6HQA1H p6dnbKlREUoik5pzTlgGxKktqOzAgPXR6Dxzzfihpe4t0gTg== X-Received: by 2002:a05:600d:4448:20b0:492:1e36:552b with SMTP id 5b1f17b1804b1-492668b7522mr81219265e9.36.1782479761223; Fri, 26 Jun 2026 06:16:01 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: Markus Armbruster , Kevin Wolf , cassel@kernel.org, dlemoal@kernel.org, qemu-block@nongnu.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Pierrick Bouvier , Eric Blake , Hanna Reitz , Sam Li Subject: [PATCH v13 1/6] docs/qcow2: add the zoned format feature Date: Fri, 26 Jun 2026 15:15:50 +0200 Message-ID: <20260626131555.459792-2-faithilikerun@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260626131555.459792-1-faithilikerun@gmail.com> References: <20260626131555.459792-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=faithilikerun@gmail.com; helo=mail-wm1-x32b.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1782479870679158500 Content-Type: text/plain; charset="utf-8" Add the specs for the zoned format feature of the qcow2 driver. The qcow2 file then can emulate real zoned devices, either passed through by virtio-blk device or NVMe ZNS drive to the guest given zoned information. Signed-off-by: Sam Li Reviewed-by: Stefan Hajnoczi Reviewed-by: Niklas Cassel --- docs/system/qemu-block-drivers.rst.inc | 50 ++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/docs/system/qemu-block-drivers.rst.inc b/docs/system/qemu-bloc= k-drivers.rst.inc index 675daa72f9..19587c515f 100644 --- a/docs/system/qemu-block-drivers.rst.inc +++ b/docs/system/qemu-block-drivers.rst.inc @@ -172,6 +172,56 @@ 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:: zone.mode + If this is set to ``host-managed``, the image is an emulated zoned + block device. This option is only valid to emulated zoned device files. + + .. 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. + Defaults to ``256 MiB``. + + .. 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. Defaults to ``zone.size``. + + The zone capacity is per zone and may be different between zones in re= al + devices. QCow2 sets all zones to the same capacity. + + .. option:: zone.conventional_zones + + The number of conventional zones of the zoned device. Defaults to ``0`` + (all zones are sequential-write-required). + + .. option:: zone.max_active_zones + + The maximum allowed active zones (zones in the implicit open, explicit + open, or closed state). + + The max active zones must be less or equal to the number of SWR + (sequential write required) zones of the device. Defaults to ``0``, + meaning no limit. + + .. option:: zone.max_open_zones + + The maximum allowed open zones (zones in the implicit open or explicit + open state). The max open zones must not be larger than the max active + zones. Defaults to ``zone.max_active_zones`` if that is set, otherwise + ``0`` (no limit). + + If the limits of open zones or active zones are equal to the number of + SWR zones, then it is the same as having no limits. + + .. option:: zone.max_append_bytes + + The maximum 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. A value of ``0`` means that zone append requests are not + supported. Defaults to ``64 KiB``. + .. program:: image-formats .. option:: qed =20 --=20 2.53.0 From nobody Sun Jul 26 11:51:49 2026 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=1782479871; cv=none; d=zohomail.com; s=zohoarc; b=erdYj4XWwxaiNOfD2Y1v6DX/0VEgeo44pHS4XVVU/f6JH0RsVH40V0EtSswkh6gM11EvtZH7Id6G4S+DhtROxJFi+4dJSlXuJ/hQrOZOCOEd/q39L2yb3Iq6EeDBUg+ODfr1NQXMkfhr3tTRSLSmcqRtJ+5ObcOBEa/CGwJZhUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782479871; 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=9ThB6GTLIkB2LxwLs/Jboo1V2nmPNwlN/KgRc5rVPHo=; b=cTUrsrzfJOnhxyvnQioVhtFFzw3NGoem6yYuvaW4FXkJ5gRUbNx5eVE77WQ76NHlfLhdCB6IzvROhzuPH4+rZekvVVJUDns94xMGASWpQCFF/xiAtz7ZjiBK4oRZy5hrdHvvoqZ50BKlRCDUwttxeqrc7Ljfs943E+DCJfq6QzY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782479871881954.8657828423692; Fri, 26 Jun 2026 06:17:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wd6Pm-0008Ck-RH; Fri, 26 Jun 2026 09:16:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wd6Pf-0008BC-7q for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:08 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wd6Pd-0000zG-Bj for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:06 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-45fd464d51fso507231f8f.3 for ; Fri, 26 Jun 2026 06:16:04 -0700 (PDT) Received: from dobby ([2a02:8109:a394:4800:b369:c9c1:81a0:4afc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46c2279b83fsm26093756f8f.29.2026.06.26.06.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 06:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782479764; x=1783084564; 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=9ThB6GTLIkB2LxwLs/Jboo1V2nmPNwlN/KgRc5rVPHo=; b=XMNByCZszYxmNSAZfGz0sY+bI1IFrhgorPpppVdz56RVwlZohcrwuPq6wuv45O1Nf9 +5Ze6TnhExCBYo9Q9xSKnfs+momUMn/SI4FkgYeHx0Ut/UlPXQn42QQaGS0LKH9cr65J UjKBsYFpxLn/Z9ZSFLzau00lJBs0+vAE9lgc6la3Q4FdehdiMPIGx2l2lSnoNALTy170 /c+putOsosfm0O0nSN8plJjAdyWK6wbsuec1oGfLckHMk3HUdOMov96fo3tM+/VRXwKb 4fnR9QBWfXBMDljbBd1SMdN3PAKFfc8vgVig7Bkfw3WeIN0QKfNCil/oBeO23AdyJI5N LC0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782479764; x=1783084564; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9ThB6GTLIkB2LxwLs/Jboo1V2nmPNwlN/KgRc5rVPHo=; b=GVGpL14R8hU1kv7diCmOxZIHHumD1NbXHCuUBlajjZJB7gjTFApLDOenMbeTA/eZCQ QBJqKb8FPus2FuJsVI+dOnHnJXOgCMjbsK4q9QB++i2RrI7qUPgMnig7PPolPHiNigYJ OiJC3q6v3wMKouJ5DaLP+JCFSjzpUKnobcKAjyCm8PeJ1m9Y+MjphfUPyhjP6Bzcho7R HLBZNVr/1hERItd+xE2yyFzAqXjJP0a+isaZ1k7C31i2rsoUdL/PJsQOp/kGesz3VdR9 fDdRr564L3bf9Zc/gjBihh00bWTgI5jrmqsYCFKBN6RJlSWmNtCG7V+WdG1eCrV7S1QO KAgw== X-Gm-Message-State: AOJu0Yw3eT/ue14cKMEKVdyDIRl2+kegkjyFwvm3FJJGSxtytepjfVj7 LlIrufZ0nDhHUsO9nhgldCKcuVyvITs8A+6g6goH2K+GYrj227f0BJmp6f4VMg== X-Gm-Gg: AfdE7ck/QuS7koTpkTGUolo5MeL9D91TnNwPIx4TkdmV9wxhVHTcVVMEt/x17wYkDrq GxgTThA8I5tKeaVW7Dl1ZIi+wsxMYtoCZfrNPaOfAwhZLyHfOY4eEzuq07GgnJomPYUbndh8zRh 2S7q26l0SD7yED6G3zdFu/PPAybthqZ0p2YsZ3PSGBhtmjm5BRTcJwoM8BcYmaRXHYK6sSeYGTu aZGuPNsGDwvtUdHZNwESSE6LWWTgWWwK3gce7S0hLmXwCq6lFJhHDrD4MLIyuzaSc4SWcOS0dtq lcbHa0H3mhRzzyCSOm3Wny9iT0AXXonlN1en8yJc0VRiUyS9OpDYZbJVf/+pPzG5YkQn5jnpt3l n/VKycCYUmbK9XWJ/FAmRsBimiUPUIy/swEc40jdOI1rkr8SzSTVgCG5uBBHodb0tDS5IFM3i1b 8o85akbwvrQrkfefQG+q4dQjqQzztQqUiqiJRBwMP8xCuStA== X-Received: by 2002:a05:6000:2c0f:b0:46b:ea12:2912 with SMTP id ffacd0b85a97d-46dc05553f8mr11618756f8f.5.1782479762730; Fri, 26 Jun 2026 06:16:02 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: Markus Armbruster , Kevin Wolf , cassel@kernel.org, dlemoal@kernel.org, qemu-block@nongnu.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Pierrick Bouvier , Eric Blake , Hanna Reitz , Sam Li Subject: [PATCH v13 2/6] block: widen BlockLimits.zone_size to uint64_t Date: Fri, 26 Jun 2026 15:15:51 +0200 Message-ID: <20260626131555.459792-3-faithilikerun@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260626131555.459792-1-faithilikerun@gmail.com> References: <20260626131555.459792-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=faithilikerun@gmail.com; helo=mail-wr1-x434.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: qemu development 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: 1782479872629158500 Content-Type: text/plain; charset="utf-8" The zone-size field in BlockLimits is currently uint32_t, capping expressible zone sizes at 4 GiB. Real zoned-device protocols like NVMe ZNS allow larger zones. Widen BlockLimits.zone_size to uint64_t to match. Signed-off-by: Sam Li Reviewed-by: Niklas Cassel --- block/file-posix.c | 2 +- include/block/block_int-common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 3c985da94f..ddb159c58b 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -3600,7 +3600,7 @@ raw_co_zone_append(BlockDriverState *bs, =20 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); + "%" PRId64 "", *offset / 512, bs->bl.zone_size / 512); return -EINVAL; } =20 diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index 147c08155f..7571ed9968 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -901,7 +901,7 @@ typedef struct BlockLimits { BlockZoneModel zoned; =20 /* zone size expressed in bytes */ - uint32_t zone_size; + uint64_t zone_size; =20 /* total number of zones */ uint32_t nr_zones; --=20 2.53.0 From nobody Sun Jul 26 11:51:49 2026 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=1782479869; cv=none; d=zohomail.com; s=zohoarc; b=IoN5Xd4V3dD3p+s930EnICGEDjwRSgu/XX/zR1W1Bu7ZYio4d35bymFO3yOorVD4zQ3ypBWyCESDi+BkWcvqS00+iyF5pWEEJjPckraBo1l5SHeA7sb/0tbxrZG3gkhT28clvUKRb7ElRKKMsFpSgsWYit8nFdPAsdrRJ2wH+P0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782479869; 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=pwrzxsW/X0aKl2U6R2HfLV7iSN+gqtltG6tjYmbDoe8=; b=CkVHOZ7YKj+dCxHXR6NjAOQvi8ZeHuHjaTeCnyNGYtNomT8MXLhO2EtBJ3FYRhgVDQJBwuT2QzL8AiOv6xDUH3MZnQ6Hspjm2PiR6nEKhZTZdVuPhTvRJAEcWBHDnqnPq5igE4dtjg+DXXz1zsfyYBlllk7h4ZcK0SPtX8kqIKw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17824798694671004.2393896845682; Fri, 26 Jun 2026 06:17:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wd6Q1-0008Hx-OL; Fri, 26 Jun 2026 09:16:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wd6Pq-0008Dn-RY for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:19 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wd6Pk-000113-TF for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:18 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-46255b269c2so640545f8f.3 for ; Fri, 26 Jun 2026 06:16:11 -0700 (PDT) Received: from dobby ([2a02:8109:a394:4800:b369:c9c1:81a0:4afc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46c2279b83fsm26093756f8f.29.2026.06.26.06.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 06:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782479771; x=1783084571; 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=pwrzxsW/X0aKl2U6R2HfLV7iSN+gqtltG6tjYmbDoe8=; b=h/hJzpnB1XMYH6RMEF8/cpFp5+JzPbNUxgvQPgKZ3uZAVVGHJryf8Yjv4T1BEfQdS3 wluv1NWsgzPJw59/oCIaehiV1CWbhiv//GjocCFLh+TDmUj+RWeeSM8uKzqZC9AMjT82 ExURlLQ9wBBwRGuo2prS2Xm2MtAIUILDDo6ZcmKI+BuKcuPxFQ1D28dNs6LM+VxRVNuL c4o13ppoMKRw/Y/lkAqqYjTt39XnK2WRk8Y44qP6X2PFz2mRDmOtrvfL49G45HuVNLzM UwfJXmxNC4f1a8cVG8GXiy3VqCBwsY/UvjK6eGXxXprZQli/5d2UHhF4A11dd8J0W85+ bJRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782479771; x=1783084571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pwrzxsW/X0aKl2U6R2HfLV7iSN+gqtltG6tjYmbDoe8=; b=pplcEFNtPFZnRK5NOCGBsOFoTUF5hsSHrz5M0HEhUX0nPN/0Wuy7mu4ypf6JWJDGjG 9o95zX9GDmNPd3XAs5ccqwLaXByLsZrVajqbW+fy4c4dpEu40IKJN3YTgARFXYAgfl4d 0S/J1z04lUuNxPj3yF5wi9CX5IAcfbko2w99JxWLXMn5x6XeDk9AVUSZcf/YPu8CbL8C c6ZZKhEOnx5st7H4TlYtLdyR2LTl0QekVYgt2Q/c5olAH3lbtfPNbncsSTt7VePqgW/+ tDukxpktyAmkktpAbO246S1Mo8utHiHxe04mKbnDhs4QOnRjwNg8q/UXTvDedR4TtNGv BZEQ== X-Gm-Message-State: AOJu0Ywpd2QEESZjvDDZnSqwClfC89pp5kQW+yNdOW+lE00NapXyOcAN N11wf9x2PVMFZqHzKs1W++Z7MCVqyRv4Eity68QuGBrX3BeqVc4V1VFHQG3qHw== X-Gm-Gg: AfdE7clVrpnch8etdOUre3mi3vtscVYpXQGZ9QG6gPIALRA46mBHPr09zs+Wcgi5x6K ccXDaF9Bj4gD/b1ARU+4puvA1vYufUVpRAv3NJ3m8QzXDvGbU4dw8VVbt1TySYPfpVwoeqq2AVx q32wIsFzXhbR+eUt1OXEGpSEoAiYbEZujhH+9deIlfqxJlAC6adASYOY47hWvJ1yMyBeJw1WFNZ t08TJEu5iVIsvuqm0Wf9ChWpJ/GwCfH2RTgsN8aXO1t3zeQ5ertFSXkstWEfoC5Vnq6D+4ev9Oh FkhhNEF/8W4X5GTFY2uMAFOiJoW8YCYgSxugVNHN8+U8hwGLVHq+rL2zmZ+X/hAc6uA3g3GxhYi OhINu+a1d1lL0/xwkwqn135WL1s3146YSyzhjgwNlzbUpOGIkCsM2TmP1kGdODs9uVwc98pn+9O 69DZzvxAuAZsTvgZW5nnGaziRSG6tXOjsD+XmOuEggUvosGjMtU13+cUxk X-Received: by 2002:a05:6000:4025:b0:464:c1b9:8a24 with SMTP id ffacd0b85a97d-46dbf7d239fmr11335700f8f.14.1782479764300; Fri, 26 Jun 2026 06:16:04 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: Markus Armbruster , Kevin Wolf , cassel@kernel.org, dlemoal@kernel.org, qemu-block@nongnu.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Pierrick Bouvier , Eric Blake , Hanna Reitz , Sam Li Subject: [PATCH v13 3/6] qcow2: add configurations for zoned format extension Date: Fri, 26 Jun 2026 15:15:52 +0200 Message-ID: <20260626131555.459792-4-faithilikerun@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260626131555.459792-1-faithilikerun@gmail.com> References: <20260626131555.459792-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=faithilikerun@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1782479870755158500 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 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 Acked-by: Markus Armbruster # QAPI schema --- block/qcow2.c | 347 ++++++++++++++++++++++++++++++- block/qcow2.h | 83 +++++++- docs/interop/qcow2.rst | 120 ++++++++++- include/block/block_int-common.h | 13 ++ qapi/block-core.json | 91 +++++++- tests/qemu-iotests/082.out | 126 +++++++++++ 6 files changed, 773 insertions(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 19271b10a4..d7e421687b 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,98 @@ qcow2_extract_crypto_opts(QemuOpts *opts, const char *= fmt, Error **errp) return cryptoopts_qdict; } =20 +/* + * Returns true if zone_opt is valid, false otherwise. Fields that are + * out of range but recoverable by clamping (e.g. max_open_zones above + * the number of SWR zones) emit a warning and are adjusted in place; + * fields that have no safe clamp cause a hard error via errp. + */ +static bool +qcow2_check_zone_options(Qcow2ZonedHeaderExtension *zone_opt, Error **errp) +{ + uint32_t sequential_zones; + + assert(zone_opt !=3D NULL); + + if (zone_opt->zoned !=3D QCOW2_Z_NONE && zone_opt->zoned !=3D QCOW2_Z_= HM) { + error_setg(errp, "Zoned extension header zoned field has unknown " + "value %" PRIu8, zone_opt->zoned); + return false; + } + + if (zone_opt->zone_size =3D=3D 0) { + warn_report("Zoned extension header zone_size field must not be 0"= ); + return false; + } + + if (!is_power_of_2(zone_opt->zone_size)) { + error_setg(errp, "Zoned extension header zone_size %" PRIu64 + "B is not a power of 2", zone_opt->zone_size); + return false; + } + + if (zone_opt->nr_zones > UINT32_MAX / 8) { + error_setg(errp, "Zoned extension header nr_zones %" PRIu32 + " exceeds maximum %u", + zone_opt->nr_zones, UINT32_MAX / 8); + 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 (!QEMU_IS_ALIGNED(zone_opt->max_append_bytes, BDRV_SECTOR_SIZE)) { + error_setg(errp, "max append bytes %" PRIu32 "B is not aligned " + "to %" PRIu64, zone_opt->max_append_bytes, + (uint64_t)BDRV_SECTOR_SIZE); + return false; + } + + if (zone_opt->max_append_bytes + BDRV_SECTOR_SIZE >=3D + zone_opt->zone_capacity) { + error_setg(errp, "max append bytes %" PRIu32 "B exceeds zone " + "capacity %" PRIu64 "B by more than block size", + zone_opt->max_append_bytes, zone_opt->zone_capacity); + 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) { + warn_report("max_active_zones %" PRIu32 " exceeds nr_zones %" PRIu= 32 + ", clamping 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_zones; + if (zone_opt->max_open_zones > sequential_zones) { + warn_report("max_open_zones %" PRIu32 " exceeds the number of SWR " + "zones, clamping to %" PRIu32, + zone_opt->max_open_zones, sequential_zones); + zone_opt->max_open_zones =3D sequential_zones; + } + if (zone_opt->max_active_zones !=3D 0 && + zone_opt->max_open_zones > zone_opt->max_active_zones) { + warn_report("max_open_zones %" PRIu32 " exceeds max_active_zones " + "%" PRIu32 ", clamping 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; +} + /* * read qcow2 extension and fill bs * start reading from start_offset @@ -211,6 +304,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 +526,62 @@ 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: unexpected len=3D%" PRIu32 " " + "(expected %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; + + /* validate the header first */ + if (!qcow2_check_zone_options(&zoned_ext, errp)) { + return -EINVAL; + } + /* + * refuse to open broken images: reject untrusted total_sectors + * that would overflow when converted to bytes, then verify + * nr_zones matches the device size. + */ + if (bs->total_sectors < 0 || + (uint64_t)bs->total_sectors > UINT64_MAX / BDRV_SECTOR_SIZ= E) { + error_setg(errp, "Image size overflows when converted " + "to bytes"); + return -EINVAL; + } + if (zoned_ext.nr_zones !=3D DIV_ROUND_UP( + (uint64_t)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%" PRIu64 "\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 @@ -2068,6 +2218,25 @@ 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; + + switch (s->zoned_header.zoned) { + case QCOW2_Z_HM: + bs->bl.zoned =3D BLK_Z_HM; + break; + case QCOW2_Z_NONE: + default: + bs->bl.zoned =3D BLK_Z_NONE; + break; + } + + 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 @@ -3170,6 +3339,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, @@ -3215,6 +3389,31 @@ int qcow2_update_header(BlockDriverState *bs) buflen -=3D ret; } =20 + /* Zoned devices header extension */ + if (s->zoned_header.zoned =3D=3D QCOW2_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); @@ -3589,6 +3788,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. @@ -3615,6 +3816,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 qcow2_opts->zone; + zone_host_managed =3D NULL; =20 bs =3D bdrv_co_open_blockdev_ref(qcow2_opts->file, errp); if (bs =3D=3D NULL) { @@ -3828,6 +4031,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); @@ -3885,10 +4096,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?= "); @@ -3896,11 +4106,77 @@ 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 QCOW2_Z_HM; + zone_host_managed =3D &zone_struct->u.host_managed; + + if (zone_host_managed->has_size) { + s->zoned_header.zone_size =3D zone_host_managed->size; + } else { + s->zoned_header.zone_size =3D DEFAULT_ZONE_SIZE; + } + + if (s->zoned_header.zone_size =3D=3D 0) { + error_setg(errp, "Zoned extension header zone_size field " + "can not be 0"); + s->zoned_header.zoned =3D QCOW2_Z_NONE; + ret =3D -EINVAL; + goto unlock; + } + 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; + } else { + s->zoned_header.conventional_zones =3D 0; + } + + if (zone_host_managed->has_max_active_zones) { + s->zoned_header.max_active_zones =3D + zone_host_managed->max_active_zones; + } else { + s->zoned_header.max_active_zones =3D 0; + } + + if (zone_host_managed->has_max_open_zones) { + s->zoned_header.max_open_zones =3D + zone_host_managed->max_open_zones; + } else if (zone_host_managed->has_max_active_zones) { + s->zoned_header.max_open_zones =3D + zone_host_managed->max_active_zones; + } else { + s->zoned_header.max_open_zones =3D 0; + } + + 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_ZONE_MAX_APPEND_B= YTES; + } + + if (!qcow2_check_zone_options(&s->zoned_header, errp)) { + s->zoned_header.zoned =3D QCOW2_Z_NONE; + ret =3D -EINVAL; + goto unlock; + } + } else { + s->zoned_header.zoned =3D QCOW2_Z_NONE; + } + /* Create a full header (including things like feature table) */ ret =3D qcow2_update_header(blk_bs(blk)); bdrv_graph_co_rdunlock(); @@ -3974,6 +4250,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); @@ -4052,6 +4331,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 @@ -5448,6 +5731,29 @@ qcow2_get_specific_info(BlockDriverState *bs, Error = **errp) .data_file_raw =3D data_file_is_raw(bs), .compression_type =3D s->compression_type, }; + if (s->zoned_header.zoned =3D=3D QCOW2_Z_HM) { + ImageInfoSpecificQCow2Zoned *z =3D + g_new0(ImageInfoSpecificQCow2Zoned, 1); + *z =3D (ImageInfoSpecificQCow2Zoned){ + .mode =3D QCOW2_ZONE_MODEL_HOST_MANAGED, + .nr_zones =3D s->zoned_header.nr_zones, + .u.host_managed =3D { + .has_size =3D true, + .size =3D s->zoned_header.zone_size, + .has_capacity =3D true, + .capacity =3D s->zoned_header.zone_capacity, + .has_conventional_zones =3D true, + .conventional_zones =3D s->zoned_header.conventional_z= ones, + .has_max_open_zones =3D true, + .max_open_zones =3D s->zoned_header.max_open_zones, + .has_max_active_zones =3D true, + .max_active_zones =3D s->zoned_header.max_active_zones, + .has_max_append_bytes =3D true, + .max_append_bytes =3D s->zoned_header.max_append_bytes, + }, + }; + spec_info->u.qcow2.data->zone =3D z; + } } else { /* if this assertion fails, this probably means a new version was * added without having it covered here */ @@ -6271,6 +6577,41 @@ static QemuOptsList qcow2_create_opts =3D { .type =3D QEMU_OPT_BOOL, \ .help =3D "Assume the external data file already exists and " \ "do not overwrite it" \ + }, \ + { \ + .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 ce517040c4..2f1a48f4c1 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -129,6 +129,12 @@ =20 #define DEFAULT_CLUSTER_SIZE 65536 =20 +#define DEFAULT_ZONE_SIZE (256 * MiB) +#define DEFAULT_ZONE_MAX_APPEND_BYTES (64 * KiB) + +#define QCOW2_Z_NONE 0 /* Regular block device */ +#define QCOW2_Z_HM 1 /* Host-managed zoned block device */ + #define QCOW2_OPT_DATA_FILE "data-file" #define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts" #define QCOW2_OPT_DISCARD_REQUEST "pass-discard-request" @@ -237,6 +243,60 @@ 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 nr_zones; + uint64_t zone_size; + uint64_t zone_capacity; + uint32_t conventional_zones; + uint32_t max_active_zones; + uint32_t max_open_zones; + uint32_t max_append_bytes; + uint64_t zonedmeta_offset; +} QEMU_PACKED Qcow2ZonedHeaderExtension; + +typedef struct Qcow2ZoneListEntry { + QTAILQ_ENTRY(Qcow2ZoneListEntry) exp_open_zone_entry; + QTAILQ_ENTRY(Qcow2ZoneListEntry) imp_open_zone_entry; + QTAILQ_ENTRY(Qcow2ZoneListEntry) closed_zone_entry; +} Qcow2ZoneListEntry; + +/* + * Per-zone tracking for write pointer (WP) advance. A submitter + * reserves an LBA range, performs the data write outside the zone + * lock, then waits until the persisted WP catches up to its end + * offset before returning success to the guest. A failure aborts + * all higher-LBA peers in the same zone. + */ +typedef enum Qcow2WPReqState { + /* data write submitted, awaiting completion */ + QCOW2_WP_REQ_INFLIGHT, + /* data write completed, persisted WP not yet advanced past lba + len = */ + QCOW2_WP_REQ_PENDING, + /* persisted WP covers this range, submitter may ack success */ + QCOW2_WP_REQ_RESOLVED, + /* data write failed, or a lower-LBA peer in the same zone failed */ + QCOW2_WP_REQ_ABORTED, +} Qcow2WPReqState; + +typedef struct Qcow2WPReq { + uint64_t lba; /* start offset of the data write = */ + uint64_t len; /* length in bytes */ + Qcow2WPReqState state; + /* submitter waits for the data write to reach a terminal state */ + CoQueue wait; + QTAILQ_ENTRY(Qcow2WPReq) entry; +} Qcow2WPReq; + +typedef struct Qcow2ZoneWPState { + /* INFLIGHT reqs */ + QTAILQ_HEAD(, Qcow2WPReq) in_flight; + /* PENDING reqs, sorted by lba */ + QTAILQ_HEAD(, Qcow2WPReq) completed_pending; +} Qcow2ZoneWPState; + typedef struct Qcow2UnknownHeaderExtension { uint32_t magic; uint32_t len; @@ -257,17 +317,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 */ @@ -426,6 +489,24 @@ typedef struct BDRVQcow2State { * is to convert the image with the desired compression type set. */ Qcow2CompressionType compression_type; + + /* States of zoned device */ + Qcow2ZonedHeaderExtension zoned_header; + QTAILQ_HEAD(, Qcow2ZoneListEntry) exp_open_zones; + QTAILQ_HEAD(, Qcow2ZoneListEntry) imp_open_zones; + QTAILQ_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; + + /* Per-zone in-memory WP tracking for zoned imgaes. */ + Qcow2ZoneWPState *zone_wp_state; + /* + * Cache holding the on-disk zonedmeta cluster(s) for zoned image. + * WP advances go through this cache. + */ + Qcow2Cache *wp_cache; } BDRVQcow2State; =20 typedef struct Qcow2COWRegion { diff --git a/docs/interop/qcow2.rst b/docs/interop/qcow2.rst index 5948591107..08ff7844fa 100644 --- a/docs/interop/qcow2.rst +++ b/docs/interop/qcow2.rst @@ -128,7 +128,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 @@ -259,6 +278,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 @@ -344,6 +364,104 @@ 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 +Zoned extension +--------------- + +The zoned extension must be present if the incompatible_features bit 5 is = set, +and omitted when it is clear. It contains fields for emulating the zoned +storage model (https://zonedstorage.io/). Currently only the host-managed = zone +model is supported. + +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 - 7: 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. + + 8 - 15: 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. + + 16 - 23: 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. + + 24 - 27: conventional_zones + The number of conventional zones. The conventional zones + allow sequential writes and random writes. While the + sequential zones only allow sequential writes. + + 28 - 31: max_active_zones + The maximum allowed active zones (zones in the implicit + open, explicit open, or closed state). It cannot be lar= ger + than nr_zones. + + 32 - 35: max_open_zones + The maximum allowed open zones (zones in the implicit o= pen + or explicit open state). It cannot be larger than the n= umber + of SWR zones of the device, nor larger than max_active_= zones. + + 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 maximum number of bytes of a zone append request th= at + can be issued to the device. It must be 512-byte aligned + and less than the zone capacity. + + A value of 0 means that the zone append requests are not + supported. + + 40 - 47: zonedmeta_offset + The offset of zoned metadata structure in the contained + image, in bytes. + +The zonedmeta clusters contain a table of the zone write pointers. Each en= try +is a 64-bit value encoding both the zone type and the zone's write pointer= :: + + Bit 0 - 58: Write pointer offset, in bytes, indicates the starting + point of the next write position in that zone. + For conventional zones the value is the zone's starting + offset. + + 59: Zone type. 0 =3D SWR; 1 =3D conventional. + + 60 - 63: Reserved, must be zero. + + +Each zone's write pointer in the zonedmeta area is durable on disk only af= ter +the data it covers is durable. For a write to a SWR zone, the data is writ= ten +back to disk first, then the non-zoned qcow2 L1/L2/refcount metadata is wr= itten, +and finally the write pointers are written. This ordering ensures that aft= er +a power failure the on-disk write pointer never leads data being written. + Full disk encryption header pointer ----------------------------------- =20 diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index 7571ed9968..349876bc65 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -57,6 +57,13 @@ #define BLOCK_OPT_COMPRESSION_TYPE "compression_type" #define BLOCK_OPT_EXTL2 "extended_l2" #define BLOCK_OPT_KEEP_DATA_FILE "keep_data_file" +#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 @@ -903,6 +910,12 @@ typedef struct BlockLimits { /* zone size expressed in bytes */ uint64_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. + */ + uint64_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 1f87b07850..4542bfc8f5 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -93,6 +93,9 @@ # # @compression-type: the image cluster compression method (since 5.1) # +# @zone: zoned configuration; only set when the image was created +# with a zoned model (since 11.1) +# # Since: 1.7 ## { 'struct': 'ImageInfoSpecificQCow2', @@ -106,7 +109,8 @@ 'refcount-bits': 'int', '*encrypt': 'ImageInfoSpecificQCow2Encryption', '*bitmaps': ['Qcow2BitmapInfo'], - 'compression-type': 'Qcow2CompressionType' + 'compression-type': 'Qcow2CompressionType', + '*zone': 'ImageInfoSpecificQCow2Zoned' } } =20 ## @@ -5221,6 +5225,85 @@ { '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: 11.1 +## +{ '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 usable space within each zone, in bytes. Always +# smaller than or equal to @size (default: same as @size). +# +# @conventional-zones: The number of conventional zones of the +# zoned device (default: 0). +# +# @max-open-zones: The maximal number of open zones. Must be less +# than or equal to the number of non-conventional zones (i.e. +# ``size / zone.size - @conventional-zones``), and less than or +# equal to @max-active-zones (default: 0, meaning no limit). +# +# @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 number of zones (default: 0, meaning no limit). +# +# @max-append-bytes: The maximal size in bytes of a zone-append +# request that can be issued to the device. Must be a multiple +# of 512, and less than @capacity (default: 64 KB). +# +# Since: 11.1 +## +{ 'struct': 'Qcow2ZoneHostManaged', + 'data': { '*size': 'size', + '*capacity': 'size', + '*conventional-zones': 'uint32', + '*max-open-zones': 'uint32', + '*max-active-zones': 'uint32', + '*max-append-bytes': 'size' } } + +## +# @Qcow2ZoneCreateOptions: +# +# Creation options for zoned qcow2 images. +# +# @mode: The zone model used by the image. +# +# Since: 11.1 +## +{ 'union': 'Qcow2ZoneCreateOptions', + 'base': { 'mode': 'Qcow2ZoneModel' }, + 'discriminator': 'mode', + 'data': { 'host-managed': 'Qcow2ZoneHostManaged' } } + +## +# @ImageInfoSpecificQCow2Zoned: +# +# @mode: The zone model used by the image. +# +# @nr-zones: total number of zones in the image, derived at create +# time from the size and the zone size. +# +# Since: 11.1 +## +{ 'union': 'ImageInfoSpecificQCow2Zoned', + 'base': { 'mode': 'Qcow2ZoneModel', + 'nr-zones': 'uint32' }, + 'discriminator': 'mode', + 'data': { 'host-managed': 'Qcow2ZoneHostManaged' } } + ## # @BlockdevCreateOptionsQcow2: # @@ -5263,6 +5346,9 @@ # @compression-type: The image cluster compression method # (default: zlib, since 5.1) # +# @zone: Options for zoned images. If absent, the device is not +# zoned. (since 11.1) +# # Since: 2.12 ## { 'struct': 'BlockdevCreateOptionsQcow2', @@ -5279,7 +5365,8 @@ '*preallocation': 'PreallocMode', '*lazy-refcounts': 'bool', '*refcount-bits': 'int', - '*compression-type':'Qcow2CompressionType' } } + '*compression-type':'Qcow2CompressionType', + '*zone': 'Qcow2ZoneCreateOptions' } } =20 ## # @BlockdevCreateOptionsQed: diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out index e0463815c6..d1c8bb2532 100644 --- a/tests/qemu-iotests/082.out +++ b/tests/qemu-iotests/082.out @@ -72,6 +72,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: create -f qcow2 -o ? TEST_DIR/t.qcow2 128M Supported options: @@ -99,6 +106,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: create -f qcow2 -o cluster_size=3D4k,help TEST_DIR/t.qcow2 128M Supported options: @@ -126,6 +140,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: create -f qcow2 -o cluster_size=3D4k,? TEST_DIR/t.qcow2 128M Supported options: @@ -153,6 +174,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: create -f qcow2 -o help,cluster_size=3D4k TEST_DIR/t.qcow2 128M Supported options: @@ -180,6 +208,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: create -f qcow2 -o ?,cluster_size=3D4k TEST_DIR/t.qcow2 128M Supported options: @@ -207,6 +242,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: create -f qcow2 -o cluster_size=3D4k -o help TEST_DIR/t.qcow2 128M Supported options: @@ -234,6 +276,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: create -f qcow2 -o cluster_size=3D4k -o ? TEST_DIR/t.qcow2 128M Supported options: @@ -261,6 +310,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: create -f qcow2 -u -o backing_file=3DTEST_DIR/t.qcow2,,help -F qc= ow2 TEST_DIR/t.qcow2 128M Formatting 'TEST_DIR/t.qcow2', fmt=3Dqcow2 cluster_size=3D65536 extended_l= 2=3Doff compression_type=3Dzlib size=3D134217728 backing_file=3DTEST_DIR/t.= qcow2,,help backing_fmt=3Dqcow2 lazy_refcounts=3Doff refcount_bits=3D16 @@ -301,6 +357,13 @@ Supported qcow2 options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 The protocol level may support further options. Specify the target filename to include those options. @@ -391,6 +454,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: convert -O qcow2 -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base Supported options: @@ -418,6 +488,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: convert -O qcow2 -o cluster_size=3D4k,help TEST_DIR/t.qcow2 TEST_= DIR/t.qcow2.base Supported options: @@ -445,6 +522,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: convert -O qcow2 -o cluster_size=3D4k,? TEST_DIR/t.qcow2 TEST_DIR= /t.qcow2.base Supported options: @@ -472,6 +556,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: convert -O qcow2 -o help,cluster_size=3D4k TEST_DIR/t.qcow2 TEST_= DIR/t.qcow2.base Supported options: @@ -499,6 +590,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: convert -O qcow2 -o ?,cluster_size=3D4k TEST_DIR/t.qcow2 TEST_DIR= /t.qcow2.base Supported options: @@ -526,6 +624,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: convert -O qcow2 -o cluster_size=3D4k -o help TEST_DIR/t.qcow2 TE= ST_DIR/t.qcow2.base Supported options: @@ -553,6 +658,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: convert -O qcow2 -o cluster_size=3D4k -o ? TEST_DIR/t.qcow2 TEST_= DIR/t.qcow2.base Supported options: @@ -580,6 +692,13 @@ Supported options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 Testing: convert -O qcow2 -o backing_fmt=3Dqcow2,backing_file=3DTEST_DIR/t= .qcow2,,help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open backing f= ile: Could not open 'TEST_DIR/t.qcow2,help': No such file or directory @@ -620,6 +739,13 @@ Supported qcow2 options: preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size + zone.capacity=3D - zone capacity + zone.conventional_zones=3D - numbers of conventional zones + zone.max_active_zones=3D - max active zones + zone.max_append_bytes=3D - max append bytes + zone.max_open_zones=3D - max open zones + zone.mode=3D - zone model modes, mode choice: host-managed + zone.size=3D - zone size =20 The protocol level may support further options. Specify the target filename to include those options. --=20 2.53.0 From nobody Sun Jul 26 11:51:49 2026 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=1782479869; cv=none; d=zohomail.com; s=zohoarc; b=LvyVIuKyVEPDMHRukO5bbDJdB3IBrEuPVM/SzeS5zAckDbfORs4OiR8sZTbIBcz/oM+y8onGubPsQY5aWj5Y83lYQWR/jJyDJFN5VfzZ21IiIhaHpnfVWvIr5y46ZADvK0oZp1Ymu3bIfe1R8Kp1Xj5bT9iMhZ5LeJcrJ+torgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782479869; 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=FtXZ27SLy65lCTtPsnWgrQRf4nL5oIDYBfojUKHflv4=; b=jsZoJKzvOT+d2laTnd/M1Ma2RO/FzYBpM1Cj8Of3oiFjekwR7CHVnBx98x1ZM7VfNDJsZw1kh7aeERrIaQMIvkRCd5JcBQtSG5P2IC7CvM4uicE74TyPOxiwkrmO7543lGwBQD9ckFnMdUlMmjWdrWZ69tbEbKccrsuPPV7oARQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782479869817325.19004091683735; Fri, 26 Jun 2026 06:17:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wd6Pm-0008Cf-On; Fri, 26 Jun 2026 09:16:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wd6Pi-0008Bl-BA for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:10 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wd6Pf-0000zz-DH for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:08 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-49222fb062bso10049495e9.1 for ; Fri, 26 Jun 2026 06:16:07 -0700 (PDT) Received: from dobby ([2a02:8109:a394:4800:b369:c9c1:81a0:4afc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46c2279b83fsm26093756f8f.29.2026.06.26.06.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 06:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782479766; x=1783084566; 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=FtXZ27SLy65lCTtPsnWgrQRf4nL5oIDYBfojUKHflv4=; b=kJXTuUb2cBbgPe9ubDI/j/npr3z41/KyZIoNTia159DsnVd77zptCB0YO2w8mwCcer MnexDPdhlx/Zi0HES16MERHSasfG//qF3wYjVU2aoUWgsMdNRKQlvfccAtGDvGyPOq6Q OG7/idzfN2p7xxqCP3bwCowMKsFAZGfezU0xeAhZ+pHhtuJn9/joN6v5Slmrbm21UgQt ELRsVbPVGSZie5v3pFxAc92JcbccOErddjLEqWG9jAl1wD6IDLgZcIBwEkJ4/eFlOPTq sZumB7TD0J/+y26UP9M2/nK7E8j3gkkiq6DWDvcPBDWe8ucimeMGdhIcZHukB4vHhUGs uZzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782479766; x=1783084566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FtXZ27SLy65lCTtPsnWgrQRf4nL5oIDYBfojUKHflv4=; b=srakWCIrQquWg7zXDpNC6kElLwwh/P8XPFkwqjEumSvGBtGT/oSWKC9oF7YanaSJPu R7vf9yhdGmT3Z0MFKJI6H3df8RKy/NYZA1HhB/etauo9XnPi/vK+qhiKnmKVsvklqCxH /8ydUTVMEpjXiZ0M+XhgsAMDW0tpdElChHpx4X4z4GipjsPANtDv1ElrGBDEIhnkfEYG zuTJVSJGfaX9Fi6urV2CJV3KK5J5kHgHS9nGiO8cGzU3PC284FRB5N5pnSojtFB/jWbE bqior/Nfe3bBW8h7WSSPcwtG2XxAwkLimPLKm9NylBXgLkj5UtQKt8+jnwIZrIsNQXxb H8+Q== X-Gm-Message-State: AOJu0YxnOJwd03bjQobGHRDDPE1PBVBxyWteCiL9gl0MRfpnynm5fPJC NYuA8imyN0xELHmdGO3VB8GtyeeCuPDQ0iD+PEuU2U48bW2iiyBotXg4jk1wPQ== X-Gm-Gg: AfdE7ckzAboN8DbqwEpp1qRL0AJyJetzybdh6O+tcViswPsRhicgAIF/Q2hqdwwRIAL GRpa6ts0bNHCkVO+M1A7sD+Tb6UMmZq83NrFsgMcahhxizY98huY4BA34AOYFe0JcE9M/xGwbwb 7cFksM7dbAEeI97F68dUUfTXvFKsaiDj+9hX2uSAf49w9uLJu6G04rtEojbrZErfWUni/qT9bA0 OrpjTn0EFuklXw95QCKcW6Eg0BUUNGoKyLhXfBTe4ioUarsXZKWsQyi66MeCx8IGp3VxzOBce3t +d9bmCfZTGHoihbObYpr+vOBxteNRoMF+cz4XgHo8MrD3ZkjZMrewcsjY5RZgTvX+Fg7BSAc9Nz G21Ci6qaUq4BwtvcwkT9N7yyIfJGgsqr0gE3lCoTIvqmayn0AlPlh5/3XXUwNGGod7OcfUmGOyZ tFHwu4FvPaewwFg0/hXXaMuDX+5cefsNOoo+LcXpbjo3jjzVQthAejkGum X-Received: by 2002:a05:600c:1d18:b0:492:2100:aba2 with SMTP id 5b1f17b1804b1-49266855475mr99599345e9.4.1782479765859; Fri, 26 Jun 2026 06:16:05 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: Markus Armbruster , Kevin Wolf , cassel@kernel.org, dlemoal@kernel.org, qemu-block@nongnu.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Pierrick Bouvier , Eric Blake , Hanna Reitz , Sam Li Subject: [PATCH v13 4/6] virtio-blk: do not merge writes across a zone boundary Date: Fri, 26 Jun 2026 15:15:53 +0200 Message-ID: <20260626131555.459792-5-faithilikerun@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260626131555.459792-1-faithilikerun@gmail.com> References: <20260626131555.459792-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=faithilikerun@gmail.com; helo=mail-wm1-x32e.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: qemu development 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: 1782479870697158500 Content-Type: text/plain; charset="utf-8" virtio_blk_submit_multireq() fuses adjacent in-zone requests into a single request. On a zoned backend, a merged zone append request that straddles a zone boundary is rejected by the device because each write must stay within a single zone. Add a bail condition to the merge coalescer: if combining the candidate request into the current batch would cross a zone boundary, flush the current batch and start a new one. Signed-off-by: Sam Li Reviewed-by: Stefan Hajnoczi Reviewed-by: Niklas Cassel --- block/block-backend.c | 11 +++++++++++ hw/block/virtio-blk.c | 22 +++++++++++++++++++++- include/system/block-backend-io.h | 1 + 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/block/block-backend.c b/block/block-backend.c index 37ba7e9fc4..049e70ddcb 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -2326,6 +2326,17 @@ uint32_t blk_get_request_alignment(BlockBackend *blk) return bs ? bs->bl.request_alignment : BDRV_SECTOR_SIZE; } =20 +/* + * Returns the zone size in bytes for a zoned backend, or 0 if @blk does + * not present zoned geometry. + */ +uint64_t blk_get_zone_size(BlockBackend *blk) +{ + BlockDriverState *bs =3D blk_bs(blk); + IO_CODE(); + return bs ? bs->bl.zone_size : 0; +} + /* Returns the optimal write zeroes alignment, in bytes; guaranteed nonzer= o */ uint32_t blk_get_pwrite_zeroes_alignment(BlockBackend *blk) { diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 6b92066aff..f74cc3dbd0 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -294,6 +294,9 @@ static void virtio_blk_submit_multireq(VirtIOBlock *s, = MultiReqBuffer *mrb) int i =3D 0, start =3D 0, num_reqs =3D 0, niov =3D 0, nb_sectors =3D 0; uint32_t max_transfer; int64_t sector_num =3D 0; + uint64_t zone_size =3D blk_get_zone_size(s->blk); + bool zone_cross; + int64_t zone_sector, end_sector; =20 if (mrb->num_reqs =3D=3D 1) { submit_requests(s, mrb, 0, 1, -1); @@ -309,17 +312,34 @@ static void virtio_blk_submit_multireq(VirtIOBlock *s= , MultiReqBuffer *mrb) for (i =3D 0; i < mrb->num_reqs; i++) { VirtIOBlockReq *req =3D mrb->reqs[i]; if (num_reqs > 0) { + zone_cross =3D false; + + /* + * On zoned backends, a single backend write/read must not span + * a zone boundary. Bail out of merging if combining req into + * the current batch would straddle a zone. + */ + if (zone_size > 0) { + zone_sector =3D zone_size / BDRV_SECTOR_SIZE; + end_sector =3D req->sector_num + + req->qiov.size / BDRV_SECTOR_SIZE - 1; + zone_cross =3D (sector_num / zone_sector) !=3D + (end_sector / zone_sector); + } + /* * NOTE: We cannot merge the requests in below situations: * 1. requests are not sequential * 2. merge would exceed maximum number of IOVs * 3. merge would exceed maximum transfer length of backend de= vice + * 4. merge would cross a zone boundary on a zoned backend */ if (sector_num + nb_sectors !=3D req->sector_num || niov > blk_get_max_iov(s->blk) - req->qiov.niov || req->qiov.size > max_transfer || nb_sectors > (max_transfer - - req->qiov.size) / BDRV_SECTOR_SIZE) { + req->qiov.size) / BDRV_SECTOR_SIZE || + zone_cross) { submit_requests(s, mrb, start, num_reqs, niov); num_reqs =3D 0; } diff --git a/include/system/block-backend-io.h b/include/system/block-backe= nd-io.h index fd84723d9d..78d410b8df 100644 --- a/include/system/block-backend-io.h +++ b/include/system/block-backend-io.h @@ -121,6 +121,7 @@ uint32_t blk_get_request_alignment(BlockBackend *blk); uint32_t blk_get_pwrite_zeroes_alignment(BlockBackend *blk); uint32_t blk_get_max_transfer(BlockBackend *blk); uint64_t blk_get_max_hw_transfer(BlockBackend *blk); +uint64_t blk_get_zone_size(BlockBackend *blk); =20 int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in, BlockBackend *blk_out, int64_t off_out, --=20 2.53.0 From nobody Sun Jul 26 11:51:49 2026 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=1782479841; cv=none; d=zohomail.com; s=zohoarc; b=Fh+GuL++5c5JYCLqd5ynH3oGXJ+adhdgnSXOWuqA9PH/HM6MVZ1i+uBQj5vRROe9Ea9N98UzHgqSxTRhaltuOE+rdeFVaSbEsQCbl6l6bAhhjPwBG0cmg8UbZsxc/bNrJXg+pSy1g6myKU/DoDOCVHYWE3aZLY33oa+vCepv1/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782479841; 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=0sIyYo0om2Sjt6HAKKTzEOsTG17BEA97/HtXcC+icwU=; b=ZcRTTbX1dXZN5ST7BV15S1/9h7uIqdZDtUL34l2H7Vo5xjpl5fz6XXFJZKsI3gQnLl6iuxgRYkzmAogqzn/7FZlP7j4gibVVzGl/VwDboHmmEoS0cfb/bZnHdID93kMWVXmdSfgsQVTwxHUIAYAwhJwz/G55oaqm7Sb2XfTuzho= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178247984135094.6035598130627; Fri, 26 Jun 2026 06:17:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wd6Q1-0008KO-RB; Fri, 26 Jun 2026 09:16:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wd6Pp-0008Dd-2k for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:19 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wd6Pi-00010W-4D for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:14 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-490b613a17bso9140965e9.3 for ; Fri, 26 Jun 2026 06:16:09 -0700 (PDT) Received: from dobby ([2a02:8109:a394:4800:b369:c9c1:81a0:4afc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46c2279b83fsm26093756f8f.29.2026.06.26.06.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 06:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782479768; x=1783084568; 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=0sIyYo0om2Sjt6HAKKTzEOsTG17BEA97/HtXcC+icwU=; b=pkZVYU4tNq35lirt7ZGr8jxe24+wXcNJ9Q+TuyD3wKoJjeTaw2TsyYrnRHRNbhx37G 3EcYwJFM+fTlpXIKk8WUdJAQRByl4K20tOnLCC8jkq2Yh0naVvGFbFXSjod84xTNNbdr t+0ssWCT4tRYlVpKnDOatXt7j0iA72tZA2cPf0t5jg7fJIOw65YedU+pwbgCBt5omQhc xmg4f4H3H4+TNsY8mB/lKXzjTwUHq02jHilx0xicStVKVAXP8JIPJ7y/MYMQkT4jj/2A bZGMj+8Y9ViIvjtWjohf1jK4U492g2QOh3MS3yoLNLJfkZB+pZ4Ddd6S87dAs+5qmfjn zccg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782479768; x=1783084568; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0sIyYo0om2Sjt6HAKKTzEOsTG17BEA97/HtXcC+icwU=; b=KrCwy0u2T5iZ68PivMz4dB9AA8eF7mVI1fIdNgkOKzwITTvXq+ficf6HcYrc6IHr/e v11+4boESfiCxR5HKdQQAJY5eVTDkpf97d3125fzVDf5aessjoocr6nGgFInotRxX/zm mG65fjbNJvdRiddaut3HNdxM3kf5A3qupRBWjBF88HitpWrpspblcJbhPS18G7NlCgV9 GOIIw9/9Bn8Dc4Xk/1+17d0hKjBnU48l42BsRH1wrlxWpVdYwvIFhReXosBHBf0v4eVJ cjozYEUWzLT0xDsyMMIIxzUaWy1NPIAb/j1/oanzHqibqpxKclcHWxquQ/XI3shg9H0Y roIw== X-Gm-Message-State: AOJu0YxAFsv0LQZOSNXh1uAdpy5Xughv4+bpS549KfSQItDWkZhwd1o8 wdNpQ1SG7oCW5BCJSj06CaaWL5snTxUR842p8HUb8S+qixotTBDavIy5HX17DA== X-Gm-Gg: AfdE7cmuhWQuYxFC1YnA/srmNRAqkp8R4jFRkv03DQmmMKvXrxjKz/Y8uDxLvAZbRlt Ail7lh5Ig00f+ahr5lA2H6H1G5rvK7CRKNm6J1jR0UC7gL69SuiPhpXQjHBndLx0HQNHLcA5lrt 1Ri2eX/FshRpEsu/dGMlu8TB0gnWyxX05N07QUHJdC/5z+VPLBefCL5MONsWC7SW4w+Rcy4zLoj QcPyzUV8Vob9jzC/RsrbB7BKWqKZ+VWgLQTpdjaCofPTMjx1jlPoVOSxNPxoWBCvygiDopyM7bw cf0AbX8epc3HlJlMA6m6DvF4wSY06v+s4vp7QZ9yc3+Q1ZIhxVavjVjU+UGAZiDeb19T5az8fhc HkN9NyuqPcuPYNH/aiszU8JW+VD9gUuVwTixRPlOGZMuiO2yxQqtEA9aeR1rBtWWssY8OsFzMBI 18zKeszh/UokF1LrHhnYDiXaokPZmxnpChXTloucJFQZy2vGsIM8FF3zbQ X-Received: by 2002:a05:600c:8114:b0:492:45a0:dcef with SMTP id 5b1f17b1804b1-4926fc2df2dmr12360135e9.5.1782479767667; Fri, 26 Jun 2026 06:16:07 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: Markus Armbruster , Kevin Wolf , cassel@kernel.org, dlemoal@kernel.org, qemu-block@nongnu.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Pierrick Bouvier , Eric Blake , Hanna Reitz , Sam Li Subject: [PATCH v13 5/6] qcow2: add zoned emulation capability Date: Fri, 26 Jun 2026 15:15:54 +0200 Message-ID: <20260626131555.459792-6-faithilikerun@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260626131555.459792-1-faithilikerun@gmail.com> References: <20260626131555.459792-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=faithilikerun@gmail.com; helo=mail-wm1-x334.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1782479842407158500 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 (WP) of each zone, which is stored to an array of unsigned integers. WP accessor (qcow2_rw_wp_at) routes reads and writes of an 8-byte WP slot through the write pointer cache. The write pointer cache is written to disk after the qcow2 metadata is written, thus guaranteeing that the write pointer is updated after the corresponding data is written. Per-completion cache flush is deferred. The WP cluster reaches disk on the next flush. 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 limits on zone resources, which put constraints on write operations on zones. It is managed by active zone queues following LRU policy. Signed-off-by: Sam Li --- block/qcow2-cache.c | 11 +- block/qcow2-refcount.c | 7 + block/qcow2.c | 1195 +++++++++++++++++++++++++++++++++++++++- block/trace-events | 2 + 4 files changed, 1209 insertions(+), 6 deletions(-) diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c index 23d9588b08..73f2be3641 100644 --- a/block/qcow2-cache.c +++ b/block/qcow2-cache.c @@ -275,14 +275,23 @@ int qcow2_cache_set_dependency(BlockDriverState *bs, = Qcow2Cache *c, { int ret; =20 + /* + * If the dependency graph is unchanged, nothing to do. This avoids + * a synchronous flush on every call below. + */ + if (c->depends =3D=3D dependency) { + return 0; + } + if (dependency->depends) { + /* Flatten any chain on the dependency side as a cycle-breaker. */ ret =3D qcow2_cache_flush_dependency(bs, dependency); if (ret < 0) { return ret; } } =20 - if (c->depends && (c->depends !=3D dependency)) { + if (c->depends) { ret =3D qcow2_cache_flush_dependency(bs, c); if (ret < 0) { return ret; diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 6512cda407..f551726609 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1239,6 +1239,13 @@ int qcow2_write_caches(BlockDriverState *bs) } } =20 + if (s->wp_cache) { + ret =3D qcow2_cache_write(bs, s->wp_cache); + if (ret < 0) { + return ret; + } + } + return 0; } =20 diff --git a/block/qcow2.c b/block/qcow2.c index d7e421687b..1f693208be 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -195,6 +195,315 @@ qcow2_extract_crypto_opts(QemuOpts *opts, const char = *fmt, Error **errp) return cryptoopts_qdict; } =20 +#define QCOW2_ZT_IS_CONV(wp) (wp & 1ULL << 59) +#define QCOW2_GET_WP(wp) ((wp << 5) >> 5) + +/* + * To emulate a real zoned device, closed, empty and full states are + * preserved after a power cycle. The 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. + * + * The qcow2 state lock must be held when called. + */ +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 (QTAILQ_IN_USE(zone_entry, exp_open_zone_entry)) { + return BLK_ZS_EOPEN; + } + if (QTAILQ_IN_USE(zone_entry, imp_open_zone_entry)) { + return BLK_ZS_IOPEN; + } + + zone_start =3D (uint64_t)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) { + if (!QTAILQ_IN_USE(zone_entry, closed_zone_entry)) { + /* + * The number of closed zones is not always updated in time wh= en + * the device is closed. However, it only matters when doing + * zone report. Refresh the count and list of closed zones to + * provide correct zone states for zone report. + */ + QTAILQ_INSERT_HEAD(&s->closed_zones, zone_entry, closed_zone_e= ntry); + s->nr_zones_closed++; + } + return BLK_ZS_CLOSED; + } + return BLK_ZS_NOT_WP; +} + +/* The qcow2 state lock must be held when called */ +static void qcow2_rm_exp_open_zone(BDRVQcow2State *s, + uint32_t index) +{ + Qcow2ZoneListEntry *zone_entry =3D &s->zone_list_entries[index]; + + QTAILQ_REMOVE(&s->exp_open_zones, zone_entry, exp_open_zone_entry); + s->nr_zones_exp_open--; +} + +/* The qcow2 state lock must be held when called */ +static void qcow2_rm_imp_open_zone(BDRVQcow2State *s, + int32_t index) +{ + Qcow2ZoneListEntry *zone_entry; + if (index < 0) { + /* Apply LRU when the index is not specified. */ + zone_entry =3D QTAILQ_LAST(&s->imp_open_zones); + } else { + zone_entry =3D &s->zone_list_entries[index]; + } + + QTAILQ_REMOVE(&s->imp_open_zones, zone_entry, imp_open_zone_entry); + s->nr_zones_imp_open--; +} + +/* The qcow2 state lock must be held when called */ +static void qcow2_rm_open_zone(BDRVQcow2State *s, + uint32_t index) +{ + Qcow2ZoneListEntry *zone_entry =3D &s->zone_list_entries[index]; + + if (QTAILQ_IN_USE(zone_entry, exp_open_zone_entry)) { + qcow2_rm_exp_open_zone(s, index); + } else if (QTAILQ_IN_USE(zone_entry, imp_open_zone_entry)) { + qcow2_rm_imp_open_zone(s, index); + } +} + +/* The qcow2 state lock must be held when called */ +static void qcow2_rm_closed_zone(BDRVQcow2State *s, + uint32_t index) +{ + Qcow2ZoneListEntry *zone_entry =3D &s->zone_list_entries[index]; + + QTAILQ_REMOVE(&s->closed_zones, zone_entry, closed_zone_entry); + s->nr_zones_closed--; +} + +/* The qcow2 state lock must be held when called */ +static void qcow2_do_imp_open_zone(BDRVQcow2State *s, + uint32_t index, + BlockZoneState zs) +{ + Qcow2ZoneListEntry *zone_entry =3D &s->zone_list_entries[index]; + + switch (zs) { + case BLK_ZS_EMPTY: + break; + case BLK_ZS_CLOSED: + qcow2_rm_closed_zone(s, index); + break; + case BLK_ZS_IOPEN: + /* + * The LRU policy: update the zone that is most recently + * used to the head of the zone list + */ + if (zone_entry =3D=3D QTAILQ_FIRST(&s->imp_open_zones)) { + return; + } + QTAILQ_REMOVE(&s->imp_open_zones, zone_entry, imp_open_zone_entry); + s->nr_zones_imp_open--; + break; + default: + return; + } + + QTAILQ_INSERT_HEAD(&s->imp_open_zones, zone_entry, imp_open_zone_entry= ); + s->nr_zones_imp_open++; +} + +/* The qcow2 state lock must be held when called */ +static void qcow2_do_exp_open_zone(BDRVQcow2State *s, + uint32_t index) +{ + Qcow2ZoneListEntry *zone_entry =3D &s->zone_list_entries[index]; + + QTAILQ_INSERT_HEAD(&s->exp_open_zones, zone_entry, exp_open_zone_entry= ); + s->nr_zones_exp_open++; +} + +/* + * The list of zones is managed using an LRU policy: the last + * zone of the list is always the one that was least recently used + * for writing and is chosen as the zone to close to be able to + * implicitly open another zone. + * + * We can only close the open zones. The index is not specified + * when it is less than 0. + * + * The qcow2 state lock must be held when called. + */ +static void qcow2_do_close_zone(BlockDriverState *bs, + int32_t index, + BlockZoneState zs) +{ + BDRVQcow2State *s =3D bs->opaque; + Qcow2ZoneListEntry *zone_entry; + + if (index >=3D 0) { + zone_entry =3D &s->zone_list_entries[index]; + } else { + /* before removal of the last implicitly open zone */ + zone_entry =3D QTAILQ_LAST(&s->imp_open_zones); + } + + if (zs =3D=3D BLK_ZS_IOPEN) { + assert(zone_entry !=3D NULL); + qcow2_rm_imp_open_zone(s, index); + QTAILQ_INSERT_HEAD(&s->closed_zones, zone_entry, closed_zone_entry= ); + s->nr_zones_closed++; + return; + } + + if (index >=3D 0 && zs =3D=3D BLK_ZS_EOPEN) { + qcow2_rm_exp_open_zone(s, index); + /* + * The zone state changes when the zone is removed from the list of + * open zones (explicitly open -> empty). The closed zone list is + * refreshed during get_zone_state(). + */ + qcow2_get_zone_state(bs, index); + } +} + +/* + * Read/Write the new wp value for zone `index` through write pointe + * cache. Reads return the value currently held in the cache, which may + * be ahead of the on-disk value if the cache hasn't been flushed yet. + * Writes update the cache and mark the entry dirty. + */ +static int coroutine_fn GRAPH_RDLOCK +qcow2_rw_wp_at(BlockDriverState *bs, uint64_t *wp, + int32_t index, bool is_write) +{ + BDRVQcow2State *s =3D bs->opaque; + uint64_t wp_byte_off =3D sizeof(uint64_t) * index; + uint64_t cluster_file_off =3D + s->zoned_header.zonedmeta_offset + + (wp_byte_off & ~((uint64_t)s->cluster_size - 1)); + size_t off_in_cluster =3D wp_byte_off & (s->cluster_size - 1); + void *cluster_buf; + uint64_t *slot; + int ret; + + assert(s->wp_cache !=3D NULL); + + qemu_co_mutex_lock(&s->lock); + ret =3D qcow2_cache_get(bs, s->wp_cache, cluster_file_off, &cluster_bu= f); + if (ret < 0) { + qemu_co_mutex_unlock(&s->lock); + error_report("Failed to %s WP slot (zone %d): %s", + is_write ? "write" : "read", index, strerror(-ret)); + return ret; + } + + slot =3D (uint64_t *)((char *)cluster_buf + off_in_cluster); + if (is_write) { + *slot =3D *wp; + qcow2_cache_entry_mark_dirty(s->wp_cache, cluster_buf); + } else { + *wp =3D *slot; + } + qcow2_cache_put(s->wp_cache, &cluster_buf); + qemu_co_mutex_unlock(&s->lock); + + trace_qcow2_wp_tracking(index, *wp >> BDRV_SECTOR_BITS); + return 0; +} + +/* The qcow2 state lock must be held when called */ +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; + } + + /* Active zones are zones that are open or closed */ + return s->nr_zones_exp_open + s->nr_zones_imp_open + s->nr_zones_closed + < s->zoned_header.max_active_zones; +} + +/* + * 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. + * + * The qcow2 state lock must be held when called. + */ +static bool qcow2_can_open_zone(BlockDriverState *bs) +{ + BDRVQcow2State *s =3D bs->opaque; + + /* 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 one at a time. Thus, the number of implicitly open + * zone can never be over the open zone limit. When the active zone li= mit + * is not reached, close only one implicitly open zone. + * + * Only an implicitly open zone can be evicted to make room. If every + * open zone is explicitly open, the open zone limit cannot be satisfi= ed. + */ + if (s->nr_zones_imp_open > 0 && qcow2_can_activate_zone(bs)) { + qcow2_do_close_zone(bs, -1, BLK_ZS_IOPEN); + trace_qcow2_imp_open_zones(0x23, s->nr_zones_imp_open); + return true; + } + return false; +} + +static inline int coroutine_fn GRAPH_RDLOCK +qcow2_refresh_zonedmeta(BlockDriverState *bs) +{ + int ret; + BDRVQcow2State *s =3D bs->opaque; + uint64_t wps_size =3D s->zoned_header.nr_zones * sizeof(uint64_t); + g_autofree uint64_t *temp =3D NULL; + + temp =3D g_new(uint64_t, s->zoned_header.nr_zones); + ret =3D bdrv_pread(bs->file, s->zoned_header.zonedmeta_offset, + wps_size, temp, 0); + if (ret < 0) { + error_report("Cannot read metadata"); + return ret; + } + + memcpy(bs->wps->wp, temp, wps_size); + return 0; +} + /* * Returns true if zone_opt is valid, false otherwise. Fields that are * out of range but recoverable by clamping (e.g. max_open_zones above @@ -550,6 +859,8 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t st= art_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); s->zoned_header =3D zoned_ext; =20 /* validate the header first */ @@ -575,6 +886,35 @@ qcow2_read_extensions(BlockDriverState *bs, uint64_t s= tart_offset, return -EINVAL; } =20 + bs->wps =3D g_malloc(sizeof(BlockZoneWps) + + s->zoned_header.nr_zones * sizeof(uint64_t)); + ret =3D qcow2_refresh_zonedmeta(bs); + if (ret < 0) { + return ret; + } + + s->zone_list_entries =3D g_new0(Qcow2ZoneListEntry, + zoned_ext.nr_zones); + QTAILQ_INIT(&s->exp_open_zones); + QTAILQ_INIT(&s->imp_open_zones); + QTAILQ_INIT(&s->closed_zones); + qemu_co_mutex_init(&bs->wps->colock); + + s->zone_wp_state =3D g_new0(Qcow2ZoneWPState, zoned_ext.nr_zon= es); + for (uint32_t i =3D 0; i < zoned_ext.nr_zones; i++) { + QTAILQ_INIT(&s->zone_wp_state[i].in_flight); + QTAILQ_INIT(&s->zone_wp_state[i].completed_pending); + } + + s->wp_cache =3D qcow2_cache_create(bs, + DIV_ROUND_UP(zoned_ext.nr_zones * sizeof(uint64_t), + s->cluster_size), + s->cluster_size); + if (!s->wp_cache) { + error_setg(errp, "Could not allocate the write pointer cac= he"); + return -ENOMEM; + } + #ifdef DEBUG_EXT printf("Qcow2: Got zoned format extension: " "offset=3D%" PRIu64 "\n", offset); @@ -2928,21 +3268,292 @@ static coroutine_fn GRAPH_RDLOCK int qcow2_co_pwri= tev_task_entry(AioTask *task) t->l2meta); } =20 +/* + * Walk the per-zone completed_pending list while the head's LBA equals + * the cached persisted-WP, advancing persisted-WP and marking each + * covered request RESOLVED. On any advance, the new persisted-WP is + * written into the WP cache and depends-on qcow2 L2 table cache is + * established so write pointer is updated after the corresponding write + * completes. + * + * Caller holds bs->wps->colock. + */ static int coroutine_fn GRAPH_RDLOCK -qcow2_co_pwritev_part(BlockDriverState *bs, int64_t offset, int64_t bytes, - QEMUIOVector *qiov, size_t qiov_offset, - BdrvRequestFlags flags) +qcow2_wp_greedy_advance_locked(BlockDriverState *bs, uint32_t index) +{ + BDRVQcow2State *s =3D bs->opaque; + Qcow2ZoneWPState *zs =3D &s->zone_wp_state[index]; + uint64_t wp_byte_off =3D sizeof(uint64_t) * index; + uint64_t cluster_file_off =3D + s->zoned_header.zonedmeta_offset + + (wp_byte_off & ~((uint64_t)s->cluster_size - 1)); + size_t off_in_cluster =3D wp_byte_off & (s->cluster_size - 1); + void *cluster_buf; + uint64_t *slot; + uint64_t persisted_wp, new_persisted_wp; + Qcow2WPReq *head; + bool any_advanced =3D false; + int ret; + + qemu_co_mutex_lock(&s->lock); + ret =3D qcow2_cache_get(bs, s->wp_cache, cluster_file_off, &cluster_bu= f); + if (ret < 0) { + qemu_co_mutex_unlock(&s->lock); + return ret; + } + slot =3D (uint64_t *)((char *)cluster_buf + off_in_cluster); + persisted_wp =3D *slot; + new_persisted_wp =3D persisted_wp; + + QTAILQ_FOREACH(head, &zs->completed_pending, entry) { + if (head->lba !=3D new_persisted_wp) { + break; + } + new_persisted_wp +=3D head->len; + any_advanced =3D true; + } + + if (!any_advanced) { + qcow2_cache_put(s->wp_cache, &cluster_buf); + qemu_co_mutex_unlock(&s->lock); + return 0; + } + + *slot =3D new_persisted_wp; + qcow2_cache_entry_mark_dirty(s->wp_cache, cluster_buf); + qcow2_cache_put(s->wp_cache, &cluster_buf); + + qcow2_cache_set_dependency(bs, s->wp_cache, s->l2_table_cache); + qemu_co_mutex_unlock(&s->lock); + + while (!QTAILQ_EMPTY(&zs->completed_pending)) { + head =3D QTAILQ_FIRST(&zs->completed_pending); + if (head->lba >=3D new_persisted_wp) { + break; + } + QTAILQ_REMOVE(&zs->completed_pending, head, entry); + head->state =3D QCOW2_WP_REQ_RESOLVED; + qemu_co_queue_restart_all(&head->wait); + } + + return 0; +} + +/* + * Insert req into the zone's completed_pending list in ascending LBA + * order. Data writes may complete out of order; greedy_advance walks + * the list head while head->lba =3D=3D persisted_wp, so the list must + * stay sorted. + * + * Caller holds bs->wps->colock. + */ +static void +qcow2_wp_insert_pending_locked(Qcow2ZoneWPState *zs, Qcow2WPReq *req) +{ + Qcow2WPReq *iter; + + req->state =3D QCOW2_WP_REQ_PENDING; + + QTAILQ_FOREACH(iter, &zs->completed_pending, entry) { + if (iter->lba > req->lba) { + QTAILQ_INSERT_BEFORE(iter, req, entry); + return; + } + } + QTAILQ_INSERT_TAIL(&zs->completed_pending, req, entry); +} + +/* + * Peer requests with lba > failed_lba are marked ABORTED. Survivors + * with lba < failed_lba are left untouched. Logical WP is rolled back + * to the contiguous extent above persisted-WP that remains covered by + * survivor requests. + * + * Caller holds bs->wps->colock. + */ +static void +qcow2_wp_abort_higher_peers_locked(BlockDriverState *bs, uint32_t index, + uint64_t failed_lba) +{ + BDRVQcow2State *s =3D bs->opaque; + Qcow2ZoneWPState *zs =3D &s->zone_wp_state[index]; + Qcow2WPReq *r, *next; + uint64_t logical_wp; + + QTAILQ_FOREACH(r, &zs->in_flight, entry) { + if (r->lba > failed_lba && r->state !=3D QCOW2_WP_REQ_ABORTED) { + r->state =3D QCOW2_WP_REQ_ABORTED; + qemu_co_queue_restart_all(&r->wait); + } + } + QTAILQ_FOREACH_SAFE(r, &zs->completed_pending, entry, next) { + if (r->lba > failed_lba) { + r->state =3D QCOW2_WP_REQ_ABORTED; + QTAILQ_REMOVE(&zs->completed_pending, r, entry); + qemu_co_queue_restart_all(&r->wait); + } + } + + /* Rewind logical_wp to the highest survivor end_offset. */ + logical_wp =3D failed_lba; + QTAILQ_FOREACH(r, &zs->in_flight, entry) { + if (r->lba < failed_lba && r->lba + r->len > logical_wp) { + logical_wp =3D r->lba + r->len; + } + } + QTAILQ_FOREACH(r, &zs->completed_pending, entry) { + if (r->lba < failed_lba && r->lba + r->len > logical_wp) { + logical_wp =3D r->lba + r->len; + } + } + bs->wps->wp[index] =3D logical_wp; +} + +/* + * If it is an append write request, the offset pointer needs to be update= d to + * the wp value of that zone after the IO completion. The unique pointer is + * passed on to this function to prevent the value being changed in condit= ion of + * multiple concurrent writes. + * + * For host-managed zoned writes, the WP lock is acquired across the WP + * check and advance, with the qcow2 state lock nested for the zone + * state TAILQ traversals. + */ +static int coroutine_fn GRAPH_RDLOCK +qcow2_co_pwv_part(BlockDriverState *bs, int64_t *offset_ptr, int64_t bytes, + QEMUIOVector *qiov, size_t qiov_offset, bool is_append, + BdrvRequestFlags flags) { BDRVQcow2State *s =3D bs->opaque; int offset_in_cluster; int ret; unsigned int cur_bytes; /* number of sectors in current iteration */ uint64_t host_offset; + int64_t offset =3D *offset_ptr; QCowL2Meta *l2meta =3D NULL; AioTaskPool *aio =3D NULL; + int64_t start_offset, start_bytes; + BlockZoneState zs; + int64_t end_zone, end_offset; + uint64_t *wp; + int64_t zone_size =3D bs->bl.zone_size; + int64_t zone_capacity =3D bs->bl.zone_capacity; + int index =3D 0; + Qcow2WPReq req; + Qcow2WPReq *wp_req =3D NULL; =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) { + index =3D start_offset / zone_size; + wp =3D &bs->wps->wp[index]; + qemu_co_mutex_lock(&bs->wps->colock); + if (QCOW2_ZT_IS_CONV(*wp)) { + qemu_co_mutex_unlock(&bs->wps->colock); + } else { + if (offset !=3D *wp && !is_append) { + /* The write offset must be equal to the zone write pointe= r */ + qemu_co_mutex_unlock(&bs->wps->colock); + error_report("Offset 0x%" PRIx64 " of regular writes must = be " + "equal to the zone write pointer 0x%" PRIx64 = "", + offset, *wp); + return -EIO; + } + + if (is_append) { + /* + * The offset of append write is the write pointer value of + * that zone. + */ + start_offset =3D *wp; + } + + end_offset =3D start_offset + start_bytes; + + qemu_co_mutex_lock(&s->lock); + + /* 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_can_open_zone(bs)) { + qemu_co_mutex_unlock(&s->lock); + qemu_co_mutex_unlock(&bs->wps->colock); + error_report("no more open zones available"); + return -EINVAL; + } + } + + /* + * Align up (start_offset, zone_size), the start offset is not + * necessarily power of two. + */ + end_zone =3D index * zone_size + zone_capacity; + /* Write cannot exceed the zone capacity. */ + if (end_offset > end_zone) { + qemu_co_mutex_unlock(&s->lock); + qemu_co_mutex_unlock(&bs->wps->colock); + error_report("write exceeds zone capacity with end_offset:" + "0x%lx, end_zone: 0x%lx", + end_offset / 512, end_zone / 512); + return -EIO; + } + + /* + * Real drives change states before it can write to the zone. = If + * the write fails, the zone state may have changed. + * + * 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. + */ + zs =3D qcow2_get_zone_state(bs, index); + if (end_offset =3D=3D end_zone) { + /* Reaching the zone capacity implies full state */ + qcow2_rm_open_zone(s, index); + trace_qcow2_imp_open_zones(0x24, + s->nr_zones_imp_open); + } else { + qcow2_do_imp_open_zone(s, index, zs); + trace_qcow2_imp_open_zones(0x24, + s->nr_zones_imp_open); + } + + qemu_co_mutex_unlock(&s->lock); + + /* + * Submission for a zone append write. The logical-WP is updat= ed + * while the on-disk WP is not touched. + */ + if (is_append) { + start_offset =3D *wp; + end_offset =3D start_offset + start_bytes; + end_zone =3D (uint64_t)index * zone_size + zone_capacity; + if (end_offset > end_zone) { + qemu_co_mutex_unlock(&bs->wps->colock); + error_report("append: end_offset 0x%" PRIx64 + " > end_zone 0x%" PRIx64, + end_offset, end_zone); + return -EIO; + } + *offset_ptr =3D start_offset; + offset =3D start_offset; + } + + wp_req =3D &req; + wp_req->lba =3D start_offset; + wp_req->len =3D start_bytes; + wp_req->state =3D QCOW2_WP_REQ_INFLIGHT; + qemu_co_queue_init(&wp_req->wait); + QTAILQ_INSERT_TAIL(&s->zone_wp_state[index].in_flight, + wp_req, entry); + + *wp =3D end_offset; + qemu_co_mutex_unlock(&bs->wps->colock); + } + } + while (bytes !=3D 0 && aio_task_pool_status(aio) =3D=3D 0) { =20 l2meta =3D NULL; @@ -3006,11 +3617,75 @@ fail_nometa: g_free(aio); } =20 + if (wp_req !=3D NULL) { + qemu_co_mutex_lock(&bs->wps->colock); + QTAILQ_REMOVE(&s->zone_wp_state[index].in_flight, wp_req, entry); + + if (wp_req->state =3D=3D QCOW2_WP_REQ_ABORTED) { + /* + * A peer's failure handler aborted us. Whether our data + * write itself succeeded or not, reject it. + */ + qemu_co_mutex_unlock(&bs->wps->colock); + ret =3D ret < 0 ? ret : -EIO; + goto wp_done; + } + + if (ret < 0) { + /* + * This req's data write failed. Higher-LBA peers (still + * in_flight or already completed_pending) are marked ABORTED, + * their waiters woken; logical-WP rewinds to the highest + * surviving end_offset below this LBA. The zone remains usabl= e. + */ + qcow2_wp_abort_higher_peers_locked(bs, index, wp_req->lba); + qemu_co_mutex_unlock(&bs->wps->colock); + goto wp_done; + } + + qcow2_wp_insert_pending_locked(&s->zone_wp_state[index], wp_req); + + ret =3D qcow2_wp_greedy_advance_locked(bs, index); + if (ret < 0) { + if (wp_req->state =3D=3D QCOW2_WP_REQ_PENDING) { + QTAILQ_REMOVE(&s->zone_wp_state[index].completed_pending, + wp_req, entry); + } + qcow2_wp_abort_higher_peers_locked(bs, index, wp_req->lba); + qemu_co_mutex_unlock(&bs->wps->colock); + goto wp_done; + } + + /* Block until this write pointer req is RESOLVED or ABORTED. */ + while (wp_req->state =3D=3D QCOW2_WP_REQ_PENDING) { + qemu_co_queue_wait(&wp_req->wait, &bs->wps->colock); + } + + if (wp_req->state =3D=3D QCOW2_WP_REQ_ABORTED) { + ret =3D -EIO; + } else { + assert(wp_req->state =3D=3D QCOW2_WP_REQ_RESOLVED); + ret =3D 0; + } + qemu_co_mutex_unlock(&bs->wps->colock); + } + +wp_done: trace_qcow2_writev_done_req(qemu_coroutine_self(), ret); =20 return ret; } =20 +static int coroutine_fn GRAPH_RDLOCK +qcow2_co_pwritev_part(BlockDriverState *bs, int64_t offset, int64_t bytes, + QEMUIOVector *qiov, size_t qiov_offset, + BdrvRequestFlags flags) +{ + return qcow2_co_pwv_part(bs, &offset, bytes, qiov, qiov_offset, false, + flags); +} + + static int GRAPH_RDLOCK qcow2_inactivate(BlockDriverState *bs) { BDRVQcow2State *s =3D bs->opaque; @@ -3039,6 +3714,15 @@ static int GRAPH_RDLOCK qcow2_inactivate(BlockDriver= State *bs) strerror(-ret)); } =20 + if (s->wp_cache) { + ret =3D qcow2_cache_flush(bs, s->wp_cache); + if (ret) { + result =3D ret; + error_report("Failed to flush the WP cache: %s", + strerror(-ret)); + } + } + if (result =3D=3D 0) { qcow2_mark_clean(bs); } @@ -3046,6 +3730,25 @@ static int GRAPH_RDLOCK qcow2_inactivate(BlockDriver= State *bs) return result; } =20 +static void qcow2_do_close_all_zone(BDRVQcow2State *s) +{ + Qcow2ZoneListEntry *zone_entry, *next; + + QTAILQ_FOREACH_SAFE(zone_entry, &s->imp_open_zones, imp_open_zone_entr= y, + next) { + QTAILQ_REMOVE(&s->imp_open_zones, zone_entry, imp_open_zone_entry); + s->nr_zones_imp_open--; + } + + QTAILQ_FOREACH_SAFE(zone_entry, &s->exp_open_zones, exp_open_zone_entr= y, + next) { + QTAILQ_REMOVE(&s->exp_open_zones, 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) { @@ -3061,6 +3764,10 @@ qcow2_do_close(BlockDriverState *bs, bool close_data= _file) cache_clean_timer_del_and_wait(bs); qcow2_cache_destroy(s->l2_table_cache); qcow2_cache_destroy(s->refcount_block_cache); + if (s->wp_cache) { + qcow2_cache_destroy(s->wp_cache); + s->wp_cache =3D NULL; + } =20 qcrypto_block_free(s->crypto); s->crypto =3D NULL; @@ -3085,6 +3792,12 @@ qcow2_do_close(BlockDriverState *bs, bool close_data= _file) =20 qcow2_refcount_close(bs); qcow2_free_snapshots(bs); + qcow2_do_close_all_zone(s); + g_free(s->zone_list_entries); + s->zone_list_entries =3D NULL; + g_free(s->zone_wp_state); + s->zone_wp_state =3D NULL; + g_free(bs->wps); } =20 static void GRAPH_UNLOCKED qcow2_close(BlockDriverState *bs) @@ -3402,7 +4115,9 @@ 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), }; ret =3D header_ext_add(buf, QCOW2_EXT_MAGIC_ZONED_FORMAT, &zoned_header, sizeof(zoned_header), @@ -3811,7 +4526,9 @@ 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; + int64_t offset; + int ret, i; uint8_t compression_type =3D QCOW2_COMPRESSION_TYPE_ZLIB; =20 assert(create_options->driver =3D=3D BLOCKDEV_DRIVER_QCOW2); @@ -4173,6 +4890,45 @@ qcow2_co_create(BlockdevCreateOptions *create_option= s, Error **errp) ret =3D -EINVAL; goto unlock; } + + 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) { + ret =3D offset; + error_setg_errno(errp, -ret, "Could not allocate clusters " + "for zoned metadata size"); + goto unlock; + } + s->zoned_header.zonedmeta_offset =3D offset; + + zoned_clusterlen =3D size_to_clusters(s, zoned_meta_size) + * s->cluster_size; + ret =3D qcow2_pre_write_overlap_check(blk_bs(blk), 0, offset, + zoned_clusterlen, false); + if (ret < 0) { + error_setg_errno(errp, -ret, "Overlap check failed for zoned " + "metadata"); + goto unlock; + } + 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 unlock; + } } else { s->zoned_header.zoned =3D QCOW2_Z_NONE; } @@ -4578,6 +5334,431 @@ 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; + uint64_t zone_capacity =3D s->zoned_header.zone_capacity; + int64_t capacity =3D bs->total_sectors << BDRV_SECTOR_BITS; + int64_t size =3D bs->bl.nr_zones * zone_size; + unsigned int nrz; + 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; + } + + nrz =3D ((*nr_zones) < bs->bl.nr_zones) ? (*nr_zones) : bs->bl.nr_zone= s; + si =3D offset / zone_size; /* Zone size cannot be 0 for zoned device */ + 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 MIN(zone_capacity, l); + } else { + zones[i].length =3D zone_size; + zones[i].cap =3D zone_capacity; + } + + 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 masking bits */ + wp =3D QCOW2_GET_WP(wp); + } else { + zones[i].type =3D BLK_ZT_SWR; + qemu_co_mutex_lock(&s->lock); + zones[i].state =3D qcow2_get_zone_state(bs, si + i); + qemu_co_mutex_unlock(&s->lock); + } + zones[i].wp =3D wp; + } + qemu_co_mutex_unlock(&bs->wps->colock); + *nr_zones =3D i; + return 0; +} + +static int coroutine_fn GRAPH_RDLOCK +qcow2_open_zone(BlockDriverState *bs, uint32_t index) +{ + BDRVQcow2State *s =3D bs->opaque; + int ret; + + qemu_co_mutex_lock(&bs->wps->colock); + qemu_co_mutex_lock(&s->lock); + BlockZoneState zs =3D qcow2_get_zone_state(bs, index); + trace_qcow2_imp_open_zones(BLK_ZO_OPEN, s->nr_zones_imp_open); + + switch (zs) { + case BLK_ZS_EMPTY: + if (!qcow2_can_activate_zone(bs)) { + ret =3D -EBUSY; + goto unlock; + } + break; + case BLK_ZS_IOPEN: + qcow2_rm_imp_open_zone(s, index); + break; + case BLK_ZS_EOPEN: + qemu_co_mutex_unlock(&s->lock); + qemu_co_mutex_unlock(&bs->wps->colock); + return 0; + case BLK_ZS_CLOSED: + if (!qcow2_can_open_zone(bs)) { + ret =3D -EINVAL; + goto unlock; + } + qcow2_rm_closed_zone(s, index); + break; + case BLK_ZS_FULL: + break; + default: + ret =3D -EINVAL; + goto unlock; + } + + qcow2_do_exp_open_zone(s, index); + ret =3D 0; + +unlock: + qemu_co_mutex_unlock(&s->lock); + 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); + qemu_co_mutex_lock(&s->lock); + BlockZoneState zs =3D qcow2_get_zone_state(bs, index); + + switch (zs) { + case BLK_ZS_EMPTY: + break; + case BLK_ZS_IOPEN: + break; + case BLK_ZS_EOPEN: + break; + case BLK_ZS_CLOSED: + /* Closing a closed zone is not an error */ + ret =3D 0; + goto unlock; + case BLK_ZS_FULL: + break; + default: + ret =3D -EINVAL; + goto unlock; + } + qcow2_do_close_zone(bs, index, zs); + ret =3D 0; + +unlock: + qemu_co_mutex_unlock(&s->lock); + qemu_co_mutex_unlock(&bs->wps->colock); + return ret; +} + +static int coroutine_fn GRAPH_RDLOCK +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]; + qemu_co_mutex_lock(&s->lock); + BlockZoneState zs =3D qcow2_get_zone_state(bs, index); + + switch (zs) { + case BLK_ZS_EMPTY: + if (!qcow2_can_activate_zone(bs)) { + ret =3D -EBUSY; + goto unlock_state; + } + break; + case BLK_ZS_IOPEN: + qcow2_rm_imp_open_zone(s, index); + trace_qcow2_imp_open_zones(BLK_ZO_FINISH, s->nr_zones_imp_open); + break; + case BLK_ZS_EOPEN: + qcow2_rm_exp_open_zone(s, index); + break; + case BLK_ZS_CLOSED: + if (!qcow2_can_open_zone(bs)) { + ret =3D -EINVAL; + goto unlock_state; + } + qcow2_rm_closed_zone(s, index); + break; + case BLK_ZS_FULL: + ret =3D 0; + goto unlock_state; + default: + ret =3D -EINVAL; + goto unlock_state; + } + + /* Reject if any append write is still in flight for this zone. */ + if (s->zone_wp_state && + !QTAILQ_EMPTY(&s->zone_wp_state[index].in_flight)) { + ret =3D -EBUSY; + goto unlock_state; + } + + qemu_co_mutex_unlock(&s->lock); + + *wp =3D ((uint64_t)index + 1) * s->zoned_header.zone_size; + ret =3D qcow2_rw_wp_at(bs, wp, index, true); + if (ret < 0) { + goto unlock; + } + + /* + * Flush the WP cache so the on-disk write pointer reflects the new st= ate + * on return. + */ + qemu_co_mutex_lock(&s->lock); + ret =3D qcow2_cache_flush(bs, s->wp_cache); + qemu_co_mutex_unlock(&s->lock); + goto unlock; + +unlock_state: + qemu_co_mutex_unlock(&s->lock); +unlock: + qemu_co_mutex_unlock(&bs->wps->colock); + return ret; +} + +static int coroutine_fn GRAPH_RDLOCK +qcow2_reset_zone(BlockDriverState *bs, uint32_t index, + int64_t len) +{ + BDRVQcow2State *s =3D bs->opaque; + int nrz =3D bs->bl.nr_zones; + int64_t zone_size =3D bs->bl.zone_size; + int n, ret =3D 0; + bool any_dirtied =3D false; + + 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; + wp =3D &bs->wps->wp[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; + } + + /* Reject if any write is in flight for this zone. */ + if (s->zone_wp_state && + !QTAILQ_EMPTY(&s->zone_wp_state[index + i].in_flight)) { + ret =3D -EBUSY; + goto unlock; + } + + qemu_co_mutex_lock(&s->lock); + BlockZoneState zs =3D qcow2_get_zone_state(bs, index + i); + switch (zs) { + case BLK_ZS_EMPTY: + break; + case BLK_ZS_IOPEN: + qcow2_rm_imp_open_zone(s, index + i); + trace_qcow2_imp_open_zones(BLK_ZO_RESET, s->nr_zones_imp_open); + break; + case BLK_ZS_EOPEN: + qcow2_rm_exp_open_zone(s, index + i); + break; + case BLK_ZS_CLOSED: + qcow2_rm_closed_zone(s, index + i); + break; + case BLK_ZS_FULL: + break; + default: + ret =3D -EINVAL; + qemu_co_mutex_unlock(&s->lock); + goto unlock; + } + qemu_co_mutex_unlock(&s->lock); + + if (zs =3D=3D BLK_ZS_EMPTY) { + continue; + } + + /* + * Zero the data extent first. Date write fires before the WP clus= ter + * hits disk. So the wp advance cannot become durable while stale = data + * is still readable. + */ + ret =3D qcow2_co_pwrite_zeroes(bs, (uint64_t)(index + i) * zone_si= ze, + zone_size, 0); + if (ret < 0) { + error_report("Failed to clear zone data at zone %u", + index + i); + goto unlock; + } + + qemu_co_mutex_lock(&s->lock); + qcow2_cache_depends_on_flush(s->wp_cache); + qemu_co_mutex_unlock(&s->lock); + + *wp_i =3D (uint64_t)(index + i) * zone_size; + ret =3D qcow2_rw_wp_at(bs, wp_i, index + i, true); + if (ret < 0) { + goto unlock; + } + any_dirtied =3D true; + } + + if (any_dirtied) { + /* Single flush at the end. */ + qemu_co_mutex_lock(&s->lock); + ret =3D qcow2_cache_flush(bs, s->wp_cache); + qemu_co_mutex_unlock(&s->lock); + } + +unlock: + qemu_co_mutex_unlock(&bs->wps->colock); + return ret; +} + +static int coroutine_fn GRAPH_RDLOCK +qcow2_co_zone_mgmt(BlockDriverState *bs, BlockZoneOp 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]; + qemu_co_mutex_unlock(&wps->colock); + + if (QCOW2_ZT_IS_CONV(wpv)) { + /* + * ZONE_RESET_ALL is a global operation that is allowed when the + * starting zone is conventional; the zone reset path itself skips + * conventional zones. + */ + if (op !=3D BLK_ZO_RESET || len !=3D capacity) { + error_report("zone mgmt operation 0x%x is not allowed on " + "a conventional zone", op); + return -EIO; + } + } + + 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; +} + +static int coroutine_fn GRAPH_RDLOCK +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; + 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 " + "%" PRId64 "", *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] 0x%" PRIx64 " is not aligned= to " + "block size 0x%" PRIx64 "", i, iov_len, wg); + return -EINVAL; + } + } + len =3D qiov->size; + + if ((len >> BDRV_SECTOR_BITS) > bs->bl.max_append_sectors) { + error_report("len 0x%" PRIx64 " in sectors is greater than " + "max_append_sectors 0x%" PRIx32 "", + len >> BDRV_SECTOR_BITS, bs->bl.max_append_sectors); + return -EINVAL; + } + + return qcow2_co_pwv_part(bs, offset, len, qiov, 0, true, 0); +} + static int coroutine_fn GRAPH_RDLOCK qcow2_co_copy_range_from(BlockDriverState *bs, BdrvChild *src, int64_t src_offset, @@ -6667,6 +7848,10 @@ BlockDriver bdrv_qcow2 =3D { .bdrv_co_pwritev_compressed_part =3D qcow2_co_pwritev_compressed_pa= rt, .bdrv_make_empty =3D qcow2_make_empty, =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_snapshot_create =3D qcow2_snapshot_create, .bdrv_snapshot_goto =3D qcow2_snapshot_goto, .bdrv_snapshot_delete =3D qcow2_snapshot_delete, diff --git a/block/trace-events b/block/trace-events index 950c82d4b8..30a3e303ca 100644 --- a/block/trace-events +++ b/block/trace-events @@ -76,6 +76,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" --=20 2.53.0 From nobody Sun Jul 26 11:51:49 2026 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=1782479848; cv=none; d=zohomail.com; s=zohoarc; b=jpdBOiPyM0xi9nk+DrpvCJRIitp3+2zZJp8FSrwesIW8fp1KtBbHRRkELwsvdwNyWEAaP/60SldDcEJ2bdEQhbgJ4JpoCmPWp9jjHakkYePBfDolqoVJfXzK6HIZc3/xLLKFkaJhmpTRCUyEmA6eXRJGHq3epADLPwCaLlbWVe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782479848; 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=myfBXCt2K0eelQGeRMA7eEt1nCzzaHeqqBnY+kQMtPE=; b=jcKL4qXzykF7B5Cn2YfPjhJ3jaUulQ4sT2ApdGWvcRu1HIDmQ8kJEZ24in2vIBm0kG6MElZZ+ZI0oHcsTehBxOrRgdOREbl8ZgxNrWCTPZJrPkIFtPspr1gA21REa8R0CSwnrod0A4J+XCOItALRsEXwUCsFrk1Kme4qhTxkK54= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782479848629813.4088717713483; Fri, 26 Jun 2026 06:17:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wd6Q3-0008O4-O5; Fri, 26 Jun 2026 09:16:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wd6Pp-0008De-3B for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:18 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wd6Pj-00010i-12 for qemu-devel@nongnu.org; Fri, 26 Jun 2026 09:16:15 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-46f34d8f888so597557f8f.2 for ; Fri, 26 Jun 2026 06:16:10 -0700 (PDT) Received: from dobby ([2a02:8109:a394:4800:b369:c9c1:81a0:4afc]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46c2279b83fsm26093756f8f.29.2026.06.26.06.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 06:16:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782479769; x=1783084569; 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=myfBXCt2K0eelQGeRMA7eEt1nCzzaHeqqBnY+kQMtPE=; b=EeH6684H3/Hc+1jdDKe4TUrFrtUReJoHCGZ3NfHBZsHKhd0YcSi1w8+nSYsXhSM2i0 z/JkP2chCM31rmnxXt41rOtI+m3Z3530jly+QR7Ezl0/QtVcoRCgmCt+1jcm/EitRjoC wQqu/AVsCHXY9vjBO3+yjxMId1dY+i/2EbKsTpKIWRbx7nUk8zBxRWwFLDl6PYye3HFf WA94g2g3RRndgaQ1rUJxgTgC2Q5P4Ck1gEx1c6Al9h/N0kAcIFdbUiguBpFMMwskHAwN fqSjwGi4fB3+2x5RVVvSC/3V+eyxKXgJvTMnjwWL9XNV8eWnfV3SL7ZWMPVC/A3kSHyx +GwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782479769; x=1783084569; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=myfBXCt2K0eelQGeRMA7eEt1nCzzaHeqqBnY+kQMtPE=; b=mWxnt/61EL/CG7+AykNLCiuhjoxm7sh4Qjrz8p3W9/dPP3296ownb3W410J42Nt7fD 4hjIDJNWio+bJX2g/OtIbQNto4yxGcSwzCB/CBxrbhEQ+ETZ+UiGpQbVrlxhL+E2Er4r Q2t7RJOJMJHuiGLM0FmD8A+qTYWdf8THp/B1/3wg9xXYA6zgeaTNqBy5IVZY0o7cq6yH dnKdmIn6XzNOiPCxnvEAI5V0R9X59LgN9MZyO67XIfwRkIf6M7IacPZTwRGXYyircp63 pcDKtGsvq+/Y9c4tdc0cXeJ++ElBIYDj1Hms5mmWuhz/6T3gv59uAZzUA7aNgfhAoM8A Ib8w== X-Gm-Message-State: AOJu0YxCdZcJhtPmx5z73mpZMylKbLDntQ5fNfxkKp1Qq1CBkj9in6bJ Q3n9nFlHbjCyvUjbliMVlxj2SOLWq0hLBSSsMiPXsoNNbZVxKUHNzmHUixQ7ig== X-Gm-Gg: AfdE7cnY0cWIbCkFLkT7VR8pir0jYdPP79k4X0W6LZ0dk1quG7VJCKDP8iR+cWEG+vA uaroX9T4G/IDgzKCTIHIWMCdrCpY9GT3ZOotG+PDMR7NG3/Eu8wFOPLhDqJjxuURAAQhb0Ul0sW Ea9xNd4gj0fcTNyQ6dn5oL8Z92jb3ga5VeiaxgoHJZ+9Z54yl0SI9PmSCDxHhG3MNqQkBdXh83S ag/QPWG0gkRxSVbu9Us5gxPJanLU2heEy/5T5lVA2EH783P+NO8TP/a40mi82nObimv4Yiq0sYX YXxIM6I9kKb3ulUQCqGybaSVHUrFiEZNDduCnKvuuL6MTE7Lwzkmxdv41V5sIzN6h5yuxJYsfJx xmEaDT6w50oX/R1vyEr//Qd61DypLhXPJnfpgx0bJ1L0Bz1veDAVClutyJRspeNwkghdvCozbIV Nm1gQck3uOKLdKeydXen0+y2mytvFe2l8FsGw3kOhLHsj+Jg== X-Received: by 2002:a05:6000:4913:b0:45e:ea68:523b with SMTP id ffacd0b85a97d-46dbf7d1902mr10235550f8f.10.1782479769360; Fri, 26 Jun 2026 06:16:09 -0700 (PDT) From: Sam Li To: qemu-devel@nongnu.org Cc: Markus Armbruster , Kevin Wolf , cassel@kernel.org, dlemoal@kernel.org, qemu-block@nongnu.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Pierrick Bouvier , Eric Blake , Hanna Reitz , Sam Li Subject: [PATCH v13 6/6] iotests: test the zoned format feature for qcow2 file Date: Fri, 26 Jun 2026 15:15:55 +0200 Message-ID: <20260626131555.459792-7-faithilikerun@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260626131555.459792-1-faithilikerun@gmail.com> References: <20260626131555.459792-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=faithilikerun@gmail.com; helo=mail-wr1-x436.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: qemu development 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: 1782479850649158500 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 --- tests/qemu-iotests/303.out | 4 +- tests/qemu-iotests/tests/qcow2-encryption.out | 4 +- tests/qemu-iotests/tests/zoned-qcow2 | 209 ++++++++++++++++++ tests/qemu-iotests/tests/zoned-qcow2.out | 191 ++++++++++++++++ 4 files changed, 404 insertions(+), 4 deletions(-) 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/303.out b/tests/qemu-iotests/303.out index b3c70827b7..684a481cae 100644 --- a/tests/qemu-iotests/303.out +++ b/tests/qemu-iotests/303.out @@ -47,7 +47,7 @@ header_length 112 =20 Header extension: magic 0x6803f857 (Feature table) -length 384 +length 432 data =20 Header extension: @@ -133,7 +133,7 @@ wrote 1048576/1048576 bytes at offset 7340032 { "name": "Feature table", "magic": 1745090647, - "length": 384, + "length": 432, "data_str": "" }, { diff --git a/tests/qemu-iotests/tests/qcow2-encryption.out b/tests/qemu-iot= ests/tests/qcow2-encryption.out index 9b549dc2ab..8be3e57f6e 100644 --- a/tests/qemu-iotests/tests/qcow2-encryption.out +++ b/tests/qemu-iotests/tests/qcow2-encryption.out @@ -10,7 +10,7 @@ data =20 Header extension: magic 0x6803f857 (Feature table) -length 384 +length 432 data =20 image: TEST_DIR/t.IMGFMT @@ -24,7 +24,7 @@ No errors were found on the image. =20 Header extension: magic 0x6803f857 (Feature table) -length 384 +length 432 data =20 qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Missing CRYPTO header for cr= ypt method 2 diff --git a/tests/qemu-iotests/tests/zoned-qcow2 b/tests/qemu-iotests/test= s/zoned-qcow2 new file mode 100755 index 0000000000..d37100c8ab --- /dev/null +++ b/tests/qemu-iotests/tests/zoned-qcow2 @@ -0,0 +1,209 @@ +#!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# 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 zone.conventional_zones=3D0 -o zone.max_append_byte= s=3D32M \ +-o zone.max_open_zones=3D6 -o zone.max_active_zones=3D8 -o zone.mode=3Dhos= t-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 +zrp 0 1 +zo 0x4000000 0x4000000 +zrp 0x4000000 1 +zo 0x2C000000 0x4000000 +zrp 0x2C000000 2 +zc 0 0x4000000 +zrp 0 1 +zc 0x4000000 0x4000000 +zrp 0x4000000 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 "zrp 0 12" -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 +zrp 0 1 +zap -p 0 0x1000 0x1ffd000 +zap -p 0 0x1000000 0x1000000 +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 + +echo "case 3: test zone resource management" +echo "(1) write in zones[0], zones[1], zones[2] and then close it" +$QEMU_IO $IMG << EOF +zap -p 0 0x1000 0x1000 +zap -p 0x4000000 0x1000 0x1000 +zap -p 0x8000000 0x1000 0x1000 +zrp 0 12 +zc 0 64M +zc 0x4000000 64M +zc 0x8000000 64M +zrp 0 12 +EOF + +echo "(2) reset all after 3(1)" +$QEMU_IO $IMG << EOF +zrs 0 768M +zrp 0 12 +EOF + +echo +echo "case 4: WP cache crash consistency under concurrent appends" +echo "(1) concurrent writes to the same sequential zone (zone 5 @ 320M)" +# Three concurrent aio_writes at WP, WP+4K, WP+8K. Data writes are +# permitted to complete out of order +$QEMU_IO $IMG < qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x0, zcond:3,= [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: 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> 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 0x30, zcond:4, [type: 2] +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20030, zcond:4, [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] +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> After zap done, the append sector is 0x0 +qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x10, zcond:2, [type: = 2] +qemu-io> After zap done, the append sector is 0x10 +qemu-io> After zap done, the append sector is 0x10000 +qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x20000, zcond:14, [ty= pe: 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> case 3: test zone resource management +(1) write in zones[0], zones[1], zones[2] and then close it +qemu-io> After zap done, the append sector is 0x0 +qemu-io> After zap done, the append sector is 0x20000 +qemu-io> After zap done, the append sector is 0x40000 +qemu-io> start: 0x0, len 0x20000, cap 0x20000, wptr 0x10, zcond:2, [type: = 2] +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20010, zcond:2, [type: 2] +start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40010, zcond:2, [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> qemu-io> qemu-io> qemu-io> start: 0x0, len 0x20000, cap 0x20000, = wptr 0x10, zcond:4, [type: 2] +start: 0x20000, len 0x20000, cap 0x20000, wptr 0x20010, zcond:4, [type: 2] +start: 0x40000, len 0x20000, cap 0x20000, wptr 0x40010, zcond:4, [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> (2) reset all after 3(1) +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> +case 4: WP cache crash consistency under concurrent appends +(1) concurrent writes to the same sequential zone (zone 5 @ 320M) +qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> start: 0xa0000, len 0x20000, = cap 0x20000, wptr 0xa0018, zcond:2, [type: 2] +qemu-io> qemu-io> qemu-io> qemu-io> (2) concurrent writes to different seq= uential zones (zones 6, 7, 9) +qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> start: 0xc0000, len 0x20000, = cap 0x20000, wptr 0xc0008, zcond:2, [type: 2] +qemu-io> start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0008, zcond:2, = [type: 2] +qemu-io> start: 0x120000, len 0x20000, cap 0x20000, wptr 0x120008, zcond:2= , [type: 2] +qemu-io> qemu-io> qemu-io> qemu-io> (3) reset zones with no in-flight writ= es (zones 5, 6) +start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, zcond:1, [type: 2] +start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, [type: 2] +(4) BLKRESETALL after concurrent writes +qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> qemu-io> start: 0xa0000, len = 0x20000, cap 0x20000, wptr 0xa0008, zcond:2, [type: 2] +qemu-io> start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0008, zcond:2, = [type: 2] +qemu-io> start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0008, zcond:2, = [type: 2] +qemu-io> qemu-io> start: 0xa0000, len 0x20000, cap 0x20000, wptr 0xa0000, = zcond:1, [type: 2] +qemu-io> start: 0xc0000, len 0x20000, cap 0x20000, wptr 0xc0000, zcond:1, = [type: 2] +qemu-io> start: 0xe0000, len 0x20000, cap 0x20000, wptr 0xe0000, zcond:1, = [type: 2] +qemu-io> *** done --=20 2.53.0