From nobody Thu Nov 13 09:08:58 2025 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; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579006716; cv=none; d=zohomail.com; s=zohoarc; b=i88Plo6jhD7pkTE/e4D6NvA0Y4YlukV9PjyiqhGNJHUN/UnbjBuOoRVbQvoy/tHGHnNmrBTkmqCBrYtd8cs1HEnnP0W6Dy5QJiEbjDXy0uw5tpPeivmCprZVQ5eCcFl4yss/kICOGtRzQqa41C4ZEYhVosbvfxQGIdq/ZFX+xVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579006716; h=Content-Type: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; bh=JqNxX14HW/WLivX9UNa9yxrv0SVTGvB61OAO+BVcZaw=; b=eNIw330KrKMiSpkTqYytiVVsOl5FcDgdgI/Nw3mdjFyLeJKyAHbMOPUPnw5RGYjji7OJfdCPwKa+IWNS7/I4/RwC2WIUdVmpECGn4jeVRw+XjaGTBsFj3wczCRtySpu2QeTbX9hcHWuBdULCdf+J2Sb+qIlP+Kf2amg2I0YfOyA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1579006716844751.6423488594239; Tue, 14 Jan 2020 04:58:36 -0800 (PST) Received: from localhost ([::1]:38906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irLmF-0006N0-B8 for importer@patchew.org; Tue, 14 Jan 2020 07:58:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40628) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irLhR-0000fx-Jp for qemu-devel@nongnu.org; Tue, 14 Jan 2020 07:53:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irLhN-0001Qk-MB for qemu-devel@nongnu.org; Tue, 14 Jan 2020 07:53:37 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:31774 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irLhN-0001QY-Ix for qemu-devel@nongnu.org; Tue, 14 Jan 2020 07:53:33 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-308-sprUiLntNBi18fyCMww_3Q-1; Tue, 14 Jan 2020 07:53:32 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 647CF800D54; Tue, 14 Jan 2020 12:53:30 +0000 (UTC) Received: from secure.mitica (ovpn-116-207.ams2.redhat.com [10.36.116.207]) by smtp.corp.redhat.com (Postfix) with ESMTP id C68F15D9E5; Tue, 14 Jan 2020 12:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579006413; 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: in-reply-to:in-reply-to:references:references; bh=JqNxX14HW/WLivX9UNa9yxrv0SVTGvB61OAO+BVcZaw=; b=R7YiBBRAc8vmFfUU5YwWWTnEcUe7ZxFxH9WwMrAG5uIm3SS7bz5YsEijPO+eZ1LgXphPgm +sk+7ec1ra5cpoPwpe8pj68OqAyrVCZBtDvsP8Kff/0L1TJ+qv4XKPl2axbHpVvq9WsDvW 61iQ8TOKgFdT8UkxCBAlkVAQw73gkeY= From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 04/30] migration: Make sure that we don't call write() in case of error Date: Tue, 14 Jan 2020 13:52:28 +0100 Message-Id: <20200114125254.4515-5-quintela@redhat.com> In-Reply-To: <20200114125254.4515-1-quintela@redhat.com> References: <20200114125254.4515-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: sprUiLntNBi18fyCMww_3Q-1 X-Mimecast-Spam-Score: 0 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: 205.139.110.120 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 , Peter Maydell , Thomas Huth , Corey Minyard , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Juan Quintela , Stefan Weil , Jason Wang , "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , Stefan Berger , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Richard Henderson , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" If we are exiting due to an error/finish/.... Just don't try to even touch the channel with one IO operation. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index d003538f06..39e7b922ff 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -900,6 +900,12 @@ struct { uint64_t packet_num; /* send channels ready */ QemuSemaphore channels_ready; + /* + * Have we already run terminate threads. There is a race when it + * happens that we got one error while we are exiting. + * We will use atomic operations. Only valid values are 0 and 1. + */ + int exiting; } *multifd_send_state; =20 /* @@ -928,6 +934,10 @@ static int multifd_send_pages(RAMState *rs) MultiFDPages_t *pages =3D multifd_send_state->pages; uint64_t transferred; =20 + if (atomic_read(&multifd_send_state->exiting)) { + return -1; + } + qemu_sem_wait(&multifd_send_state->channels_ready); for (i =3D next_channel;; i =3D (i + 1) % migrate_multifd_channels()) { p =3D &multifd_send_state->params[i]; @@ -1009,6 +1019,16 @@ static void multifd_send_terminate_threads(Error *er= r) } } =20 + /* + * We don't want to exit each threads twice. Depending on where + * we get the error, or if there are two independent errors in two + * threads at the same time, we can end calling this function + * twice. + */ + if (atomic_xchg(&multifd_send_state->exiting, 1)) { + return; + } + for (i =3D 0; i < migrate_multifd_channels(); i++) { MultiFDSendParams *p =3D &multifd_send_state->params[i]; =20 @@ -1118,6 +1138,10 @@ static void *multifd_send_thread(void *opaque) =20 while (true) { qemu_sem_wait(&p->sem); + + if (atomic_read(&multifd_send_state->exiting)) { + break; + } qemu_mutex_lock(&p->mutex); =20 if (p->pending_job) { @@ -1224,6 +1248,7 @@ int multifd_save_setup(void) multifd_send_state->params =3D g_new0(MultiFDSendParams, thread_count); multifd_send_state->pages =3D multifd_pages_init(page_count); qemu_sem_init(&multifd_send_state->channels_ready, 0); + atomic_set(&multifd_send_state->exiting, 0); =20 for (i =3D 0; i < thread_count; i++) { MultiFDSendParams *p =3D &multifd_send_state->params[i]; --=20 2.24.1