From nobody Mon Nov 10 19:10:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558322018; cv=none; d=zoho.com; s=zohoarc; b=gELzKAdt13bBOeBJvqBBoNarWeFXmF4pYmXd/EGZeQ/fxyHmtsFgVvtJjTDYx56M1FprAGxaIzwoMKhesueD2AnJIiYDCpYW7RNy61O4z3O83RMHKPOFlZkitIk1ZkbR5VLV8fW1adxtdlKBi5kcPqBXCDEiIvNCCTiT1my38LE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558322018; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=dxakjFnCNsAqml/IPIzm6tfuke6toEJviXmNi5ulTRE=; b=blVvPqRiDbj0LVCT/psWQsPFMi6yGiYAlkb0oriUKTPij2L4InzZOWNKyZtghnehli9SnW/GM75iy9XNGpxm3RgaCFoDdC4+JhVCFblo9LRNX6QMcjdphpKTjoUE9MoJlA3wLTvFZzYuTnkEoOkv2JRzMrsuV6h5FhvLWcq7Mcs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558322018536410.6953601291741; Sun, 19 May 2019 20:13:38 -0700 (PDT) Received: from localhost ([127.0.0.1]:57025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSYk0-0005be-Ci for importer@patchew.org; Sun, 19 May 2019 23:13:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSYfe-0001us-Bb for qemu-devel@nongnu.org; Sun, 19 May 2019 23:09:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSYfd-0001YS-FF for qemu-devel@nongnu.org; Sun, 19 May 2019 23:09:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40396) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hSYfd-0001YI-AQ for qemu-devel@nongnu.org; Sun, 19 May 2019 23:09:01 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AA801C04D318 for ; Mon, 20 May 2019 03:09:00 +0000 (UTC) Received: from xz-x1.nay.redhat.com (dhcp-15-205.nay.redhat.com [10.66.15.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90A38100200A; Mon, 20 May 2019 03:08:58 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Mon, 20 May 2019 11:08:29 +0800 Message-Id: <20190520030839.6795-6-peterx@redhat.com> In-Reply-To: <20190520030839.6795-1-peterx@redhat.com> References: <20190520030839.6795-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 20 May 2019 03:09:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 05/15] memory: Don't set migration bitmap when without migration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , "Dr . David Alan Gilbert" , peterx@redhat.com, Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Similar to 9460dee4b2 ("memory: do not touch code dirty bitmap unless TCG is enabled", 2015-06-05) but for the migration bitmap - we can skip the MIGRATION bitmap update if migration not enabled. Reviewed-by: Paolo Bonzini Signed-off-by: Peter Xu --- include/exec/memory.h | 2 ++ include/exec/ram_addr.h | 12 +++++++++++- memory.c | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index e6140e8a04..f29300c54d 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -46,6 +46,8 @@ OBJECT_GET_CLASS(IOMMUMemoryRegionClass, (obj), \ TYPE_IOMMU_MEMORY_REGION) =20 +extern bool global_dirty_log; + typedef struct MemoryRegionOps MemoryRegionOps; typedef struct MemoryRegionMmio MemoryRegionMmio; =20 diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 993fb760f3..86bc8e1a4a 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -348,8 +348,13 @@ static inline void cpu_physical_memory_set_dirty_lebit= map(unsigned long *bitmap, if (bitmap[k]) { unsigned long temp =3D leul_to_cpu(bitmap[k]); =20 - atomic_or(&blocks[DIRTY_MEMORY_MIGRATION][idx][offset], te= mp); atomic_or(&blocks[DIRTY_MEMORY_VGA][idx][offset], temp); + + if (global_dirty_log) { + atomic_or(&blocks[DIRTY_MEMORY_MIGRATION][idx][offset], + temp); + } + if (tcg_enabled()) { atomic_or(&blocks[DIRTY_MEMORY_CODE][idx][offset], tem= p); } @@ -366,6 +371,11 @@ static inline void cpu_physical_memory_set_dirty_lebit= map(unsigned long *bitmap, xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); } else { uint8_t clients =3D tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIE= NTS_NOCODE; + + if (!global_dirty_log) { + clients &=3D ~(1 << DIRTY_MEMORY_MIGRATION); + } + /* * bitmap-traveling is faster than memory-traveling (for addr...) * especially when most of the memory is not dirty. diff --git a/memory.c b/memory.c index 0920c105aa..cff0ea8f40 100644 --- a/memory.c +++ b/memory.c @@ -38,7 +38,7 @@ static unsigned memory_region_transaction_depth; static bool memory_region_update_pending; static bool ioeventfd_update_pending; -static bool global_dirty_log =3D false; +bool global_dirty_log; =20 static QTAILQ_HEAD(, MemoryListener) memory_listeners =3D QTAILQ_HEAD_INITIALIZER(memory_listeners); --=20 2.17.1