From nobody Wed Feb 11 10:38:30 2026 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=1682709269; cv=none; d=zohomail.com; s=zohoarc; b=Wkgxopsehw6tGihv7AKPUDagJ4/ofEViMamA5owlIcHC5t7NFy71ndUbGWTv62a6PSHS+FMcFBXml6jWgX5Ka2OCiZGz2CDzEwCuiljVkyNxP/Cda6IYMPN2s/6r4ra3Pxx68inltC4KIk/+Jj8jo0WVz9crUdETRcpGt2mhoEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682709269; 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=B4sv46wwHMZHoYs6QFZax8TYeOmxvB56IfSEwn1UIhU=; b=ZlmEEM8JpqN6QI6vqY/ghxv4z+14Y9aOtpQBPpxkC//hMeO2H9j6wh48yo8GvCbvlOPGYogfgSISX0k6B13CH5vhM4ueUbkHVEwiAk+/uIBQUxZLFMO7O6cmvJuUp00HrXsiCWhs5FuywgOxmnNkuJbJ4t+Okzu8vpxK2F34q0M= 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 1682709269430197.23563683975067; Fri, 28 Apr 2023 12:14:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psTWJ-0004t1-2z; Fri, 28 Apr 2023 15:12:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psTWG-0004qL-H1 for qemu-devel@nongnu.org; Fri, 28 Apr 2023 15:12:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psTWC-0002zv-QN for qemu-devel@nongnu.org; Fri, 28 Apr 2023 15:12:36 -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-652-ysCqC1yMNy6Yg9U5I8XgDw-1; Fri, 28 Apr 2023 15:12:30 -0400 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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id B700D185A78B; Fri, 28 Apr 2023 19:12:29 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 649C12166B5E; Fri, 28 Apr 2023 19:12:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682709151; 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=B4sv46wwHMZHoYs6QFZax8TYeOmxvB56IfSEwn1UIhU=; b=jHwHv05LBSM7pOYGhmWft8c034a/88WSTyC5hR4fRRHSUVvRltnpmPLf0VP4WxRwMewfFP fGdArwqmoBaHoFks79rtL7e5DLqQf2SHPtbseyOOiGALZmCbbSd1hhDdev4EIq1Nyn/1Oh Ai28YU7s9S+SaljtwZ4nVdiqtvHXKVY= X-MC-Unique: ysCqC1yMNy6Yg9U5I8XgDw-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Leonardo Bras , Juan Quintela , Thomas Huth , Laurent Vivier , Paolo Bonzini , Peter Xu , Lukas Straub Subject: [PULL 14/21] ram.c: Do not call save_page_header() from compress threads Date: Fri, 28 Apr 2023 21:11:56 +0200 Message-Id: <20230428191203.39520-15-quintela@redhat.com> In-Reply-To: <20230428191203.39520-1-quintela@redhat.com> References: <20230428191203.39520-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682709270516100005 Content-Type: text/plain; charset="utf-8" From: Lukas Straub save_page_header() accesses several global variables, so calling it from multiple threads is pretty ugly. Instead, call save_page_header() before writing out the compressed data from the compress buffer to the migration stream. This also makes the core compress code more independend from ram.c. Signed-off-by: Lukas Straub Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/ram.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index b0b11f37fb..53aba37be9 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1465,17 +1465,13 @@ static CompressResult do_compress_ram_page(QEMUFile= *f, z_stream *stream, RAMBlock *block, ram_addr_t off= set, uint8_t *source_buf) { - RAMState *rs =3D ram_state; - PageSearchStatus *pss =3D &rs->pss[RAM_CHANNEL_PRECOPY]; uint8_t *p =3D block->host + offset; int ret; =20 - if (save_zero_page_to_file(pss, f, block, offset)) { + if (buffer_is_zero(p, TARGET_PAGE_SIZE)) { return RES_ZEROPAGE; } =20 - save_page_header(pss, f, block, offset | RAM_SAVE_FLAG_COMPRESS_PAGE); - /* * copy it to a internal buffer to avoid it being modified by VM * so that we can catch up the error during compression and @@ -1515,9 +1511,40 @@ static inline void compress_reset_result(CompressPar= am *param) param->offset =3D 0; } =20 +static int send_queued_data(CompressParam *param) +{ + PageSearchStatus *pss =3D &ram_state->pss[RAM_CHANNEL_PRECOPY]; + MigrationState *ms =3D migrate_get_current(); + QEMUFile *file =3D ms->to_dst_file; + int len =3D 0; + + RAMBlock *block =3D param->block; + ram_addr_t offset =3D param->offset; + + if (param->result =3D=3D RES_NONE) { + return 0; + } + + assert(block =3D=3D pss->last_sent_block); + + if (param->result =3D=3D RES_ZEROPAGE) { + len +=3D save_page_header(pss, file, block, offset | RAM_SAVE_FLAG= _ZERO); + qemu_put_byte(file, 0); + len +=3D 1; + ram_release_page(block->idstr, offset); + } else if (param->result =3D=3D RES_COMPRESS) { + len +=3D save_page_header(pss, file, block, + offset | RAM_SAVE_FLAG_COMPRESS_PAGE); + len +=3D qemu_put_qemu_file(file, param->file); + } else { + abort(); + } + + return len; +} + static void flush_compressed_data(RAMState *rs) { - MigrationState *ms =3D migrate_get_current(); int idx, len, thread_count; =20 if (!save_page_use_compression(rs)) { @@ -1537,7 +1564,7 @@ static void flush_compressed_data(RAMState *rs) qemu_mutex_lock(&comp_param[idx].mutex); if (!comp_param[idx].quit) { CompressParam *param =3D &comp_param[idx]; - len =3D qemu_put_qemu_file(ms->to_dst_file, param->file); + len =3D send_queued_data(param); compress_reset_result(param); =20 /* @@ -1563,7 +1590,6 @@ static int compress_page_with_multi_thread(RAMBlock *= block, ram_addr_t offset) { int idx, thread_count, bytes_xmit =3D -1, pages =3D -1; bool wait =3D migrate_compress_wait_thread(); - MigrationState *ms =3D migrate_get_current(); =20 thread_count =3D migrate_compress_threads(); qemu_mutex_lock(&comp_done_lock); @@ -1573,7 +1599,7 @@ retry: CompressParam *param =3D &comp_param[idx]; qemu_mutex_lock(¶m->mutex); param->done =3D false; - bytes_xmit =3D qemu_put_qemu_file(ms->to_dst_file, param->file= ); + bytes_xmit =3D send_queued_data(param); compress_reset_result(param); set_compress_params(param, block, offset); =20 --=20 2.40.0