From nobody Tue Apr 21 14:39:41 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1776451713; cv=none; d=zohomail.com; s=zohoarc; b=KofAif64UneTIyRJCbbxvA+DFqpQ4py72PlngHQY3wtbwPkFoFRmf65VbiLS2SoTWfh3Mt5MQB5XUO78tr4U9t3JPArAGkvXHCCnxcIE1uR2nRZgSrWThImS05FsLLa/ypDaXPCsdBaVynez1qH9f6cwyzl2PSAfZafVV5adgb0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776451713; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gnjqo+pqbMlz5cqi/ASPMjsRwhbdVbV/bUNHiWq7jek=; b=XIjxzon+NQc+8BkuBxJ99IEzPGBMjyQy8zOZfpz4JDpgUZ2Smqui8WQaZKd0WlXGXw6ums54xXiMiJuc5jbcCOpjQ3q1Ban/5/fZ4cDR9oIzqNsXgaL0C3RANeR9GjJffuMVDmqPthFO2UscCRETCx73bZWgAFQHbQHruOnibwE= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1776451713765737.9846812270777; Fri, 17 Apr 2026 11:48:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wDoEU-0003FR-KW; Fri, 17 Apr 2026 14:48:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wDoEP-0003Eq-Rc for qemu-devel@nongnu.org; Fri, 17 Apr 2026 14:47:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wDoEO-00064F-BA for qemu-devel@nongnu.org; Fri, 17 Apr 2026 14:47:57 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-148-NZslp314MeCAzbGAHeVFvg-1; Fri, 17 Apr 2026 14:47:48 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6AA52180036E; Fri, 17 Apr 2026 18:47:47 +0000 (UTC) Received: from localhost (unknown [10.44.24.6]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EDE5A1800351; Fri, 17 Apr 2026 18:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776451672; 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=gnjqo+pqbMlz5cqi/ASPMjsRwhbdVbV/bUNHiWq7jek=; b=WsOXOcFyFALMmO9xnodUWhn5PhORDoaYdcI7URcmex0cpdKD5d7MdXBSwxy5gd7TXcSVzG xV74cVoRNKC93C4jrbnhz6Cuop7SycSpPI7Z8Yk8FtP5QuNPaZd+W5gahOEcQ2eNNGi/m3 7B9kC3ZzOMJulNaLpqaimXgKgjDgnZc= X-MC-Unique: NZslp314MeCAzbGAHeVFvg-1 X-Mimecast-MFC-AGG-ID: NZslp314MeCAzbGAHeVFvg_1776451667 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: steven.sistare@oracle.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Xu , Fabiano Rosas Subject: [PATCH] migration: fix abort when re-migrating after cancel during SETUP Date: Fri, 17 Apr 2026 22:47:42 +0400 Message-ID: <20260417184742.293061-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: qemu development 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: 1776451717046154100 From: Marc-Andr=C3=A9 Lureau When a migration is cancelled during the early SETUP phase (before migration_connect_outgoing() has set s->to_dst_file), migration_cancel() takes a fast path that transitions the state from CANCELLING to Cancelled without calling migration_cleanup(). This leaves the migration yank instance registered. A subsequent qmp_migrate() call passes the migration_is_running() guard (since CANCELLED is a terminal state) and then calls yank_register_instance(MIGRATION_YANK_INSTANCE, &error_abort), which finds the stale entry and aborts with "duplicate yank instance". #6 0x000056028b5e17fc in error_setg_internal (errp=3Derrp@entry=3D0x56028cc8cb18 , src=3Dsrc@entry=3D= 0x56028ba87fa5 "../util/yank.c", line=3Dline@entry=3D87, func=3Dfunc@entry= =3D0x56028bb77140 <__func__.5> "yank_register_instance", fmt=3Dfmt@entry=3D= 0x56028ba87f8d "duplicate yank instance") at ../util/error.c:100 #7 0x000056028b601b2a in yank_register_instance (instance=3Dinstance@ent= ry=3D0x7ffea0cf36b0, errp=3D0x56028cc8cb18 ) at ../util/yank.c= :87 #8 0x000056028b25221e in migrate_prepare (s=3D0x5602b0a7db90, resume=3D<= optimized out>, errp=3D0x7ffea0cf3718) at ../migration/migration.c:2001 #9 qmp_migrate (uri=3D, has_channels=3D, c= hannels=3D, has_resume=3D, resume=3D, errp=3Derrp@entry=3D0x7ffea0cf3718) at ../migration/migration.c:2039 #10 0x000056028b5891be in qmp_marshal_migrate (args=3D, re= t=3D, errp=3D0x7f63392e0ee0) at qapi/qapi-commands-migration= .c:459 Add missing yank_unregister_instance. Alternatively, it seems migration_cleanup() should be safe in this context too. Fixes: 624e6e654e11 ("migration: cpr-transfer mode") Signed-off-by: Marc-Andr=C3=A9 Lureau --- migration/migration.c | 1 + 1 file changed, 1 insertion(+) diff --git a/migration/migration.c b/migration/migration.c index 5c9aaa6e58f..bbdd91ee7ee 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1477,6 +1477,7 @@ void migration_cancel(void) MIGRATION_STATUS_CANCELLED); cpr_state_close(); cpr_transfer_source_destroy(s); + yank_unregister_instance(MIGRATION_YANK_INSTANCE); } } =20 --=20 2.53.0