From: "Cédric Le Goater" <clg@kaod.org>
To: David Gibson <david@gibson.dropbear.id.au>,
qemu-devel@nongnu.org, groug@kaod.org, philmd@redhat.com
Cc: aik@ozlabs.ru, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
qemu-ppc@nongnu.org, lvivier@redhat.com, paulus@samba.org
Subject: Re: [PATCH v2 03/10] target/ppc: Correct handling of real mode accesses with vhyp on hash MMU
Date: Tue, 14 Jan 2020 11:22:59 +0100 [thread overview]
Message-ID: <6452c163-b2e4-ab9f-3117-4a19aad3e04e@kaod.org> (raw)
In-Reply-To: <20200107044827.471355-4-david@gibson.dropbear.id.au>
On 1/7/20 5:48 AM, David Gibson wrote:
> On ppc we have the concept of virtual hypervisor ("vhyp") mode, where we
> only model the non-hypervisor-privileged parts of the cpu. Essentially we
> model the hypervisor's behaviour from the point of view of a guest OS, but
> we don't model the hypervisor's execution.
>
> In particular, in this mode, qemu's notion of target physical address is
> a guest physical address from the vcpu's point of view. So accesses in
> guest real mode don't require translation. If we were modelling the
> hypervisor mode, we'd need to translate the guest physical address into
> a host physical address.
>
> Currently, we handle this sloppily: we rely on setting up the virtual LPCR
> and RMOR registers so that GPAs are simply HPAs plus an offset, which we
> set to zero. This is already conceptually dubious, since the LPCR and RMOR
> registers don't exist in the non-hypervisor portion of the CPU. It gets
> worse with POWER9, where RMOR and LPCR[VPM0] no longer exist at all.
>
> Clean this up by explicitly handling the vhyp case. While we're there,
> remove some unnecessary nesting of if statements that made the logic to
> select the correct real mode behaviour a bit less clear than it could be.
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
I went through the changes and they look correct to me.
Reviewed-by: Cédric Le Goater <clg@kaod.org>
C.
> ---
> target/ppc/mmu-hash64.c | 60 ++++++++++++++++++++++++-----------------
> 1 file changed, 35 insertions(+), 25 deletions(-)
>
> diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
> index a881876647..5fabd93c92 100644
> --- a/target/ppc/mmu-hash64.c
> +++ b/target/ppc/mmu-hash64.c
> @@ -789,27 +789,30 @@ int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
> */
> raddr = eaddr & 0x0FFFFFFFFFFFFFFFULL;
>
> - /* In HV mode, add HRMOR if top EA bit is clear */
> - if (msr_hv || !env->has_hv_mode) {
> + if (cpu->vhyp) {
> + /*
> + * In virtual hypervisor mode, there's nothing to do:
> + * EA == GPA == qemu guest address
> + */
> + } else if (msr_hv || !env->has_hv_mode) {
> + /* In HV mode, add HRMOR if top EA bit is clear */
> if (!(eaddr >> 63)) {
> raddr |= env->spr[SPR_HRMOR];
> }
> - } else {
> - /* Otherwise, check VPM for RMA vs VRMA */
> - if (env->spr[SPR_LPCR] & LPCR_VPM0) {
> - slb = &env->vrma_slb;
> - if (slb->sps) {
> - goto skip_slb_search;
> - }
> - /* Not much else to do here */
> + } else if (env->spr[SPR_LPCR] & LPCR_VPM0) {
> + /* Emulated VRMA mode */
> + slb = &env->vrma_slb;
> + if (!slb->sps) {
> + /* Invalid VRMA setup, machine check */
> cs->exception_index = POWERPC_EXCP_MCHECK;
> env->error_code = 0;
> return 1;
> - } else if (raddr < env->rmls) {
> - /* RMA. Check bounds in RMLS */
> - raddr |= env->spr[SPR_RMOR];
> - } else {
> - /* The access failed, generate the approriate interrupt */
> + }
> +
> + goto skip_slb_search;
> + } else {
> + /* Emulated old-style RMO mode, bounds check against RMLS */
> + if (raddr >= env->rmls) {
> if (rwx == 2) {
> ppc_hash64_set_isi(cs, SRR1_PROTFAULT);
> } else {
> @@ -821,6 +824,8 @@ int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
> }
> return 1;
> }
> +
> + raddr |= env->spr[SPR_RMOR];
> }
> tlb_set_page(cs, eaddr & TARGET_PAGE_MASK, raddr & TARGET_PAGE_MASK,
> PAGE_READ | PAGE_WRITE | PAGE_EXEC, mmu_idx,
> @@ -953,22 +958,27 @@ hwaddr ppc_hash64_get_phys_page_debug(PowerPCCPU *cpu, target_ulong addr)
> /* In real mode the top 4 effective address bits are ignored */
> raddr = addr & 0x0FFFFFFFFFFFFFFFULL;
>
> - /* In HV mode, add HRMOR if top EA bit is clear */
> - if ((msr_hv || !env->has_hv_mode) && !(addr >> 63)) {
> + if (cpu->vhyp) {
> + /*
> + * In virtual hypervisor mode, there's nothing to do:
> + * EA == GPA == qemu guest address
> + */
> + return raddr;
> + } else if ((msr_hv || !env->has_hv_mode) && !(addr >> 63)) {
> + /* In HV mode, add HRMOR if top EA bit is clear */
> return raddr | env->spr[SPR_HRMOR];
> - }
> -
> - /* Otherwise, check VPM for RMA vs VRMA */
> - if (env->spr[SPR_LPCR] & LPCR_VPM0) {
> + } else if (env->spr[SPR_LPCR] & LPCR_VPM0) {
> + /* Emulated VRMA mode */
> slb = &env->vrma_slb;
> if (!slb->sps) {
> return -1;
> }
> - } else if (raddr < env->rmls) {
> - /* RMA. Check bounds in RMLS */
> - return raddr | env->spr[SPR_RMOR];
> } else {
> - return -1;
> + /* Emulated old-style RMO mode, bounds check against RMLS */
> + if (raddr >= env->rmls) {
> + return -1;
> + }
> + return raddr | env->spr[SPR_RMOR];
> }
> } else {
> slb = slb_lookup(cpu, addr);
>
next prev parent reply other threads:[~2020-01-14 10:25 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 4:48 [PATCH v2 00/10] target/ppc: Correct some errors with real mode handling David Gibson
2020-01-07 4:48 ` [PATCH v2 01/10] ppc: Drop PPC_EMULATE_32BITS_HYPV stub David Gibson
2020-01-07 12:52 ` Cédric Le Goater
2020-01-07 17:05 ` Greg Kurz
2020-01-07 4:48 ` [PATCH v2 02/10] ppc: Remove stub of PPC970 HID4 implementation David Gibson
2020-01-07 12:51 ` Cédric Le Goater
2020-01-07 17:32 ` Greg Kurz
2020-01-07 17:36 ` Greg Kurz
2020-01-07 18:05 ` BALATON Zoltan
2020-01-08 1:09 ` David Gibson
2020-01-08 8:29 ` Thomas Huth
2020-01-08 1:08 ` David Gibson
2020-01-08 8:11 ` Greg Kurz
2020-01-08 2:17 ` Paul Mackerras
2020-01-08 13:35 ` Greg Kurz
2020-01-07 4:48 ` [PATCH v2 03/10] target/ppc: Correct handling of real mode accesses with vhyp on hash MMU David Gibson
2020-01-14 10:22 ` Cédric Le Goater [this message]
2020-01-07 4:48 ` [PATCH v2 04/10] target/ppc: Introduce ppc_hash64_use_vrma() helper David Gibson
2020-01-07 13:24 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 05/10] spapr, ppc: Remove VPM0/RMLS hacks for POWER9 David Gibson
2020-01-07 14:35 ` Cédric Le Goater
2020-01-09 7:33 ` Alexey Kardashevskiy
2020-01-13 3:38 ` David Gibson
2020-01-07 4:48 ` [PATCH v2 06/10] target/ppc: Remove RMOR register from POWER9 & POWER10 David Gibson
2020-01-07 13:39 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 07/10] target/ppc: Use class fields to simplify LPCR masking David Gibson
2020-01-07 13:41 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 08/10] target/ppc: Streamline calculation of RMA limit from LPCR[RMLS] David Gibson
2020-01-07 13:43 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 09/10] target/ppc: Correct RMLS table David Gibson
2020-01-07 14:21 ` Cédric Le Goater
2020-01-08 1:06 ` David Gibson
2020-01-08 8:29 ` Cédric Le Goater
2020-01-09 7:46 ` Alexey Kardashevskiy
2020-01-13 3:46 ` David Gibson
2020-01-08 8:28 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 10/10] target/ppc: Only calculate RMLS derived RMA limit on demand David Gibson
2020-01-08 8:31 ` Cédric Le Goater
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=6452c163-b2e4-ab9f-3117-4a19aad3e04e@kaod.org \
--to=clg@kaod.org \
--cc=aik@ozlabs.ru \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=lvivier@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=paulus@samba.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).