Merge pull request jclulow#2 from richlowe/master

Let invlpg invlpg, walk hash list safely in get_page
richlowe · Sep 11, 2011 · 80e916d · 80e916d
2 parents 4196b23 + 0fc5cf7
commit 80e916d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/kvm_emulate.c b/kvm_emulate.c
@@ -1874,11 +1874,7 @@ emulator_io_permited(struct x86_emulate_ctxt *ctxt,
 int
 emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address)
 {
-#ifdef XXX
 	kvm_mmu_invlpg(vcpu, address);
-#else
-	XXX_KVM_PROBE;
-#endif
 	return (X86EMUL_CONTINUE);
 }
 

diff --git a/kvm_mmu.c b/kvm_mmu.c
@@ -1176,7 +1176,7 @@ kvm_mmu_get_page(struct kvm_vcpu *vcpu, gfn_t gfn, gva_t gaddr, unsigned level,
 	unsigned index;
 	unsigned quadrant;
 	list_t *bucket;
-	struct kvm_mmu_page *sp;
+	struct kvm_mmu_page *sp, *nsp = NULL;
 	struct hlist_node *node, *tmp;
 
 	role = vcpu->arch.mmu.base_role;
@@ -1193,8 +1193,8 @@ kvm_mmu_get_page(struct kvm_vcpu *vcpu, gfn_t gfn, gva_t gaddr, unsigned level,
 	index = kvm_page_table_hashfn(gfn);
 	bucket = &vcpu->kvm->arch.mmu_page_hash[index];
 
-	for (sp = list_head(bucket); sp != NULL;
-	    sp = list_next(bucket, sp)) {
+	for (sp = list_head(bucket); sp != NULL; sp = nsp) {
+		nsp = list_next(bucket, sp);
 		if (sp->gfn == gfn) {
 			if (sp->unsync)
 				if (kvm_sync_page(vcpu, sp))

diff --git a/tools/kvm-xxx.d b/tools/kvm-xxx.d
@@ -10,5 +10,5 @@ kvm-xxx
 tick-10sec
 {
 	printf("%-12s %-40s %-8s %8s\n", "FILE", "FUNCTION", "LINE", "COUNT");
-	printa("%20s %8d %@8d\n", @);
+	printa("%-12s %-40s %-8d %@8d\n", @);
 }