Skip to contentSkip to conversation

KVM: PPC: Allocate vcpu struct using vmalloc

PATCH Applied Alexander Graf 3 participants 4 messages Feb 19, 2010 – Feb 21, 2010 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KVM: PPC: Allocate vcpu struct using vmalloc

We used to use get_free_pages to allocate our vcpu struct. Unfortunately that call failed on me several times after my machine had a big enough uptime, as memory became too fragmented by then.

Fortunately, we don't need it to be page aligned any more! We can just vmalloc it and everything's great.

---
 arch/powerpc/kvm/book3s.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
arch/powerpc/kvm/book3s.c +3 -4
index f842d1d..794c94b 100644
@@ -1110,8 +1110,7 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 	struct kvm_vcpu *vcpu;
 	int err;
 
-	vcpu_book3s = (struct kvmppc_vcpu_book3s *)__get_free_pages( GFP_KERNEL | __GFP_ZERO,
-			get_order(sizeof(struct kvmppc_vcpu_book3s)));
+	vcpu_book3s = vmalloc(sizeof(struct kvmppc_vcpu_book3s));
 	if (!vcpu_book3s) {
 		err = -ENOMEM;
 		goto out;
@@ -1149,7 +1148,7 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 	return vcpu;
 
 free_vcpu:
-	free_pages((long)vcpu_book3s, get_order(sizeof(struct kvmppc_vcpu_book3s)));
+	vfree(vcpu_book3s);
 out:
 	return ERR_PTR(err);
 }
@@ -1160,7 +1159,7 @@ void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)
 
 	__destroy_context(vcpu_book3s->context_id);
 	kvm_vcpu_uninit(vcpu);
-	free_pages((long)vcpu_book3s, get_order(sizeof(struct kvmppc_vcpu_book3s)));
+	vfree(vcpu_book3s);
 }
 
 extern int __kvmppc_vcpu_entry(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu);
Signature · 1 line
1.6.0.2

A message that is not in the archive (sent off-list or not yet received): 1266578673-32254-1-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org

Applied
#2 lore raw
Quoted 7 lines · Alexander Graf

We used to use get_free_pages to allocate our vcpu struct. Unfortunately that call failed on me several times after my machine had a big enough uptime, as memory became too fragmented by then.

Fortunately, we don't need it to be page aligned any more! We can just vmalloc it and everything's great.

Applied, thanks.

We have the same problem in x86 (though never observed it in practice); my plan there is to split the various structure so they take less than a page.

Signature · 1 line
error compiling committee.c: too many arguments to function
#3 lore raw
In reply to Alexander Graf
Quoted 5 lines · Avi Kivity
Quoted 4 lines · Alexander Graf

We used to use get_free_pages to allocate our vcpu struct. Unfortunately that call failed on me several times after my machine had a big enough uptime, as memory became too fragmented by then.

Quoted 7 lines
Quoted 3 lines

Fortunately, we don't need it to be page aligned any more! We can just vmalloc it and everything's great.

Applied, thanks.

We have the same problem in x86 (though never observed it in practice); my plan there is to split the various structure so they take less than a page.

That was my original idea too, but then I looked over the code again and realized that I never need to access the vcpu struct from critical sections, as we moved everything we need there to the PACA.

I also did experience it several times on PPC. But then again, I'm fairly sure the Book3S vcpu struct is a _lot_ larger than the average x86 vcpu struct ;-). I'd need to actually measure it up, but I'm pretty sure it's > 64k.

Alex

#4 lore raw
In reply to Alexander Graf
Quoted 13 lines · Alexander Graf
Quoted 10 lines · Avi Kivity
Quoted 8 lines · Alexander Graf

We used to use get_free_pages to allocate our vcpu struct. Unfortunately that call failed on me several times after my machine had a big enough uptime, as memory became too fragmented by then.

Fortunately, we don't need it to be page aligned any more! We can just vmalloc it and everything's great.

Quoted 8 lines
Quoted 4 lines

Applied, thanks.

We have the same problem in x86 (though never observed it in practice); my plan there is to split the various structure so they take less than a page.

That was my original idea too, but then I looked over the code again and realized that I never need to access the vcpu struct from critical sections, as we moved everything we need there to the PACA.

I also did experience it several times on PPC. But then again, I'm fairly sure the Book3S vcpu struct is a _lot_ larger than the average x86 vcpu struct ;-). I'd need to actually measure it up, but I'm pretty sure it's> 64k.

Right, x86 is around 8k, which is the thread stack size, and if we can't allocate that we're really dead.

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