From nobody Thu Nov 6 06:13:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15397870200141014.4210407036951; Wed, 17 Oct 2018 07:37:00 -0700 (PDT) Received: from localhost ([::1]:37033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCmwR-0001Sj-3T for importer@patchew.org; Wed, 17 Oct 2018 10:36:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCmuJ-0000DB-6F for qemu-devel@nongnu.org; Wed, 17 Oct 2018 10:34:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCmuF-0006FJ-3R for qemu-devel@nongnu.org; Wed, 17 Oct 2018 10:34:43 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:48028) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCmuE-0005ou-BB; Wed, 17 Oct 2018 10:34:38 -0400 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1gCmtt-0004Gn-9p; Wed, 17 Oct 2018 16:34:17 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1gCmtb-0003iZ-9r; Wed, 17 Oct 2018 17:33:59 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=LLoD6/cUM3YQA9qalTv0FsNk3cEb7CQSqfhELh7PCig=; b=K3nOJZeWi95qKifCMYCgd3z937Q/hFf/hrbPtsgUy0jluR6P2awGhN6r20BrmbrUfaL8dyCfyI0FGqt7d6qu4tA5TFdoM8PjZ4Kpp8hdHYcrp5Q0Uzd1mLHUWd2QcYLZbp0pj6bdGS5smQ1JKlvKYNUX6KeqntmRBPQs03/JioaDNNbMzlkRVY5vbEqsoMxb47p6ndRvhsp5PAwxvCOtKY+6x1LDHZ3D3BgaWNzqiagIl4xo4nphTw0S0p/WKQrAnL5sqxM04EnKUF8bkqR0jUO3QSUcFrEFuCoK3TLpREjBcGytaY61s07Xw1GS/YbsZwHwma7LywD7BnoDaIgUXA==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2018 17:33:49 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH 1/3] quorum: Remove quorum_err() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , Markus Armbruster , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is a static function with only one caller, so there's no need to keep it. Inlining the code in quorum_compare() makes it much simpler. Signed-off-by: Alberto Garcia Reported-by: Markus Armbruster --- block/quorum.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/block/quorum.c b/block/quorum.c index eb526cc0f1..b1b777baef 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -437,23 +437,7 @@ static bool quorum_iovec_compare(QEMUIOVector *a, QEMU= IOVector *b) return true; } =20 -static void GCC_FMT_ATTR(2, 3) quorum_err(QuorumAIOCB *acb, - const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - fprintf(stderr, "quorum: offset=3D%" PRIu64 " bytes=3D%" PRIu64 " ", - acb->offset, acb->bytes); - vfprintf(stderr, fmt, ap); - fprintf(stderr, "\n"); - va_end(ap); - exit(1); -} - -static bool quorum_compare(QuorumAIOCB *acb, - QEMUIOVector *a, - QEMUIOVector *b) +static bool quorum_compare(QuorumAIOCB *acb, QEMUIOVector *a, QEMUIOVector= *b) { BDRVQuorumState *s =3D acb->bs->opaque; ssize_t offset; @@ -462,8 +446,10 @@ static bool quorum_compare(QuorumAIOCB *acb, if (s->is_blkverify) { offset =3D qemu_iovec_compare(a, b); if (offset !=3D -1) { - quorum_err(acb, "contents mismatch at offset %" PRIu64, - acb->offset + offset); + fprintf(stderr, "quorum: offset=3D%" PRIu64 " bytes=3D%" PRIu64 + " contents mismatch at offset %" PRIu64 "\n", + acb->offset, acb->bytes, acb->offset + offset); + exit(1); } return true; } --=20 2.11.0 From nobody Thu Nov 6 06:13:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539787020154293.915332393216; Wed, 17 Oct 2018 07:37:00 -0700 (PDT) Received: from localhost ([::1]:37030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCmwR-0001SH-B2 for importer@patchew.org; Wed, 17 Oct 2018 10:36:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCmuJ-0000DA-6B for qemu-devel@nongnu.org; Wed, 17 Oct 2018 10:34:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCmuG-0006HU-QW for qemu-devel@nongnu.org; Wed, 17 Oct 2018 10:34:43 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:48027) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCmuG-0005ot-8W; Wed, 17 Oct 2018 10:34:40 -0400 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1gCmtt-0004Gp-AQ; Wed, 17 Oct 2018 16:34:17 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1gCmtb-0003ib-Au; Wed, 17 Oct 2018 17:33:59 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=eEG8rSmGvJF+bWufq/aBbY6dyeXCQnXdefWMrgNKHyM=; b=lIEuHvgTxH7tiLanZRS7Tjexj+61Jk6lPYngsy07R0IXiSkFKC3RSoxJDhKbzUzX4mCQNkxzukqkQVcjLUcv/2NcpCW8u76IuG9lPr/xvXwvWsgjkQvDG4YOpdJCBRs51zn2/NgCZr8jdKP2kSCPeL6JCrFhE/kn2T1eMB8k34QcjNh6Up71mlJvZHSjWyT2hjSPM5wwYLDUe+Tcp9SMsBrr5w61znlhl8qAQPQW2zv/cck0TC273i0baFuqijkttQZMBP/OBn9oHTE7yJuY7uBOBEkMKAvzApoIzmSxYM3bVW+PSEFh0ebabZ7xPb3aiiQo842dl5xRWXnro/Lsbg==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2018 17:33:50 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH 2/3] quorum: Return an error if the blkverify mode has invalid settings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , Markus Armbruster , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The blkverify mode of Quorum can only be enabled if the number of children is exactly two and the value of vote-threshold is also two. If the user tries to enable it but the other settings are incorrect then QEMU simply prints an error message to stderr and carries on disabling the blkverify setting. This patch makes quorum_open() fail and return an error in this case. Signed-off-by: Alberto Garcia Reported-by: Markus Armbruster --- block/quorum.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/block/quorum.c b/block/quorum.c index b1b777baef..6188ff6666 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -912,13 +912,12 @@ static int quorum_open(BlockDriverState *bs, QDict *o= ptions, int flags, s->read_pattern =3D ret; =20 if (s->read_pattern =3D=3D QUORUM_READ_PATTERN_QUORUM) { - /* is the driver in blkverify mode */ - if (qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false) && - s->num_children =3D=3D 2 && s->threshold =3D=3D 2) { - s->is_blkverify =3D true; - } else if (qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false)) { - fprintf(stderr, "blkverify mode is set by setting blkverify=3D= on " - "and using two files with vote_threshold=3D2\n"); + s->is_blkverify =3D qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, = false); + if (s->is_blkverify && (s->num_children !=3D 2 || s->threshold != =3D 2)) { + error_setg(&local_err, "blkverify=3Don can only be set if ther= e are " + "exactly two files and vote-threshold is 2"); + ret =3D -EINVAL; + goto exit; } =20 s->rewrite_corrupted =3D qemu_opt_get_bool(opts, QUORUM_OPT_REWRIT= E, --=20 2.11.0 From nobody Thu Nov 6 06:13:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15397870331831012.2544954327675; Wed, 17 Oct 2018 07:37:13 -0700 (PDT) Received: from localhost ([::1]:37036 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCmwh-0001gf-DW for importer@patchew.org; Wed, 17 Oct 2018 10:37:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCmuJ-0000D8-5M for qemu-devel@nongnu.org; Wed, 17 Oct 2018 10:34:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCmuG-0006Gd-7g for qemu-devel@nongnu.org; Wed, 17 Oct 2018 10:34:43 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:48025) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCmuE-0005or-F3; Wed, 17 Oct 2018 10:34:39 -0400 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1gCmtt-0004Gq-9f; Wed, 17 Oct 2018 16:34:17 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1gCmtb-0003id-Bz; Wed, 17 Oct 2018 17:33:59 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=jPmBiybIYQlNkYQMVI+70/FvaaYTdPTfPByJcNwaI1M=; b=VC3eQ9r4rQ57VuX5UrEIhlHT2bP48BLiDDk0HEgDzCxjMM8p95Kg7Hc/5GjNVczdRa0mFqGlgKxkcx62AoIplHCMq2M1pJh8kOM1mGwXs7Vh+T1gmAkNJo1JAMCO6eR1y9kn6V32T3qDrQ62K0wBC8vRJ40HlAybtNPPblMYb704V/a8bE+xGbb4qkXVrFEoldGmoGo8W/58POvd581S4zRnyYhyaZVyHw664V8eLGsyRuYP6+dkU2n8Q/lUERBWVDG8V+YhHJ2JDhW8xF8+fZSA81e/WU48EhFPNKBDMVT/03ldblB1CuyhjoudE0xp6uYpYc6nzioDc+2PSdoCrg==; From: Alberto Garcia To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2018 17:33:51 +0300 Message-Id: <3e64535f5e375a67890d3f912bc4618471d8e0ff.1539786605.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH 3/3] iotest: Test the blkverify mode of the Quorum driver X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , Markus Armbruster , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Alberto Garcia --- tests/qemu-iotests/081 | 30 ++++++++++++++++++++++++++++++ tests/qemu-iotests/081.out | 16 ++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index da3fb0984b..0ea010afbf 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -168,6 +168,36 @@ echo "=3D=3D checking that quorum is broken =3D=3D" =20 $QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io =20 +echo +echo "=3D=3D checking the blkverify mode with broken content =3D=3D" + +quorum=3D"driver=3Draw,file.driver=3Dquorum,file.vote-threshold=3D2,file.b= lkverify=3Don" +quorum=3D"$quorum,file.children.0.file.filename=3D$TEST_DIR/1.raw" +quorum=3D"$quorum,file.children.1.file.filename=3D$TEST_DIR/2.raw" +quorum=3D"$quorum,file.children.0.driver=3Draw" +quorum=3D"$quorum,file.children.1.driver=3Draw" + +$QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io + +echo +echo "=3D=3D writing the same data to both files =3D=3D" + +$QEMU_IO -c "write -P 0x32 0 $size" "$TEST_DIR/1.raw" | _filter_qemu_io +$QEMU_IO -c "write -P 0x32 0 $size" "$TEST_DIR/2.raw" | _filter_qemu_io + +echo +echo "=3D=3D checking the blkverify mode with valid content =3D=3D" + +$QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io + +echo +echo "=3D=3D checking the blkverify mode with invalid settings =3D=3D" + +quorum=3D"$quorum,file.children.2.file.filename=3D$TEST_DIR/3.raw" +quorum=3D"$quorum,file.children.2.driver=3Draw" + +$QEMU_IO -c "open -o $quorum" | _filter_qemu_io + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out index 2533c31c78..2f12c890e9 100644 --- a/tests/qemu-iotests/081.out +++ b/tests/qemu-iotests/081.out @@ -55,4 +55,20 @@ wrote 10485760/10485760 bytes at offset 0 =20 =3D=3D checking that quorum is broken =3D=3D read failed: Input/output error + +=3D=3D checking the blkverify mode with broken content =3D=3D +quorum: offset=3D0 bytes=3D10485760 contents mismatch at offset 0 + +=3D=3D writing the same data to both files =3D=3D +wrote 10485760/10485760 bytes at offset 0 +10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 10485760/10485760 bytes at offset 0 +10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=3D=3D checking the blkverify mode with valid content =3D=3D +read 10485760/10485760 bytes at offset 0 +10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=3D=3D checking the blkverify mode with invalid settings =3D=3D +can't open: blkverify=3Don can only be set if there are exactly two files = and vote-threshold is 2 *** done --=20 2.11.0