From: David Gibson <david@gibson•dropbear.id.au>
To: Michael Roth <mdroth@linux•vnet.ibm.com>
Cc: linuxppc-dev@ozlabs•org, kvm-ppc@vger•kernel.org
Subject: Re: [PATCH] KVM: PPC: Book3S HV: Fix H_CEDE return code for nested guests
Date: Wed, 11 Mar 2020 10:05:57 +1100 [thread overview]
Message-ID: <20200310230557.GP660117@umbus.fritz.box> (raw)
In-Reply-To: <20200310211128.17672-1-mdroth@linux.vnet.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 2547 bytes --]
On Tue, Mar 10, 2020 at 04:11:28PM -0500, Michael Roth wrote:
> 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=90s 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
>
> Fixes: 4bad77799fed ("KVM: PPC: Book3S HV: Handle hypercalls correctly when nested")
> Cc: linuxppc-dev@ozlabs•org
> Cc: David Gibson <david@gibson•dropbear.id.au>
> Cc: Paul Mackerras <paulus@ozlabs•org>
> Signed-off-by: Michael Roth <mdroth@linux•vnet.ibm.com>
Reviewed-by: David Gibson <david@gibson•dropbear.id.au>
> ---
> arch/powerpc/kvm/book3s_hv.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
> index 2cefd071b848..c0c43a733830 100644
> --- a/arch/powerpc/kvm/book3s_hv.c
> +++ b/arch/powerpc/kvm/book3s_hv.c
> @@ -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 {
--
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-03-10 23:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-10 21:11 [PATCH] KVM: PPC: Book3S HV: Fix H_CEDE return code for nested guests Michael Roth
2020-03-10 23:05 ` David Gibson [this message]
2020-03-19 23:32 ` Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200310230557.GP660117@umbus.fritz.box \
--to=david@gibson$(echo .)dropbear.id.au \
--cc=kvm-ppc@vger$(echo .)kernel.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=mdroth@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox