From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 86329C48BE6 for ; Tue, 15 Jun 2021 01:44:46 +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 D4E5361414 for ; Tue, 15 Jun 2021 01:44:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4E5361414 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsy8D-00082d-2o for qemu-devel@archiver.kernel.org; Mon, 14 Jun 2021 21:44:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsy6o-0005ni-AB; Mon, 14 Jun 2021 21:43:18 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:56345 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsy6k-0008NY-RM; Mon, 14 Jun 2021 21:43:18 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4G3rgF6hQYz9sWQ; Tue, 15 Jun 2021 11:43:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1623721385; bh=H1aSe4jMI+j+6ADDheBkYST7eL0mGfPfA4Uo9s+i3sU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=X8H51QUTCAFNl3eIVRQv1Zk0pnHRyPj2Yq38Afr6GZ0eEdqnXPHx0qrOSFm47aBB5 MWXMeiEV66ZC6HTpkJ35+Vb6n3v97HoTpqfFgQnSs8eKPP9RO3PXmlDUSC305/wrs/ Z9TzcZKsZJ5NocrsroNSXpIBEFiQZ9ia0I7Ht9y0= Date: Tue, 15 Jun 2021 11:41:15 +1000 From: David Gibson To: "Bruno Larsen (billionai)" Subject: Re: [PATCH v2 1/2] target/ppc: fix address translation bug for radix mmus Message-ID: References: <20210614191630.101304-1-bruno.larsen@eldorado.org.br> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="StuccznVLcZnOgmy" Content-Disposition: inline In-Reply-To: <20210614191630.101304-1-bruno.larsen@eldorado.org.br> Received-SPF: pass client-ip=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: farosas@linux.ibm.com, richard.henderson@linaro.org, qemu-devel@nongnu.org, Greg Kurz , lucas.araujo@eldorado.org.br, fernando.valle@eldorado.org.br, qemu-ppc@nongnu.org, matheus.ferst@eldorado.org.br, luis.pires@eldorado.org.br Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --StuccznVLcZnOgmy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 14, 2021 at 04:16:29PM -0300, Bruno Larsen (billionai) wrote: > Based-on: <20210518201146.794854-1-richard.henderson@linaro.org> >=20 > This commit attempts to fix the first bug mentioned by Richard Henderson = in > https://lists.nongnu.org/archive/html/qemu-devel/2021-05/msg06247.html >=20 > To sumarize the bug here, when radix-style mmus are translating an > address, they might need to call a second level of translation, with > hypvervisor priviledges. However, the way it was being done up until s/hypvervisor/hypervisor/ And... it's a super-common error, even amongst native speakers, but s/priviledge/privilege/g > this point meant that the second level translation had the same > priviledges as the first level. This would only happen when a TCG guest > was emulating KVM, which is why it hasn't been discovered yet. >=20 > This patch attempts to correct that by making radix64_*_xlate functions > receive the mmu_idx, and passing one with the correct permission for the > second level translation. >=20 > The mmuidx macros added by this patch are only correct for non-bookE > mmus, because BookE style set the IS and DS bits inverted and there > might be other subtle differences. However, there doesn't seem to be > BookE cpus that have radix-style mmus, so we left a comment there to > document the issue, in case a machine does have that and was missed. Right, the mmuidx values are basically local to a cpu family. Radix is only present on BookS 64-bit cpus. > As part of this cleanup, we now need to send the correct mmmu_idx > when calling get_phys_page_debug, otherwise we might not be able to see t= he > memory that the CPU could >=20 > Suggested-by: Richard Henderson > Signed-off-by: Bruno Larsen (billionai) > --- > target/ppc/internal.h | 12 ++++++++++++ > target/ppc/mmu-radix64.c | 38 ++++++++++++++++++++++---------------- > target/ppc/mmu-radix64.h | 2 +- > target/ppc/mmu_helper.c | 8 +++++--- > 4 files changed, 40 insertions(+), 20 deletions(-) >=20 > diff --git a/target/ppc/internal.h b/target/ppc/internal.h > index f1fd3c8d04..003df7e8a9 100644 > --- a/target/ppc/internal.h > +++ b/target/ppc/internal.h > @@ -245,4 +245,16 @@ static inline int prot_for_access_type(MMUAccessType= access_type) > g_assert_not_reached(); > } > =20 > +/* > + * These correspond to the mmu_idx values computed in > + * hreg_compute_hflags_value. See the tables therein > + */ > +static inline bool mmuidx_pr(int idx) { return !(idx & 1); } > +/* > + * If we want to use these macros for hash-style MMUs, we need to > + * add an if or another macro here I think move these to mmu-book3s-v3.h, since they're correct for both the radix and hash sides of the modern book3s mmu. =2E > + */ > +static inline bool mmuidx_real(int idx) { return idx & 2; } > +static inline bool mmuidx_hv(int idx) { return idx & 4; } > + > #endif /* PPC_INTERNAL_H */ > diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c > index cbd404bfa4..0ae8f6b572 100644 > --- a/target/ppc/mmu-radix64.c > +++ b/target/ppc/mmu-radix64.c > @@ -155,7 +155,7 @@ static void ppc_radix64_raise_hsi(PowerPCCPU *cpu, MM= UAccessType access_type, > =20 > static bool ppc_radix64_check_prot(PowerPCCPU *cpu, MMUAccessType access= _type, > uint64_t pte, int *fault_cause, int *= prot, > - bool partition_scoped) > + int mmu_idx, bool partition_scoped) > { > CPUPPCState *env =3D &cpu->env; > int need_prot; > @@ -173,7 +173,8 @@ static bool ppc_radix64_check_prot(PowerPCCPU *cpu, M= MUAccessType access_type, > /* Determine permissions allowed by Encoded Access Authority */ > if (!partition_scoped && (pte & R_PTE_EAA_PRIV) && msr_pr) { > *prot =3D 0; > - } else if (msr_pr || (pte & R_PTE_EAA_PRIV) || partition_scoped) { > + } else if (mmuidx_pr(mmu_idx) || (pte & R_PTE_EAA_PRIV) || > + partition_scoped) { > *prot =3D ppc_radix64_get_prot_eaa(pte); > } else { /* !msr_pr && !(pte & R_PTE_EAA_PRIV) && !partition_scoped = */ > *prot =3D ppc_radix64_get_prot_eaa(pte); > @@ -299,7 +300,7 @@ static int ppc_radix64_partition_scoped_xlate(PowerPC= CPU *cpu, > ppc_v3_pate_t pate, > hwaddr *h_raddr, int *h_pr= ot, > int *h_page_size, bool pde= _addr, > - bool guest_visible) > + int mmu_idx, bool guest_vi= sible) > { > int fault_cause =3D 0; > hwaddr pte_addr; > @@ -310,7 +311,9 @@ static int ppc_radix64_partition_scoped_xlate(PowerPC= CPU *cpu, > if (ppc_radix64_walk_tree(CPU(cpu)->as, g_raddr, pate.dw0 & PRTBE_R_= RPDB, > pate.dw0 & PRTBE_R_RPDS, h_raddr, h_page_s= ize, > &pte, &fault_cause, &pte_addr) || > - ppc_radix64_check_prot(cpu, access_type, pte, &fault_cause, h_pr= ot, true)) { > + ppc_radix64_check_prot(cpu, access_type, pte, > + &fault_cause, h_prot, mmu_idx, true) > + ) { > if (pde_addr) { /* address being translated was that of a guest = pde */ > fault_cause |=3D DSISR_PRTABLE_FAULT; > } > @@ -332,7 +335,7 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCP= U *cpu, > vaddr eaddr, uint64_t pid, > ppc_v3_pate_t pate, hwaddr *= g_raddr, > int *g_prot, int *g_page_siz= e, > - bool guest_visible) > + int mmu_idx, bool guest_visi= ble) > { > CPUState *cs =3D CPU(cpu); > CPUPPCState *env =3D &cpu->env; > @@ -367,7 +370,8 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCP= U *cpu, > ret =3D ppc_radix64_partition_scoped_xlate(cpu, 0, eaddr, prtbe_= addr, > pate, &h_raddr, &h_prot, > &h_page_size, true, > - guest_visible); > + /* mmu_idx is 5 because we're translating from hypervisor sc= ope */ > + 5, guest_visible); > if (ret) { > return ret; > } > @@ -407,7 +411,8 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCP= U *cpu, > ret =3D ppc_radix64_partition_scoped_xlate(cpu, 0, eaddr, pt= e_addr, > pate, &h_raddr, &h_= prot, > &h_page_size, true, > - guest_visible); > + /* mmu_idx is 5 because we're translating from hypervisor sc= ope */ > + 5, guest_visible); > if (ret) { > return ret; > } > @@ -431,7 +436,8 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCP= U *cpu, > *g_raddr =3D (rpn & ~mask) | (eaddr & mask); > } > =20 > - if (ppc_radix64_check_prot(cpu, access_type, pte, &fault_cause, g_pr= ot, false)) { > + if (ppc_radix64_check_prot(cpu, access_type, pte, &fault_cause, > + g_prot, mmu_idx, false)) { > /* Access denied due to protection */ > if (guest_visible) { > ppc_radix64_raise_si(cpu, access_type, eaddr, fault_cause); > @@ -464,7 +470,7 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCP= U *cpu, > * +-------------+----------------+---------------+ > */ > bool ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType acces= s_type, > - hwaddr *raddr, int *psizep, int *protp, > + hwaddr *raddr, int *psizep, int *protp, int mmu_i= dx, > bool guest_visible) > { > CPUPPCState *env =3D &cpu->env; > @@ -474,17 +480,17 @@ bool ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr= , MMUAccessType access_type, > hwaddr g_raddr; > bool relocation; > =20 > - assert(!(msr_hv && cpu->vhyp)); > + assert(!(mmuidx_hv(mmu_idx) && cpu->vhyp)); > =20 > - relocation =3D (access_type =3D=3D MMU_INST_FETCH ? msr_ir : msr_dr); > + relocation =3D !mmuidx_real(mmu_idx); > =20 > /* HV or virtual hypervisor Real Mode Access */ > - if (!relocation && (msr_hv || cpu->vhyp)) { > + if (!relocation && (mmuidx_hv(mmu_idx) || cpu->vhyp)) { > /* In real mode top 4 effective addr bits (mostly) ignored */ > *raddr =3D eaddr & 0x0FFFFFFFFFFFFFFFULL; > =20 > /* In HV mode, add HRMOR if top EA bit is clear */ > - if (msr_hv || !env->has_hv_mode) { > + if (mmuidx_hv(mmu_idx) || !env->has_hv_mode) { > if (!(eaddr >> 63)) { > *raddr |=3D env->spr[SPR_HRMOR]; > } > @@ -546,7 +552,7 @@ bool ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr, = MMUAccessType access_type, > if (relocation) { > int ret =3D ppc_radix64_process_scoped_xlate(cpu, access_type, e= addr, pid, > pate, &g_raddr, &prot, > - &psize, guest_visible= ); > + &psize, mmu_idx, gues= t_visible); > if (ret) { > return false; > } > @@ -564,13 +570,13 @@ bool ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr= , MMUAccessType access_type, > * quadrants 1 or 2. Translates a guest real address to a host > * real address. > */ > - if (lpid || !msr_hv) { > + if (lpid || !mmuidx_hv(mmu_idx)) { > int ret; > =20 > ret =3D ppc_radix64_partition_scoped_xlate(cpu, access_type,= eaddr, > g_raddr, pate, radd= r, > &prot, &psize, fals= e, > - guest_visible); > + mmu_idx, guest_visi= ble); > if (ret) { > return false; > } > diff --git a/target/ppc/mmu-radix64.h b/target/ppc/mmu-radix64.h > index 6b13b89b64..b70357cf34 100644 > --- a/target/ppc/mmu-radix64.h > +++ b/target/ppc/mmu-radix64.h > @@ -45,7 +45,7 @@ > #ifdef TARGET_PPC64 > =20 > bool ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType acces= s_type, > - hwaddr *raddr, int *psizep, int *protp, > + hwaddr *raddr, int *psizep, int *protp, int mmu_i= dx, > bool guest_visible); > =20 > static inline int ppc_radix64_get_prot_eaa(uint64_t pte) > diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c > index ba1952c77d..9dcdf88597 100644 > --- a/target/ppc/mmu_helper.c > +++ b/target/ppc/mmu_helper.c > @@ -2908,7 +2908,7 @@ static bool ppc_xlate(PowerPCCPU *cpu, vaddr eaddr,= MMUAccessType access_type, > case POWERPC_MMU_3_00: > if (ppc64_v3_radix(cpu)) { > return ppc_radix64_xlate(cpu, eaddr, access_type, > - raddrp, psizep, protp, guest_visibl= e); > + raddrp, psizep, protp, mmu_idx, gue= st_visible); > } > /* fall through */ > case POWERPC_MMU_64B: > @@ -2941,8 +2941,10 @@ hwaddr ppc_cpu_get_phys_page_debug(CPUState *cs, v= addr addr) > * try an MMU_DATA_LOAD, we may not be able to read instructions > * mapped by code TLBs, so we also try a MMU_INST_FETCH. > */ > - if (ppc_xlate(cpu, addr, MMU_DATA_LOAD, &raddr, &s, &p, 0, false) || > - ppc_xlate(cpu, addr, MMU_INST_FETCH, &raddr, &s, &p, 0, false)) { > + if (ppc_xlate(cpu, addr, MMU_DATA_LOAD, &raddr, &s, &p, > + cpu_mmu_index(&cpu->env, false), false) || > + ppc_xlate(cpu, addr, MMU_INST_FETCH, &raddr, &s, &p, > + cpu_mmu_index(&cpu->env, true), false)) { > return raddr & TARGET_PAGE_MASK; > } > return -1; --=20 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 --StuccznVLcZnOgmy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAmDIBTkACgkQbDjKyiDZ s5JpjRAAsfpIbg4tQyOIScR0AyneSP50fQbGXpEX+XnoRrtGTXJcpX4tExe3pTHo 89iFgrmh+kPf3lNVyI7lCsn+tYBVMjeWqGwxdjKOnyakFp3EDKUTZQnHp9QfnswU 2tyNsGLrKPwTplwmtHpbVnZLdUnHSPkMSARRYMcGhKJLi+Oi4qEa78f+VBYNNenm dMJ2XAlAvC3G1LCQa8hkdun05f3vOalrpAsYDCin8LoYYJPd54gMc1QWXKXJELcr JUxDFnthpHs8CZVsVOlKiwd5399aBOSky5XX3DJpu1eteKKmr3yY6Px4SAEkExgJ AtKvKOoEs9ozE497GVWcyAAlHkN4BQLIfv9qeqBYzq7nXd+WU+xmuDdOjElkid0r pE1PwEI+Kb2/cBv57XPz3MUB6sC90AdqsuKU5s2B1NetXNF4CIoLdulzhtAL7MMe esbkCxPNZo1AGPc0GD4yW7dqxVAcqxkaUI0ykyamqHg0Y4gbb6S5lt/ZNJIM6fJ4 F7gIOkU4+u7371x95l+QuzD6kcvm370vvnrrXTJgUj4JOI3PYvnTkcFxxUZFXspk l/1vb5UQA6CjRtYpLZgv8O4CaMb/0wsWJ/oEYylFLcl5/JVcOSDSq4B+4nnOMcER 92Hf23WQZwv2f68/u4N1OaSoAjG3DSSIAx7hxVvLjg12iU19GU4= =77Cl -----END PGP SIGNATURE----- --StuccznVLcZnOgmy--