Merge tag 'kvm-ppc-fixes-4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

rkrcmar · rkrcmar · commit 732b53146ac8 · 2018-09-04T21:12:46.000+02:00
PPC KVM fixes for 4.19

Two small fixes for KVM on POWER machines; one fixes a bug where pages
might not get marked dirty, causing guest memory corruption on migration,
and the other fixes a bug causing reads from guest memory to use the
wrong guest real address for very large HPT guests (&gt;256G of memory),
leading to failures in instruction emulation.
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -358,7 +358,7 @@ static int kvmppc_mmu_book3s_64_hv_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
 	unsigned long pp, key;
 	unsigned long v, orig_v, gr;
 	__be64 *hptep;
-	int index;
+	long int index;
 	int virtmode = vcpu->arch.shregs.msr & (data ? MSR_DR : MSR_IR);
 
 	if (kvm_is_radix(vcpu->kvm))
diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c
@@ -725,10 +725,10 @@ int kvm_unmap_radix(struct kvm *kvm, struct kvm_memory_slot *memslot,
 					      gpa, shift);
 		kvmppc_radix_tlbie_page(kvm, gpa, shift);
 		if ((old & _PAGE_DIRTY) && memslot->dirty_bitmap) {
-			unsigned long npages = 1;
+			unsigned long psize = PAGE_SIZE;
 			if (shift)
-				npages = 1ul << (shift - PAGE_SHIFT);
-			kvmppc_update_dirty_map(memslot, gfn, npages);
+				psize = 1ul << shift;
+			kvmppc_update_dirty_map(memslot, gfn, psize);
 		}
 	}
 	return 0;				

Original file line number	Diff line number	Diff line change
`@@ -725,10 +725,10 @@ int kvm_unmap_radix(struct kvm kvm, struct kvm_memory_slot memslot,`
`725`	`725`	`gpa, shift);`
`726`	`726`	`kvmppc_radix_tlbie_page(kvm, gpa, shift);`
`727`	`727`	`if ((old & _PAGE_DIRTY) && memslot->dirty_bitmap) {`
`728`		`- unsigned long npages = 1;`
	`728`	`+ unsigned long psize = PAGE_SIZE;`
`729`	`729`	`if (shift)`
`730`		`- npages = 1ul << (shift - PAGE_SHIFT);`
`731`		`- kvmppc_update_dirty_map(memslot, gfn, npages);`
	`730`	`+ psize = 1ul << shift;`
	`731`	`+ kvmppc_update_dirty_map(memslot, gfn, psize);`
`732`	`732`	`}`
`733`	`733`	`}`
`734`	`734`	`return 0;`