From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D3A9C77B76 for ; Thu, 20 Apr 2023 13:22:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppUB4-0001cV-BP; Thu, 20 Apr 2023 09:18:22 -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 1ppUAv-0001VX-AO for qemu-devel@nongnu.org; Thu, 20 Apr 2023 09:18:13 -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 1ppUAt-0005fq-8I for qemu-devel@nongnu.org; Thu, 20 Apr 2023 09:18:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681996690; 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=MJ6gdf6F+x8ADzWpDsmFOY1phzyWlH2wNBarYw84/Ps=; b=FxxU/hqt1VYKkGpaHTmP6wEQfUkzaRjgnONWSVZiWAkkQk9ItwGACRB+QloKHFMvV75M2C 4wRU7TcCllwR3NgJx8pEE1GQkVaDmGyUSXG9SBhK1UFyrkp3jD1ZIxuvts3XLl3O6nxkHB qHlr5bxhhyliDY32vThFvFOecPB3+fg= 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-568-b6goYd3sMIiEXrSPJutJug-1; Thu, 20 Apr 2023 09:18:08 -0400 X-MC-Unique: b6goYd3sMIiEXrSPJutJug-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7C294884EC1 for ; Thu, 20 Apr 2023 13:18:08 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91374C16026; Thu, 20 Apr 2023 13:18:07 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Paolo Bonzini , Peter Xu Subject: [PULL 13/20] migration: Rename duplicate to zero_pages Date: Thu, 20 Apr 2023 15:17:44 +0200 Message-Id: <20230420131751.28534-14-quintela@redhat.com> In-Reply-To: <20230420131751.28534-1-quintela@redhat.com> References: <20230420131751.28534-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Rest of counters that refer to pages has a _pages suffix. And historically, this showed the number of pages composed of the same character, here comes the name "duplicated". But since years ago, it refers to the number of zero_pages. Signed-off-by: Juan Quintela Reviewed-by: Peter Xu --- migration/migration.c | 2 +- migration/ram.c | 10 +++++----- migration/ram.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 83d3bfbf62..20ef5b683b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1142,7 +1142,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->ram = g_malloc0(sizeof(*info->ram)); info->ram->transferred = stat64_get(&ram_counters.transferred); info->ram->total = ram_bytes_total(); - info->ram->duplicate = stat64_get(&ram_counters.duplicate); + info->ram->duplicate = stat64_get(&ram_counters.zero_pages); /* legacy value. It is not used anymore */ info->ram->skipped = 0; info->ram->normal = stat64_get(&ram_counters.normal); diff --git a/migration/ram.c b/migration/ram.c index 7bbaf8cd86..1a098a9c21 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1119,7 +1119,7 @@ uint64_t ram_pagesize_summary(void) uint64_t ram_get_total_transferred_pages(void) { return stat64_get(&ram_counters.normal) + - stat64_get(&ram_counters.duplicate) + + stat64_get(&ram_counters.zero_pages) + compression_counters.pages + xbzrle_counters.pages; } @@ -1322,7 +1322,7 @@ static int save_zero_page(PageSearchStatus *pss, QEMUFile *f, RAMBlock *block, int len = save_zero_page_to_file(pss, f, block, offset); if (len) { - stat64_add(&ram_counters.duplicate, 1); + stat64_add(&ram_counters.zero_pages, 1); ram_transferred_add(len); return 1; } @@ -1361,7 +1361,7 @@ static bool control_save_page(PageSearchStatus *pss, RAMBlock *block, if (bytes_xmit > 0) { stat64_add(&ram_counters.normal, 1); } else if (bytes_xmit == 0) { - stat64_add(&ram_counters.duplicate, 1); + stat64_add(&ram_counters.zero_pages, 1); } return true; @@ -1488,7 +1488,7 @@ update_compress_thread_counts(const CompressParam *param, int bytes_xmit) ram_transferred_add(bytes_xmit); if (param->zero_page) { - stat64_add(&ram_counters.duplicate, 1); + stat64_add(&ram_counters.zero_pages, 1); return; } @@ -2623,7 +2623,7 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero) uint64_t pages = size / TARGET_PAGE_SIZE; if (zero) { - stat64_add(&ram_counters.duplicate, pages); + stat64_add(&ram_counters.zero_pages, pages); } else { stat64_add(&ram_counters.normal, pages); ram_transferred_add(size); diff --git a/migration/ram.h b/migration/ram.h index 8093ebc210..b27ce01f2e 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -46,7 +46,7 @@ typedef struct { Stat64 dirty_sync_count; Stat64 dirty_sync_missed_zero_copy; Stat64 downtime_bytes; - Stat64 duplicate; + Stat64 zero_pages; Stat64 multifd_bytes; Stat64 normal; Stat64 postcopy_bytes; -- 2.39.2