From nobody Tue Feb 10 04:59:04 2026 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622801547; cv=none; d=zohomail.com; s=zohoarc; b=FL/DLpupomAvFM6k7ZisSj0u2ftLeHstQJNCVEMLr2BqvgotFR2ZXLoWbJTkH6PoKEbIo10eNbYXSZwcwYxmgbuS2zS/lGCdPTqIYbWj8RabRWrfHPJF5y3ouVIqz5hTymS6Wfg9vJIKTfx5llp7HFb37KikH8e6CeFENSR0WUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622801547; 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=w0WzuYSF01uDTpOOGbpc1IxQ4WhnVtQ1LbJi+qEYSCc=; b=UQILJfqeWH97oRTWxNzq23pqj1IbZf0alG0bu1hDJF6LNYpaFpJ8XtFSwuQbtzLZ7qzXpUjWq0uwdOaLi+j+imh5P356rDZ0eg1sAPj3pFkeItNR7IPAV7jH1VKjz2ERHk+DaeaAv64yFW57XnlXYYObwFn3OMfh9CJxMGGB5gU= 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+importer2=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 162280154788729.63833327075281; Fri, 4 Jun 2021 03:12:27 -0700 (PDT) Received: from localhost ([::1]:59878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lp6oU-0003lI-TF for importer2@patchew.org; Fri, 04 Jun 2021 06:12:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lp6k6-0002cL-25 for qemu-devel@nongnu.org; Fri, 04 Jun 2021 06:07:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33012) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lp6k4-0003Id-Dq for qemu-devel@nongnu.org; Fri, 04 Jun 2021 06:07:53 -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-549-cjKvk4EkOvSWuhks-PoIXA-1; Fri, 04 Jun 2021 06:07:50 -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 75EB2501E1; Fri, 4 Jun 2021 10:07:49 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-43.ams2.redhat.com [10.36.115.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 600BD5D705; Fri, 4 Jun 2021 10:07:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622801271; 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=w0WzuYSF01uDTpOOGbpc1IxQ4WhnVtQ1LbJi+qEYSCc=; b=OaGdBFH7thRH7o6AY7vCAGn+CpY5EbcOZgYEp69qKyu9i8iDDVabmtIsfGR0j7D1DHhfgH eiXMYmyZLlvnPycXrYCjHnOGJSMhQb53oBsIJJgWbgsIWGsvP3j62kPKdWDm/3l6A+svTI TytpNTz2aF4wT58UD6aYcOhE78LibLM= X-MC-Unique: cjKvk4EkOvSWuhks-PoIXA-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [PATCH v4 2/6] blkdebug: move post-resume handling to resume_req_by_tag Date: Fri, 4 Jun 2021 12:07:37 +0200 Message-Id: <20210604100741.18966-3-eesposit@redhat.com> In-Reply-To: <20210604100741.18966-1-eesposit@redhat.com> References: <20210604100741.18966-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.37, 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.001, RCVD_IN_MSPIKE_WL=0.001, 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 , Emanuele Giuseppe Esposito , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We want to move qemu_coroutine_yield() after the loop on rules, because QLIST_FOREACH_SAFE is wrong if the rule list is modified while the coroutine has yielded. Therefore move the suspended request to the heap and clean it up from the remove side. All that is left is for blkdebug_debug_event to handle the yielding. Co-developed-by: Paolo Bonzini Signed-off-by: Emanuele Giuseppe Esposito Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/blkdebug.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 8f19d991fa..e37f999254 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -775,25 +775,20 @@ static void blkdebug_close(BlockDriverState *bs) static void suspend_request(BlockDriverState *bs, BlkdebugRule *rule) { BDRVBlkdebugState *s =3D bs->opaque; - BlkdebugSuspendedReq r; + BlkdebugSuspendedReq *r; =20 - r =3D (BlkdebugSuspendedReq) { - .co =3D qemu_coroutine_self(), - .tag =3D g_strdup(rule->options.suspend.tag), - }; + r =3D g_new(BlkdebugSuspendedReq, 1); + + r->co =3D qemu_coroutine_self(); + r->tag =3D g_strdup(rule->options.suspend.tag); =20 remove_rule(rule); - QLIST_INSERT_HEAD(&s->suspended_reqs, &r, next); + QLIST_INSERT_HEAD(&s->suspended_reqs, r, next); =20 if (!qtest_enabled()) { - printf("blkdebug: Suspended request '%s'\n", r.tag); + printf("blkdebug: Suspended request '%s'\n", r->tag); } qemu_coroutine_yield(); - if (!qtest_enabled()) { - printf("blkdebug: Resuming request '%s'\n", r.tag); - } - - g_free(r.tag); } =20 static bool process_rule(BlockDriverState *bs, struct BlkdebugRule *rule, @@ -875,8 +870,18 @@ static int resume_req_by_tag(BDRVBlkdebugState *s, con= st char *tag, bool all) retry: QLIST_FOREACH(r, &s->suspended_reqs, next) { if (!strcmp(r->tag, tag)) { + Coroutine *co =3D r->co; + + if (!qtest_enabled()) { + printf("blkdebug: Resuming request '%s'\n", r->tag); + } + QLIST_REMOVE(r, next); - qemu_coroutine_enter(r->co); + g_free(r->tag); + g_free(r); + + qemu_coroutine_enter(co); + if (all) { goto retry; } --=20 2.30.2