From nobody Sat Oct 25 08:55:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520421125982592.484974135078; Wed, 7 Mar 2018 03:12:05 -0800 (PST) Received: from localhost ([::1]:60787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etWzN-0006Ok-6h for importer@patchew.org; Wed, 07 Mar 2018 06:12:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etWoV-00057z-Mp for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:00:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etWoU-0006O3-PV for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:00:51 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:44640 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etWoU-0006Nn-Kt for qemu-devel@nongnu.org; Wed, 07 Mar 2018 06:00:50 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 298F2404084A for ; Wed, 7 Mar 2018 11:00:50 +0000 (UTC) Received: from secure.mitica (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1135F215CDA7; Wed, 7 Mar 2018 11:00:48 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 12:00:09 +0100 Message-Id: <20180307110010.2205-24-quintela@redhat.com> In-Reply-To: <20180307110010.2205-1-quintela@redhat.com> References: <20180307110010.2205-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 07 Mar 2018 11:00:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Wed, 07 Mar 2018 11:00:50 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'quintela@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v10 23/24] migration: Create pages structure for reception 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: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela --- migration/ram.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index df9646ed2e..264d2e462a 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -698,6 +698,7 @@ static void multifd_send_page(RAMBlock *block, ram_addr= _t offset, } =20 struct MultiFDRecvParams { + /* not changed */ uint8_t id; char *name; QemuThread thread; @@ -705,8 +706,13 @@ struct MultiFDRecvParams { QemuSemaphore sem; QemuMutex mutex; bool running; + /* protected by param mutex */ bool quit; bool sync; + /* how many patckets has recv this channel */ + uint32_t packets_recv; + multifd_pages_t *pages; + bool done; }; typedef struct MultiFDRecvParams MultiFDRecvParams; =20 @@ -716,6 +722,7 @@ struct { int count; /* syncs main thread and channels */ QemuSemaphore sem_main; + multifd_pages_t *pages; } *multifd_recv_state; =20 static void terminate_multifd_recv_threads(Error *errp) @@ -764,10 +771,14 @@ int multifd_load_cleanup(Error **errp) qemu_sem_destroy(&p->sem); g_free(p->name); p->name =3D NULL; + multifd_pages_clear(p->pages); + p->pages =3D NULL; } qemu_sem_destroy(&multifd_recv_state->sem_main); g_free(multifd_recv_state->params); multifd_recv_state->params =3D NULL; + multifd_pages_clear(multifd_recv_state->pages); + multifd_recv_state->pages =3D NULL; g_free(multifd_recv_state); multifd_recv_state =3D NULL; =20 @@ -834,6 +845,9 @@ int multifd_load_setup(void) multifd_recv_state->params =3D g_new0(MultiFDRecvParams, thread_count); atomic_set(&multifd_recv_state->count, 0); qemu_sem_init(&multifd_recv_state->sem_main, 0); + multifd_pages_init(&multifd_recv_state->pages, + migrate_multifd_page_count()); + for (i =3D 0; i < thread_count; i++) { MultiFDRecvParams *p =3D &multifd_recv_state->params[i]; =20 @@ -842,6 +856,7 @@ int multifd_load_setup(void) p->quit =3D false; p->id =3D i; p->name =3D g_strdup_printf("multifdrecv_%d", i); + multifd_pages_init(&p->pages, migrate_multifd_page_count()); } =20 return 0; --=20 2.14.3