From nobody Tue Feb 10 07:40:03 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=1684154080; cv=none; d=zohomail.com; s=zohoarc; b=EECi7RX5c+XT7FcOFiyZBGdVBkRWD9Y43zmRA4iwpF5QI59zljeBBfvrk3PJfyMWfAJxu5t3n/QEJVLS5kCU8Dzhk8TreEzdPmjqppj6oKkoO9hUzHwgh0hUD37UVTHriIfhxdbE8XHEkbXvo5JujC43809TjpFOy8FlQ2oyw0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684154080; 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=zHITF7fqKh3KwcWERjg4I/zSMoPKNfMkQAlqeVndp6I=; b=Pyej2vwINRBYB1PJuECX9dVpXuT/hkLX08w1p80/ptRg9PjrwKfPpBK83c3dQh4H1CeqXDQBWV9H7yIQil83dVnuJ+K7T7eR2bjOHOC294l4wfpdFPokz7sy9THHzPVnjCvfxTv9X7rWs3PH1Bo1FU5UoyIoT2bhaiLulcTQiLE= 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 1684154080431487.793097825299; Mon, 15 May 2023 05:34:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyXPH-0006Wo-8D; Mon, 15 May 2023 08:34:27 -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 1pyXOg-0006QK-Ph for qemu-devel@nongnu.org; Mon, 15 May 2023 08:33:50 -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 1pyXOf-0003Jb-1T for qemu-devel@nongnu.org; Mon, 15 May 2023 08:33:50 -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-18-bkyUVAwMNxeYukTeV25OXQ-1; Mon, 15 May 2023 08:33:44 -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 D4A7286C60B; Mon, 15 May 2023 12:33:43 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id F3A5E35453; Mon, 15 May 2023 12:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684154028; 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=zHITF7fqKh3KwcWERjg4I/zSMoPKNfMkQAlqeVndp6I=; b=Do3d1GdtnekQ6sTAtWFZqV1t0V5ZDdDksjkfZCy+6DtYraawXMaPzhgHguzzoJz3LWqDiv 23LcTOdRHS1cf9McamuJsBUEy6+3YkDriTI+7MVtesoNvTDXFjsisyOwx135T8I4yByscH y8lV7K0K2VlcL6QGy78lfIXkbhEn4rE= X-MC-Unique: bkyUVAwMNxeYukTeV25OXQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: David Hildenbrand , qemu-block@nongnu.org, Juan Quintela , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Leonardo Bras , Peter Xu , Stefan Hajnoczi , Fam Zheng , Richard Henderson Subject: [PULL 03/11] Use new created qemu_target_pages_to_MiB() Date: Mon, 15 May 2023 14:33:26 +0200 Message-Id: <20230515123334.58995-4-quintela@redhat.com> In-Reply-To: <20230515123334.58995-1-quintela@redhat.com> References: <20230515123334.58995-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 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.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=unavailable 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: 1684154082627100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Richard Henderson Message-Id: <20230511141208.17779-3-quintela@redhat.com> --- migration/dirtyrate.c | 11 +++++------ softmmu/dirtylimit.c | 11 +++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 5bac984fa5..ae52c42c4c 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -16,6 +16,7 @@ #include "qapi/error.h" #include "cpu.h" #include "exec/ramblock.h" +#include "exec/target_page.h" #include "exec/ram_addr.h" #include "qemu/rcu_queue.h" #include "qemu/main-loop.h" @@ -75,13 +76,11 @@ static inline void record_dirtypages(DirtyPageRecord *d= irty_pages, static int64_t do_calculate_dirtyrate(DirtyPageRecord dirty_pages, int64_t calc_time_ms) { - uint64_t memory_size_MB; uint64_t increased_dirty_pages =3D dirty_pages.end_pages - dirty_pages.start_pages; + uint64_t memory_size_MiB =3D qemu_target_pages_to_MiB(increased_dirty_= pages); =20 - memory_size_MB =3D (increased_dirty_pages * TARGET_PAGE_SIZE) >> 20; - - return memory_size_MB * 1000 / calc_time_ms; + return memory_size_MiB * 1000 / calc_time_ms; } =20 void global_dirty_log_change(unsigned int flag, bool start) @@ -292,8 +291,8 @@ static void update_dirtyrate_stat(struct RamblockDirtyI= nfo *info) DirtyStat.page_sampling.total_dirty_samples +=3D info->sample_dirty_co= unt; DirtyStat.page_sampling.total_sample_count +=3D info->sample_pages_cou= nt; /* size of total pages in MB */ - DirtyStat.page_sampling.total_block_mem_MB +=3D (info->ramblock_pages * - TARGET_PAGE_SIZE) >> 20; + DirtyStat.page_sampling.total_block_mem_MB +=3D + qemu_target_pages_to_MiB(info->ramblock_pages); } =20 static void update_dirtyrate(uint64_t msec) diff --git a/softmmu/dirtylimit.c b/softmmu/dirtylimit.c index 71bf6dc7a4..015a9038d1 100644 --- a/softmmu/dirtylimit.c +++ b/softmmu/dirtylimit.c @@ -235,20 +235,15 @@ bool dirtylimit_vcpu_index_valid(int cpu_index) static uint64_t dirtylimit_dirty_ring_full_time(uint64_t dirtyrate) { static uint64_t max_dirtyrate; - unsigned target_page_bits =3D qemu_target_page_bits(); - uint64_t dirty_ring_size_MB; + uint64_t dirty_ring_size_MiB; =20 - /* So far, the largest (non-huge) page size is 64k, i.e. 16 bits. */ - assert(target_page_bits < 20); - - /* Convert ring size (pages) to MiB (2**20). */ - dirty_ring_size_MB =3D kvm_dirty_ring_size() >> (20 - target_page_bits= ); + dirty_ring_size_MiB =3D qemu_target_pages_to_MiB(kvm_dirty_ring_size()= ); =20 if (max_dirtyrate < dirtyrate) { max_dirtyrate =3D dirtyrate; } =20 - return dirty_ring_size_MB * 1000000 / max_dirtyrate; + return dirty_ring_size_MiB * 1000000 / max_dirtyrate; } =20 static inline bool dirtylimit_done(uint64_t quota, --=20 2.40.1