2020-07-08 19:35:17

by Peter Xu

Subject: [PATCH v11 01/13] KVM: Cache as_id in kvm_memory_slot

Cache the address space ID just like the slot ID. It will be used in
order to fill in the dirty ring entries.

Suggested-by: Paolo Bonzini <[email protected]>
Suggested-by: Sean Christopherson <[email protected]>
Signed-off-by: Peter Xu <[email protected]>
---
include/linux/kvm_host.h | 1 +
virt/kvm/kvm_main.c | 6 ++++++
2 files changed, 7 insertions(+)

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 9edc6fc71a89..346ee5905359 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -346,6 +346,7 @@ struct kvm_memory_slot {
unsigned long userspace_addr;
u32 flags;
short id;
+ u16 as_id;
};

static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index a852af5c3214..62b7d537e179 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1191,6 +1191,11 @@ static int kvm_delete_memslot(struct kvm *kvm,

memset(&new, 0, sizeof(new));
new.id = old->id;
+ /*
+ * This is only for debugging purpose; it should never be referenced
+ * for a removed memslot.
+ */
+ new.as_id = as_id;

r = kvm_set_memslot(kvm, mem, old, &new, as_id, KVM_MR_DELETE);
if (r)
@@ -1257,6 +1262,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
if (!mem->memory_size)
return kvm_delete_memslot(kvm, mem, &old, as_id);

+ new.as_id = as_id;
new.id = id;
new.base_gfn = mem->guest_phys_addr >> PAGE_SHIFT;
new.npages = mem->memory_size >> PAGE_SHIFT;
--
2.26.2

2020-07-23 00:30:29

by Sean Christopherson

Subject: Re: [PATCH v11 01/13] KVM: Cache as_id in kvm_memory_slot

On Wed, Jul 08, 2020 at 03:33:56PM -0400, Peter Xu wrote:
> Cache the address space ID just like the slot ID. It will be used in
> order to fill in the dirty ring entries.
>
> Suggested-by: Paolo Bonzini <[email protected]>
> Suggested-by: Sean Christopherson <[email protected]>
> Signed-off-by: Peter Xu <[email protected]>
> ---

Reviewed-by: Sean Christopherson <[email protected]>