KVM: Don't allocate dirty bitmap if dirty ring is enabled (044c59c4) · Commits · 戴 / test

Because kvm dirty rings and kvm dirty log is used in an exclusive way, Let's avoid creating the dirty_bitmap when kvm dirty ring is enabled. At the meantime, since the dirty_bitmap will be conditionally created now, we can't use it as a sign of "whether this memory slot enabled dirty tracking". Change users like that to check against the kvm memory slot flags. Note that there still can be chances where the kvm memory slot got its dirty_bitmap allocated, _if_ the memory slots are created before enabling of the dirty rings and at the same time with the dirty tracking capability enabled, they'll still with the dirty_bitmap. However it should not hurt much (e.g., the bitmaps will always be freed if they are there), and the real users normally won't trigger this because dirty bit tracking flag should in most cases only be applied to kvm slots only before migration starts, that should be far latter than kvm initializes (VM starts). Signed-off-by:

Peter Xu <peterx@redhat.com> Message-Id: <20201001012226.5868-1-peterx@redhat.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/mmu/mmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -820,7 +820,7 @@ gfn_to_memslot_dirty_bitmap(struct kvm_vcpu *vcpu, gfn_t gfn,
		slot = kvm_vcpu_gfn_to_memslot(vcpu, gfn);
		if (!slot \|\| slot->flags & KVM_MEMSLOT_INVALID)
		return NULL;
		if (no_dirty_log && slot->dirty_bitmap)
		if (no_dirty_log && kvm_slot_dirty_track_enabled(slot))
		return NULL;

		return slot;

include/linux/kvm_host.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,11 @@ struct kvm_memory_slot {
		u16 as_id;
		};

		static inline bool kvm_slot_dirty_track_enabled(struct kvm_memory_slot *slot)
		{
		return slot->flags & KVM_MEM_LOG_DIRTY_PAGES;
		}

		static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot)
		{
		return ALIGN(memslot->npages, BITS_PER_LONG) / 8;

virt/kvm/kvm_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1365,7 +1365,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
		/* Allocate/free page dirty bitmap as needed */
		if (!(new.flags & KVM_MEM_LOG_DIRTY_PAGES))
		new.dirty_bitmap = NULL;
		else if (!new.dirty_bitmap) {
		else if (!new.dirty_bitmap && !kvm->dirty_ring_size) {
		r = kvm_alloc_dirty_bitmap(&new);
		if (r)
		return r;
		@@ -2657,7 +2657,7 @@ void mark_page_dirty_in_slot(struct kvm *kvm,
		struct kvm_memory_slot *memslot,
		gfn_t gfn)
		{
		if (memslot && memslot->dirty_bitmap) {
		if (memslot && kvm_slot_dirty_track_enabled(memslot)) {
		unsigned long rel_gfn = gfn - memslot->base_gfn;
		u32 slot = (memslot->as_id << 16) \| memslot->id;

Admin message