From nobody Tue Apr 16 10:05:51 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1578996016; cv=none; d=zohomail.com; s=zohoarc; b=aGZegt9y1XerSe+gPO9M3ua/kn6hVDoCNC4Bil8aZDXGG5RAgWFTQe3J+kL8iHE5cyaTLG1bhg+YIpMdh9dxU729AXs+dz6eKloCupbA60fD6SpPIDf4GtX8fW5cUDIwATrqz8HfjWnzcTKCntQeJIq0FqwT2QyumjlpAGTBDnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578996016; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=jS50AZ7t5Lu1CXp65KR5Fq4SMZFO9P595tKzKtoEkC8=; b=alulm3BMgArrLiB3iFG2MlpfYGrf5DM8ixiZ//iXBde+VVdsng/+Rnl1mm1KWUbWPC0dPKY5TAUMlDd+ONsKaJvImp07B/Wby6xEuCPRZqcvO22Mrcr4FCCCR1OxGEFC7EE9/S6tI1NLuBjZapIfCZ4gxNZ/3+HvFk0ce1Jj4go= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578996016266952.6492559899227; Tue, 14 Jan 2020 02:00:16 -0800 (PST) Received: from localhost ([::1]:35744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irIzf-00087P-6X for importer@patchew.org; Tue, 14 Jan 2020 05:00:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60683) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irIjU-0002U3-Tf for qemu-devel@nongnu.org; Tue, 14 Jan 2020 04:43:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irIjR-00029Z-3P for qemu-devel@nongnu.org; Tue, 14 Jan 2020 04:43:32 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:60678 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irIjQ-00026e-PC for qemu-devel@nongnu.org; Tue, 14 Jan 2020 04:43:29 -0500 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 991745033930F92FDFD6; Tue, 14 Jan 2020 17:43:18 +0800 (CST) Received: from huawei.com (10.173.220.198) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.439.0; Tue, 14 Jan 2020 17:43:12 +0800 From: Zhimin Feng To: , Subject: [PATCH] migration: Maybe VM is paused when migration is cancelled Date: Tue, 14 Jan 2020 17:43:09 +0800 Message-ID: <20200114094309.1309-1-fengzhimin1@huawei.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 X-Originating-IP: [10.173.220.198] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.32 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: Euler Robot , Zhimin Feng , qemu-devel@nongnu.org, zhang.zhanghailiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If the migration is cancelled when it is in the completion phase, the migration state is set to MIGRATION_STATUS_CANCELLING. The VM maybe wait for the 'pause_sem' semaphore in migration_maybe_pause function, so that VM always is paused. Reported-by: Euler Robot Signed-off-by: Zhimin Feng Reviewed-by: Juan Quintela --- migration/migration.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 354ad07..82ee981 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2765,14 +2765,22 @@ static int migration_maybe_pause(MigrationState *s, /* This block intentionally left blank */ } =20 - qemu_mutex_unlock_iothread(); - migrate_set_state(&s->state, *current_active_state, - MIGRATION_STATUS_PRE_SWITCHOVER); - qemu_sem_wait(&s->pause_sem); - migrate_set_state(&s->state, MIGRATION_STATUS_PRE_SWITCHOVER, - new_state); - *current_active_state =3D new_state; - qemu_mutex_lock_iothread(); + /* + * If the migration is cancelled when it is in the completion phase, + * the migration state is set to MIGRATION_STATUS_CANCELLING. + * So we don't need to wait a semaphore, otherwise we would always + * wait for the 'pause_sem' semaphore. + */ + if (s->state !=3D MIGRATION_STATUS_CANCELLING) { + qemu_mutex_unlock_iothread(); + migrate_set_state(&s->state, *current_active_state, + MIGRATION_STATUS_PRE_SWITCHOVER); + qemu_sem_wait(&s->pause_sem); + migrate_set_state(&s->state, MIGRATION_STATUS_PRE_SWITCHOVER, + new_state); + *current_active_state =3D new_state; + qemu_mutex_lock_iothread(); + } =20 return s->state =3D=3D new_state ? 0 : -EINVAL; } --=20 1.8.3.1