From nobody Sun Feb 8 22:49:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1595777265; cv=none; d=zohomail.com; s=zohoarc; b=JF5R/9EVGolNfdbmcRNNGcyPN057lCDz96ktSLQRjqF93xaGEVbdeOPB5UvHd0O2n1uo+Q/M//PfuCEdjLQUgBVgm7IxLKZawJJOPHjOVL0YBoqtGuGgDqDAFKjlWuKCMRyeGxell/H8wpD0lhG9nhl9tVWdbskiCDH+ZwOt8GY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595777265; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3zoa87Ykk+F8g84mfgH2rj0x/RwpluBghvUGd3VfP9I=; b=BUT6YMfH8lwqoBEGrWkHWAXSgYQyBMHdsy8USd8zDsUt6Lz791Ey08Ab6J5vXKa5dOxRRo1uEmHlUcwQ0Qpkm5nU0ImxzTWdjvu8vBKcUrQlQX17WFcCzV4esN+sF5siNyCjm6mdAw8Xk0lGOWbF9OkbsVX43BuC5Klfc61dYLc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595777265301444.14687835529355; Sun, 26 Jul 2020 08:27:45 -0700 (PDT) Received: from localhost ([::1]:35922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jziYx-0003f9-Q8 for importer@patchew.org; Sun, 26 Jul 2020 11:27:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jziX0-0001AX-73; Sun, 26 Jul 2020 11:25:42 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:43270) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jziWy-0001t7-1V; Sun, 26 Jul 2020 11:25:41 -0400 Received: by mail-wr1-x442.google.com with SMTP id a15so12447422wrh.10; Sun, 26 Jul 2020 08:25:39 -0700 (PDT) Received: from localhost.localdomain (109-186-134-209.bb.netvision.net.il. [109.186.134.209]) by smtp.gmail.com with ESMTPSA id 14sm14160206wmk.19.2020.07.26.08.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jul 2020 08:25:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3zoa87Ykk+F8g84mfgH2rj0x/RwpluBghvUGd3VfP9I=; b=pbkTTRA1r2/1y4GiacdMCPu48cUaDSRn4sA1Kd/elUTpGA2ZMut5rHjNWHAvAA6bOg 5m1Jbfp8rsuxOFf49J+3kKOO8ux6KLj42momZts1KX9/vfGwQMrYazdIuL5mP+bdGYeV o9sV+Ffs5Oo8f6Ww9s06YnEjYoIFGxuAPLZxpb1c6R1/ZhNgheRXF/Qtgywy6ee1GMH6 Wchfr6mUTzUwWEcYpJ33pgNS8i3KDeibLOL9grsB8pMcG4Fj4OcjOwqF9ELVONEU7uSD pl80LHTAJWYRYvneJE8b+5T9Og9txiytVykb+knJwbmPgOHuZQFLuluHiTGFQeSVGgBw 4ofw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3zoa87Ykk+F8g84mfgH2rj0x/RwpluBghvUGd3VfP9I=; b=rA9MqqPZkcYkuTotjJf4RJIY4n3E2HbonLEO5EPot0BlVy/qmfVy3QD/aRwYqLSvSk iffpCmXkTuxchH/vIiD6wx8os/Xw/IQQWYWnpX6lslXLIZ9f7vYbEyBfk1PXWdLrM43v eZWKHXGX2C3PoQ8mmH8b9YziOAo2KLamm4guPQ81G5nqrDQPaDKyZCRii35bpEmP1tDe DfJ0OErk3yiI2iIJUSyrQaNFyAANUxhfZkIuNtRnX0BjPM38EF6TdGfYcvAihpb9OCAw WceVWu79ufnQZ2t+bLz1pqRlOuh42NIRjQYbq/5CQT+GNxwN9Poa9nDEmZu2m2B3Xbhw RTnA== X-Gm-Message-State: AOAM533JbjWF2dqiIQNGQ0Xfxz08zTI2pduo3/vW2VKlwUgTvWlZOtvu BKhMuf2smy5iLWYIDcYYcUlBwetuEPE= X-Google-Smtp-Source: ABdhPJxxf1mCDp6JTqDhO2oaMP9gZb4hN6noKVcQLvDhTdMUaccbDNGYNLLiQiy+00hX2nvwH345mw== X-Received: by 2002:adf:94e5:: with SMTP id 92mr16127002wrr.316.1595777137797; Sun, 26 Jul 2020 08:25:37 -0700 (PDT) From: Nir Soffer X-Google-Original-From: Nir Soffer To: qemu-block@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/2] block: nbd: Fix convert qcow2 compressed to nbd Date: Sun, 26 Jul 2020 18:25:31 +0300 Message-Id: <20200726152532.256261-2-nsoffer@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200726152532.256261-1-nsoffer@redhat.com> References: <20200726152532.256261-1-nsoffer@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=nirsof@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Nir Soffer , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When converting to qcow2 compressed format, the last step is a special zero length compressed write, ending in call to bdrv_co_truncate(). This call always fail for the nbd driver since it does not implement bdrv_co_truncate(). For block devices, which have the same limits, the call succeeds since file driver implements bdrv_co_truncate(). If the caller asked to truncate to the same or smaller size with exact=3Dfalse, the truncate succeeds. Implement the same logic for nbd. Example failing without this change: In one shell starts qemu-nbd: $ truncate -s 1g test.tar $ qemu-nbd --socket=3D/tmp/nbd.sock --persistent --format=3Draw --offset 15= 36 test.tar In another shell convert an image to qcow2 compressed via NBD: $ echo "disk data" > disk.raw $ truncate -s 1g disk.raw $ qemu-img convert -f raw -O qcow2 -c disk1.raw nbd+unix:///?socket=3D/tmp/= nbd.sock; echo $? 1 qemu-img failed, but the conversion was successful: $ qemu-img info nbd+unix:///?socket=3D/tmp/nbd.sock image: nbd+unix://?socket=3D/tmp/nbd.sock file format: qcow2 virtual size: 1 GiB (1073741824 bytes) ... $ qemu-img check nbd+unix:///?socket=3D/tmp/nbd.sock No errors were found on the image. 1/16384 =3D 0.01% allocated, 100.00% fragmented, 100.00% compressed clusters Image end offset: 393216 $ qemu-img compare disk.raw nbd+unix:///?socket=3D/tmp/nbd.sock Images are identical. Fixes: https://bugzilla.redhat.com/1860627 Signed-off-by: Nir Soffer --- block/nbd.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/block/nbd.c b/block/nbd.c index 65a4f56924..2154113af3 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -1966,6 +1966,30 @@ static void nbd_close(BlockDriverState *bs) nbd_clear_bdrvstate(s); } =20 +/* + * NBD cannot truncate, but if the caller ask to truncate to the same size= , or + * to a smaller size with extact=3Dfalse, there is not reason to fail the + * operation. + */ +static int coroutine_fn nbd_co_truncate(BlockDriverState *bs, int64_t offs= et, + bool exact, PreallocMode prealloc, + BdrvRequestFlags flags, Error **er= rp) +{ + BDRVNBDState *s =3D bs->opaque; + + if (offset !=3D s->info.size && exact) { + error_setg(errp, "Cannot resize NBD nodes"); + return -ENOTSUP; + } + + if (offset > s->info.size) { + error_setg(errp, "Cannot grow NBD nodes"); + return -EINVAL; + } + + return 0; +} + static int64_t nbd_getlength(BlockDriverState *bs) { BDRVNBDState *s =3D bs->opaque; @@ -2045,6 +2069,7 @@ static BlockDriver bdrv_nbd =3D { .bdrv_co_flush_to_os =3D nbd_co_flush, .bdrv_co_pdiscard =3D nbd_client_co_pdiscard, .bdrv_refresh_limits =3D nbd_refresh_limits, + .bdrv_co_truncate =3D nbd_co_truncate, .bdrv_getlength =3D nbd_getlength, .bdrv_detach_aio_context =3D nbd_client_detach_aio_context, .bdrv_attach_aio_context =3D nbd_client_attach_aio_context, @@ -2072,6 +2097,7 @@ static BlockDriver bdrv_nbd_tcp =3D { .bdrv_co_flush_to_os =3D nbd_co_flush, .bdrv_co_pdiscard =3D nbd_client_co_pdiscard, .bdrv_refresh_limits =3D nbd_refresh_limits, + .bdrv_co_truncate =3D nbd_co_truncate, .bdrv_getlength =3D nbd_getlength, .bdrv_detach_aio_context =3D nbd_client_detach_aio_context, .bdrv_attach_aio_context =3D nbd_client_attach_aio_context, @@ -2099,6 +2125,7 @@ static BlockDriver bdrv_nbd_unix =3D { .bdrv_co_flush_to_os =3D nbd_co_flush, .bdrv_co_pdiscard =3D nbd_client_co_pdiscard, .bdrv_refresh_limits =3D nbd_refresh_limits, + .bdrv_co_truncate =3D nbd_co_truncate, .bdrv_getlength =3D nbd_getlength, .bdrv_detach_aio_context =3D nbd_client_detach_aio_context, .bdrv_attach_aio_context =3D nbd_client_attach_aio_context, --=20 2.25.4