KVM: introduce id_to_memslot function

Introduce id_to_memslot to get memslot by slot id Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>

KVM: introduce id_to_memslot function
Introduce id_to_memslot to get memslot by slot id Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Xiao Guangrong · Avi Kivity
1 parent be6ba0f096
Showing 6 changed files with 30 additions and 17 deletions Side-by-side Diff
arch/ia64/kvm/kvm-ia64.c
arch/powerpc/kvm/book3s.c
arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c
include/linux/kvm_host.h
virt/kvm/kvm_main.c
@@ -1818,7 +1818,7 @@
 	if (log->slot >= KVM_MEMORY_SLOTS)
 		goto out;
  
-	memslot = &kvm->memslots->memslots[log->slot];
+	memslot = id_to_memslot(kvm->memslots, log->slot);
 	r = -ENOENT;
 	if (!memslot->dirty_bitmap)
 		goto out;
@@ -498,7 +498,7 @@
  
 	/* If nothing is dirty, don't bother messing with page tables. */
 	if (is_dirty) {
-		memslot = &kvm->memslots->memslots[log->slot];
+		memslot = id_to_memslot(kvm->memslots, log->slot);
  
 		ga = memslot->base_gfn << PAGE_SHIFT;
 		ga_end = ga + (memslot->npages << PAGE_SHIFT);
@@ -2711,11 +2711,13 @@
 {
 	if (!kvm->arch.tss_addr) {
 		struct kvm_memslots *slots;
+		struct kvm_memory_slot *slot;
 		gfn_t base_gfn;
  
 		slots = kvm_memslots(kvm);
-		base_gfn = slots->memslots[0].base_gfn +
-				 kvm->memslots->memslots[0].npages - 3;
+		slot = id_to_memslot(slots, 0);
+		base_gfn = slot->base_gfn + slot->npages - 3;
+
 		return base_gfn << PAGE_SHIFT;
 	}
 	return kvm->arch.tss_addr;
@@ -3520,7 +3520,7 @@
 	if (log->slot >= KVM_MEMORY_SLOTS)
 		goto out;
  
-	memslot = &kvm->memslots->memslots[log->slot];
+	memslot = id_to_memslot(kvm->memslots, log->slot);
 	r = -ENOENT;
 	if (!memslot->dirty_bitmap)
 		goto out;
  
  
  
  
@@ -3531,27 +3531,27 @@
 	/* If nothing is dirty, don't bother messing with page tables. */
 	if (nr_dirty_pages) {
 		struct kvm_memslots *slots, *old_slots;
-		unsigned long *dirty_bitmap;
+		unsigned long *dirty_bitmap, *dirty_bitmap_head;
  
-		dirty_bitmap = memslot->dirty_bitmap_head;
-		if (memslot->dirty_bitmap == dirty_bitmap)
-			dirty_bitmap += n / sizeof(long);
-		memset(dirty_bitmap, 0, n);
+		dirty_bitmap = memslot->dirty_bitmap;
+		dirty_bitmap_head = memslot->dirty_bitmap_head;
+		if (dirty_bitmap == dirty_bitmap_head)
+			dirty_bitmap_head += n / sizeof(long);
+		memset(dirty_bitmap_head, 0, n);
  
 		r = -ENOMEM;
 		slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);
 		if (!slots)
 			goto out;
 		memcpy(slots, kvm->memslots, sizeof(struct kvm_memslots));
-		memslot = &slots->memslots[log->slot];
-		memslot->dirty_bitmap = dirty_bitmap;
+		memslot = id_to_memslot(slots, log->slot);
 		memslot->nr_dirty_pages = 0;
+		memslot->dirty_bitmap = dirty_bitmap_head;
 		update_memslots(slots, NULL);
  
 		old_slots = kvm->memslots;
 		rcu_assign_pointer(kvm->memslots, slots);
 		synchronize_srcu_expedited(&kvm->srcu);
-		dirty_bitmap = old_slots->memslots[log->slot].dirty_bitmap;
 		kfree(old_slots);
  
 		write_protect_slot(kvm, memslot, dirty_bitmap, nr_dirty_pages);
@@ -333,6 +333,12 @@
 			|| lockdep_is_held(&kvm->slots_lock));
 }
  
+static inline struct kvm_memory_slot *
+id_to_memslot(struct kvm_memslots *slots, int id)
+{
+	return &slots->memslots[id];
+}
+
 #define HPA_MSB ((sizeof(hpa_t) * 8) - 1)
 #define HPA_ERR_MASK ((hpa_t)1 << HPA_MSB)
 static inline int is_error_hpa(hpa_t hpa) { return hpa >> HPA_MSB; }
@@ -634,8 +634,9 @@
 {
 	if (new) {
 		int id = new->id;
+		struct kvm_memory_slot *old = id_to_memslot(slots, id);
  
-		slots->memslots[id] = *new;
+		*old = *new;
 		if (id >= slots->nmemslots)
 			slots->nmemslots = id + 1;
 	}
@@ -681,7 +682,7 @@
 	if (mem->guest_phys_addr + mem->memory_size < mem->guest_phys_addr)
 		goto out;
  
-	memslot = &kvm->memslots->memslots[mem->slot];
+	memslot = id_to_memslot(kvm->memslots, mem->slot);
 	base_gfn = mem->guest_phys_addr >> PAGE_SHIFT;
 	npages = mem->memory_size >> PAGE_SHIFT;
  
  
@@ -788,12 +789,16 @@
 #endif /* not defined CONFIG_S390 */
  
 	if (!npages) {
+		struct kvm_memory_slot *slot;
+
 		r = -ENOMEM;
 		slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),
 				GFP_KERNEL);
 		if (!slots)
 			goto out_free;
-		slots->memslots[mem->slot].flags |= KVM_MEMSLOT_INVALID;
+		slot = id_to_memslot(slots, mem->slot);
+		slot->flags |= KVM_MEMSLOT_INVALID;
+
 		update_memslots(slots, NULL);
  
 		old_memslots = kvm->memslots;
@@ -897,7 +902,7 @@
 	if (log->slot >= KVM_MEMORY_SLOTS)
 		goto out;
  
-	memslot = &kvm->memslots->memslots[log->slot];
+	memslot = id_to_memslot(kvm->memslots, log->slot);
 	r = -ENOENT;
 	if (!memslot->dirty_bitmap)
 		goto out;
...	...	@@ -1818,7 +1818,7 @@
1818	1818	if (log->slot >= KVM_MEMORY_SLOTS)
1819	1819	goto out;
1820	1820
1821		- memslot = &kvm->memslots->memslots[log->slot];
	1821	+ memslot = id_to_memslot(kvm->memslots, log->slot);
1822	1822	r = -ENOENT;
1823	1823	if (!memslot->dirty_bitmap)
1824	1824	goto out;
...	...	@@ -498,7 +498,7 @@
498	498
499	499	/* If nothing is dirty, don't bother messing with page tables. */
500	500	if (is_dirty) {
501		- memslot = &kvm->memslots->memslots[log->slot];
	501	+ memslot = id_to_memslot(kvm->memslots, log->slot);
502	502
503	503	ga = memslot->base_gfn << PAGE_SHIFT;
504	504	ga_end = ga + (memslot->npages << PAGE_SHIFT);
...	...	@@ -2711,11 +2711,13 @@
2711	2711	{
2712	2712	if (!kvm->arch.tss_addr) {
2713	2713	struct kvm_memslots *slots;
	2714	+ struct kvm_memory_slot *slot;
2714	2715	gfn_t base_gfn;
2715	2716
2716	2717	slots = kvm_memslots(kvm);
2717		- base_gfn = slots->memslots[0].base_gfn +
2718		- kvm->memslots->memslots[0].npages - 3;
	2718	+ slot = id_to_memslot(slots, 0);
	2719	+ base_gfn = slot->base_gfn + slot->npages - 3;
	2720	+
2719	2721	return base_gfn << PAGE_SHIFT;
2720	2722	}
2721	2723	return kvm->arch.tss_addr;
...	...	@@ -3520,7 +3520,7 @@
3520	3520	if (log->slot >= KVM_MEMORY_SLOTS)
3521	3521	goto out;
3522	3522
3523		- memslot = &kvm->memslots->memslots[log->slot];
	3523	+ memslot = id_to_memslot(kvm->memslots, log->slot);
3524	3524	r = -ENOENT;
3525	3525	if (!memslot->dirty_bitmap)
3526	3526	goto out;
3527	3527
3528	3528
3529	3529
3530	3530
...	...	@@ -3531,27 +3531,27 @@
3531	3531	/* If nothing is dirty, don't bother messing with page tables. */
3532	3532	if (nr_dirty_pages) {
3533	3533	struct kvm_memslots slots, old_slots;
3534		- unsigned long *dirty_bitmap;
	3534	+ unsigned long dirty_bitmap, dirty_bitmap_head;
3535	3535
3536		- dirty_bitmap = memslot->dirty_bitmap_head;
3537		- if (memslot->dirty_bitmap == dirty_bitmap)
3538		- dirty_bitmap += n / sizeof(long);
3539		- memset(dirty_bitmap, 0, n);
	3536	+ dirty_bitmap = memslot->dirty_bitmap;
	3537	+ dirty_bitmap_head = memslot->dirty_bitmap_head;
	3538	+ if (dirty_bitmap == dirty_bitmap_head)
	3539	+ dirty_bitmap_head += n / sizeof(long);
	3540	+ memset(dirty_bitmap_head, 0, n);
3540	3541
3541	3542	r = -ENOMEM;
3542	3543	slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);
3543	3544	if (!slots)
3544	3545	goto out;
3545	3546	memcpy(slots, kvm->memslots, sizeof(struct kvm_memslots));
3546		- memslot = &slots->memslots[log->slot];
3547		- memslot->dirty_bitmap = dirty_bitmap;
	3547	+ memslot = id_to_memslot(slots, log->slot);
3548	3548	memslot->nr_dirty_pages = 0;
	3549	+ memslot->dirty_bitmap = dirty_bitmap_head;
3549	3550	update_memslots(slots, NULL);
3550	3551
3551	3552	old_slots = kvm->memslots;
3552	3553	rcu_assign_pointer(kvm->memslots, slots);
3553	3554	synchronize_srcu_expedited(&kvm->srcu);
3554		- dirty_bitmap = old_slots->memslots[log->slot].dirty_bitmap;
3555	3555	kfree(old_slots);
3556	3556
3557	3557	write_protect_slot(kvm, memslot, dirty_bitmap, nr_dirty_pages);
...	...	@@ -333,6 +333,12 @@
333	333	\|\| lockdep_is_held(&kvm->slots_lock));
334	334	}
335	335
	336	+static inline struct kvm_memory_slot *
	337	+id_to_memslot(struct kvm_memslots *slots, int id)
	338	+{
	339	+ return &slots->memslots[id];
	340	+}
	341	+
336	342	#define HPA_MSB ((sizeof(hpa_t) * 8) - 1)
337	343	#define HPA_ERR_MASK ((hpa_t)1 << HPA_MSB)
338	344	static inline int is_error_hpa(hpa_t hpa) { return hpa >> HPA_MSB; }
...	...	@@ -634,8 +634,9 @@
634	634	{
635	635	if (new) {
636	636	int id = new->id;
	637	+ struct kvm_memory_slot *old = id_to_memslot(slots, id);
637	638
638		- slots->memslots[id] = *new;
	639	+ old = new;
639	640	if (id >= slots->nmemslots)
640	641	slots->nmemslots = id + 1;
641	642	}
...	...	@@ -681,7 +682,7 @@
681	682	if (mem->guest_phys_addr + mem->memory_size < mem->guest_phys_addr)
682	683	goto out;
683	684
684		- memslot = &kvm->memslots->memslots[mem->slot];
	685	+ memslot = id_to_memslot(kvm->memslots, mem->slot);
685	686	base_gfn = mem->guest_phys_addr >> PAGE_SHIFT;
686	687	npages = mem->memory_size >> PAGE_SHIFT;
687	688
688	689
...	...	@@ -788,12 +789,16 @@
788	789	#endif /* not defined CONFIG_S390 */
789	790
790	791	if (!npages) {
	792	+ struct kvm_memory_slot *slot;
	793	+
791	794	r = -ENOMEM;
792	795	slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),
793	796	GFP_KERNEL);
794	797	if (!slots)
795	798	goto out_free;
796		- slots->memslots[mem->slot].flags \|= KVM_MEMSLOT_INVALID;
	799	+ slot = id_to_memslot(slots, mem->slot);
	800	+ slot->flags \|= KVM_MEMSLOT_INVALID;
	801	+
797	802	update_memslots(slots, NULL);
798	803
799	804	old_memslots = kvm->memslots;
...	...	@@ -897,7 +902,7 @@
897	902	if (log->slot >= KVM_MEMORY_SLOTS)
898	903	goto out;
899	904
900		- memslot = &kvm->memslots->memslots[log->slot];
	905	+ memslot = id_to_memslot(kvm->memslots, log->slot);
901	906	r = -ENOENT;
902	907	if (!memslot->dirty_bitmap)
903	908	goto out;