From nobody Tue Feb 10 10:57:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165609146650234.241559927092226; Fri, 24 Jun 2022 10:24:26 -0700 (PDT) Received: from localhost ([::1]:51658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4n2f-0002gI-AI for importer@patchew.org; Fri, 24 Jun 2022 13:24:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4mw6-0007cX-6y; Fri, 24 Jun 2022 13:17:38 -0400 Received: from [187.72.171.209] (port=15972 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4mvw-0008Lo-8P; Fri, 24 Jun 2022 13:17:31 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Fri, 24 Jun 2022 14:17:18 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id 1487480003F; Fri, 24 Jun 2022 14:17:18 -0300 (-03) From: Leandro Lupori To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: clg@kaod.org, danielhb413@gmail.com, david@gibson.dropbear.id.au, groug@kaod.org, richard.henderson@linaro.org, Leandro Lupori Subject: [PATCH v2 2/3] target/ppc: Improve Radix xlate level validation Date: Fri, 24 Jun 2022 14:16:52 -0300 Message-Id: <20220624171653.143740-3-leandro.lupori@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220624171653.143740-1-leandro.lupori@eldorado.org.br> References: <20220624171653.143740-1-leandro.lupori@eldorado.org.br> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-OriginalArrivalTime: 24 Jun 2022 17:17:18.0518 (UTC) FILETIME=[41E8ED60:01D887EE] X-Host-Lookup-Failed: Reverse DNS lookup failed for 187.72.171.209 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=187.72.171.209; envelope-from=leandro.lupori@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1656091467495100003 Content-Type: text/plain; charset="utf-8" Check if the number and size of Radix levels are valid on POWER9/POWER10 CPUs, according to the supported Radix Tree Configurations described in their User Manuals. Signed-off-by: Leandro Lupori --- target/ppc/mmu-radix64.c | 51 +++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c index 9a8a2e2875..339cf5b4d8 100644 --- a/target/ppc/mmu-radix64.c +++ b/target/ppc/mmu-radix64.c @@ -236,17 +236,39 @@ static void ppc_radix64_set_rc(PowerPCCPU *cpu, MMUAc= cessType access_type, } } =20 +static bool ppc_radix64_is_valid_level(int level, int psize, uint64_t nls) +{ + /* + * Check if this is a valid level, according to POWER9 and POWER10 + * Processor User's Manuals, sections 4.10.4.1 and 5.10.6.1, respectiv= ely: + * Supported Radix Tree Configurations and Resulting Page Sizes. + * + * NOTE: these checks are valid for POWER9 and POWER10 CPUs only. If + * new CPUs that support other Radix configurations are added + * (e.g., Microwatt), then a new method should be added to + * PowerPCCPUClass, with this function being the POWER9/POWER10 + * implementation. + */ + switch (level) { + case 0: /* Root Page Dir */ + return psize =3D=3D 52 && nls =3D=3D 13; + case 1: + case 2: + return nls =3D=3D 9; + case 3: + return nls =3D=3D 9 || nls =3D=3D 5; + default: + qemu_log_mask(LOG_GUEST_ERROR, "invalid radix level: %d\n", level); + return false; + } +} + static int ppc_radix64_next_level(AddressSpace *as, vaddr eaddr, uint64_t *pte_addr, uint64_t *nls, int *psize, uint64_t *pte, int *fault_ca= use) { uint64_t index, pde; =20 - if (*nls < 5) { /* Directory maps less than 2**5 entries */ - *fault_cause |=3D DSISR_R_BADCONFIG; - return 1; - } - /* Read page entry from guest address space */ pde =3D ldq_phys(as, *pte_addr); if (!(pde & R_PTE_VALID)) { /* Invalid Entry */ @@ -270,12 +292,8 @@ static int ppc_radix64_walk_tree(AddressSpace *as, vad= dr eaddr, hwaddr *raddr, int *psize, uint64_t *pte, int *fault_cause, hwaddr *pte_addr) { - uint64_t index, pde, rpn , mask; - - if (nls < 5) { /* Directory maps less than 2**5 entries */ - *fault_cause |=3D DSISR_R_BADCONFIG; - return 1; - } + uint64_t index, pde, rpn, mask; + int level =3D 0; =20 index =3D eaddr >> (*psize - nls); /* Shift */ index &=3D ((1UL << nls) - 1); /* Mask */ @@ -283,6 +301,11 @@ static int ppc_radix64_walk_tree(AddressSpace *as, vad= dr eaddr, do { int ret; =20 + if (!ppc_radix64_is_valid_level(level++, *psize, nls)) { + *fault_cause |=3D DSISR_R_BADCONFIG; + return 1; + } + ret =3D ppc_radix64_next_level(as, eaddr, pte_addr, &nls, psize, &= pde, fault_cause); if (ret) { @@ -456,6 +479,7 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCPU = *cpu, } } else { uint64_t rpn, mask; + int level =3D 0; =20 index =3D (eaddr & R_EADDR_MASK) >> (*g_page_size - nls); /* Shift= */ index &=3D ((1UL << nls) - 1); /* Mask = */ @@ -475,6 +499,11 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCPU= *cpu, return ret; } =20 + if (!ppc_radix64_is_valid_level(level++, *g_page_size, nls)) { + fault_cause |=3D DSISR_R_BADCONFIG; + return 1; + } + ret =3D ppc_radix64_next_level(cs->as, eaddr & R_EADDR_MASK, &= h_raddr, &nls, g_page_size, &pte, &fault_c= ause); if (ret) { --=20 2.25.1