From nobody Sun Feb 8 12:58:21 2026 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1559810901; cv=none; d=zoho.com; s=zohoarc; b=Hf80jphpNBzbnZfnv8BJoR10qP1MwKfMyf/d2HvvmPx17wgt6nfjTnwLR3WWQdTFMeZO0DvHrcEOztdLrUeXFgoy16O+YrODhfNUNw96vYr1DRx+jTpbVzu9h9LbjEWw5xMP6vnHr/Ks3Ue2KfMa+XOFr4x9xlMY6aVP4rFdOGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559810901; 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=GTH4V2Qg6cn1+2FbaHX6i574+zTKpuuUZfn0Iy31mIA=; b=FA+7jEEG7rw4G8nsY0CGI4Y6PeDJuDsP8lsYBtlbINIhJTylp8CjTnkoYJJVaCy/ZdulGRy/fRZUo8ryzCMxHvMJItTwdyacJUOobm1M6lSoNXUXlI2lRJB3SfFQlQmI6Chm9nZJ5kPnZbXqMKQNVZcNnQFOfwNxZ+w0qOvf1MQ= 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 1559810901896421.8883772576215; Thu, 6 Jun 2019 01:48:21 -0700 (PDT) Received: from localhost ([127.0.0.1]:56636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYo4H-0008DD-P3 for importer@patchew.org; Thu, 06 Jun 2019 04:48:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYnyf-0003mZ-6q for qemu-devel@nongnu.org; Thu, 06 Jun 2019 04:42:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYnsJ-0003W5-Ie for qemu-devel@nongnu.org; Thu, 06 Jun 2019 04:35:56 -0400 Received: from mga14.intel.com ([192.55.52.115]:4990) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYnsJ-0003TJ-Ap for qemu-devel@nongnu.org; Thu, 06 Jun 2019 04:35:55 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Jun 2019 01:35:55 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga001.fm.intel.com with ESMTP; 06 Jun 2019 01:35:54 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 From: Wei Yang To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 16:34:58 +0800 Message-Id: <20190606083501.2087-4-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190606083501.2087-1-richardw.yang@linux.intel.com> References: <20190606083501.2087-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH 3/6] migration/multifd: use sync field to synchronize send threads X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add a field in MultiFDSendParams to indicate there is a request to synchronize send threads. By doing so, send_thread will just post sem_sync on synchronization request and channels_ready will not *overflow*. Signed-off-by: Wei Yang --- migration/ram.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index f9e53ac413..9982930392 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -640,6 +640,8 @@ typedef struct { QemuMutex mutex; /* is this channel thread running */ bool running; + /* should sync this channel */ + bool sync; /* should this thread finish */ bool quit; /* thread has work to do */ @@ -1065,8 +1067,7 @@ static void multifd_send_sync_main(void) qemu_mutex_lock(&p->mutex); =20 p->packet_num =3D multifd_send_state->packet_num++; - p->flags |=3D MULTIFD_FLAG_SYNC; - p->pending_job++; + p->sync =3D true; qemu_mutex_unlock(&p->mutex); qemu_sem_post(&p->sem); } @@ -1129,10 +1130,27 @@ static void *multifd_send_thread(void *opaque) p->pending_job--; qemu_mutex_unlock(&p->mutex); =20 - if (flags & MULTIFD_FLAG_SYNC) { - qemu_sem_post(&multifd_send_state->sem_sync); - } qemu_sem_post(&multifd_send_state->channels_ready); + } else if (p->sync) { + uint64_t packet_num =3D p->packet_num; + uint32_t flags =3D p->flags; + assert(!p->pages->used); + + p->flags |=3D MULTIFD_FLAG_SYNC; + multifd_send_fill_packet(p); + p->sync =3D false; + qemu_mutex_unlock(&p->mutex); + + trace_multifd_send(p->id, packet_num, 0, flags | MULTIFD_FLAG_= SYNC, + p->next_packet_size); + + ret =3D qio_channel_write_all(p->c, (void *)p->packet, + p->packet_len, &local_err); + if (ret !=3D 0) { + break; + } + + qemu_sem_post(&multifd_send_state->sem_sync); } else if (p->quit) { qemu_mutex_unlock(&p->mutex); break; @@ -1196,7 +1214,7 @@ int multifd_save_setup(void) =20 qemu_mutex_init(&p->mutex); qemu_sem_init(&p->sem, 0); - p->quit =3D false; + p->sync =3D p->quit =3D false; p->pending_job =3D 0; p->id =3D i; p->pages =3D multifd_pages_init(page_count); --=20 2.19.1