Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55BF7C43331 for ; Mon, 30 Mar 2020 14:22:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 17E8E20409 for ; Mon, 30 Mar 2020 14:22:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 17E8E20409 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIvIv-0006hC-TU for qemu-devel@archiver.kernel.org; Mon, 30 Mar 2020 10:22:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55769) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jIvFt-0002AQ-Ax for qemu-devel@nongnu.org; Mon, 30 Mar 2020 10:19:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jIvFq-0005l3-7A for qemu-devel@nongnu.org; Mon, 30 Mar 2020 10:19:07 -0400 Received: from 17.mo1.mail-out.ovh.net ([87.98.179.142]:57996) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jIvFq-0005jR-0Y for qemu-devel@nongnu.org; Mon, 30 Mar 2020 10:19:06 -0400 Received: from player779.ha.ovh.net (unknown [10.108.35.131]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 917FB1B1FB5 for ; Mon, 30 Mar 2020 16:19:03 +0200 (CEST) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player779.ha.ovh.net (Postfix) with ESMTPSA id D1EF910E6690D; Mon, 30 Mar 2020 14:18:56 +0000 (UTC) Date: Mon, 30 Mar 2020 16:18:48 +0200 From: Greg Kurz To: =?UTF-8?B?Q8OpZHJpYw==?= Le Goater Subject: Re: [PATCH 4/7] target/ppc: Introduce ppc_radix64_xlate() for Radix tree translation Message-ID: <20200330161848.27226542@bahia.lan> In-Reply-To: <20200330094946.24678-5-clg@kaod.org> References: <20200330094946.24678-1-clg@kaod.org> <20200330094946.24678-5-clg@kaod.org> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 18435203601739717003 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedugedrudeihedgjeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepfffhvffukfgjfhfogggtgfesthhqfedtredtjeenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecukfhppedtrddtrddtrddtpdekvddrvdehfedrvddtkedrvdegkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrhejjeelrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepghhrohhugheskhgrohgurdhorhhgpdhrtghpthhtohepqhgvmhhuqdguvghvvghlsehnohhnghhnuhdrohhrgh X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 87.98.179.142 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Suraj Jitindar Singh , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Nicholas Piggin , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 30 Mar 2020 11:49:43 +0200 C=C3=A9dric Le Goater wrote: > This is moving code under a new ppc_radix64_xlate() routine shared by > the MMU Radix page fault handler and the get_phys_page_debug PPC > callback. The difference being that get_phys_page_debug does not > generate exceptions. >=20 > The specific part of process-scoped Radix translation is moved under > ppc_radix64_process_scoped_xlate() in preparation of the future > support for partition-scoped Radix translation. >=20 > It should be functionally equivalent. >=20 > Signed-off-by: Suraj Jitindar Singh > Signed-off-by: C=C3=A9dric Le Goater > --- > target/ppc/mmu-radix64.c | 201 ++++++++++++++++++++++----------------- > 1 file changed, 116 insertions(+), 85 deletions(-) >=20 > diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c > index d2422d1c54c9..b4e6abcd2d35 100644 > --- a/target/ppc/mmu-radix64.c > +++ b/target/ppc/mmu-radix64.c > @@ -219,17 +219,119 @@ static bool validate_pate(PowerPCCPU *cpu, uint64_= t lpid, ppc_v3_pate_t *pate) > return true; > } > =20 > +static int ppc_radix64_process_scoped_xlate(PowerPCCPU *cpu, int rwx, > + vaddr eaddr, uint64_t lpid, uint64= _t pid, > + ppc_v3_pate_t pate, hwaddr *g_radd= r, > + int *g_prot, int *g_page_size, > + bool cause_excp) > +{ > + CPUState *cs =3D CPU(cpu); > + uint64_t offset, size, prtbe_addr, prtbe0, pte; > + int fault_cause =3D 0; > + hwaddr pte_addr; > + > + /* Index Process Table by PID to Find Corresponding Process Table En= try */ > + offset =3D pid * sizeof(struct prtb_entry); > + size =3D 1ULL << ((pate.dw1 & PATE1_R_PRTS) + 12); > + if (offset >=3D size) { > + /* offset exceeds size of the process table */ > + if (cause_excp) { > + ppc_radix64_raise_si(cpu, rwx, eaddr, DSISR_NOPTE); > + } > + return 1; > + } > + prtbe_addr =3D (pate.dw1 & PATE1_R_PRTB) + offset; > + prtbe0 =3D ldq_phys(cs->as, prtbe_addr); > + > + /* Walk Radix Tree from Process Table Entry to Convert EA to RA */ > + *g_page_size =3D PRTBE_R_GET_RTS(prtbe0); > + pte =3D ppc_radix64_walk_tree(cpu, eaddr & R_EADDR_MASK, > + prtbe0 & PRTBE_R_RPDB, prtbe0 & PRTBE_R_= RPDS, > + g_raddr, g_page_size, &fault_cause, &pte= _addr); > + > + if (!(pte & R_PTE_VALID) || > + ppc_radix64_check_prot(cpu, rwx, pte, &fault_cause, g_prot)) { Current code checks !pte instead of !(pte & R_PTE_VALID)... and I it seems that ppc_radix64_walk_tree() already handles that: if (!(pde & R_PTE_VALID)) { /* Invalid Entry */ *fault_cause |=3D DSISR_NOPTE; return 0; } > + /* No valid pte or access denied due to protection */ > + if (cause_excp) { > + ppc_radix64_raise_si(cpu, rwx, eaddr, fault_cause); > + } > + return 1; > + } > + > + ppc_radix64_set_rc(cpu, rwx, pte, pte_addr, g_prot); > + > + return 0; > +} > + > +static int ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr, int rwx, > + uint64_t lpid, uint64_t pid, bool relocatio= n, > + hwaddr *raddr, int *psizep, int *protp, > + bool cause_excp) > +{ > + ppc_v3_pate_t pate; > + int psize, prot; > + hwaddr g_raddr; > + > + *psizep =3D INT_MAX; > + *protp =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; > + > + /* Get Process Table */ > + if (cpu->vhyp && lpid =3D=3D 0) { Current code doesn't check lpid =3D=3D 0. Not sure to see what it's for... especially env->spr[SPR_LPIDR] is always 0 with pseries machine types AFAICT... is it even possible to have lpid !=3D 0 here ? Rest LGTM. > + PPCVirtualHypervisorClass *vhc; > + vhc =3D PPC_VIRTUAL_HYPERVISOR_GET_CLASS(cpu->vhyp); > + vhc->get_pate(cpu->vhyp, &pate); > + } else { > + if (!ppc64_v3_get_pate(cpu, lpid, &pate)) { > + if (cause_excp) { > + ppc_radix64_raise_si(cpu, rwx, eaddr, DSISR_NOPTE); > + } > + return 1; > + } > + if (!validate_pate(cpu, lpid, &pate)) { > + if (cause_excp) { > + ppc_radix64_raise_si(cpu, rwx, eaddr, DSISR_R_BADCONFIG); > + } > + return 1; > + } > + /* We don't support guest mode yet */ > + if (lpid !=3D 0) { > + error_report("PowerNV guest support Unimplemented"); > + exit(1); > + } > + } > + > + /* > + * Perform process-scoped translation if relocation enabled. > + * > + * - Translates an effective address to a host real address in > + * quadrants 0 and 3 when HV=3D1. > + */ > + if (relocation) { > + int ret =3D ppc_radix64_process_scoped_xlate(cpu, rwx, eaddr, lp= id, pid, > + pate, &g_raddr, &prot, > + &psize, cause_excp); > + if (ret) { > + return ret; > + } > + *psizep =3D MIN(*psizep, psize); > + *protp &=3D prot; > + } else { > + g_raddr =3D eaddr & R_EADDR_MASK; > + } > + > + *raddr =3D g_raddr; > + return 0; > +} > + > int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr, int rwx, > int mmu_idx) > { > CPUState *cs =3D CPU(cpu); > CPUPPCState *env =3D &cpu->env; > - PPCVirtualHypervisorClass *vhc; > - hwaddr raddr, pte_addr; > - uint64_t lpid =3D 0, pid =3D 0, offset, size, prtbe0, pte; > - int page_size, prot, fault_cause =3D 0; > - ppc_v3_pate_t pate; > + uint64_t lpid =3D 0, pid =3D 0; > + int page_size, prot; > bool relocation; > + hwaddr raddr; > =20 > assert(!(msr_hv && cpu->vhyp)); > assert((rwx =3D=3D 0) || (rwx =3D=3D 1) || (rwx =3D=3D 2)); > @@ -268,48 +370,11 @@ int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, v= addr eaddr, int rwx, > return 1; > } > =20 > - /* Get Process Table */ > - if (cpu->vhyp) { > - vhc =3D PPC_VIRTUAL_HYPERVISOR_GET_CLASS(cpu->vhyp); > - vhc->get_pate(cpu->vhyp, &pate); > - } else { > - if (!ppc64_v3_get_pate(cpu, lpid, &pate)) { > - ppc_radix64_raise_si(cpu, rwx, eaddr, DSISR_NOPTE); > - return 1; > - } > - if (!validate_pate(cpu, lpid, &pate)) { > - ppc_radix64_raise_si(cpu, rwx, eaddr, DSISR_R_BADCONFIG); > - } > - /* We don't support guest mode yet */ > - if (lpid !=3D 0) { > - error_report("PowerNV guest support Unimplemented"); > - exit(1); > - } > - } > - > - /* Index Process Table by PID to Find Corresponding Process Table En= try */ > - offset =3D pid * sizeof(struct prtb_entry); > - size =3D 1ULL << ((pate.dw1 & PATE1_R_PRTS) + 12); > - if (offset >=3D size) { > - /* offset exceeds size of the process table */ > - ppc_radix64_raise_si(cpu, rwx, eaddr, DSISR_NOPTE); > + /* Translate eaddr to raddr (where raddr is addr qemu needs for acce= ss) */ > + if (ppc_radix64_xlate(cpu, eaddr, rwx, lpid, pid, relocation, &raddr, > + &page_size, &prot, 1)) { > return 1; > } > - prtbe0 =3D ldq_phys(cs->as, (pate.dw1 & PATE1_R_PRTB) + offset); > - > - /* Walk Radix Tree from Process Table Entry to Convert EA to RA */ > - page_size =3D PRTBE_R_GET_RTS(prtbe0); > - pte =3D ppc_radix64_walk_tree(cpu, eaddr & R_EADDR_MASK, > - prtbe0 & PRTBE_R_RPDB, prtbe0 & PRTBE_R_= RPDS, > - &raddr, &page_size, &fault_cause, &pte_a= ddr); > - if (!pte || ppc_radix64_check_prot(cpu, rwx, pte, &fault_cause, &pro= t)) { > - /* Couldn't get pte or access denied due to protection */ > - ppc_radix64_raise_si(cpu, rwx, eaddr, fault_cause); > - return 1; > - } > - > - /* Update Reference and Change Bits */ > - ppc_radix64_set_rc(cpu, rwx, pte, pte_addr, &prot); > =20 > tlb_set_page(cs, eaddr & TARGET_PAGE_MASK, raddr & TARGET_PAGE_MASK, > prot, mmu_idx, 1UL << page_size); > @@ -318,16 +383,13 @@ int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, v= addr eaddr, int rwx, > =20 > hwaddr ppc_radix64_get_phys_page_debug(PowerPCCPU *cpu, target_ulong ead= dr) > { > - CPUState *cs =3D CPU(cpu); > CPUPPCState *env =3D &cpu->env; > - PPCVirtualHypervisorClass *vhc; > - hwaddr raddr, pte_addr; > - uint64_t lpid =3D 0, pid =3D 0, offset, size, prtbe0, pte; > - int page_size, fault_cause =3D 0; > - ppc_v3_pate_t pate; > + uint64_t lpid =3D 0, pid =3D 0; > + int psize, prot; > + hwaddr raddr; > =20 > /* Handle Real Mode */ > - if (msr_dr =3D=3D 0) { > + if ((msr_dr =3D=3D 0) && (msr_hv || (cpu->vhyp && lpid =3D=3D 0))) { > /* In real mode top 4 effective addr bits (mostly) ignored */ > return eaddr & 0x0FFFFFFFFFFFFFFFULL; > } > @@ -337,39 +399,8 @@ hwaddr ppc_radix64_get_phys_page_debug(PowerPCCPU *c= pu, target_ulong eaddr) > return -1; > } > =20 > - /* Get Process Table */ > - if (cpu->vhyp) { > - vhc =3D PPC_VIRTUAL_HYPERVISOR_GET_CLASS(cpu->vhyp); > - vhc->get_pate(cpu->vhyp, &pate); > - } else { > - if (!ppc64_v3_get_pate(cpu, lpid, &pate)) { > - return -1; > - } > - if (!validate_pate(cpu, lpid, &pate)) { > - return -1; > - } > - /* We don't support guest mode yet */ > - if (lpid !=3D 0) { > - error_report("PowerNV guest support Unimplemented"); > - exit(1); > - } > - } > - > - /* Index Process Table by PID to Find Corresponding Process Table En= try */ > - offset =3D pid * sizeof(struct prtb_entry); > - size =3D 1ULL << ((pate.dw1 & PATE1_R_PRTS) + 12); > - if (offset >=3D size) { > - /* offset exceeds size of the process table */ > - return -1; > - } > - prtbe0 =3D ldq_phys(cs->as, (pate.dw1 & PATE1_R_PRTB) + offset); > - > - /* Walk Radix Tree from Process Table Entry to Convert EA to RA */ > - page_size =3D PRTBE_R_GET_RTS(prtbe0); > - pte =3D ppc_radix64_walk_tree(cpu, eaddr & R_EADDR_MASK, > - prtbe0 & PRTBE_R_RPDB, prtbe0 & PRTBE_R_= RPDS, > - &raddr, &page_size, &fault_cause, &pte_a= ddr); > - if (!pte) { > + if (ppc_radix64_xlate(cpu, eaddr, 0, lpid, pid, msr_dr, &raddr, &psi= ze, > + &prot, 0)) { > return -1; > } > =20