From nobody Sun May 19 19:40:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1563962185; cv=none; d=zoho.com; s=zohoarc; b=TkIM4lSl6Mpgrne/4SfTwd3aSONfk42wdzz3NiC6bo3mus+2tnSkBgZ73e2SCFWv90IebiirDccAK7Ug92fUxI2GiQKMqi3Cmyj5eZXXoa0SAaocfYUJZgSM4qwcqOd2ofpo/pTGc44/9FtrAIlJxBZ85TtaXuqlA8WckYAA9DI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563962185; h=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:ARC-Authentication-Results; bh=Sc/a4Vw1ALilWqLQMUz7PyxXNW0PowosNIiRREK5fPY=; b=dtowmTFl4/IdhMXJ+/42Cg+31DA9xc2Bg9o2r5Jri5hw6VQ2Y66ktTjVgc2AUf9SPM0xeDVKTxLYsJTdDQrHYlJwEpm/002slynAB9w77BLyU+9PmQ0uouLAOalY1ztlWEZvvqENAVKtaARjuTd1+bjfToN7Z9vcOEL2kNck0V4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1563962185263255.8133769915454; Wed, 24 Jul 2019 02:56:25 -0700 (PDT) Received: from localhost ([::1]:50180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqE0V-0007Oh-VL for importer@patchew.org; Wed, 24 Jul 2019 05:56:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53956) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqDzt-0004zO-V3 for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqDzs-0004O8-MM for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52572) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqDzr-0004M7-7S for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 302C859465; Wed, 24 Jul 2019 09:55:39 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-189.ams2.redhat.com [10.36.116.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEC0160BEC; Wed, 24 Jul 2019 09:55:36 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 11:55:20 +0200 Message-Id: <20190724095523.1527-2-quintela@redhat.com> In-Reply-To: <20190724095523.1527-1-quintela@redhat.com> References: <20190724095523.1527-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 24 Jul 2019 09:55:39 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/4] migration: fix migrate_cancel leads live_migration thread endless loop 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: Laurent Vivier , Thomas Huth , kvm@vger.kernel.org, Juan Quintela , "Dr. David Alan Gilbert" , Ivan Ren , Paolo Bonzini , Ivan Ren , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Ivan Ren When we 'migrate_cancel' a multifd migration, live_migration thread may go into endless loop in multifd_send_pages functions. Reproduce steps: (qemu) migrate_set_capability multifd on (qemu) migrate -d url (qemu) [wait a while] (qemu) migrate_cancel Then may get live_migration 100% cpu usage in following stack: pthread_mutex_lock qemu_mutex_lock_impl multifd_send_pages multifd_queue_page ram_save_multifd_page ram_save_target_page ram_save_host_page ram_find_and_save_block ram_find_and_save_block ram_save_iterate qemu_savevm_state_iterate migration_iteration_run migration_thread qemu_thread_start start_thread clone Signed-off-by: Ivan Ren Message-Id: <1561468699-9819-2-git-send-email-ivanren@tencent.com> Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 2b0774c2bf..52a2d498e4 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -920,7 +920,7 @@ struct { * false. */ =20 -static void multifd_send_pages(void) +static int multifd_send_pages(void) { int i; static int next_channel; @@ -933,6 +933,11 @@ static void multifd_send_pages(void) p =3D &multifd_send_state->params[i]; =20 qemu_mutex_lock(&p->mutex); + if (p->quit) { + error_report("%s: channel %d has already quit!", __func__, i); + qemu_mutex_unlock(&p->mutex); + return -1; + } if (!p->pending_job) { p->pending_job++; next_channel =3D (i + 1) % migrate_multifd_channels(); @@ -951,9 +956,11 @@ static void multifd_send_pages(void) ram_counters.transferred +=3D transferred;; qemu_mutex_unlock(&p->mutex); qemu_sem_post(&p->sem); + + return 1; } =20 -static void multifd_queue_page(RAMBlock *block, ram_addr_t offset) +static int multifd_queue_page(RAMBlock *block, ram_addr_t offset) { MultiFDPages_t *pages =3D multifd_send_state->pages; =20 @@ -968,15 +975,19 @@ static void multifd_queue_page(RAMBlock *block, ram_a= ddr_t offset) pages->used++; =20 if (pages->used < pages->allocated) { - return; + return 1; } } =20 - multifd_send_pages(); + if (multifd_send_pages() < 0) { + return -1; + } =20 if (pages->block !=3D block) { - multifd_queue_page(block, offset); + return multifd_queue_page(block, offset); } + + return 1; } =20 static void multifd_send_terminate_threads(Error *err) @@ -1049,7 +1060,10 @@ static void multifd_send_sync_main(void) return; } if (multifd_send_state->pages->used) { - multifd_send_pages(); + if (multifd_send_pages() < 0) { + error_report("%s: multifd_send_pages fail", __func__); + return; + } } for (i =3D 0; i < migrate_multifd_channels(); i++) { MultiFDSendParams *p =3D &multifd_send_state->params[i]; @@ -1058,6 +1072,12 @@ static void multifd_send_sync_main(void) =20 qemu_mutex_lock(&p->mutex); =20 + if (p->quit) { + error_report("%s: channel %d has already quit", __func__, i); + qemu_mutex_unlock(&p->mutex); + return; + } + p->packet_num =3D multifd_send_state->packet_num++; p->flags |=3D MULTIFD_FLAG_SYNC; p->pending_job++; @@ -2033,7 +2053,9 @@ static int ram_save_page(RAMState *rs, PageSearchStat= us *pss, bool last_stage) static int ram_save_multifd_page(RAMState *rs, RAMBlock *block, ram_addr_t offset) { - multifd_queue_page(block, offset); + if (multifd_queue_page(block, offset) < 0) { + return -1; + } ram_counters.normal++; =20 return 1; --=20 2.21.0 From nobody Sun May 19 19:40:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1563962167; cv=none; d=zoho.com; s=zohoarc; b=S2070iLLGMsUWZeGnKophufTAd3IAYF3ALlPONQuy+yjQ5YQ6aF3TUmhsicMbbgSAt0gqNKPD8UeUAngBOGr2M2wnogHnEtLSWmGwe7DnHUPSxq9LSGX96tV3OCtyZo0cl1ZaDYig/hc3RYfOaYO4ITUVyZxDcTxzcWvvQZ73B4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563962167; h=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:ARC-Authentication-Results; bh=xkRsfkIuu5hSF3z3n/GkjZSaLfJyRDpIdiNYgk+WL7g=; b=JaE41f8auP4xYaR1k0313NciGi5lnc/yuStLj2VQjB/sAodzh5Tesu9PAAa1sJ3rjffh9X+R/q+ArgZtoIbMSfODOJHRjkg9hQSo5gcnF0ZmrQIUrf2+Nj34liXXufoW5A91nORIlzr99DHeEIkGgrkmvdxvsKKy0ixvkpBQs/A= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 156396216707317.142680347777514; Wed, 24 Jul 2019 02:56:07 -0700 (PDT) Received: from localhost ([::1]:50168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqE0D-0005zC-MM for importer@patchew.org; Wed, 24 Jul 2019 05:56:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53967) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqDzu-000525-H5 for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqDzt-0004Oo-3J for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53200) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqDzs-0004Mi-Rx for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C367180F7C; Wed, 24 Jul 2019 09:55:41 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-189.ams2.redhat.com [10.36.116.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8705960BF3; Wed, 24 Jul 2019 09:55:39 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 11:55:21 +0200 Message-Id: <20190724095523.1527-3-quintela@redhat.com> In-Reply-To: <20190724095523.1527-1-quintela@redhat.com> References: <20190724095523.1527-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 24 Jul 2019 09:55:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/4] migration: fix migrate_cancel leads live_migration thread hung forever 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: Laurent Vivier , Thomas Huth , kvm@vger.kernel.org, Juan Quintela , "Dr. David Alan Gilbert" , Ivan Ren , Paolo Bonzini , Ivan Ren , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Ivan Ren When we 'migrate_cancel' a multifd migration, live_migration thread may hung forever at some points, because of multifd_send_thread has already exit for socket error: 1. multifd_send_pages may hung at qemu_sem_wait(&multifd_send_state-> channels_ready) 2. multifd_send_sync_main my hung at qemu_sem_wait(&multifd_send_state-> sem_sync) Signed-off-by: Ivan Ren Message-Id: <1561468699-9819-3-git-send-email-ivanren@tencent.com> Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- Remove spurious not needed bits --- migration/ram.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 52a2d498e4..87bb7da8e2 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1097,7 +1097,8 @@ static void *multifd_send_thread(void *opaque) { MultiFDSendParams *p =3D opaque; Error *local_err =3D NULL; - int ret; + int ret =3D 0; + uint32_t flags =3D 0; =20 trace_multifd_send_thread_start(p->id); rcu_register_thread(); @@ -1115,7 +1116,7 @@ static void *multifd_send_thread(void *opaque) if (p->pending_job) { uint32_t used =3D p->pages->used; uint64_t packet_num =3D p->packet_num; - uint32_t flags =3D p->flags; + flags =3D p->flags; =20 p->next_packet_size =3D used * qemu_target_page_size(); multifd_send_fill_packet(p); @@ -1164,6 +1165,17 @@ out: multifd_send_terminate_threads(local_err); } =20 + /* + * Error happen, I will exit, but I can't just leave, tell + * who pay attention to me. + */ + if (ret !=3D 0) { + if (flags & MULTIFD_FLAG_SYNC) { + qemu_sem_post(&multifd_send_state->sem_sync); + } + qemu_sem_post(&multifd_send_state->channels_ready); + } + qemu_mutex_lock(&p->mutex); p->running =3D false; qemu_mutex_unlock(&p->mutex); --=20 2.21.0 From nobody Sun May 19 19:40:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1563962199; cv=none; d=zoho.com; s=zohoarc; b=Vy8XHNsZXeCnnzeQwvO8fhXycOGlZHHVjblOqG6irYmQY2DKiwOw7DznJ60QTS0+BHzmPYntPwHoE5l8W6LAfePW4FjEDLB5vI7KpDDgkVTqlXW+Fusrs+Fzmot6GAiDTq4XzDl3tFDsGJ9AoOofMrFTaoYIJunOP0lxmnjrmc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563962199; h=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:ARC-Authentication-Results; bh=BwBS4Rrh4ww/nXiBMUEA0ggm12HCM+/S/HD5YlR5GC8=; b=JYIKcPjHnt6e0e3ws2qoPYRKq/sfUcQHxYdMwV+UbDIEQhEu0S+o+Eykql3bRVdD/tCXRMQGPhdFwfhpF+Ar1TkiO2Mc8ldYY3jjTLJJ5+IScP/6UypKylNOmXQygKdoY7KnvAdggfY2ibUyGL/inryVR1tJttIZfM4dCe8hnUs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 156396219978710.187434014926566; Wed, 24 Jul 2019 02:56:39 -0700 (PDT) Received: from localhost ([::1]:50188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqE0k-0000BU-PC for importer@patchew.org; Wed, 24 Jul 2019 05:56:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53962) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqDzu-00050d-6m for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqDzt-0004Oi-1S for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60040) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqDzs-0004Ne-Qk for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0A9603082138; Wed, 24 Jul 2019 09:55:44 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-189.ams2.redhat.com [10.36.116.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2391360BEC; Wed, 24 Jul 2019 09:55:41 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 11:55:22 +0200 Message-Id: <20190724095523.1527-4-quintela@redhat.com> In-Reply-To: <20190724095523.1527-1-quintela@redhat.com> References: <20190724095523.1527-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Wed, 24 Jul 2019 09:55:44 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] migration: Make explicit that we are quitting multifd 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: Laurent Vivier , Thomas Huth , kvm@vger.kernel.org, Juan Quintela , "Dr. David Alan Gilbert" , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We add a bool to indicate that. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index 87bb7da8e2..eb6716710e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -677,6 +677,8 @@ typedef struct { QemuMutex mutex; /* is this channel thread running */ bool running; + /* should this thread finish */ + bool quit; /* array of pages to receive */ MultiFDPages_t *pages; /* packet allocated len */ @@ -1266,6 +1268,7 @@ static void multifd_recv_terminate_threads(Error *err) MultiFDRecvParams *p =3D &multifd_recv_state->params[i]; =20 qemu_mutex_lock(&p->mutex); + p->quit =3D true; /* We could arrive here for two reasons: - normal quit, i.e. everything went fine, just finished - error quit: We close the channels so the channel threads @@ -1288,6 +1291,7 @@ int multifd_load_cleanup(Error **errp) MultiFDRecvParams *p =3D &multifd_recv_state->params[i]; =20 if (p->running) { + p->quit =3D true; qemu_thread_join(&p->thread); } object_unref(OBJECT(p->c)); @@ -1351,6 +1355,10 @@ static void *multifd_recv_thread(void *opaque) uint32_t used; uint32_t flags; =20 + if (p->quit) { + break; + } + ret =3D qio_channel_read_all_eof(p->c, (void *)p->packet, p->packet_len, &local_err); if (ret =3D=3D 0) { /* EOF */ @@ -1422,6 +1430,7 @@ int multifd_load_setup(void) =20 qemu_mutex_init(&p->mutex); qemu_sem_init(&p->sem_sync, 0); + p->quit =3D false; p->id =3D i; p->pages =3D multifd_pages_init(page_count); p->packet_len =3D sizeof(MultiFDPacket_t) --=20 2.21.0 From nobody Sun May 19 19:40:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1563962183; cv=none; d=zoho.com; s=zohoarc; b=ErwgpDhBwtdFcCMjTMnFhAyR1KjxZsBumHjnehJS+xAgfbeZSfVQA+QROpVVnjFGgEE6svXQCL9YbSmOnQF2pHaMGgNuuzJOl9qOUHD6EpGwAC1d31L7eDYc6NjuEFZ8sydk48NzCfHXb9fD4BOf/+VvW7l1ksmjSosJSs5pIJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563962183; h=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:ARC-Authentication-Results; bh=R8vrZ78JPi8OvXN0kC7LMZJuM3wEEj2gZQs59cd5DtI=; b=nfktcoOuVKgjcaElDnz31ePFK9MJtxk/PwRkDuJmEiHWuHPISeNnuY2wjNMJd4hu5M5WnZcZGCG/LAuF/WbDvTJzOJUUtXPDr0LmnD6NTU9snsTABUE/tgv39GjCnM5XSoBQGrqlmYlcLhLvOO1V485zZMMGtn073S5w+GUNfAQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1563962183861764.0192076324735; Wed, 24 Jul 2019 02:56:23 -0700 (PDT) Received: from localhost ([::1]:50178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqE0U-0007Mg-LH for importer@patchew.org; Wed, 24 Jul 2019 05:56:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54021) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqE07-0005wp-D8 for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:56:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqE05-0004SY-9T for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59152) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqE05-0004SN-4B for qemu-devel@nongnu.org; Wed, 24 Jul 2019 05:55:57 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6CB268CB4B; Wed, 24 Jul 2019 09:55:56 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-189.ams2.redhat.com [10.36.116.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C18360BEC; Wed, 24 Jul 2019 09:55:44 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 11:55:23 +0200 Message-Id: <20190724095523.1527-5-quintela@redhat.com> In-Reply-To: <20190724095523.1527-1-quintela@redhat.com> References: <20190724095523.1527-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 24 Jul 2019 09:55:56 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] migration: fix migrate_cancel multifd migration leads destination hung forever 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: Laurent Vivier , Thomas Huth , kvm@vger.kernel.org, Juan Quintela , "Dr. David Alan Gilbert" , Ivan Ren , Paolo Bonzini , Ivan Ren , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Ivan Ren When migrate_cancel a multifd migration, if run sequence like this: [source] [destination] multifd_send_sync_main[finish] multifd_recv_thread wait &p->sem_sync shutdown to_dst_file detect error from_src_file send RAM_SAVE_FLAG_EOS[fail] [no chance to run multifd_recv_sync_mai= n] multifd_load_cleanup join multifd receive thread forever will lead destination qemu hung at following stack: pthread_join qemu_thread_join multifd_load_cleanup process_incoming_migration_co coroutine_trampoline Signed-off-by: Ivan Ren Reviewed-by: Juan Quintela Message-Id: <1561468699-9819-4-git-send-email-ivanren@tencent.com> Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index eb6716710e..889148dd84 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1292,6 +1292,11 @@ int multifd_load_cleanup(Error **errp) =20 if (p->running) { p->quit =3D true; + /* + * multifd_recv_thread may hung at MULTIFD_FLAG_SYNC handle co= de, + * however try to wakeup it without harm in cleanup phase. + */ + qemu_sem_post(&p->sem_sync); qemu_thread_join(&p->thread); } object_unref(OBJECT(p->c)); --=20 2.21.0