Skip to content

Commit 05f2bb0

Browse files
committed
KVM: PPC: Book3S HV: Fix handling of secondary HPTEG in HPT resizing code
This fixes the computation of the HPTE index to use when the HPT resizing code encounters a bolted HPTE which is stored in its secondary HPTE group. The code inverts the HPTE group number, which is correct, but doesn't then mask it with new_hash_mask. As a result, new_pteg will be effectively negative, resulting in new_hptep pointing before the new HPT, which will corrupt memory. In addition, this removes two BUG_ON statements. The condition that the BUG_ONs were testing -- that we have computed the hash value incorrectly -- has never been observed in testing, and if it did occur, would only affect the guest, not the host. Given that BUG_ON should only be used in conditions where the kernel (i.e. the host kernel, in this case) can't possibly continue execution, it is not appropriate here. Reviewed-by: David Gibson <[email protected]> Signed-off-by: Paul Mackerras <[email protected]>
1 parent 57ea5f1 commit 05f2bb0

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

arch/powerpc/kvm/book3s_64_mmu_hv.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,12 +1329,8 @@ static unsigned long resize_hpt_rehash_hpte(struct kvm_resize_hpt *resize,
13291329
}
13301330

13311331
new_pteg = hash & new_hash_mask;
1332-
if (vpte & HPTE_V_SECONDARY) {
1333-
BUG_ON(~pteg != (hash & old_hash_mask));
1334-
new_pteg = ~new_pteg;
1335-
} else {
1336-
BUG_ON(pteg != (hash & old_hash_mask));
1337-
}
1332+
if (vpte & HPTE_V_SECONDARY)
1333+
new_pteg = ~hash & new_hash_mask;
13381334

13391335
new_idx = new_pteg * HPTES_PER_GROUP + (idx % HPTES_PER_GROUP);
13401336
new_hptep = (__be64 *)(new->virt + (new_idx << 4));

0 commit comments

Comments
 (0)