From nobody Fri Mar 29 08:30:12 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673551032; cv=none; d=zohomail.com; s=zohoarc; b=gE35piHLfHxsWZyJ26pMp/iSgEK7AnMmPzO49shDyT3mcxUsj2f/gCRCihGUk3fqnlP0Ba6XIYFe2oX2arJGlYseYRf6T6nfgnZ73+5O8qnDnqSeQ+wPKIOyY6giSZh3YOHogOQq6qG01XBjiRlr/BeRc83MKSAeG9P8qM4WehU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673551032; 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=YUU8VrXA4jUIkYKhKyvhLL9c6PO4miT/0C8AgVa1GZs=; b=NT0nD3cSmIC2YiqYN0dZinicmO7Y+yBgnDlbrS0BmTi/heE9Gu3Vmoo++zqxhysVjJz5cgU16SmxRdmi0zTTpHLC/7Cqp6xMj8wuS2SMyjoNzYq4q8KLuEF2RWuxPuTRdwlGisqfR2ORW2KQ5YSlIy+o6VGeDI8e4MOCj0LFKjY= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673551032357995.0535807025196; Thu, 12 Jan 2023 11:17:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pG32b-0007Zo-Hb; Thu, 12 Jan 2023 14:15:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32Y-0007Y7-Ox for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32W-00082R-5S for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:06 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-180-YITfRap-O5mObSA62tL1Aw-1; Thu, 12 Jan 2023 14:15:01 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C8E6B857A85; Thu, 12 Jan 2023 19:15:00 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.195.125]) by smtp.corp.redhat.com (Postfix) with ESMTP id 54614492C14; Thu, 12 Jan 2023 19:14:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673550902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YUU8VrXA4jUIkYKhKyvhLL9c6PO4miT/0C8AgVa1GZs=; b=QitLXHZkXH8NbNfAB5W0zboNvyzZQiA2SXEczrMYMi4XtpnwZjdYiXq2rGAJLD29nFgua6 zkxDGiezvX0voo/R1YXSIkz35Yvn1Xge628OQUeLFJg3fy7aZSk1Pu4cQ/0lp6ZPz88C2z ogNLB3yP78QOHpeeaSLmYYPBVgdrYbs= X-MC-Unique: YITfRap-O5mObSA62tL1Aw-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, aesteve@redhat.com, nsoffer@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 1/4] qcow2: Fix theoretical corruption in store_bitmap() error path Date: Thu, 12 Jan 2023 20:14:51 +0100 Message-Id: <20230112191454.169353-2-kwolf@redhat.com> In-Reply-To: <20230112191454.169353-1-kwolf@redhat.com> References: <20230112191454.169353-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673551033803100003 Content-Type: text/plain; charset="utf-8" In order to write the bitmap table to the image file, it is converted to big endian. If the write fails, it is passed to clear_bitmap_table() to free all of the clusters it had allocated before. However, if we don't convert it back to native endianness first, we'll free things at a wrong offset. In practical terms, the offsets will be so high that we won't actually free any allocated clusters, but just run into an error, but in theory this can cause image corruption. Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Hanna Czenczek Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block/qcow2-bitmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index bcad567c0c..3dff99ba06 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -115,7 +115,7 @@ static int update_header_sync(BlockDriverState *bs) return bdrv_flush(bs->file->bs); } =20 -static inline void bitmap_table_to_be(uint64_t *bitmap_table, size_t size) +static inline void bitmap_table_bswap_be(uint64_t *bitmap_table, size_t si= ze) { size_t i; =20 @@ -1401,9 +1401,10 @@ static int store_bitmap(BlockDriverState *bs, Qcow2B= itmap *bm, Error **errp) goto fail; } =20 - bitmap_table_to_be(tb, tb_size); + bitmap_table_bswap_be(tb, tb_size); ret =3D bdrv_pwrite(bs->file, tb_offset, tb_size * sizeof(tb[0]), tb, = 0); if (ret < 0) { + bitmap_table_bswap_be(tb, tb_size); error_setg_errno(errp, -ret, "Failed to write bitmap '%s' to file", bm_name); goto fail; --=20 2.38.1 From nobody Fri Mar 29 08:30:12 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673550987; cv=none; d=zohomail.com; s=zohoarc; b=SX+F4kHza0mpXHotJ/BVThVsEXyuVvWyIArm2iNu/GJpdyda5se/WRSGAlpXJRo9ERWcQNsSYywLqtJKov7MOSSSNLY62T1DswKgXXw2sz7bSLphHx+ca4ZbSOAaVNqHluyUwC44tmt2VIh8r7GCLJ3IjOwYXRZW+0Ea2a9TH3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673550987; 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=8LiTmw3QdTShVcaKcTC5WIhseguMBvfQFAYKy9Z4p+w=; b=L808xsQOXrFWRbKk6co+VrQCDeM8sCQ8algLgR5uBnepbvls4gTMNm78J0khIv8hO1gEx61He8IoMD1SX0Aa19kcA8ixl6T8E8RYeU5PufTJe2P7PWd++FVmSQP8dDjq2P4FxZvaK4U4bPo04o8oWHFVEI9Jn1kjBs1ntiRoL2Q= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673550987171684.2350126047443; Thu, 12 Jan 2023 11:16:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pG32c-0007ao-Tb; Thu, 12 Jan 2023 14:15:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32a-0007ZD-9k for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32Y-0008EA-Ne for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:08 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-382-PXne6unhPKONttOoXjPs7w-1; Thu, 12 Jan 2023 14:15:02 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 68998802D36; Thu, 12 Jan 2023 19:15:02 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.195.125]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26A3F492C18; Thu, 12 Jan 2023 19:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673550906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8LiTmw3QdTShVcaKcTC5WIhseguMBvfQFAYKy9Z4p+w=; b=LFmTtKeF2JvT9lQ55CaT8vdZK5cLwUX8aKwHT8rDbcdi/hbBMlrOo5RaDL+7wTHypS8Miy WCFIvLvjZe+dzrOzlgCk1e8HesfV9MmLgEgF4mnLSWW5TJohmCdzn4TeQVFKnwN/6YcqfI tg7tcRuicSfVI+wdgfxziORtnC0wSSk= X-MC-Unique: PXne6unhPKONttOoXjPs7w-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, aesteve@redhat.com, nsoffer@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 2/4] qemu-img commit: Report errors while closing the image Date: Thu, 12 Jan 2023 20:14:52 +0100 Message-Id: <20230112191454.169353-3-kwolf@redhat.com> In-Reply-To: <20230112191454.169353-1-kwolf@redhat.com> References: <20230112191454.169353-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673550987677100001 Content-Type: text/plain; charset="utf-8" blk_unref() can't report any errors that happen while closing the image. For example, if qcow2 hits an -ENOSPC error while writing out dirty bitmaps when it's closed, it prints error messages to stderr, but 'qemu-img commit' won't see any error return value and will therefore look successful with exit code 0. In order to fix this, manually inactivate the image first before calling blk_unref(). This already performs the operations that would be most likely to fail while closing the image, but it can still return errors. Signed-off-by: Kevin Wolf Reviewed-by: Hanna Czenczek --- qemu-img.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index 439d8de1e3..22d6ecefd5 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -449,6 +449,11 @@ static BlockBackend *img_open(bool image_opts, blk =3D img_open_file(filename, NULL, fmt, flags, writethrough, qu= iet, force_share); } + + if (blk) { + blk_set_force_allow_inactivate(blk); + } + return blk; } =20 @@ -1119,6 +1124,14 @@ unref_backing: done: qemu_progress_end(); =20 + /* + * Manually inactivate the image first because this way we can know wh= ether + * an error occurred. blk_unref() doesn't tell us about failures. + */ + ret =3D bdrv_inactivate_all(); + if (ret < 0 && !local_err) { + error_setg_errno(&local_err, -ret, "Error while closing the image"= ); + } blk_unref(blk); =20 if (local_err) { --=20 2.38.1 From nobody Fri Mar 29 08:30:12 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673551030; cv=none; d=zohomail.com; s=zohoarc; b=edxlVKRog4wZIbThY7DGCTfNngiNWKIQoBJk0zieWpXdewtGsAV5CL1wSXv7vL/kq1OA4zXDrv0Jzy/NsWDPxXWSPOBvhnd3BoiZ0cWIDDkr7z1AzZQz6rsaiEd+w/nwB93PVjmUXnnh2k2ndOSy8ZqLMzzyX1bFcVKYl05gIuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673551030; 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=w4FMIKqOkK3PfzSvu0coa8Cvc9krYVpVU37RFcG4z+g=; b=FRUVm3AdJ/pnR872J6xv2thOd6ANoY0ekYYuCtBVUj6et+Q8hS8VpGQ6FnUyWvyX08+G2ekf1tDif2HOgnOkkGjOZ0XviXjwukQBfMkmq65M6Kc7TNypTyKb937awMEEZpNRzqlRnEnC8gGOGAa2wgX+pJ+yWl6TEJZCNCMEuAg= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTP id 1673551030807780.589388128302; Thu, 12 Jan 2023 11:17:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pG32c-0007aT-Pf; Thu, 12 Jan 2023 14:15:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32a-0007Z3-5t for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32Y-0008E2-FG for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:07 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-375-zB5t0XBBPeie9XP0WKEKQw-1; Thu, 12 Jan 2023 14:15:04 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F05CB802D36; Thu, 12 Jan 2023 19:15:03 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.195.125]) by smtp.corp.redhat.com (Postfix) with ESMTP id B19F0492C14; Thu, 12 Jan 2023 19:15:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673550905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w4FMIKqOkK3PfzSvu0coa8Cvc9krYVpVU37RFcG4z+g=; b=H/117CVcaRaylDDQulVfboVEkslUkY98IZehN51jqtrTLOxcb0zF+1nKw/5zWYBf3qOyZC 1cV5VdyjyYm9kQrEDCuFwZ00jjiKErLZQgxXmwbHyIt6FvkrVmL0E6S77KgKWG+bRAFBr0 Jn4syCz8D47j2GhxV1RtmezOWAu3w7g= X-MC-Unique: zB5t0XBBPeie9XP0WKEKQw-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, aesteve@redhat.com, nsoffer@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 3/4] qemu-img bitmap: Report errors while closing the image Date: Thu, 12 Jan 2023 20:14:53 +0100 Message-Id: <20230112191454.169353-4-kwolf@redhat.com> In-Reply-To: <20230112191454.169353-1-kwolf@redhat.com> References: <20230112191454.169353-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673551031810100001 Content-Type: text/plain; charset="utf-8" blk_unref() can't report any errors that happen while closing the image. For example, if qcow2 hits an -ENOSPC error while writing out dirty bitmaps when it's closed, it prints error messages to stderr, but 'qemu-img bitmap' won't see any error return value and will therefore look successful with exit code 0. In order to fix this, manually inactivate the image first before calling blk_unref(). This already performs the operations that would be most likely to fail while closing the image, but it can still return errors. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1330 Signed-off-by: Kevin Wolf Reviewed-by: Hanna Czenczek Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qemu-img.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index 22d6ecefd5..c3671d4890 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4645,6 +4645,7 @@ static int img_bitmap(int argc, char **argv) QSIMPLEQ_HEAD(, ImgBitmapAction) actions; ImgBitmapAction *act, *act_next; const char *op; + int inactivate_ret; =20 QSIMPLEQ_INIT(&actions); =20 @@ -4829,6 +4830,16 @@ static int img_bitmap(int argc, char **argv) ret =3D 0; =20 out: + /* + * Manually inactivate the images first because this way we can know w= hether + * an error occurred. blk_unref() doesn't tell us about failures. + */ + inactivate_ret =3D bdrv_inactivate_all(); + if (inactivate_ret < 0) { + error_report("Error while closing the image: %s", strerror(-inacti= vate_ret)); + ret =3D 1; + } + blk_unref(src); blk_unref(blk); qemu_opts_del(opts); --=20 2.38.1 From nobody Fri Mar 29 08:30:12 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673551023; cv=none; d=zohomail.com; s=zohoarc; b=CS6pDYzO9NzLzQYkK3JpiJtZ8GtjdDRiYIIs/qRYtiJmurC5EuHR2N/+RuHW+1I1CUFpyGLe3fxIoUtcfrkt6RBP/9c23mg1AA62Ie1hyV7YLnNgOGi7Cm2UMi1A6tsd144s54BgUlnbDJYTTTQhK1w3B/1OMsyGZe9fQ+vm6yw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673551023; 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=4MDbCo26xsnOuPtADTJRyhBP684s/8bn9h+SiAIwujI=; b=hrZFkZe3ALFQ6t6ob8UAc4q3BlbKT3nKojj5XzI1/yWeFpfWbOM1wJI4d/csPNvJ3bgX3c72Og7zPyWYC7o1dOSW8LwUDLbjqtG0LgFmssKxlH2+6khGQonh1RQcsumEwdpboxkD4a/ZP+0W21w7T21NZZeTZk42CIO2jRFDSUk= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTP id 1673551023597109.14807007471018; Thu, 12 Jan 2023 11:17:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pG32g-0007cg-1W; Thu, 12 Jan 2023 14:15:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32e-0007bp-2M for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32c-0008FR-55 for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:11 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-379-TqrguxZRPWSyOJdd7VoCxg-1; Thu, 12 Jan 2023 14:15:05 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8B4963806721; Thu, 12 Jan 2023 19:15:05 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.195.125]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4704B492C14; Thu, 12 Jan 2023 19:15:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673550909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4MDbCo26xsnOuPtADTJRyhBP684s/8bn9h+SiAIwujI=; b=GpYmFjy2fXfE/4Y6nEjlc5brfHx34iI4Mjo4/NQwRPDD8Cu9ykywL8BOg5uqrJU6FIA2OX JrMjWI1PzfM33+FQwOOrVcFeV6UcHqG9syzV/PkCEd3QRLPnIOv+eedko2jvyL2HsdNuB0 djBb/K05Cb96Rze38CxRtF0vG+e+YwI= X-MC-Unique: TqrguxZRPWSyOJdd7VoCxg-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, aesteve@redhat.com, nsoffer@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 4/4] qemu-iotests: Test qemu-img bitmap/commit exit code on error Date: Thu, 12 Jan 2023 20:14:54 +0100 Message-Id: <20230112191454.169353-5-kwolf@redhat.com> In-Reply-To: <20230112191454.169353-1-kwolf@redhat.com> References: <20230112191454.169353-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673551023817100001 Content-Type: text/plain; charset="utf-8" This tests that when an error happens while writing back bitmaps to the image file in qcow2_inactivate(), 'qemu-img bitmap/commit' actually return an error value in their exit code instead of making the operation look successful to scripts. Signed-off-by: Kevin Wolf Reviewed-by: Hanna Czenczek --- .../qemu-iotests/tests/qemu-img-close-errors | 95 +++++++++++++++++++ .../tests/qemu-img-close-errors.out | 23 +++++ 2 files changed, 118 insertions(+) create mode 100755 tests/qemu-iotests/tests/qemu-img-close-errors create mode 100644 tests/qemu-iotests/tests/qemu-img-close-errors.out diff --git a/tests/qemu-iotests/tests/qemu-img-close-errors b/tests/qemu-io= tests/tests/qemu-img-close-errors new file mode 100755 index 0000000000..662f726e5d --- /dev/null +++ b/tests/qemu-iotests/tests/qemu-img-close-errors @@ -0,0 +1,95 @@ +#!/usr/bin/env bash +# group: rw auto quick +# +# Check that errors while closing the image, in particular writing back di= rty +# bitmaps, is correctly reported with a failing qemu-img exit code. +# +# Copyright (C) 2023 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=3Dkwolf@redhat.com + +seq=3D"$(basename $0)" +echo "QA output created by $seq" + +status=3D1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +cd .. +. ./common.rc +. ./common.filter + +_supported_fmt qcow2 +_supported_proto generic + +size=3D1G + +# The error we are going to use is ENOSPC. Depending on how many bitmaps we +# create in the backing file (and therefore increase the used up space), w= e get +# failures in different places. With a low number, only merging the bitmap +# fails, whereas with a higher number, already 'qemu-img commit' fails. +for max_bitmap in 6 7; do + echo + echo "=3D=3D=3D Test with $max_bitmap bitmaps =3D=3D=3D" + + TEST_IMG=3D"$TEST_IMG.base" _make_test_img -q $size + for i in $(seq 1 $max_bitmap); do + $QEMU_IMG bitmap --add "$TEST_IMG.base" "stale-bitmap-$i" + done + + # Simulate a block device of 128 MB by resizing the image file accordi= ngly + # and then enforcing the size with the raw driver + truncate "$TEST_IMG.base" --size 128M + BASE_JSON=3D'json:{ + "driver": "qcow2", + "file": { + "driver": "raw", + "size": 134217728, + "file": { + "driver": "file", + "filename":"'"$TEST_IMG.base"'" + } + } + }' + + _make_test_img -q -b "$BASE_JSON" -F $IMGFMT + $QEMU_IMG bitmap --add "$TEST_IMG" "good-bitmap" + + $QEMU_IO -c 'write 0 126m' "$TEST_IMG" | _filter_qemu_io + + $QEMU_IMG commit -d "$TEST_IMG" 2>&1 | _filter_generated_node_ids + echo "qemu-img commit exit code: ${PIPESTATUS[0]}" + + $QEMU_IMG bitmap --add "$BASE_JSON" "good-bitmap" + echo "qemu-img bitmap --add exit code: $?" + + $QEMU_IMG bitmap --merge "good-bitmap" -b "$TEST_IMG" "$BASE_JSON" \ + "good-bitmap" 2>&1 | _filter_generated_node_ids + echo "qemu-img bitmap --merge exit code: ${PIPESTATUS[0]}" +done + +# success, all done +echo "*** done" +rm -f $seq.full +status=3D0 + diff --git a/tests/qemu-iotests/tests/qemu-img-close-errors.out b/tests/qem= u-iotests/tests/qemu-img-close-errors.out new file mode 100644 index 0000000000..1bfe88f176 --- /dev/null +++ b/tests/qemu-iotests/tests/qemu-img-close-errors.out @@ -0,0 +1,23 @@ +QA output created by qemu-img-close-errors + +=3D=3D=3D Test with 6 bitmaps =3D=3D=3D +wrote 132120576/132120576 bytes at offset 0 +126 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Image committed. +qemu-img commit exit code: 0 +qemu-img bitmap --add exit code: 0 +qemu-img: Lost persistent bitmaps during inactivation of node 'NODE_NAME':= Failed to write bitmap 'good-bitmap' to file: No space left on device +qemu-img: Error while closing the image: Invalid argument +qemu-img: Lost persistent bitmaps during inactivation of node 'NODE_NAME':= Failed to write bitmap 'good-bitmap' to file: No space left on device +qemu-img bitmap --merge exit code: 1 + +=3D=3D=3D Test with 7 bitmaps =3D=3D=3D +wrote 132120576/132120576 bytes at offset 0 +126 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +qemu-img: Lost persistent bitmaps during inactivation of node 'NODE_NAME':= Failed to write bitmap 'stale-bitmap-7' to file: No space left on device +qemu-img: Lost persistent bitmaps during inactivation of node 'NODE_NAME':= Failed to write bitmap 'stale-bitmap-7' to file: No space left on device +qemu-img: Error while closing the image: Invalid argument +qemu-img commit exit code: 1 +qemu-img bitmap --add exit code: 0 +qemu-img bitmap --merge exit code: 0 +*** done --=20 2.38.1