KVM: PPC: Book3S HV: Initialize AMOR in nested entry
Subsystems (2)
PATCH 1/1 KVM: PPC: Book3S HV: Initialize AMOR in nested entry
The hypervisor always sets AMOR to ~0, but let's ensure we're not passing stale values around.
--- arch/powerpc/kvm/book3s_hv.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kvm/book3s_hv.c +1 -0
@@ -3967,6 +3967,7 @@ static int kvmhv_vcpu_entry_p9_nested(struct kvm_vcpu *vcpu, u64 time_limit, unskvmhv_save_hv_regs (vcpu, &hvregs); hvregs.lpcr = lpcr; + hvregs.amor = ~0 ; vcpu->arch.regs.msr = vcpu->arch.shregs.msr; hvregs.version =HV_GUEST_STATE_VERSION ;if (vcpu->arch.nested) {
Signature · 1 line
2.35.1
Excerpts from Fabiano Rosas's message of April 26, 2022 12:21 am:
Quoted 3 lines
The hypervisor always sets AMOR to ~0, but let's ensure we're not passing stale values around.
Looks like our L0 doesn't do anything with hvregs.amor ?
Thanks,
Nick
Quoted 21 lines
Signed-off-by Fabiano Rosas <[email protected]>--- arch/powerpc/kvm/book3s_hv.c | 1 + 1 file changed, 1 insertion(+)arch/powerpc/kvm/book3s_hv.c +1
-0@@ -3967,6 +3967,7 @@ static int kvmhv_vcpu_entry_p9_nested(struct kvm_vcpu *vcpu, u64 time_limit, unskvmhv_save_hv_regs (vcpu, &hvregs); hvregs.lpcr = lpcr; + hvregs.amor = ~0 ; vcpu->arch.regs.msr = vcpu->arch.shregs.msr; hvregs.version =HV_GUEST_STATE_VERSION ;if (vcpu->arch.nested) {Signature · 1 line
2.35.1
Quoted 8 lines · Nicholas Piggin
Excerpts from Fabiano Rosas's message of April 26, 2022 12:21 am:
Quoted 3 lines
The hypervisor always sets AMOR to ~0, but let's ensure we're not passing stale values around.
Reviewed-by Nicholas Piggin <[email protected]>Looks like our L0 doesn't do anything with hvregs.amor ?
It doesn't. And if the HV ever starts clearing bits from AMOR, then we would need to change any kernel code that writes and reads from AMR ( such as the KUAP) to take into consideration that we might read a different value from what we wrote.
Michael Ellerman
AppliedQuoted 4 lines · Fabiano Rosas
The hypervisor always sets AMOR to ~0, but let's ensure we're not passing stale values around.
Applied to powerpc/topic/ppc-kvm.
[1/1] KVM: PPC: Book3S HV: Initialize AMOR in nested entry
https://git.kernel.org/powerpc/c/1d1cd0f12a3ab5d7f79ae6cca28e7d23dd351ce3
cheers