From nobody Sun Nov 24 10:29:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1723557276; cv=none; d=zohomail.com; s=zohoarc; b=GiBOmTF109xanYTMK5gI/YyndKiiHxgwElFmhak0Beeu44dUeHOawF93a2CG2q/bYIuGHEB0pzTfqOZFP4jAJgKy56w77p8ILltJEYs8P7bTiKfw5nNdThRt/2NM/vYeJBxyb8FrQJfS9T+qW1JheeRMrpSBLiNx6kd73qT0bD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723557276; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ocxt7oZAAz9BMDOpj25prag5V4EF45wznl+mYkNEXLQ=; b=Vj2JGrxX1WtXHgLt2lHOTCY0OSpTwIRrt8mN4g1bq+GJf5BYQwd8IT6d2uF3bm+s+/tfviMpSZGXKiLKbJkR45/VCxWi+m10CF9YnPws+ua+5vF/0bEETZidx/10SefIJfOECVa0RMsmLr8HVllbOmbSoVIWggx0cEp5TjcBjvg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1723557276028740.429477186386; Tue, 13 Aug 2024 06:54:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sdry9-0002ro-5V; Tue, 13 Aug 2024 09:53:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sdry6-0002r2-Rc for qemu-devel@nongnu.org; Tue, 13 Aug 2024 09:53:47 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sdry3-0007pl-Qm for qemu-devel@nongnu.org; Tue, 13 Aug 2024 09:53:46 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-5bb85e90ad5so4722835a12.3 for ; Tue, 13 Aug 2024 06:53:43 -0700 (PDT) Received: from m1x-phil.lan ([176.176.129.17]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f3f49748sm71127266b.4.2024.08.13.06.53.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Aug 2024 06:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723557222; x=1724162022; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ocxt7oZAAz9BMDOpj25prag5V4EF45wznl+mYkNEXLQ=; b=mJTlmzeq+gmq2j97MuOZJh+zBpKWjhLiNzef+qTdG+EdLwQA+9rF6N1F/EdRqp1ouJ 9fN0yeMu4snJSgAv7rhDXBf7zz7VIfL4aIkqg/va1irGXj15iZXGR9qOSV04LDs2JwyX LrHJ2/4U5/9QrSUV1aNE4tsRNDa7R32bQSmiFlbcy3VqUf1DOx7+8PXy6BXZr2TFb1fZ Z+nyr9Z2onTX+1lSe/2Iji1Bx+00vihxtHmHnPwWKhIiDHuBryObZHbIGk9ydNGRyvot ByhMg01TULjUr5WVzZiNnv0hbSfqH5IoU9B7TotWDzPbBH/OUBy0gnwOdSIkh1oj/Wb8 mdGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723557222; x=1724162022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ocxt7oZAAz9BMDOpj25prag5V4EF45wznl+mYkNEXLQ=; b=h0JomGGc3iAiAzKobg/Fs7rxo87AhMoe69PNC5/Dw+vUP6EyEco1FW8CChxoxC2wAy 8JPtiXPVpVCgDY4a12Sh2EXltc0186CwE/PUMHCYVqAe8fDld2l1Gbs/LTS7QuHii/MA Cq/5TPxJ2L5EHpMfyyRTfNNseVIunavbEFmxh4r3wD8hZ/3TbglnAt+bhewNH1gBC8ee fx8kzTLxChYsO5jyHqnihw80NIqDy8as0pVRvkanCCeGGXLgW3fQy+Q7yCel4S62B8++ QGMAgRXUlNoO2GrKd857NSTZJCE47i5qbeHl3qFPvxrN0OLmtHYnEsiQnV/or79BcP2r kRQA== X-Gm-Message-State: AOJu0YzexlYoFWUF4bsqSVU8lX+sL4FcDZkE02Bjv4lAmRd/BsElSWD+ LQFrw7bKtuNUuf/OUfcazyTDZN3uStGr7TyWmsajsUhKh+PSAsjNAx4QaEixcsWyzonXD3/Lp1d fVjI= X-Google-Smtp-Source: AGHT+IEmGvhgzkWQ8bhvRu4JnXLWhc5la+/XdvrQFgzetqkZHg4LJz9nd027Fg6qqauT8sIUfLTYzA== X-Received: by 2002:a17:907:3f8b:b0:a7d:a008:abca with SMTP id a640c23a62f3a-a80ed2d6162mr264486466b.56.1723557221635; Tue, 13 Aug 2024 06:53:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Petazzoni , Richard Henderson , Aleksandar Rikalo , Waldemar Brodkorb , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang Subject: [PATCH-for-9.1 v3 1/2] target/mips: Pass page table entry size as MemOp to get_pte() Date: Tue, 13 Aug 2024 15:53:12 +0200 Message-ID: <20240813135313.96519-2-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240813135313.96519-1-philmd@linaro.org> References: <20240813135313.96519-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::536; envelope-from=philmd@linaro.org; helo=mail-ed1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1723557278372116600 In order to simplify the next commit, pass the PTE size as MemOp. Rename: native_shift -> native_op directory_shift -> directory_mop leaf_shift -> leaf_mop Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/tcg/sysemu/tlb_helper.c | 59 +++++++++++++---------------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/target/mips/tcg/sysemu/tlb_helper.c b/target/mips/tcg/sysemu/t= lb_helper.c index 3ba6d369a6..75a26131ca 100644 --- a/target/mips/tcg/sysemu/tlb_helper.c +++ b/target/mips/tcg/sysemu/tlb_helper.c @@ -592,13 +592,13 @@ static void raise_mmu_exception(CPUMIPSState *env, ta= rget_ulong address, * resulting in a TLB or XTLB Refill exception. */ =20 -static bool get_pte(CPUMIPSState *env, uint64_t vaddr, int entry_size, +static bool get_pte(CPUMIPSState *env, uint64_t vaddr, MemOp op, uint64_t *pte) { - if ((vaddr & ((entry_size >> 3) - 1)) !=3D 0) { + if ((vaddr & (memop_size(op) - 1)) !=3D 0) { return false; } - if (entry_size =3D=3D 64) { + if (op =3D=3D MO_64) { *pte =3D cpu_ldq_code(env, vaddr); } else { *pte =3D cpu_ldl_code(env, vaddr); @@ -607,11 +607,11 @@ static bool get_pte(CPUMIPSState *env, uint64_t vaddr= , int entry_size, } =20 static uint64_t get_tlb_entry_layout(CPUMIPSState *env, uint64_t entry, - int entry_size, int ptei) + MemOp op, int ptei) { uint64_t result =3D entry; uint64_t rixi; - if (ptei > entry_size) { + if (ptei > memop_size(op)) { ptei -=3D 32; } result >>=3D (ptei - 2); @@ -624,14 +624,12 @@ static uint64_t get_tlb_entry_layout(CPUMIPSState *en= v, uint64_t entry, static int walk_directory(CPUMIPSState *env, uint64_t *vaddr, int directory_index, bool *huge_page, bool *hgpg_directory_hit, uint64_t *pw_entrylo0, uint64_t *pw_entrylo1, - unsigned directory_shift, unsigned leaf_shift, int ptw_mmu_idx) + MemOp directory_mop, MemOp leaf_mop, int ptw_mmu_idx) { int dph =3D (env->CP0_PWCtl >> CP0PC_DPH) & 0x1; int psn =3D (env->CP0_PWCtl >> CP0PC_PSN) & 0x3F; int hugepg =3D (env->CP0_PWCtl >> CP0PC_HUGEPG) & 0x1; int pf_ptew =3D (env->CP0_PWField >> CP0PF_PTEW) & 0x3F; - uint32_t direntry_size =3D 1 << (directory_shift + 3); - uint32_t leafentry_size =3D 1 << (leaf_shift + 3); uint64_t entry; uint64_t paddr; int prot; @@ -643,14 +641,14 @@ static int walk_directory(CPUMIPSState *env, uint64_t= *vaddr, /* wrong base address */ return 0; } - if (!get_pte(env, *vaddr, direntry_size, &entry)) { + if (!get_pte(env, *vaddr, directory_mop, &entry)) { return 0; } =20 if ((entry & (1 << psn)) && hugepg) { *huge_page =3D true; *hgpg_directory_hit =3D true; - entry =3D get_tlb_entry_layout(env, entry, leafentry_size, pf_ptew= ); + entry =3D get_tlb_entry_layout(env, entry, leaf_mop, pf_ptew); w =3D directory_index - 1; if (directory_index & 0x1) { /* Generate adjacent page from same PTE for odd TLB page */ @@ -658,7 +656,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *= vaddr, *pw_entrylo0 =3D entry & ~lsb; /* even page */ *pw_entrylo1 =3D entry | lsb; /* odd page */ } else if (dph) { - int oddpagebit =3D 1 << leaf_shift; + int oddpagebit =3D 1 << leaf_mop; uint64_t vaddr2 =3D *vaddr ^ oddpagebit; if (*vaddr & oddpagebit) { *pw_entrylo1 =3D entry; @@ -669,10 +667,10 @@ static int walk_directory(CPUMIPSState *env, uint64_t= *vaddr, ptw_mmu_idx) !=3D TLBRET_MATCH) { return 0; } - if (!get_pte(env, vaddr2, leafentry_size, &entry)) { + if (!get_pte(env, vaddr2, leaf_mop, &entry)) { return 0; } - entry =3D get_tlb_entry_layout(env, entry, leafentry_size, pf_= ptew); + entry =3D get_tlb_entry_layout(env, entry, leaf_mop, pf_ptew); if (*vaddr & oddpagebit) { *pw_entrylo0 =3D entry; } else { @@ -711,7 +709,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, v= addr address, =20 /* Native pointer size */ /*For the 32-bit architectures, this bit is fixed to 0.*/ - int native_shift =3D (((env->CP0_PWSize >> CP0PS_PS) & 1) =3D=3D 0) ? = 2 : 3; + MemOp native_op =3D (((env->CP0_PWSize >> CP0PS_PS) & 1) =3D=3D 0) ? M= O_32 : MO_64; =20 /* Indices from PWField */ int pf_gdw =3D (env->CP0_PWField >> CP0PF_GDW) & 0x3F; @@ -728,11 +726,10 @@ static bool page_table_walk_refill(CPUMIPSState *env,= vaddr address, =20 /* Other HTW configs */ int hugepg =3D (env->CP0_PWCtl >> CP0PC_HUGEPG) & 0x1; - unsigned directory_shift, leaf_shift; + MemOp directory_mop, leaf_mop; =20 /* Offsets into tables */ unsigned goffset, uoffset, moffset, ptoffset0, ptoffset1; - uint32_t leafentry_size; =20 /* Starting address - Page Table Base */ uint64_t vaddr =3D env->CP0_PWBase; @@ -759,23 +756,21 @@ static bool page_table_walk_refill(CPUMIPSState *env,= vaddr address, } =20 /* HTW Shift values (depend on entry size) */ - directory_shift =3D (hugepg && (ptew =3D=3D 1)) ? native_shift + 1 : n= ative_shift; - leaf_shift =3D (ptew =3D=3D 1) ? native_shift + 1 : native_shift; + directory_mop =3D (hugepg && (ptew =3D=3D 1)) ? native_op + 1 : native= _op; + leaf_mop =3D (ptew =3D=3D 1) ? native_op + 1 : native_op; =20 - goffset =3D gindex << directory_shift; - uoffset =3D uindex << directory_shift; - moffset =3D mindex << directory_shift; - ptoffset0 =3D (ptindex >> 1) << (leaf_shift + 1); - ptoffset1 =3D ptoffset0 | (1 << (leaf_shift)); - - leafentry_size =3D 1 << (leaf_shift + 3); + goffset =3D gindex << directory_mop; + uoffset =3D uindex << directory_mop; + moffset =3D mindex << directory_mop; + ptoffset0 =3D (ptindex >> 1) << (leaf_mop + 1); + ptoffset1 =3D ptoffset0 | (1 << (leaf_mop)); =20 /* Global Directory */ if (gdw > 0) { vaddr |=3D goffset; switch (walk_directory(env, &vaddr, pf_gdw, &huge_page, &hgpg_gdhi= t, &pw_entrylo0, &pw_entrylo1, - directory_shift, leaf_shift, ptw_mmu_idx)) + directory_mop, leaf_mop, ptw_mmu_idx)) { case 0: return false; @@ -792,7 +787,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, v= addr address, vaddr |=3D uoffset; switch (walk_directory(env, &vaddr, pf_udw, &huge_page, &hgpg_udhi= t, &pw_entrylo0, &pw_entrylo1, - directory_shift, leaf_shift, ptw_mmu_idx)) + directory_mop, leaf_mop, ptw_mmu_idx)) { case 0: return false; @@ -809,7 +804,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, v= addr address, vaddr |=3D moffset; switch (walk_directory(env, &vaddr, pf_mdw, &huge_page, &hgpg_mdhi= t, &pw_entrylo0, &pw_entrylo1, - directory_shift, leaf_shift, ptw_mmu_idx)) + directory_mop, leaf_mop, ptw_mmu_idx)) { case 0: return false; @@ -827,10 +822,10 @@ static bool page_table_walk_refill(CPUMIPSState *env,= vaddr address, ptw_mmu_idx) !=3D TLBRET_MATCH) { return false; } - if (!get_pte(env, vaddr, leafentry_size, &dir_entry)) { + if (!get_pte(env, vaddr, leaf_mop, &dir_entry)) { return false; } - dir_entry =3D get_tlb_entry_layout(env, dir_entry, leafentry_size, pf_= ptew); + dir_entry =3D get_tlb_entry_layout(env, dir_entry, leaf_mop, pf_ptew); pw_entrylo0 =3D dir_entry; =20 /* Leaf Level Page Table - Second half of PTE pair */ @@ -839,10 +834,10 @@ static bool page_table_walk_refill(CPUMIPSState *env,= vaddr address, ptw_mmu_idx) !=3D TLBRET_MATCH) { return false; } - if (!get_pte(env, vaddr, leafentry_size, &dir_entry)) { + if (!get_pte(env, vaddr, leaf_mop, &dir_entry)) { return false; } - dir_entry =3D get_tlb_entry_layout(env, dir_entry, leafentry_size, pf_= ptew); + dir_entry =3D get_tlb_entry_layout(env, dir_entry, leaf_mop, pf_ptew); pw_entrylo1 =3D dir_entry; =20 refill: --=20 2.45.2 From nobody Sun Nov 24 10:29:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1723557284; cv=none; d=zohomail.com; s=zohoarc; b=Kuj2o9OwhKe4y/sAf9GQOyJOsWeA2hzwZB4SsuBkowxaPiwhHo49yZtXJnpolKKFGwgX6WbWbnHKT4uetGi6ELpneqdKWAaH3dFtNEeMowvuUeKaixxxzqG6Yz0nV54JXkU9GuTpICW2ZL2AuMgf98eQSS/wguTfX0Z4nQyt9aQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723557284; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YvKmjjUJqY8VJl2i3YDgoMrvEzziJTXRVQk9yERgOsk=; b=TGWfEyPUHRzlH0fwtEcHki/w4XeDEZwzzWsp9s0Qf8z33bRi5WuxOGLHtZ1Ehbfx+lSdpBwVWlCYJDS3Q3AdBVe2PY3WkuGsWxpml4UNuIkdvaRfGEp8FLGj5h+jgezIM8Jh0gbvCNSSNVUpz5lHlqtv0uoghTCzabJjhWu74CA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1723557283998538.4137819228966; Tue, 13 Aug 2024 06:54:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sdryT-0003CN-Kq; Tue, 13 Aug 2024 09:54:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sdryP-00038P-Fd for qemu-devel@nongnu.org; Tue, 13 Aug 2024 09:54:05 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sdryN-0007ri-JE for qemu-devel@nongnu.org; Tue, 13 Aug 2024 09:54:05 -0400 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5af326eddb2so10375483a12.1 for ; Tue, 13 Aug 2024 06:54:02 -0700 (PDT) Received: from m1x-phil.lan ([176.176.129.17]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f414eb82sm72466266b.175.2024.08.13.06.53.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 13 Aug 2024 06:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723557241; x=1724162041; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YvKmjjUJqY8VJl2i3YDgoMrvEzziJTXRVQk9yERgOsk=; b=IbC7F4YpL+iNsDelrE3y4wb7JTyAmmqg48IS53P06Li3PQTs7U/p9pK/PWHwFRjPzv KQO3QLfeypgO2LT8vCQm2XNmVelaT8VNhbK+An4EO2reR1K2PrLhF3qayT7bDvRfesvs 949xcHYU2b4o70dmMKczCBDBiAjyOm+DGuBGyXbYkmc640WgOfLoHK/zFse1jFlMdDgV S+mD1NrJlBcqJGpnb2wpO+fGAn7LXohiqso09yydgma+jgJFKINS8tGpSC7PBYxmILxE tTXqsMcBhecU3nhrdCyaG4TUyQeR6Q4TJFw4ke1rw+TqKF7/U+bXNWpIE4bGVviZHjhH LqtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723557241; x=1724162041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YvKmjjUJqY8VJl2i3YDgoMrvEzziJTXRVQk9yERgOsk=; b=dq9CJ7xVri1xjyej0Qvzz9AczQpGVxn+vf9AZNcIR/xNJuQ1FESEwGb9wQedmNOvXW t8iLHWP8t4jXtKMKLIEzxZqbMfFRW4avvllEGZNGVCHIe3kJgUMkji19ozuZCPZ64TI5 ppjiEMn0w/R9l0H6JQP58qWjfy2XvDklpKsJtfgYPiEw/33/5qzrDSMWaVLEccYt/vku TGFgbuWh827clTR5+8WbY9MD1nWDE+sOIaVlDk/hN1tXmRPISvtLDbTiXLSqWb1tdwey c6+EYtoFNMP0lMklkAeTJb2vx40Gy+wPMZTBhnqo5Rsd49flgQIzTjav7/sjTtNTyXbR pupA== X-Gm-Message-State: AOJu0Yxm1dJKtnr69VZfbwfIt89wYU6ppXOIGYOiTRbhTe/KwDgwQwDv XTkDx+zOrFyA4dpNwSzexsApbttbXhcJ9IoTtEQeThShzKxEwrlTUq+kdUAoCif8G9F5rL/lVV0 DtkM= X-Google-Smtp-Source: AGHT+IGKFercliZf60z7hslylbPL+DPhm5ssu0KvHfbHvqfTDuUc0tNWU6aaLCmBliOtZm1GWbLLCA== X-Received: by 2002:a17:907:cca3:b0:a7a:afe8:1013 with SMTP id a640c23a62f3a-a80f0a85a48mr186250666b.1.1723557240536; Tue, 13 Aug 2024 06:54:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Petazzoni , Richard Henderson , Aleksandar Rikalo , Waldemar Brodkorb , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang Subject: [PATCH-for-9.1 v3 2/2] target/mips: Use correct MMU index in get_pte() Date: Tue, 13 Aug 2024 15:53:13 +0200 Message-ID: <20240813135313.96519-3-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240813135313.96519-1-philmd@linaro.org> References: <20240813135313.96519-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::535; envelope-from=philmd@linaro.org; helo=mail-ed1-x535.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1723557287161116600 When refactoring page_table_walk_refill() in commit 4e999bf419 we missed the indirect call to cpu_mmu_index() in get_pte(): page_table_walk_refill() -> get_pte() -> cpu_ld[lq]_code() -> cpu_mmu_index() Since we don't mask anymore the modes in hflags, cpu_mmu_index() can return UM or SM, while we only expect KM or ERL. Fix by propagating ptw_mmu_idx to get_pte(), and use the cpu_ld/st_code_mmu() API with the correct MemOpIdx. Reported-by: Thomas Petazzoni Reported-by: Waldemar Brodkorb Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2470 Fixes: 4e999bf419 ("target/mips: Pass ptw_mmu_idx down from mips_cpu_tlb_fi= ll") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/tcg/sysemu/tlb_helper.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/target/mips/tcg/sysemu/tlb_helper.c b/target/mips/tcg/sysemu/t= lb_helper.c index 75a26131ca..5bff4cb72f 100644 --- a/target/mips/tcg/sysemu/tlb_helper.c +++ b/target/mips/tcg/sysemu/tlb_helper.c @@ -593,16 +593,21 @@ static void raise_mmu_exception(CPUMIPSState *env, ta= rget_ulong address, */ =20 static bool get_pte(CPUMIPSState *env, uint64_t vaddr, MemOp op, - uint64_t *pte) + uint64_t *pte, unsigned ptw_mmu_idx) { + MemOpIdx oi; + if ((vaddr & (memop_size(op) - 1)) !=3D 0) { return false; } + + oi =3D make_memop_idx(op | MO_TE, ptw_mmu_idx); if (op =3D=3D MO_64) { - *pte =3D cpu_ldq_code(env, vaddr); + *pte =3D cpu_ldq_code_mmu(env, vaddr, oi, 0); } else { - *pte =3D cpu_ldl_code(env, vaddr); + *pte =3D cpu_ldl_code_mmu(env, vaddr, oi, 0); } + return true; } =20 @@ -641,7 +646,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *= vaddr, /* wrong base address */ return 0; } - if (!get_pte(env, *vaddr, directory_mop, &entry)) { + if (!get_pte(env, *vaddr, directory_mop, &entry, ptw_mmu_idx)) { return 0; } =20 @@ -667,7 +672,7 @@ static int walk_directory(CPUMIPSState *env, uint64_t *= vaddr, ptw_mmu_idx) !=3D TLBRET_MATCH) { return 0; } - if (!get_pte(env, vaddr2, leaf_mop, &entry)) { + if (!get_pte(env, vaddr2, leaf_mop, &entry, ptw_mmu_idx)) { return 0; } entry =3D get_tlb_entry_layout(env, entry, leaf_mop, pf_ptew); @@ -822,7 +827,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, v= addr address, ptw_mmu_idx) !=3D TLBRET_MATCH) { return false; } - if (!get_pte(env, vaddr, leaf_mop, &dir_entry)) { + if (!get_pte(env, vaddr, leaf_mop, &dir_entry, ptw_mmu_idx)) { return false; } dir_entry =3D get_tlb_entry_layout(env, dir_entry, leaf_mop, pf_ptew); @@ -834,7 +839,7 @@ static bool page_table_walk_refill(CPUMIPSState *env, v= addr address, ptw_mmu_idx) !=3D TLBRET_MATCH) { return false; } - if (!get_pte(env, vaddr, leaf_mop, &dir_entry)) { + if (!get_pte(env, vaddr, leaf_mop, &dir_entry, ptw_mmu_idx)) { return false; } dir_entry =3D get_tlb_entry_layout(env, dir_entry, leaf_mop, pf_ptew); --=20 2.45.2