From nobody Wed Nov 27 10:38:40 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=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1699900512; cv=none; d=zohomail.com; s=zohoarc; b=B+f93gOaNUmEjjnZAyW37x+ssbbX01vezEY13KOo+SJVS+zVMCLzMZ6JC3oXMd/VwExRir1avsKm/iGAKN6mgegzg+93Pxz0J/dRFl9LWFhPS+bn5tEt/rBywXzgVVhsK8aZOrLB+Qpc88jB0LdMED7GPcljdcu2bx2NsxKSz4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699900512; h=Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lLd6Mo4zyMhWMPMd86suUM6Hp31icbaZDQ+QwDRS4vI=; b=B3WXN1h1rVx3PLlqFOFNcTJU9spOl3bmUSelff04lB5tU/cDb473CQwSrjj8/0K3Ae5Y/JNGhLuLvzZn6zqnH6Dd5bdDJF/oJeOY5FTACAOae+n7jhk9SGiliB778gaTCHaAn3UNxwknOh82KM8IR+1HiLQSoDyDC750+453X8k= 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 1699900512890275.6293672014111; Mon, 13 Nov 2023 10:35:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2blZ-0004bs-3b; Mon, 13 Nov 2023 13:34:33 -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 1r2blH-0003ZC-Mt for qemu-devel@nongnu.org; Mon, 13 Nov 2023 13:34:15 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r2blF-0003Cv-Ts for qemu-devel@nongnu.org; Mon, 13 Nov 2023 13:34:15 -0500 Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADHiVPn022815; Mon, 13 Nov 2023 18:34:12 GMT Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2r03g2v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:34:12 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADH9JiO004602; Mon, 13 Nov 2023 18:34:11 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ub5k23k64-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:34:11 +0000 Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3ADIY2Jg026498; Mon, 13 Nov 2023 18:34:10 GMT Received: from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3ub5k23k09-8; Mon, 13 Nov 2023 18:34:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2023-03-30; bh=lLd6Mo4zyMhWMPMd86suUM6Hp31icbaZDQ+QwDRS4vI=; b=DUYCLizpkLQLYeXuunyoCsqGX/g9mzDkj1A3085tbGyyw6+kF6kyZgmBGzucvNPaNikJ 4uNmZv4JteCbJmdQHPvUdgoa5qZH8CnTEziNjk6LnlQ5gYhJ9FnmrkKHH/+omg9E2drz WR2/eXE06T/0UvWSUfXSNzWU7fIT64HXw1GClrAA2Se12/9cy1B0mzCNnsvW/YQVWd1z MenvfHAolfnGpkhj8gSnb0yoLZk0JxFcsGAyWqoruhfrajbW4t8mc1BUaZ6XZb4YbDWU O9fDyPGQz0CgnKWLb2j7Aq+xPhq31ii/4S+QfDaEhyPZGB6MwH+yev60oDL/ExF+7QLy Lw== From: Steve Sistare To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Paolo Bonzini , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Fabiano Rosas , Leonardo Bras , Steve Sistare Subject: [PATCH V5 07/12] migration: preserve suspended for bg_migration Date: Mon, 13 Nov 2023 10:33:55 -0800 Message-Id: <1699900440-207345-8-git-send-email-steven.sistare@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1699900440-207345-1-git-send-email-steven.sistare@oracle.com> References: <1699900440-207345-1-git-send-email-steven.sistare@oracle.com> X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-13_09,2023-11-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxlogscore=999 spamscore=0 suspectscore=0 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311130151 X-Proofpoint-ORIG-GUID: 0dU2wRIcpv-c8VTqdHk7XBpY7J5Ik-rR X-Proofpoint-GUID: 0dU2wRIcpv-c8VTqdHk7XBpY7J5Ik-rR 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=205.220.165.32; envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @oracle.com) X-ZM-MESSAGEID: 1699900513919100011 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Do not wake a suspended guest during bg_migration, and restore the prior state at finish rather than unconditionally running. Allow the additional state transitions that occur because bg migration forces RUN_STATE_PAUSED to save the precopy device state. Signed-off-by: Steve Sistare Reviewed-by: Fabiano Rosas --- migration/migration.c | 7 +------ system/runstate.c | 3 +++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 29ed901..49ec836 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3394,7 +3394,7 @@ static void bg_migration_vm_start_bh(void *opaque) qemu_bh_delete(s->vm_start_bh); s->vm_start_bh =3D NULL; =20 - vm_start(); + vm_resume(s->vm_old_state); migration_downtime_end(s); } =20 @@ -3466,11 +3466,6 @@ static void *bg_migration_thread(void *opaque) =20 qemu_mutex_lock_iothread(); =20 - /* - * If VM is currently in suspended state, then, to make a valid runsta= te - * transition in vm_stop_force_state() we need to wakeup it up. - */ - qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); s->vm_old_state =3D runstate_get(); =20 global_state_store(); diff --git a/system/runstate.c b/system/runstate.c index f1d4bc7..68cc485 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -112,6 +112,7 @@ static const RunStateTransition runstate_transitions_de= f[] =3D { { RUN_STATE_PAUSED, RUN_STATE_COLO}, { RUN_STATE_PAUSED, RUN_STATE_SAVE_VM}, { RUN_STATE_PAUSED, RUN_STATE_RESTORE_VM}, + { RUN_STATE_PAUSED, RUN_STATE_SUSPENDED}, =20 { RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING }, { RUN_STATE_POSTMIGRATE, RUN_STATE_FINISH_MIGRATE }, @@ -171,6 +172,8 @@ static const RunStateTransition runstate_transitions_de= f[] =3D { { RUN_STATE_SUSPENDED, RUN_STATE_COLO}, { RUN_STATE_SUSPENDED, RUN_STATE_SAVE_VM }, { RUN_STATE_SUSPENDED, RUN_STATE_RESTORE_VM }, + { RUN_STATE_SUSPENDED, RUN_STATE_PAUSED }, + { RUN_STATE_SUSPENDED, RUN_STATE_SHUTDOWN }, =20 { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING }, { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE }, --=20 1.8.3.1