From nobody Mon May 6 17:21:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1555696221; cv=none; d=zoho.com; s=zohoarc; b=M9zC1wal0wHenVzQ7s9lgHERE/CvOv53jiUYRzD33Pre4xJcwdvy/41yxwPfOaEUTDUWCmIEuvkQeCnRDkmQc19cgNgk6HxQJUA50nZCF7K9oeFLcM45ITwX8nBfi0BbZeZDk+qUKrs24JEonBscRUCQCdUvHBv3VEVrMjFXtds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555696221; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=MK23TwA90uxcXgiGIzezA0PrUlLWy5ZLJWpRxE6ZABI=; b=deaRfZOrmw6LJlr3vBBjSZAyK7Mij4MQ9yxYVs/XHB2VlkA2JkJg1kw34Xfy7VV6sNzv4zHknTZB2roPMa79KzilZFRsQSQu4TbcbltkwWEhVQiHJ/02bhMnAU86Ksm3a69NfQKc9UewKkrdo3/8ORXqTbgWt1/+AShzEA0ZOVM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555696220970229.91178906256528; Fri, 19 Apr 2019 10:50:20 -0700 (PDT) Received: from localhost ([127.0.0.1]:59550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHXeQ-0006qd-1G for importer@patchew.org; Fri, 19 Apr 2019 13:50:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHXcs-00067o-5G for qemu-devel@nongnu.org; Fri, 19 Apr 2019 13:48:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHXcq-0003xp-Gb for qemu-devel@nongnu.org; Fri, 19 Apr 2019 13:48:38 -0400 Received: from relay.sw.ru ([185.231.240.75]:42182) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHXcq-0003wy-9Q; Fri, 19 Apr 2019 13:48:36 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hHXcn-0001Mc-0R; Fri, 19 Apr 2019 20:48:33 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 19 Apr 2019 20:48:31 +0300 Message-Id: <20190419174832.146377-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190419174832.146377-1-vsementsov@virtuozzo.com> References: <20190419174832.146377-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 1/2] block: introduce pinned blk 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: kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add stay_at_node fields to BlockBackend and BdrvChild, for the same behavior as stay_at_node field of BdrvChildRole. It will be used for block-job blk. Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/block/block_int.h | 6 ++++++ include/sysemu/block-backend.h | 1 + block.c | 2 +- block/block-backend.c | 23 ++++++++++++++++++++++- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index 01e855a066..ae8fc3a580 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -725,6 +725,12 @@ struct BdrvChild { */ bool frozen; =20 + /* + * This link should not be modified in bdrv_replace_node process. Used= by + * should_update_child() + */ + bool stay_at_node; + QLIST_ENTRY(BdrvChild) next; QLIST_ENTRY(BdrvChild) next_parent; }; diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 3be05c2d68..d9c7b9f86a 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -77,6 +77,7 @@ typedef struct BlockBackendPublic { } BlockBackendPublic; =20 BlockBackend *blk_new(uint64_t perm, uint64_t shared_perm); +BlockBackend *blk_new_pinned(uint64_t perm, uint64_t shared_perm); BlockBackend *blk_new_open(const char *filename, const char *reference, QDict *options, int flags, Error **errp); int blk_get_refcnt(BlockBackend *blk); diff --git a/block.c b/block.c index 16615bc876..5069515976 100644 --- a/block.c +++ b/block.c @@ -3905,7 +3905,7 @@ static bool should_update_child(BdrvChild *c, BlockDr= iverState *to) GHashTable *found; bool ret; =20 - if (c->role->stay_at_node) { + if (c->stay_at_node || c->role->stay_at_node) { return false; } =20 diff --git a/block/block-backend.c b/block/block-backend.c index f78e82a707..b2de911383 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -86,6 +86,11 @@ struct BlockBackend { * Accessed with atomic ops. */ unsigned int in_flight; + + /* + * On blk_insert_bs() new child will inherit @stay_at_node. + */ + bool stay_at_node; }; =20 typedef struct BlockBackendAIOCB { @@ -311,9 +316,13 @@ static const BdrvChildRole child_root =3D { * to other users of the attached node. * Both sets of permissions can be changed later using blk_set_perm(). * + * @stay_at_node is used to set stay_at_node field of child, attached in + * blk_insert_bs(). If true, child bs will not be updated on bdrv_replace_= node. + * * Return the new BlockBackend on success, null on failure. */ -BlockBackend *blk_new(uint64_t perm, uint64_t shared_perm) +static BlockBackend *blk_new_common(uint64_t perm, uint64_t shared_perm, + bool stay_at_node) { BlockBackend *blk; =20 @@ -321,6 +330,7 @@ BlockBackend *blk_new(uint64_t perm, uint64_t shared_pe= rm) blk->refcnt =3D 1; blk->perm =3D perm; blk->shared_perm =3D shared_perm; + blk->stay_at_node =3D stay_at_node; blk_set_enable_write_cache(blk, true); =20 blk->on_read_error =3D BLOCKDEV_ON_ERROR_REPORT; @@ -336,6 +346,16 @@ BlockBackend *blk_new(uint64_t perm, uint64_t shared_p= erm) return blk; } =20 +BlockBackend *blk_new(uint64_t perm, uint64_t shared_perm) +{ + return blk_new_common(perm, shared_perm, false); +} + +BlockBackend *blk_new_pinned(uint64_t perm, uint64_t shared_perm) +{ + return blk_new_common(perm, shared_perm, true); +} + /* * Creates a new BlockBackend, opens a new BlockDriverState, and connects = both. * @@ -796,6 +816,7 @@ int blk_insert_bs(BlockBackend *blk, BlockDriverState *= bs, Error **errp) if (blk->root =3D=3D NULL) { return -EPERM; } + blk->root->stay_at_node =3D blk->stay_at_node; bdrv_ref(bs); =20 notifier_list_notify(&blk->insert_bs_notifiers, blk); --=20 2.18.0 From nobody Mon May 6 17:21:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1555696315; cv=none; d=zoho.com; s=zohoarc; b=SSjcxOCwPXXN97j9zzXckGL9fGGs48CZGknWaN+I31X+MWQhBwJmzqtdFnZtwLlRh2TEIth9dRuowl8nnJP9z66aw36xkm2T+o4MY5cm5+ajFXrexQ3qq8XcZiLSMOM7CtUaDFYQDbTcKKqCwa389CIhtn31My+85bFra9c4Xzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555696315; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=MudUzC3/vdyu4c5JmCVMVT4/SWuM0iUjIWBBuabLy1A=; b=N3rhaUciW4IpGgJxKvtFexaYHi0qJsdM/SYVwfF9kBijFs/Et3/8ja+tUbbeZqmlspl3B3GR+ic026LgRQP++IoiA58fWOBOGS4C9cErsTthkwu9ey1H9nh2vNLlDy50TcWj/AVQgh0uMT6bTj9fQ8InNz+HseKM4zyvK/NiNMQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1555696315112859.3543327782685; Fri, 19 Apr 2019 10:51:55 -0700 (PDT) Received: from localhost ([127.0.0.1]:59592 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHXfz-00081K-3D for importer@patchew.org; Fri, 19 Apr 2019 13:51:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHXcs-00067p-WC for qemu-devel@nongnu.org; Fri, 19 Apr 2019 13:48:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHXcq-0003xy-K8 for qemu-devel@nongnu.org; Fri, 19 Apr 2019 13:48:38 -0400 Received: from relay.sw.ru ([185.231.240.75]:42184) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHXcq-0003wx-CY; Fri, 19 Apr 2019 13:48:36 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hHXcn-0001Mc-55; Fri, 19 Apr 2019 20:48:33 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 19 Apr 2019 20:48:32 +0300 Message-Id: <20190419174832.146377-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190419174832.146377-1-vsementsov@virtuozzo.com> References: <20190419174832.146377-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH 2/2] blockjob: use blk_new_pinned in block_job_create 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: kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" child_role job already has .stay_at_node=3Dtrue, so on bdrv_replace_node operation these child are unchanged. Make block job blk behave in same manner, to avoid inconsistent intermediate graph states and workarounds like in mirror. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/mirror.c | 6 +----- blockjob.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index ff15cfb197..c2cb6bccff 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -713,12 +713,8 @@ static int mirror_exit_common(Job *job) &error_abort); bdrv_replace_node(mirror_top_bs, backing_bs(mirror_top_bs), &error_abo= rt); =20 - /* We just changed the BDS the job BB refers to (with either or both o= f the - * bdrv_replace_node() calls), so switch the BB back so the cleanup do= es - * the right thing. We don't need any permissions any more now. */ - blk_remove_bs(bjob->blk); + /* We don't need any permissions any more now. */ blk_set_perm(bjob->blk, 0, BLK_PERM_ALL, &error_abort); - blk_insert_bs(bjob->blk, mirror_top_bs, &error_abort); =20 bs_opaque->job =3D NULL; =20 diff --git a/blockjob.c b/blockjob.c index 730101d282..47466bdfcf 100644 --- a/blockjob.c +++ b/blockjob.c @@ -396,7 +396,7 @@ void *block_job_create(const char *job_id, const BlockJ= obDriver *driver, job_id =3D bdrv_get_device_name(bs); } =20 - blk =3D blk_new(perm, shared_perm); + blk =3D blk_new_pinned(perm, shared_perm); ret =3D blk_insert_bs(blk, bs, errp); if (ret < 0) { blk_unref(blk); --=20 2.18.0