From nobody Fri Nov 1 03:44:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653995605; cv=none; d=zohomail.com; s=zohoarc; b=ZBmSMLw6sf6RWR0BDM0qS5dARqmPrqzhhft7BzKIXxKIQ8B2P+98m2TyLXj665WoOpXhBPU8CPLwwR+FJpPoRioWFlQ69+0/35YP4imSS2o/2oNQUmbHnZ3oe2gbsYDi78bcMyI2Q+FRCEs5leCXWsPlhjizDo95EirWYKcmgbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653995605; 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; bh=KaYL2VfLUjkgTupNU10ufAv96hul6CJ8wTO/z1f1Edg=; b=N8IBbgfhScmljmpV0vFM5JeWj/8snptOBE2xIXu7e92omAgxKCER1+9xYgKQCtiM8E92APmAGF1eUWpLzrmgbOMAKc9CCTyad5nLfT1eq3eZIMsthE4MEgkpC0Yj7VyOMiD8HeCBl10bIXBDc2TmswW7oet63PPv9LN/qA28mCE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653995605660835.8049902316073; Tue, 31 May 2022 04:13:25 -0700 (PDT) Received: from localhost ([::1]:51180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvzoS-0007cW-Fr for importer@patchew.org; Tue, 31 May 2022 07:13:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvzLm-0003MI-1X for qemu-devel@nongnu.org; Tue, 31 May 2022 06:43:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:31329) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvzLk-0004eu-DQ for qemu-devel@nongnu.org; Tue, 31 May 2022 06:43:45 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-271-ncFR8uYhNDKBhlyIu1JCRw-1; Tue, 31 May 2022 06:43:40 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1B5DF185A7A4; Tue, 31 May 2022 10:43:40 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 677108287E; Tue, 31 May 2022 10:43:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653993823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KaYL2VfLUjkgTupNU10ufAv96hul6CJ8wTO/z1f1Edg=; b=NtjVVQAyp4IwjkWwhFqI4wwXKvhoEN7rTyCVhnExSLXTk88hBUEu5RiJ/RybEBif/XFjlZ Pb9Lbh7NTmcqa5KQkMuG2679x3/1T1xLeaGHGWCP5h1Ze3/oPEoBodejXh54KQ4iN2/nyx 54TjB3URwi9Uk7WGxErQeW4U+1TRle8= X-MC-Unique: ncFR8uYhNDKBhlyIu1JCRw-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , "Dr. David Alan Gilbert" , Juan Quintela , Eduardo Habkost , Peter Xu , Leonardo Bras Subject: [PATCH v7 08/13] multifd: Prepare to send a packet without the mutex held Date: Tue, 31 May 2022 12:43:13 +0200 Message-Id: <20220531104318.7494-9-quintela@redhat.com> In-Reply-To: <20220531104318.7494-1-quintela@redhat.com> References: <20220531104318.7494-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653995607905100001 Content-Type: text/plain; charset="utf-8" We do the send_prepare() and the fill of the head packet without the mutex held. It will help a lot for compression and later in the series for zero pages. Notice that we can use p->pages without holding p->mutex because p->pending_job =3D=3D 1. Signed-off-by: Juan Quintela --- migration/multifd.h | 2 ++ migration/multifd.c | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index af8ce8921d..d48597a1ea 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -109,7 +109,9 @@ typedef struct { /* array of pages to sent. * The owner of 'pages' depends of 'pending_job' value: * pending_job =3D=3D 0 -> migration_thread can use it. + * No need for mutex lock. * pending_job !=3D 0 -> multifd_channel can use it. + * No need for mutex lock. */ MultiFDPages_t *pages; =20 diff --git a/migration/multifd.c b/migration/multifd.c index 69b9d7cf98..056599cbaf 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -661,6 +661,8 @@ static void *multifd_send_thread(void *opaque) p->flags |=3D MULTIFD_FLAG_SYNC; p->sync_needed =3D false; } + qemu_mutex_unlock(&p->mutex); + p->normal_num =3D 0; =20 if (use_zero_copy_send) { @@ -682,11 +684,6 @@ static void *multifd_send_thread(void *opaque) } } multifd_send_fill_packet(p); - p->num_packets++; - p->total_normal_pages +=3D p->normal_num; - p->pages->num =3D 0; - p->pages->block =3D NULL; - qemu_mutex_unlock(&p->mutex); =20 trace_multifd_send(p->id, packet_num, p->normal_num, p->flags, p->next_packet_size); @@ -711,6 +708,10 @@ static void *multifd_send_thread(void *opaque) } =20 qemu_mutex_lock(&p->mutex); + p->num_packets++; + p->total_normal_pages +=3D p->normal_num; + p->pages->num =3D 0; + p->pages->block =3D NULL; p->sent_bytes +=3D p->packet_len;; p->sent_bytes +=3D p->next_packet_size; p->pending_job--; --=20 2.35.3