From nobody Tue Feb 10 14:49: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=1682334302; cv=none; d=zohomail.com; s=zohoarc; b=cNjMJrZFHPYH+UafInzVArJwF9GHF6cXqD2R7rB0QCsBVwYPooAuiY7/EH8XG65+lgMS1GAwDssMGPSfPJGEjQAiAa6u8lnuv1O3ImKicuzDQSUDtSFYIBfKsaVoCOEqAvpmrqUVr7/St0WCjPMzdK6zZJkg5sBd2m5ZvUZJhtY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682334302; 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=GjcTrAksCxmbiPlNvbjUXnHDSgjwXW8MBUgNQYev5Eg=; b=aZwCCNRkC6AKyhwHbUIgBEW3enoixfVk9Hmmfsd/AcUKm8s6XO6noHaLAdmxBKedGejjXbuNJGoudzNBa8Fv4emAvq4snsGuCaSPxMaov3i0tyvJfIqdkTt9Q8/JheoywQ2x9MVwvr88eYfDFiJekb0vkzsf8GOZx9NLWpwsYlU= 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 1682334302406787.0700011645331; Mon, 24 Apr 2023 04:05:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqtxI-0006Qg-7f; Mon, 24 Apr 2023 07:02:00 -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 1pqtxF-0006MF-QB for qemu-devel@nongnu.org; Mon, 24 Apr 2023 07:01:57 -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 1pqtxC-00005a-SS for qemu-devel@nongnu.org; Mon, 24 Apr 2023 07:01:57 -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-342-8yzzXYw6PJWR2JcC__l7zA-1; Mon, 24 Apr 2023 07:01:52 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 998EC108C492 for ; Mon, 24 Apr 2023 11:01:30 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B85C1492C14; Mon, 24 Apr 2023 11:01:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682334114; 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=GjcTrAksCxmbiPlNvbjUXnHDSgjwXW8MBUgNQYev5Eg=; b=FjiX5LHdF2/y+bsOPB2wvEsqSeAvihTnnGzY9Ov28d1nX/wDv2PcqSGvhlAz0aUJhNRx57 z6fre4fdkutCcm/0+ZkICRH2LT66olqw1ilDrSU+QIM56KyuvyCNQ9b3weKFeYKTwghBsU 6PPKfOZ0LgIZDfL7h5s7hIebQX2uTiE= X-MC-Unique: 8yzzXYw6PJWR2JcC__l7zA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Peter Xu , Juan Quintela , Leonardo Bras , Paolo Bonzini Subject: [PULL 08/17] migration: Make dirty_sync_count atomic Date: Mon, 24 Apr 2023 13:01:10 +0200 Message-Id: <20230424110119.68520-9-quintela@redhat.com> In-Reply-To: <20230424110119.68520-1-quintela@redhat.com> References: <20230424110119.68520-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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.172, 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: 1682334304291100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Peter Xu --- migration/migration.c | 3 ++- migration/ram.c | 13 +++++++------ migration/ram.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 4ca2173d85..97c227aa85 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1148,7 +1148,8 @@ static void populate_ram_info(MigrationInfo *info, Mi= grationState *s) info->ram->normal =3D stat64_get(&ram_counters.normal); info->ram->normal_bytes =3D info->ram->normal * page_size; info->ram->mbps =3D s->mbps; - info->ram->dirty_sync_count =3D ram_counters.dirty_sync_count; + info->ram->dirty_sync_count =3D + stat64_get(&ram_counters.dirty_sync_count); info->ram->dirty_sync_missed_zero_copy =3D stat64_get(&ram_counters.dirty_sync_missed_zero_copy); info->ram->postcopy_requests =3D ram_counters.postcopy_requests; diff --git a/migration/ram.c b/migration/ram.c index b1722b6071..3c13136559 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -764,7 +764,7 @@ static void xbzrle_cache_zero_page(RAMState *rs, ram_ad= dr_t current_addr) /* We don't care if this fails to allocate a new cache page * as long as it updated an old one */ cache_insert(XBZRLE.cache, current_addr, XBZRLE.zero_target_page, - ram_counters.dirty_sync_count); + stat64_get(&ram_counters.dirty_sync_count)); } =20 #define ENCODING_FLAG_XBZRLE 0x1 @@ -790,13 +790,13 @@ static int save_xbzrle_page(RAMState *rs, PageSearchS= tatus *pss, int encoded_len =3D 0, bytes_xbzrle; uint8_t *prev_cached_page; QEMUFile *file =3D pss->pss_channel; + uint64_t generation =3D stat64_get(&ram_counters.dirty_sync_count); =20 - if (!cache_is_cached(XBZRLE.cache, current_addr, - ram_counters.dirty_sync_count)) { + if (!cache_is_cached(XBZRLE.cache, current_addr, generation)) { xbzrle_counters.cache_miss++; if (!rs->last_stage) { if (cache_insert(XBZRLE.cache, current_addr, *current_data, - ram_counters.dirty_sync_count) =3D=3D -1) { + generation) =3D=3D -1) { return -1; } else { /* update *current_data when the page has been @@ -1209,7 +1209,7 @@ static void migration_bitmap_sync(RAMState *rs) RAMBlock *block; int64_t end_time; =20 - ram_counters.dirty_sync_count++; + stat64_add(&ram_counters.dirty_sync_count, 1); =20 if (!rs->time_last_bitmap_sync) { rs->time_last_bitmap_sync =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIM= E); @@ -1246,7 +1246,8 @@ static void migration_bitmap_sync(RAMState *rs) rs->bytes_xfer_prev =3D stat64_get(&ram_counters.transferred); } if (migrate_use_events()) { - qapi_event_send_migration_pass(ram_counters.dirty_sync_count); + uint64_t generation =3D stat64_get(&ram_counters.dirty_sync_count); + qapi_event_send_migration_pass(generation); } } =20 diff --git a/migration/ram.h b/migration/ram.h index bb52632424..8c0d07c43a 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -42,7 +42,7 @@ */ typedef struct { int64_t dirty_pages_rate; - int64_t dirty_sync_count; + Stat64 dirty_sync_count; Stat64 dirty_sync_missed_zero_copy; Stat64 downtime_bytes; Stat64 duplicate; --=20 2.39.2