From nobody Mon Nov 17 08:04:37 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1603465480; cv=none; d=zohomail.com; s=zohoarc; b=KdkdXiBAk3LUn0lk8axx0iAtMJ3ET30xfwQaglxP0codol5sQMwltt5sjkezE6lyuaWdmiuJi5JTWEmkZ+WBEJmt3iP5Rt4QFqtPd9zfDHWqYUM+vupkj57+g5cVLycdztg2jfUxvph0pfV6iWvnyF7Cf/0egdde6Sw5qSEppAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603465480; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=P+zD6OmiQgKAYDYm6tLYk7FTl2D+D1WkLGhF5m1PBxg=; b=VhhkD4FtZHN+a0mU1gMCq4TZhHC17gLLYl456Y9UEK0oTbQec2KHjkEQwvgG6EKdNyX1U0z1PjWxdYmWhtwaX++KOES9vCqpPmh09TgQY6mrn+i2spcKJstKQuvons0daBD39KVtZ5/chmgi7sNxxFjwsGYctU/Rifh84ewQlrs= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603465480043862.9182235609941; Fri, 23 Oct 2020 08:04:40 -0700 (PDT) Received: from localhost ([::1]:59804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVycO-0000cV-PM for importer@patchew.org; Fri, 23 Oct 2020 11:04:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVyZH-00075j-Rp for qemu-devel@nongnu.org; Fri, 23 Oct 2020 11:01:23 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:47924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVyZG-0006IQ-1U for qemu-devel@nongnu.org; Fri, 23 Oct 2020 11:01:23 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-334-stF4zQsjMuqYGaftO4Z7XQ-1; Fri, 23 Oct 2020 11:01:17 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30A3A83DC21; Fri, 23 Oct 2020 15:01:15 +0000 (UTC) Received: from bahia.lan (ovpn-115-53.ams2.redhat.com [10.36.115.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04A555C1CF; Fri, 23 Oct 2020 15:01:10 +0000 (UTC) X-MC-Unique: stF4zQsjMuqYGaftO4Z7XQ-1 Subject: [PATCH v2] block: End quiescent sections when a BDS is deleted From: Greg Kurz To: qemu-devel@nongnu.org Date: Fri, 23 Oct 2020 17:01:10 +0200 Message-ID: <160346526998.272601.9045392804399803158.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org 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: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 11:01:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no 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 , Stefan Hajnoczi , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If a BDS gets deleted during blk_drain_all(), it might miss a call to bdrv_do_drained_end(). This means missing a call to aio_enable_external() and the AIO context remains disabled for ever. This can cause a device to become irresponsive and to disrupt the guest execution, ie. hang, loop forever or worse. This scenario is quite easy to encounter with virtio-scsi on POWER when punching multiple blockdev-create QMP commands while the guest is booting and it is still running the SLOF firmware. This happens because SLOF disables/re-enables PCI devices multiple times via IO/MEM/MASTER bits of PCI_COMMAND register after the initial probe/feature negotiation, as it tends to work with a single device at a time at various stages like probing and running block/network bootloaders without doing a full reset in-between. This naturally generates many dataplane stops and starts, and thus many drain sections that can race with blockdev_create_run(). In the end, SLOF bails out. It is somehow reproducible on x86 but it requires to generate articial dataplane start/stop activity with stop/cont QMP commands. In this case, seabios ends up looping for ever, waiting for the virtio-scsi device to send a response to a command it never received. Add a helper that pairs all previously called bdrv_do_drained_begin() with a bdrv_do_drained_end() and call it from bdrv_close(). While at it, update the "/bdrv-drain/graph-change/drain_all" test in test-bdrv-drain so that it can catch the issue. BugId: https://bugzilla.redhat.com/show_bug.cgi?id=3D1874441 Signed-off-by: Greg Kurz --- v2: - use g_assert() in core code (checkpatch) - rename helper to bdrv_drain_all_end_quiesce() (Kevin) --- block.c | 9 +++++++++ block/io.c | 13 +++++++++++++ include/block/block.h | 6 ++++++ tests/test-bdrv-drain.c | 1 + 4 files changed, 29 insertions(+) diff --git a/block.c b/block.c index 430edf79bb10..ee5b28a9798d 100644 --- a/block.c +++ b/block.c @@ -4458,6 +4458,15 @@ static void bdrv_close(BlockDriverState *bs) } QLIST_INIT(&bs->aio_notifiers); bdrv_drained_end(bs); + + /* + * If we're still inside some bdrv_drain_all_begin()/end() sections, e= nd + * them now since this BDS won't exist anymore when bdrv_drain_all_end= () + * gets called. + */ + if (bs->quiesce_counter) { + bdrv_drain_all_end_quiesce(bs); + } } =20 void bdrv_close_all(void) diff --git a/block/io.c b/block/io.c index 54f0968aee27..c3a345a911e6 100644 --- a/block/io.c +++ b/block/io.c @@ -633,6 +633,19 @@ void bdrv_drain_all_begin(void) } } =20 +void bdrv_drain_all_end_quiesce(BlockDriverState *bs) +{ + int drained_end_counter =3D 0; + + g_assert(bs->quiesce_counter > 0); + g_assert(!bs->refcnt); + + while (bs->quiesce_counter) { + bdrv_do_drained_end(bs, false, NULL, true, &drained_end_counter); + } + BDRV_POLL_WHILE(bs, qatomic_read(&drained_end_counter) > 0); +} + void bdrv_drain_all_end(void) { BlockDriverState *bs =3D NULL; diff --git a/include/block/block.h b/include/block/block.h index d16c401cb44e..809987017631 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -779,6 +779,12 @@ void bdrv_drained_end(BlockDriverState *bs); */ void bdrv_drained_end_no_poll(BlockDriverState *bs, int *drained_end_count= er); =20 +/** + * End all quiescent sections started by bdrv_drain_all_begin(). This is + * only needed when deleting a BDS before bdrv_drain_all_end() is called. + */ +void bdrv_drain_all_end_quiesce(BlockDriverState *bs); + /** * End a quiescent section started by bdrv_subtree_drained_begin(). */ diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c index 1595bbc92e9e..8a29e33e004a 100644 --- a/tests/test-bdrv-drain.c +++ b/tests/test-bdrv-drain.c @@ -594,6 +594,7 @@ static void test_graph_change_drain_all(void) =20 g_assert_cmpint(bs_b->quiesce_counter, =3D=3D, 0); g_assert_cmpint(b_s->drain_count, =3D=3D, 0); + g_assert_cmpint(qemu_get_aio_context()->external_disable_cnt, =3D=3D, = 0); =20 bdrv_unref(bs_b); blk_unref(blk_b);