Skip to contentSkip to conversation

Large page fixes

PATCH In review Avi Kivity 2 participants 5 messages Jun 8, 2009 KVM

lore
Share & tools
lore

Avi Kivity

author
#0 lore raw

cover Large page fixes

Couple of random large page fixes for review.

Avi Kivity (2):
KVM: Disable large pages on misaligned memory slots
KVM: Prevent overflow in largepages calculation

 virt/kvm/kvm_main.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
author
#1 lore raw

PATCH 1/2 KVM: Disable large pages on misaligned memory slots

If a slots guest physical address and host virtual address unequal (mod large page size), then we would erronously try to back guest large pages with host large pages. Detect this misalignment and diable large page support for the trouble slot.

---
 virt/kvm/kvm_main.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
virt/kvm/kvm_main.c +9 -1
index 9c99307..b9ca73c 100644
@@ -1086,7 +1086,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
 {
 	int r;
 	gfn_t base_gfn;
-	unsigned long npages;
+	unsigned long npages, ugfn;
 	int largepages;
 	unsigned long i;
 	struct kvm_memory_slot *memslot;
@@ -1177,6 +1177,14 @@ int __kvm_set_memory_region(struct kvm *kvm,
 			new.lpage_info[0].write_count = 1;
 		if ((base_gfn+npages) % KVM_PAGES_PER_HPAGE)
 			new.lpage_info[largepages-1].write_count = 1;
+		ugfn = new.userspace_addr >> PAGE_SHIFT;
+		/*
+		 * If the gfn and userspace address are not aligned wrt each
+		 * other, disable large page support for this slot
+		 */
+		if ((base_gfn ^ ugfn) & (KVM_PAGES_PER_HPAGE - 1))
+			for (i = 0; i < largepages; ++i)
+				new.lpage_info[i].write_count = 1;
 	}
 
 	/* Allocate page dirty bitmap if needed */
Signature · 1 line
1.6.0.6
author
#2 lore raw

PATCH 2/2 KVM: Prevent overflow in largepages calculation

In reply to Avi Kivity

If userspace specifies a memory slot that is larger than 8 petabytes, it could overflow the largepages variable.

---
 virt/kvm/kvm_main.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
virt/kvm/kvm_main.c +1 -2
index b9ca73c..669eb4a 100644
@@ -1087,8 +1087,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
 	int r;
 	gfn_t base_gfn;
 	unsigned long npages, ugfn;
-	int largepages;
-	unsigned long i;
+	unsigned long largepages, i;
 	struct kvm_memory_slot *memslot;
 	struct kvm_memory_slot old, new;
 
Signature · 1 line
1.6.0.6
#3 lore raw
In reply to Avi Kivity
Quoted 8 lines · Avi Kivity

Couple of random large page fixes for review.

Avi Kivity (2):
KVM: Disable large pages on misaligned memory slots
KVM: Prevent overflow in largepages calculation

 virt/kvm/kvm_main.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

Looks good, nice catches.

author
#4 lore raw
Quoted 8 lines · Marcelo Tosatti
Quoted 6 lines · Avi Kivity

Couple of random large page fixes for review.

Avi Kivity (2):
KVM: Disable large pages on misaligned memory slots
KVM: Prevent overflow in largepages calculation

Quoted 6 lines
Quoted 3 lines
 virt/kvm/kvm_main.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

Looks good, nice catches.

Thanks for the review, I merged those in.

Signature · 1 line
error compiling committee.c: too many arguments to function