From patchwork Mon Dec 2 22:01:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabiano Rosas X-Patchwork-Id: 13891353 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2CFBEE69E98 for ; Mon, 2 Dec 2024 22:03:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIEUN-00076R-G1; Mon, 02 Dec 2024 17:01:55 -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 1tIEUJ-00075a-Sa for qemu-devel@nongnu.org; Mon, 02 Dec 2024 17:01:51 -0500 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIEUI-0003cU-7H for qemu-devel@nongnu.org; Mon, 02 Dec 2024 17:01:51 -0500 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id BFC9F2117B; Mon, 2 Dec 2024 22:01:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1733176908; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cdxYBEqgn4kOXDr/O55Bx/l2mCvnSz1Da+lplp0fIH8=; b=tDaM8YxMqygXHcpFG8It6pKZ/3K+WYiWLZ/X1HDayR447nIKdTOPahkW6AVRnuCY1eTXmj fE3125Mv34oZwmmrF25K59SMvfAkGaJp5iz+8BNorBfkAz1VuxK7P8bFnVo38/CYwFNk25 bZUUB0ZZN5cclegj+F6dOmXJKlJdWak= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1733176908; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cdxYBEqgn4kOXDr/O55Bx/l2mCvnSz1Da+lplp0fIH8=; b=sgvREuEAzX2/iy2FOILIyX5xhQYoDUFs4b9yv+6Qd6b3UFlDb/dxJ3Bv0L1u6US/RiCo1P MlmGB3RS3gDIaVDg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=tDaM8YxM; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=sgvREuEA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1733176908; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cdxYBEqgn4kOXDr/O55Bx/l2mCvnSz1Da+lplp0fIH8=; b=tDaM8YxMqygXHcpFG8It6pKZ/3K+WYiWLZ/X1HDayR447nIKdTOPahkW6AVRnuCY1eTXmj fE3125Mv34oZwmmrF25K59SMvfAkGaJp5iz+8BNorBfkAz1VuxK7P8bFnVo38/CYwFNk25 bZUUB0ZZN5cclegj+F6dOmXJKlJdWak= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1733176908; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cdxYBEqgn4kOXDr/O55Bx/l2mCvnSz1Da+lplp0fIH8=; b=sgvREuEAzX2/iy2FOILIyX5xhQYoDUFs4b9yv+6Qd6b3UFlDb/dxJ3Bv0L1u6US/RiCo1P MlmGB3RS3gDIaVDg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8E1EB13A31; Mon, 2 Dec 2024 22:01:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id ICOeFEsuTmdlIAAAD6G6ig (envelope-from ); Mon, 02 Dec 2024 22:01:47 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PATCH 4/6] migration: Make sure postcopy recovery doesn't hang when cancelling Date: Mon, 2 Dec 2024 19:01:35 -0300 Message-Id: <20241202220137.32584-5-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20241202220137.32584-1-farosas@suse.de> References: <20241202220137.32584-1-farosas@suse.de> MIME-Version: 1.0 X-Rspamd-Queue-Id: BFC9F2117B X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email, suse.de:dkim, suse.de:mid, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Make sure postcopy recovery doesn't hang when calling qmp_migrate_cancel() and also doesn't pause the migration once more. Signed-off-by: Fabiano Rosas --- migration/migration.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index 07fbb5c9f4..8a61cc26d7 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1531,6 +1531,8 @@ static void migrate_fd_cancel(MigrationState *s, MigrationIncomingState *mis) qemu_sem_post(&s->pause_sem); } else if (old_state == MIGRATION_STATUS_POSTCOPY_PAUSED) { qemu_sem_post(&s->postcopy_pause_sem); + } else if (old_state == MIGRATION_STATUS_POSTCOPY_RECOVER) { + qemu_sem_post(&s->rp_state.rp_sem); } migrate_set_state(&s->state, old_state, MIGRATION_STATUS_CANCELLING); } while (s->state != MIGRATION_STATUS_CANCELLING); @@ -2148,6 +2150,10 @@ void qmp_migrate_continue(MigrationStatus state, Error **errp) int migration_rp_wait(MigrationState *s) { + if (qatomic_read(&s->state) == MIGRATION_STATUS_CANCELLING) { + return -1; + } + /* If migration has failure already, ignore the wait */ if (migrate_has_error(s)) { return -1; @@ -2160,6 +2166,10 @@ int migration_rp_wait(MigrationState *s) return -1; } + if (qatomic_read(&s->state) == MIGRATION_STATUS_CANCELLING) { + return -1; + } + return 0; } @@ -3023,6 +3033,9 @@ static MigThrError postcopy_pause(MigrationState *s) trace_postcopy_pause_continued(); return MIG_THR_ERR_RECOVERED; } else { + if (s->state == MIGRATION_STATUS_CANCELLING) { + return MIG_THR_ERR_FATAL; + } /* * Something wrong happened during the recovery, let's * pause again. Pause is always better than throwing