Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

KVM: introduce update_memslots function

Browse source 
Introduce update_memslots to update slot which will be update to
kvm->memslots

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Xiao Guangrong 2011-11-24 17:38:24 +08:00 • committed by Avi Kivity
parent 93a5cef07d
commit be593d6286
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/kvm/x86.c
View file

@ -3546,7 +3546,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
memslot = &slots->memslots[log->slot]; memslot = &slots->memslots[log->slot];
memslot->dirty_bitmap = dirty_bitmap; memslot->dirty_bitmap = dirty_bitmap;
memslot->nr_dirty_pages = 0; memslot->nr_dirty_pages = 0;
slots->generation++; update_memslots(slots, NULL);
old_slots = kvm->memslots; old_slots = kvm->memslots;
rcu_assign_pointer(kvm->memslots, slots); rcu_assign_pointer(kvm->memslots, slots);

1
include/linux/kvm_host.h
View file

@ -320,6 +320,7 @@ void kvm_exit(void);
void kvm_get_kvm(struct kvm *kvm); void kvm_get_kvm(struct kvm *kvm);
void kvm_put_kvm(struct kvm *kvm); void kvm_put_kvm(struct kvm *kvm);
void update_memslots(struct kvm_memslots *slots, struct kvm_memory_slot *new);
static inline struct kvm_memslots *kvm_memslots(struct kvm *kvm) static inline struct kvm_memslots *kvm_memslots(struct kvm *kvm)
{ {

22
virt/kvm/kvm_main.c
View file

@ -630,6 +630,19 @@ static int kvm_create_dirty_bitmap(struct kvm_memory_slot *memslot)
} }
#endif /* !CONFIG_S390 */ #endif /* !CONFIG_S390 */
void update_memslots(struct kvm_memslots *slots, struct kvm_memory_slot *new)
{
if (new) {
int id = new->id;
slots->memslots[id] = *new;
if (id >= slots->nmemslots)
slots->nmemslots = id + 1;
}
slots->generation++;
}
/* /*
* Allocate some memory and give it an address in the guest physical address * Allocate some memory and give it an address in the guest physical address
* space. * space.
@ -780,10 +793,8 @@ int __kvm_set_memory_region(struct kvm *kvm,
GFP_KERNEL); GFP_KERNEL);
if (!slots) if (!slots)
goto out_free; goto out_free;
if (mem->slot >= slots->nmemslots)
slots->nmemslots = mem->slot + 1;
slots->generation++;
slots->memslots[mem->slot].flags |= KVM_MEMSLOT_INVALID; slots->memslots[mem->slot].flags |= KVM_MEMSLOT_INVALID;
update_memslots(slots, NULL);
old_memslots = kvm->memslots; old_memslots = kvm->memslots;
rcu_assign_pointer(kvm->memslots, slots); rcu_assign_pointer(kvm->memslots, slots);
@ -815,9 +826,6 @@ int __kvm_set_memory_region(struct kvm *kvm,
GFP_KERNEL); GFP_KERNEL);
if (!slots) if (!slots)
goto out_free; goto out_free;
if (mem->slot >= slots->nmemslots)
slots->nmemslots = mem->slot + 1;
slots->generation++;
/* actual memory is freed via old in kvm_free_physmem_slot below */ /* actual memory is freed via old in kvm_free_physmem_slot below */
if (!npages) { if (!npages) {
@ -827,7 +835,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
new.lpage_info[i] = NULL; new.lpage_info[i] = NULL;
} }
slots->memslots[mem->slot] = new; update_memslots(slots, &new);
old_memslots = kvm->memslots; old_memslots = kvm->memslots;
rcu_assign_pointer(kvm->memslots, slots); rcu_assign_pointer(kvm->memslots, slots);
synchronize_srcu_expedited(&kvm->srcu); synchronize_srcu_expedited(&kvm->srcu);