KVM: PPC: Book3S HV: Fix H_CEDE return code for nested guests
Subsystems (2)
PATCH 1/1 KVM: PPC: Book3S HV: Fix H_CEDE return code for nested guests
The h_cede_tm kvm-unit-test currently fails when run inside an L1 guest via the guest/nested hypervisor.
./run-tests.sh -v
...
TESTNAME=h_cede_tm TIMEOUT�s ACCEL= ./powerpc/run powerpc/tm.elf -smp 2,threads=2 -machine cap-htm=on -append "h_cede_tm" FAIL h_cede_tm (2 tests, 1 unexpected failures)
While the test relates to transactional memory instructions, the actual failure is due to the return code of the H_CEDE hypercall, which is reported as 224 instead of 0. This happens even when no TM instructions are issued.
224 is the value placed in r3 to execute a hypercall for H_CEDE, and r3 is where the caller expects the return code to be placed upon return.
In the case of guest running under a nested hypervisor, issuing H_CEDE causes a return from H_ENTER_NESTED. In this case H_CEDE is specially-handled immediately rather than later in kvmppc_pseries_do_hcall() as with most other hcalls, but we forget to set the return code for the caller, hence why kvm-unit-test sees the 224 return code and reports an error.
Guest kernels generally don't check the return value of H_CEDE, so that likely explains why this hasn't caused issues outside of kvm-unit-tests so far.
Fix this by setting r3 to 0 after we finish processing the H_CEDE.
RHBZ: 1778556
--- arch/powerpc/kvm/book3s_hv.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kvm/book3s_hv.c +1 -0
@@ -3616,6 +3616,7 @@ int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit,if (trap =BOOK3S_INTERRUPT_SYSCALL && !vcpu->arch.nested &&kvmppc_get_gpr (vcpu,3 ) =H_CEDE ) {kvmppc_nested_cede (vcpu); +kvmppc_set_gpr (vcpu,3 ,0 ); trap =0 ; } }else {
Signature · 1 line
2.17.1
Quoted 29 lines · Michael Roth
The
h_cede_tmkvm-unit-test currently fails when run inside an L1 guest via the guest/nested hypervisor../run-tests.sh -v
...
TESTNAME=h_cede_tm TIMEOUT=90s ACCEL= ./powerpc/run powerpc/tm.elf -smp 2,threads=2 -machine cap-htm=on -append "h_cede_tm" FAILh_cede_tm(2 tests, 1 unexpected failures)While the test relates to transactional memory instructions, the actual failure is due to the return code of the
H_CEDEhypercall, which is reported as 224 instead of 0. This happens even when no TM instructions are issued.224 is the value placed in r3 to execute a hypercall for
H_CEDE, and r3 is where the caller expects the return code to be placed upon return.In the case of guest running under a nested hypervisor, issuing
H_CEDEcauses a return fromH_ENTER_NESTED. In this caseH_CEDEis specially-handled immediately rather than later inkvmppc_pseries_do_hcall()as with most other hcalls, but we forget to set the return code for the caller, hence why kvm-unit-test sees the 224 return code and reports an error.Guest kernels generally don't check the return value of
H_CEDE, so that likely explains why this hasn't caused issues outside of kvm-unit-tests so far.Fix this by setting r3 to 0 after we finish processing the
H_CEDE.
Quoted 7 lines
RHBZ: 1778556
Fixes 4bad77799fed ("KVM: PPC: Book3S HV: Handle hypercalls correctly when nested")Cc David Gibson <[email protected]>Cc Paul Mackerras <[email protected]>Signed-off-by Michael Roth <[email protected]>
Quoted 16 lines
--- arch/powerpc/kvm/book3s_hv.c | 1 + 1 file changed, 1 insertion(+)arch/powerpc/kvm/book3s_hv.c +1
-0@@ -3616,6 +3616,7 @@ int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit,if (trap ==BOOK3S_INTERRUPT_SYSCALL && !vcpu->arch.nested &&kvmppc_get_gpr (vcpu,3 ) ==H_CEDE ) {kvmppc_nested_cede (vcpu); +kvmppc_set_gpr (vcpu,3 ,0 ); trap =0 ; } }else {
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Paul Mackerras
AppliedQuoted 29 lines · Michael Roth
The
h_cede_tmkvm-unit-test currently fails when run inside an L1 guest via the guest/nested hypervisor../run-tests.sh -v
...
TESTNAME=h_cede_tm TIMEOUT�s ACCEL= ./powerpc/run powerpc/tm.elf -smp 2,threads=2 -machine cap-htm=on -append "h_cede_tm" FAILh_cede_tm(2 tests, 1 unexpected failures)While the test relates to transactional memory instructions, the actual failure is due to the return code of the
H_CEDEhypercall, which is reported as 224 instead of 0. This happens even when no TM instructions are issued.224 is the value placed in r3 to execute a hypercall for
H_CEDE, and r3 is where the caller expects the return code to be placed upon return.In the case of guest running under a nested hypervisor, issuing
H_CEDEcauses a return fromH_ENTER_NESTED. In this caseH_CEDEis specially-handled immediately rather than later inkvmppc_pseries_do_hcall()as with most other hcalls, but we forget to set the return code for the caller, hence why kvm-unit-test sees the 224 return code and reports an error.Guest kernels generally don't check the return value of
H_CEDE, so that likely explains why this hasn't caused issues outside of kvm-unit-tests so far.Fix this by setting r3 to 0 after we finish processing the
H_CEDE.
Quoted 7 lines
RHBZ: 1778556
Fixes 4bad77799fed ("KVM: PPC: Book3S HV: Handle hypercalls correctly when nested")Cc David Gibson <[email protected]>Cc Paul Mackerras <[email protected]>Signed-off-by Michael Roth <[email protected]>
Thanks, applied to my kvm-ppc-next branch.
Paul.