From: Juan Quintela <quintela@redhat.com> To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Juan Quintela <quintela@redhat.com>, Laurent Vivier <lvivier@redhat.com>, kvm@vger.kernel.org, Thomas Huth <thuth@redhat.com>, Richard Henderson <rth@twiddle.net>, Paolo Bonzini <pbonzini@redhat.com>, Peter Xu <peterx@redhat.com> Subject: [PULL 10/19] memory: Don't set migration bitmap when without migration Date: Thu, 11 Jul 2019 12:44:03 +0200 [thread overview] Message-ID: <20190711104412.31233-11-quintela@redhat.com> (raw) In-Reply-To: <20190711104412.31233-1-quintela@redhat.com> From: Peter Xu <peterx@redhat.com> 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 <pbonzini@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20190603065056.25211-4-peterx@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com> --- 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 2c5cdffa31..70d6f7e451 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -46,6 +46,8 @@ OBJECT_GET_CLASS(IOMMUMemoryRegionClass, (obj), \ TYPE_IOMMU_MEMORY_REGION) +extern bool global_dirty_log; + typedef struct MemoryRegionOps MemoryRegionOps; typedef struct MemoryRegionMmio MemoryRegionMmio; diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 44dcc98de6..0a532c3963 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -349,8 +349,13 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, if (bitmap[k]) { unsigned long temp = leul_to_cpu(bitmap[k]); - atomic_or(&blocks[DIRTY_MEMORY_MIGRATION][idx][offset], temp); 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], temp); } @@ -367,6 +372,11 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; + + if (!global_dirty_log) { + clients &= ~(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 480f3d989b..93486a71d7 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 = false; +bool global_dirty_log; static QTAILQ_HEAD(, MemoryListener) memory_listeners = QTAILQ_HEAD_INITIALIZER(memory_listeners); -- 2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Juan Quintela <quintela@redhat.com> To: qemu-devel@nongnu.org Cc: Laurent Vivier <lvivier@redhat.com>, Thomas Huth <thuth@redhat.com>, kvm@vger.kernel.org, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Peter Xu <peterx@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <rth@twiddle.net> Subject: [Qemu-devel] [PULL 10/19] memory: Don't set migration bitmap when without migration Date: Thu, 11 Jul 2019 12:44:03 +0200 [thread overview] Message-ID: <20190711104412.31233-11-quintela@redhat.com> (raw) In-Reply-To: <20190711104412.31233-1-quintela@redhat.com> From: Peter Xu <peterx@redhat.com> 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 <pbonzini@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20190603065056.25211-4-peterx@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com> --- 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 2c5cdffa31..70d6f7e451 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -46,6 +46,8 @@ OBJECT_GET_CLASS(IOMMUMemoryRegionClass, (obj), \ TYPE_IOMMU_MEMORY_REGION) +extern bool global_dirty_log; + typedef struct MemoryRegionOps MemoryRegionOps; typedef struct MemoryRegionMmio MemoryRegionMmio; diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 44dcc98de6..0a532c3963 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -349,8 +349,13 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, if (bitmap[k]) { unsigned long temp = leul_to_cpu(bitmap[k]); - atomic_or(&blocks[DIRTY_MEMORY_MIGRATION][idx][offset], temp); 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], temp); } @@ -367,6 +372,11 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; + + if (!global_dirty_log) { + clients &= ~(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 480f3d989b..93486a71d7 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 = false; +bool global_dirty_log; static QTAILQ_HEAD(, MemoryListener) memory_listeners = QTAILQ_HEAD_INITIALIZER(memory_listeners); -- 2.21.0
next prev parent reply other threads:[~2019-07-11 10:44 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-11 10:43 [PULL 00/19] Migration patches Juan Quintela 2019-07-11 10:43 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:43 ` [PULL 01/19] migration: fix multifd_recv event typo Juan Quintela 2019-07-11 10:43 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:43 ` [PULL 02/19] migration-test: rename parameter to parameter_int Juan Quintela 2019-07-11 10:43 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:43 ` [PULL 03/19] migration-test: Add migration multifd test Juan Quintela 2019-07-11 10:43 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:43 ` [PULL 04/19] migration/multifd: call multifd_send_sync_main when sending RAM_SAVE_FLAG_EOS Juan Quintela 2019-07-11 10:43 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:43 ` [PULL 05/19] migration/xbzrle: update cache and current_data in one place Juan Quintela 2019-07-11 10:43 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:43 ` [PULL 06/19] cutils: remove one unnecessary pointer operation Juan Quintela 2019-07-11 10:43 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` [PULL 07/19] migration/multifd: sync packet_num after all thread are done Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` [PULL 08/19] migratioin/ram.c: reset complete_round when we gets a queued page Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` [PULL 09/19] migration: No need to take rcu during sync_dirty_bitmap Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` Juan Quintela [this message] 2019-07-11 10:44 ` [Qemu-devel] [PULL 10/19] memory: Don't set migration bitmap when without migration Juan Quintela 2019-07-11 10:44 ` [PULL 11/19] bitmap: Add bitmap_copy_with_{src|dst}_offset() Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` [PULL 12/19] memory: Pass mr into snapshot_and_clear_dirty Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` [PULL 13/19] memory: Introduce memory listener hook log_clear() Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` [PULL 14/19] kvm: Update comments for sync_dirty_bitmap Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` [PULL 15/19] kvm: Persistent per kvmslot dirty bitmap Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` [PULL 16/19] kvm: Introduce slots lock for memory listener Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` [PULL 17/19] kvm: Support KVM_CLEAR_DIRTY_LOG Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] [PULL 18/19] migration: Split log_clear() into smaller chunks Juan Quintela 2019-07-11 11:51 ` Dr. David Alan Gilbert 2019-07-11 10:44 ` [PULL 19/19] migration: allow private destination ram with x-ignore-shared Juan Quintela 2019-07-11 10:44 ` [Qemu-devel] " Juan Quintela 2019-07-11 11:19 ` [PULL 00/19] Migration patches Paolo Bonzini 2019-07-11 11:19 ` [Qemu-devel] " Paolo Bonzini 2019-07-11 11:32 ` Juan Quintela 2019-07-11 11:32 ` [Qemu-devel] " Juan Quintela 2019-07-11 11:34 ` Dr. David Alan Gilbert 2019-07-11 11:34 ` [Qemu-devel] " Dr. David Alan Gilbert 2019-07-11 11:40 ` Peter Maydell 2019-07-11 11:40 ` Peter Maydell 2019-07-11 12:39 ` Peter Maydell 2019-07-11 12:39 ` Peter Maydell 2019-07-12 14:06 ` Juan Quintela 2019-07-12 14:06 ` [Qemu-devel] " Juan Quintela 2019-07-11 12:55 ` Christian Borntraeger 2019-07-11 12:55 ` [Qemu-devel] " Christian Borntraeger 2019-07-11 13:01 ` Peter Maydell 2019-07-11 13:01 ` Peter Maydell 2019-07-11 13:00 ` no-reply 2019-07-11 13:00 ` no-reply 2019-07-12 14:33 ` no-reply 2019-07-12 14:33 ` no-reply 2019-07-12 14:31 Juan Quintela 2019-07-12 14:31 ` [PULL 10/19] memory: Don't set migration bitmap when without migration Juan Quintela
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190711104412.31233-11-quintela@redhat.com \ --to=quintela@redhat.com \ --cc=dgilbert@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=lvivier@redhat.com \ --cc=pbonzini@redhat.com \ --cc=peterx@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ --cc=thuth@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.