From nobody Sun Feb 8 12:38:36 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618822801; cv=none; d=zohomail.com; s=zohoarc; b=joe2baZpGDYAqn7tIvmc5UPIMdvxdK7mttZoqudyNL9CTkfB5UFDMbSb7f6lA2/L0iBBoawWaLvwIO5HjM018jPCxYraLW3pANmdKdCgRsmIv+nPhN5ck5aFa4S6ojcnUZ0p2ZXw38JOXbvQiIOH8OF0CtLPvtPpN5vBtR+Vorg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618822801; h=Content-Type: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=UYLRRbpbjp9mKUuAMkZXKJr//pFxyKHZyB+Y7882t5M=; b=oLpxzYJGERxbv2UM//+mc9zZjRI29Joxq4pUvSv36SYyX1W61BdnNpFUIykxH/G9IfeDnuujWxtHPyDR1hI7ISFJN/wPqVIbq+ODgF9rrJ/PFnaeW4NnrIUZLhEOYZm+Mxzss65uALGT+nNXCPPozldooF3XjExXpQMqBpUZAFo= 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 161882280127137.852457622301245; Mon, 19 Apr 2021 02:00:01 -0700 (PDT) Received: from localhost ([::1]:43602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYPlA-0006Wi-5M for importer@patchew.org; Mon, 19 Apr 2021 05:00:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYPhe-0001OK-1G for qemu-devel@nongnu.org; Mon, 19 Apr 2021 04:56:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34303) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYPhb-0001BU-67 for qemu-devel@nongnu.org; Mon, 19 Apr 2021 04:56:21 -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-398-dv6RVMSUOg26xJi_rCY8HA-1; Mon, 19 Apr 2021 04:56:14 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B04A1020C21; Mon, 19 Apr 2021 08:56:13 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-195.ams2.redhat.com [10.36.114.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id F055D5D741; Mon, 19 Apr 2021 08:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618822578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UYLRRbpbjp9mKUuAMkZXKJr//pFxyKHZyB+Y7882t5M=; b=Yoh8MZH1Gp0Y+2W6SRfo1KuRcoDY/PygpxFpJUs3pBRI9sqKpFeZ09ss49yqTqZdppZSLZ o1u+8vckGXYvl+d37W1N9dH2ZN8IL/z5uhRP4ldVIcN0hshh1KuXVKInFVjZ7WXtWyAhC/ AoLk3iUWj/nHSDa0RupkPsVIltFs1MA= X-MC-Unique: dv6RVMSUOg26xJi_rCY8HA-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [PATCH v2 6/8] block: do not acquire AioContext in check_to_replace_node Date: Mon, 19 Apr 2021 10:55:39 +0200 Message-Id: <20210419085541.22310-7-eesposit@redhat.com> In-Reply-To: <20210419085541.22310-1-eesposit@redhat.com> References: <20210419085541.22310-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eesposit@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=170.10.133.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Emanuele Giuseppe Esposito , Markus Armbruster , Max Reitz , Stefan Hajnoczi , Paolo Bonzini , John Snow 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" Make the (only) caller do it. Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini Signed-off-by: Emanuele Giuseppe Esposito --- block.c | 22 +++++----------------- blockdev.c | 7 ++++++- include/block/block.h | 1 + 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/block.c b/block.c index f40fb63c75..fd12f88062 100644 --- a/block.c +++ b/block.c @@ -6776,24 +6776,15 @@ bool bdrv_recurse_can_replace(BlockDriverState *bs, * * The result (whether the node can be replaced or not) is only valid * for as long as no graph or permission changes occur. + * + * Called with AioContext lock held. */ BlockDriverState *check_to_replace_node(BlockDriverState *parent_bs, + BlockDriverState *to_replace_bs, const char *node_name, Error **err= p) { - BlockDriverState *to_replace_bs =3D bdrv_find_node(node_name); - AioContext *aio_context; - - if (!to_replace_bs) { - error_setg(errp, "Failed to find node with node-name=3D'%s'", node= _name); - return NULL; - } - - aio_context =3D bdrv_get_aio_context(to_replace_bs); - aio_context_acquire(aio_context); - if (bdrv_op_is_blocked(to_replace_bs, BLOCK_OP_TYPE_REPLACE, errp)) { - to_replace_bs =3D NULL; - goto out; + return NULL; } =20 /* We don't want arbitrary node of the BDS chain to be replaced only t= he top @@ -6806,12 +6797,9 @@ BlockDriverState *check_to_replace_node(BlockDriverS= tate *parent_bs, "because it cannot be guaranteed that doing so would no= t " "lead to an abrupt change of visible data", node_name, parent_bs->node_name); - to_replace_bs =3D NULL; - goto out; + return NULL; } =20 -out: - aio_context_release(aio_context); return to_replace_bs; } =20 diff --git a/blockdev.c b/blockdev.c index a57590aae4..e901107344 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3056,13 +3056,18 @@ static void blockdev_mirror_common(const char *job_= id, BlockDriverState *bs, return; } =20 - to_replace_bs =3D check_to_replace_node(bs, replaces, errp); + to_replace_bs =3D bdrv_find_node(replaces); if (!to_replace_bs) { + error_setg(errp, "Failed to find node with node-name=3D'%s'", + replaces); return; } =20 replace_aio_context =3D bdrv_get_aio_context(to_replace_bs); aio_context_acquire(replace_aio_context); + if (!check_to_replace_node(bs, to_replace_bs, replaces, errp)) { + return; + } replace_size =3D bdrv_getlength(to_replace_bs); aio_context_release(replace_aio_context); =20 diff --git a/include/block/block.h b/include/block/block.h index b3f6e509d4..f57c34a19a 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -474,6 +474,7 @@ int bdrv_amend_options(BlockDriverState *bs_new, QemuOp= ts *opts, =20 /* check if a named node can be replaced when doing drive-mirror */ BlockDriverState *check_to_replace_node(BlockDriverState *parent_bs, + BlockDriverState *to_replace_bs, const char *node_name, Error **err= p); =20 /* async block I/O */ --=20 2.30.2