From nobody Sat Nov 1 07:51:01 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; 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 1527153074961664.0953471686001; Thu, 24 May 2018 02:11:14 -0700 (PDT) Received: from localhost ([::1]:37316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLmHC-00060C-7f for importer@patchew.org; Thu, 24 May 2018 05:11:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLmGC-0005cI-B7 for qemu-devel@nongnu.org; Thu, 24 May 2018 05:10:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLmG2-0000J5-R9 for qemu-devel@nongnu.org; Thu, 24 May 2018 05:10:12 -0400 Received: from 10.mo69.mail-out.ovh.net ([46.105.73.241]:46538) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fLmG2-0000I5-G0 for qemu-devel@nongnu.org; Thu, 24 May 2018 05:10:02 -0400 Received: from player791.ha.ovh.net (unknown [10.109.120.34]) by mo69.mail-out.ovh.net (Postfix) with ESMTP id 62F7D16BBF for ; Thu, 24 May 2018 11:09:59 +0200 (CEST) Received: from [192.168.0.243] (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player791.ha.ovh.net (Postfix) with ESMTPA id 61C40420081; Thu, 24 May 2018 11:09:53 +0200 (CEST) From: Greg Kurz To: qemu-devel@nongnu.org Date: Thu, 24 May 2018 11:09:47 +0200 Message-ID: <152715298769.397287.11782572103987618822.stgit@bahia> User-Agent: StGit/0.17.1-46-g6855-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 9324421554051389704 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedthedrgeejgddutdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.73.241 Subject: [Qemu-devel] [PATCH v2] block: fix QEMU crash with scsi-hd and drive_del 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 , Paolo Bonzini , stable@vger.kernel.org, Stefan Hajnoczi , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Removing a drive with drive_del while it is being used to run an I/O intensive workload can cause QEMU to crash. An AIO flush can yield at some point: blk_aio_flush_entry() blk_co_flush(blk) bdrv_co_flush(blk->root->bs) ... qemu_coroutine_yield() and let the HMP command to run, free blk->root and give control back to the AIO flush: hmp_drive_del() blk_remove_bs() bdrv_root_unref_child(blk->root) child_bs =3D blk->root->bs bdrv_detach_child(blk->root) bdrv_replace_child(blk->root, NULL) blk->root->bs =3D NULL g_free(blk->root) <=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D blk->= root becomes stale bdrv_unref(child_bs) bdrv_delete(child_bs) bdrv_close() bdrv_drained_begin() bdrv_do_drained_begin() bdrv_drain_recurse() aio_poll() ... qemu_coroutine_switch() and the AIO flush completion ends up dereferencing blk->root: blk_aio_complete() scsi_aio_complete() blk_get_aio_context(blk) bs =3D blk_bs(blk) ie, bs =3D blk->root ? blk->root->bs : NULL ^^^^^ stale The problem is that we should avoid making block driver graph changes while we have in-flight requests. This patch hence adds a drained section to bdrv_detach_child(), so that we're sure all requests have been drained when blk->root is freed. Signed-off-by: Greg Kurz --- v2: - drain I/O requests when detaching the BDS (Stefan, Paolo) --- block.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/block.c b/block.c index 676e57f5623a..fc9379439883 100644 --- a/block.c +++ b/block.c @@ -2127,12 +2127,16 @@ BdrvChild *bdrv_attach_child(BlockDriverState *pare= nt_bs, =20 static void bdrv_detach_child(BdrvChild *child) { + BlockDriverState *child_bs =3D child->bs; + if (child->next.le_prev) { QLIST_REMOVE(child, next); child->next.le_prev =3D NULL; } =20 + bdrv_drained_begin(child_bs); bdrv_replace_child(child, NULL); + bdrv_drained_end(child_bs); =20 g_free(child->name); g_free(child);