AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

KVM: Cache as_id in kvm_memory_slot

Browse Source 
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 <pbonzini@redhat.com>
Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20201014182700.2888246-7-bgardon@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Xu 2020-10-14 11:26:46 -07:00 committed by Paolo Bonzini
parent 2f2fad0897
commit 9e9eb226b9
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/kvm_host.h
View File

@ -346,6 +346,7 @@ struct kvm_memory_slot {
unsigned long userspace_addr; unsigned long userspace_addr;
u32 flags; u32 flags;
short id; short id;
u16 as_id;
}; };
static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot) static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot)

6
virt/kvm/kvm_main.c
View File

@ -1247,6 +1247,11 @@ static int kvm_delete_memslot(struct kvm *kvm,
memset(&new, 0, sizeof(new)); memset(&new, 0, sizeof(new));
new.id = old->id; 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); r = kvm_set_memslot(kvm, mem, old, &new, as_id, KVM_MR_DELETE);
if (r) if (r)
@ -1313,6 +1318,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
if (!mem->memory_size) if (!mem->memory_size)
return kvm_delete_memslot(kvm, mem, &old, as_id); return kvm_delete_memslot(kvm, mem, &old, as_id);
new.as_id = as_id;
new.id = id; new.id = id;
new.base_gfn = mem->guest_phys_addr >> PAGE_SHIFT; new.base_gfn = mem->guest_phys_addr >> PAGE_SHIFT;
new.npages = mem->memory_size >> PAGE_SHIFT; new.npages = mem->memory_size >> PAGE_SHIFT;