From nobody Wed May 15 16:57:04 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=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1559615855; cv=none; d=zoho.com; s=zohoarc; b=X4SqytC8gqGp/5oKIpKE3rESWpenRHf6q5UKbY6icJfKYzVfsQ249TXRZGtVrUg71u1lJtwElbWn+YyzR0WiBJYO7C+L0Y0Dnz2+H3qL8LoHLiBYnjb+MeBXu4oQ5yXKOVtbAeMovcnj054RFCoR8+s+foNKNr7Ycn0hOQYr4IY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559615855; h=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:ARC-Authentication-Results; bh=LcOcsOcbji1GuOcTPEUjGyvV7GFUJz/FtuPO5Ky/aA0=; b=ChiaL1/aVfoH37G8AcsI9svaOyAtJmHAv1Msbt/n8EFkg2PQlPbMGNRK94dfFIQ5H804ThHdp23V2wQN2rhI0Wh5+nhjDTcztdtbZNbqHOLycs7xiA17OdJ6hlbQ3UlfPX6e1Ua949kSD0SE4fmSTfYlEoArMB2eqO98a1PJg1M= 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 155961585517256.30364947728776; Mon, 3 Jun 2019 19:37:35 -0700 (PDT) Received: from localhost ([127.0.0.1]:44173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXzKH-0004xS-WE for importer@patchew.org; Mon, 03 Jun 2019 22:37:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXzJA-0004I2-6Z for qemu-devel@nongnu.org; Mon, 03 Jun 2019 22:36:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hXzJ9-0008A9-7G for qemu-devel@nongnu.org; Mon, 03 Jun 2019 22:36:16 -0400 Received: from mga06.intel.com ([134.134.136.31]:41665) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hXzJ8-00087B-VL for qemu-devel@nongnu.org; Mon, 03 Jun 2019 22:36:15 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jun 2019 19:36:12 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga008.jf.intel.com with ESMTP; 03 Jun 2019 19:36:10 -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: Tue, 4 Jun 2019 10:35:40 +0800 Message-Id: <20190604023540.26532-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 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: 134.134.136.31 Subject: [Qemu-devel] [PATCH] migration/multifd: sync packet_num after all thread are done 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" Notification from recv thread is not ordered, which means we may be notified by one MultiFDRecvParams but adjust packet_num for another. Move the adjustment after we are sure each recv thread are sync-ed. Signed-off-by: Wei Yang Reviewed-by: Juan Quintela --- migration/ram.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index ac75e3e30e..a4e7587648 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1292,15 +1292,15 @@ static void multifd_recv_sync_main(void) =20 trace_multifd_recv_sync_main_wait(p->id); qemu_sem_wait(&multifd_recv_state->sem_sync); + } + for (i =3D 0; i < migrate_multifd_channels(); i++) { + MultiFDRecvParams *p =3D &multifd_recv_state->params[i]; + qemu_mutex_lock(&p->mutex); if (multifd_recv_state->packet_num < p->packet_num) { multifd_recv_state->packet_num =3D p->packet_num; } qemu_mutex_unlock(&p->mutex); - } - for (i =3D 0; i < migrate_multifd_channels(); i++) { - MultiFDRecvParams *p =3D &multifd_recv_state->params[i]; - trace_multifd_recv_sync_main_signal(p->id); qemu_sem_post(&p->sem_sync); } --=20 2.19.1