From nobody Sat May 4 23:44:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1669987689; cv=none; d=zohomail.com; s=zohoarc; b=nMTjk/jDSav4b19sQ9CQrZlx2isaX0MafkXUMkhxRf8N1jDGif589aFkzALcOi2ILKqhLxcg2mCfIH5+yrrWKrx5+Ed9WVxdcWRyf94J32AEsKF85qU/0vL9Qqjd0bxdUpKmPYUBQJMoruBvkJJFWyjqLmL04QmDvNTpcKeVZik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669987689; 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=QIImfJgqwIHG66Q0poMzRPI983sxe8T+J7ZFfwU1Ns8=; b=Kxf7tQs+j+TS1TtItsQTS/HSMej4kT6U/ExiJgGnyKnJs5ockWAlu/qELoJ65SFc4PmEVeBMMpKhl1fxAzX0R4HE08KW5x7RvoR3hDfVFmWK0HBAEdocRakRAz+JRvLuOz9o9L4W+5DqXwYi+9Kj09FDkv7xf31NtaaidgfLjgI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669987689362870.5456907841337; Fri, 2 Dec 2022 05:28:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p164Q-0005ni-Rj; Fri, 02 Dec 2022 08:27:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p164M-0005nO-FA for qemu-devel@nongnu.org; Fri, 02 Dec 2022 08:27:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p164K-0004Gh-Ck for qemu-devel@nongnu.org; Fri, 02 Dec 2022 08:27:10 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-423-R5i-sq9pNfSug1goT4Rbbg-1; Fri, 02 Dec 2022 08:27:06 -0500 Received: by mail-wr1-f72.google.com with SMTP id d6-20020adfa346000000b0024211c0f988so1065752wrb.9 for ; Fri, 02 Dec 2022 05:27:06 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id e18-20020a5d4e92000000b0024206ed539fsm6871484wru.66.2022.12.02.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 05:27:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669987627; 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; bh=QIImfJgqwIHG66Q0poMzRPI983sxe8T+J7ZFfwU1Ns8=; b=FeyDoUCuBb5ka2VfC7wrQW1atnF31hVDAPgcREmkiIjitCyPW5rMvm1+0KAgWUIWjT4vJ4 h73zG4OP55IB6BHIwcRzkfxEjzig5cMl0Hw/+O7n0nyH3ccQcGHuAIX58IvE12p1JwsxKe tuRMWM7RCxXgdnJoTNmh+FiBmg5ncF4= X-MC-Unique: R5i-sq9pNfSug1goT4Rbbg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QIImfJgqwIHG66Q0poMzRPI983sxe8T+J7ZFfwU1Ns8=; b=Vy8gDBCHYlKENXjSz8wb4V5p9gi/IffGhOvN7nJU0F7l/5GJ3ejvtS3PBZrlDmeZj2 c7SLiabYfLptACfOGpe1VIPNvvgkiio68o7CYvB1DzZ5BH62rfHGWhhFq91a/4C7idkR Cl4phR600EHSLvfsyAu2iaACiDbxIukVSqPS5XGxXicB8tnPcgDJE0I8Sca26QjB634Z SFI/gvaMfZAvAhYvQAhemlBUPRWSUKfEVEd8pP66ZSY5yEk0ARkKuZbc+cG45Iwq19Pd gxtlhJcz7EO3UJB6bKFZdK9tTd1wBqA3H0pn1I/W26CalSJI+zptSu5+lhTHPqgczAdu FJzw== X-Gm-Message-State: ANoB5pn5JS6RcFpSsQtmSNEbMCsM3fqipgFd5303yLotnQErL2J4X6Ew cMw1RbZ3lax/d2PqJnO6R32okmeQ9EucCq+39nEslkmCCz0WdEPof1JUBJ00SakM+gawt8KV5HP JqPztQgvRazjATonWqwKwHqQd9ThQ7Jv5vj1DgOuqZOh+RjvnhT3xKUGOec9w1wbVa7U= X-Received: by 2002:a7b:cb83:0:b0:3cf:96da:3846 with SMTP id m3-20020a7bcb83000000b003cf96da3846mr53876284wmi.10.1669987624640; Fri, 02 Dec 2022 05:27:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf5wcPIG2TnXpnIF62zWaEKsQBclBGokDeVzm6wkEzCym1/Va9rcnBmvdQDKhRzQZBuzZM0etg== X-Received: by 2002:a7b:cb83:0:b0:3cf:96da:3846 with SMTP id m3-20020a7bcb83000000b003cf96da3846mr53876266wmi.10.1669987624296; Fri, 02 Dec 2022 05:27:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, kwolf@redhat.com, eesposit@redhat.com Subject: [RFC PATCH] test-bdrv-drain: keep graph manipulations out of coroutines Date: Fri, 2 Dec 2022 14:27:01 +0100 Message-Id: <20221202132701.531048-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669987693939100001 Content-Type: text/plain; charset="utf-8" Changes to the BlockDriverState graph will have to take the corresponding lock for writing, and therefore cannot be done inside a coroutine. Move them outside the test body. Signed-off-by: Paolo Bonzini --- tests/unit/test-bdrv-drain.c | 63 ++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c index 6ae44116fe79..d85083dd4f9e 100644 --- a/tests/unit/test-bdrv-drain.c +++ b/tests/unit/test-bdrv-drain.c @@ -199,25 +199,40 @@ static void do_drain_end_unlocked(enum drain_type dra= in_type, BlockDriverState * } } =20 +static BlockBackend *blk; +static BlockDriverState *bs, *backing; + +static void test_drv_cb_init(void) +{ + blk =3D blk_new(qemu_get_aio_context(), BLK_PERM_ALL, BLK_PERM_ALL); + bs =3D bdrv_new_open_driver(&bdrv_test, "test-node", BDRV_O_RDWR, + &error_abort); + blk_insert_bs(blk, bs, &error_abort); + + backing =3D bdrv_new_open_driver(&bdrv_test, "backing", 0, &error_abor= t); + bdrv_set_backing_hd(bs, backing, &error_abort); +} + +static void test_drv_cb_fini(void) +{ + bdrv_unref(backing); + bdrv_unref(bs); + blk_unref(blk); + backing =3D NULL; + bs =3D NULL; + blk =3D NULL; +} + static void test_drv_cb_common(enum drain_type drain_type, bool recursive) { - BlockBackend *blk; - BlockDriverState *bs, *backing; BDRVTestState *s, *backing_s; BlockAIOCB *acb; int aio_ret; =20 QEMUIOVector qiov =3D QEMU_IOVEC_INIT_BUF(qiov, NULL, 0); =20 - blk =3D blk_new(qemu_get_aio_context(), BLK_PERM_ALL, BLK_PERM_ALL); - bs =3D bdrv_new_open_driver(&bdrv_test, "test-node", BDRV_O_RDWR, - &error_abort); s =3D bs->opaque; - blk_insert_bs(blk, bs, &error_abort); - - backing =3D bdrv_new_open_driver(&bdrv_test, "backing", 0, &error_abor= t); backing_s =3D backing->opaque; - bdrv_set_backing_hd(bs, backing, &error_abort); =20 /* Simple bdrv_drain_all_begin/end pair, check that CBs are called */ g_assert_cmpint(s->drain_count, =3D=3D, 0); @@ -252,30 +267,44 @@ static void test_drv_cb_common(enum drain_type drain_= type, bool recursive) =20 g_assert_cmpint(s->drain_count, =3D=3D, 0); g_assert_cmpint(backing_s->drain_count, =3D=3D, 0); - - bdrv_unref(backing); - bdrv_unref(bs); - blk_unref(blk); } =20 -static void test_drv_cb_drain_all(void) +static void test_drv_cb_do_drain_all(void) { test_drv_cb_common(BDRV_DRAIN_ALL, true); } =20 -static void test_drv_cb_drain(void) +static void test_drv_cb_do_drain(void) { test_drv_cb_common(BDRV_DRAIN, false); } =20 +static void test_drv_cb_drain_all(void) +{ + test_drv_cb_init(); + test_drv_cb_do_drain_all(); + test_drv_cb_fini(); +} + +static void test_drv_cb_drain(void) +{ + test_drv_cb_init(); + test_drv_cb_do_drain(); + test_drv_cb_fini(); +} + static void test_drv_cb_co_drain_all(void) { - call_in_coroutine(test_drv_cb_drain_all); + test_drv_cb_init(); + call_in_coroutine(test_drv_cb_do_drain_all); + test_drv_cb_fini(); } =20 static void test_drv_cb_co_drain(void) { - call_in_coroutine(test_drv_cb_drain); + test_drv_cb_init(); + call_in_coroutine(test_drv_cb_do_drain); + test_drv_cb_fini(); } =20 static void test_quiesce_common(enum drain_type drain_type, bool recursive) --=20 2.38.1