Merge tag 'kvmarm-fixes-6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

bonzini · bonzini · commit 9895ceeb5cd6 · 2024-02-16T12:02:38.000-05:00
KVM/arm64 fixes for 6.8, take #2 - Avoid dropping the page refcount twice when freeing an unlinked page-table subtree.
diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c
@@ -1419,7 +1419,6 @@ kvm_pte_t *kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable *pgt,
 				 level + 1);
 	if (ret) {
 		kvm_pgtable_stage2_free_unlinked(mm_ops, pgtable, level);
-		mm_ops->put_page(pgtable);
 		return ERR_PTR(ret);
 	}
 
@@ -1502,7 +1501,6 @@ static int stage2_split_walker(const struct kvm_pgtable_visit_ctx *ctx,
 
 	if (!stage2_try_break_pte(ctx, mmu)) {
 		kvm_pgtable_stage2_free_unlinked(mm_ops, childp, level);
-		mm_ops->put_page(childp);
 		return -EAGAIN;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1419,7 +1419,6 @@ kvm_pte_t kvm_pgtable_stage2_create_unlinked(struct kvm_pgtable pgt,`
`1419`	`1419`	`level + 1);`
`1420`	`1420`	`if (ret) {`
`1421`	`1421`	`kvm_pgtable_stage2_free_unlinked(mm_ops, pgtable, level);`
`1422`		`- mm_ops->put_page(pgtable);`
`1423`	`1422`	`return ERR_PTR(ret);`
`1424`	`1423`	`}`
`1425`	`1424`
`@@ -1502,7 +1501,6 @@ static int stage2_split_walker(const struct kvm_pgtable_visit_ctx *ctx,`
`1502`	`1501`
`1503`	`1502`	`if (!stage2_try_break_pte(ctx, mmu)) {`
`1504`	`1503`	`kvm_pgtable_stage2_free_unlinked(mm_ops, childp, level);`
`1505`		`- mm_ops->put_page(childp);`
`1506`	`1504`	`return -EAGAIN;`
`1507`	`1505`	`}`
`1508`	`1506`