From nobody Mon Feb 9 02:28:16 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=1621263471; cv=none; d=zohomail.com; s=zohoarc; b=RZgFvBJPAm/0znVrINRy+1rBKyyCUQtLlz4EorWO1Yzn/f5Kw18V/LdYf09xKQKXR6vP7w0ePuAXWgD1xqxDBF3ocN9T+WNKgSOqQBsupkk2dP5QPscIrvY/9LGIcHdMzwGLtOfb2Q4qTwJGTRSSa1XrILPn1V+ioeLjFQKQM4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621263471; 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=fV20J4Btohsbn/Q0xrXXA6gW+0ZKKcirbJd1bz20viM=; b=SZkfVGXa8eA4AYFfXFMMy+B6w+sB7osEJLBlnX5FzulPD2peTTd5VZN4cbHdtZMrahzlfmT8XiKg4uLo7aZCh+2VzqsgF82UC6Fd9/4ClEiO+fTgCk8sXKVDOsKtxLJqCIv1rrdYKmwpfuPComdqjnp+QT8s/m3x7cg2gdYds7Y= 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 1621263471546241.54221432391182; Mon, 17 May 2021 07:57:51 -0700 (PDT) Received: from localhost ([::1]:59898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liegn-0007ri-Ut for importer@patchew.org; Mon, 17 May 2021 10:57:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lieaE-0001Sz-65 for qemu-devel@nongnu.org; Mon, 17 May 2021 10:51:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lieaB-0004de-IC for qemu-devel@nongnu.org; Mon, 17 May 2021 10:51:01 -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-264-zhF3H-I6M9-x7EuMdl9zXg-1; Mon, 17 May 2021 10:50:57 -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 3A204A0CAE; Mon, 17 May 2021 14:50:56 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-113-23.ams2.redhat.com [10.36.113.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AE705D71D; Mon, 17 May 2021 14:50:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621263058; 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=fV20J4Btohsbn/Q0xrXXA6gW+0ZKKcirbJd1bz20viM=; b=RLBX1CClAGlBtWZ1w2GwakU+6s+doQVT5RXIU0ybujWvp6hJ4yrsGKrw+Zaaf6ogoQBHGj +lPrsU6v7qMOZVF2lAVp4xMmHMbnCV0XS4YK0W7NVZIBcIIze4qC3DpTltE7/yf95C81yG H+t1Dk3BtiIvaQMsQ9VytQQ5bPFoQ/M= X-MC-Unique: zhF3H-I6M9-x7EuMdl9zXg-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [PATCH v3 1/5] blkdebug: refactor removal of a suspended request Date: Mon, 17 May 2021 16:50:45 +0200 Message-Id: <20210517145049.55268-2-eesposit@redhat.com> In-Reply-To: <20210517145049.55268-1-eesposit@redhat.com> References: <20210517145049.55268-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: -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.374, 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 , qemu-devel@nongnu.org, Max Reitz , Paolo Bonzini 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" Extract to a separate function. Do not rely on FOREACH_SAFE, which is only "safe" if the *current* node is removed---not if another node is removed. Instead, just walk the entire list from the beginning when asked to resume all suspended requests with a given tag. Co-developed-by: Paolo Bonzini Signed-off-by: Emanuele Giuseppe Esposito Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/blkdebug.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 2c0b9b0ee8..8f19d991fa 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -793,7 +793,6 @@ static void suspend_request(BlockDriverState *bs, Blkde= bugRule *rule) printf("blkdebug: Resuming request '%s'\n", r.tag); } =20 - QLIST_REMOVE(&r, next); g_free(r.tag); } =20 @@ -869,25 +868,35 @@ static int blkdebug_debug_breakpoint(BlockDriverState= *bs, const char *event, return 0; } =20 -static int blkdebug_debug_resume(BlockDriverState *bs, const char *tag) +static int resume_req_by_tag(BDRVBlkdebugState *s, const char *tag, bool a= ll) { - BDRVBlkdebugState *s =3D bs->opaque; - BlkdebugSuspendedReq *r, *next; + BlkdebugSuspendedReq *r; =20 - QLIST_FOREACH_SAFE(r, &s->suspended_reqs, next, next) { +retry: + QLIST_FOREACH(r, &s->suspended_reqs, next) { if (!strcmp(r->tag, tag)) { + QLIST_REMOVE(r, next); qemu_coroutine_enter(r->co); + if (all) { + goto retry; + } return 0; } } return -ENOENT; } =20 +static int blkdebug_debug_resume(BlockDriverState *bs, const char *tag) +{ + BDRVBlkdebugState *s =3D bs->opaque; + + return resume_req_by_tag(s, tag, false); +} + static int blkdebug_debug_remove_breakpoint(BlockDriverState *bs, const char *tag) { BDRVBlkdebugState *s =3D bs->opaque; - BlkdebugSuspendedReq *r, *r_next; BlkdebugRule *rule, *next; int i, ret =3D -ENOENT; =20 @@ -900,11 +909,8 @@ static int blkdebug_debug_remove_breakpoint(BlockDrive= rState *bs, } } } - QLIST_FOREACH_SAFE(r, &s->suspended_reqs, next, r_next) { - if (!strcmp(r->tag, tag)) { - qemu_coroutine_enter(r->co); - ret =3D 0; - } + if (resume_req_by_tag(s, tag, true) =3D=3D 0) { + ret =3D 0; } return ret; } --=20 2.30.2