Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ed7b7e9 authored by Paul Mackerras's avatar Paul Mackerras Committed by Alexander Graf
Browse files

KVM: PPC: Book3S PR: Fix proto-VSID calculations 



This makes sure the calculation of the proto-VSIDs used by PR KVM
is done with 64-bit arithmetic.  Since vcpu3s->context_id[] is int,
when we do vcpu3s->context_id[0] << ESID_BITS the shift will be done
with 32-bit instructions, possibly leading to significant bits
getting lost, as the context id can be up to 524283 and ESID_BITS is
18.  To fix this we cast the context id to u64 before shifting.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 5f17ce8b

arch/powerpc/kvm/book3s_64_mmu_host.c

+2 −2
Original line number Diff line number Diff line
@@ -325,9 +325,9 @@ int kvmppc_mmu_init(struct kvm_vcpu *vcpu) 
		return -1;

	vcpu3s->context_id[0] = err;



	vcpu3s->proto_vsid_max = ((vcpu3s->context_id[0] + 1)

	vcpu3s->proto_vsid_max = ((u64)(vcpu3s->context_id[0] + 1)

				  << ESID_BITS) - 1;

	vcpu3s->proto_vsid_first = vcpu3s->context_id[0] << ESID_BITS;

	vcpu3s->proto_vsid_first = (u64)vcpu3s->context_id[0] << ESID_BITS;

	vcpu3s->proto_vsid_next = vcpu3s->proto_vsid_first;



	kvmppc_mmu_hpte_init(vcpu);