From nobody Tue Feb 10 20:47:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1683296144; cv=none; d=zohomail.com; s=zohoarc; b=KIp7e/ErDe9a7w7aKPvP9EhmRxyT/oSV+3nXNpUCWZszVPfXmlLYZziMZEkacAqLpu3FBfOi6btDaotORCpX+sAC2DfZxdNJ/J484KuYWEwYoNVRHG4cVd5yNY8QXmQq9NuMMJX02ktVDku6zTnSIc1FBxKilukTS6QmQ1cFfWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683296144; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=kQHg5N0/5UTmajh8F0ihHp+8v29KXkEdNsfTf8dLZNA=; b=bqFHfmVJtZNDvF+aLABAcFBDBK/X6PTJ3UPeRzmgZfckhC5yV+WP/7S+hHyVOuGOV2ok1TZcJQAU5f6cm41SflN43h97HR47ph3KQU/mO4+fo1JXAYUK8Hr9UJ2TrQn+gGPOEm5Z7Q80vvVIWoGxPZr9VL5dxTlo24mE6qi7E1Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1683296144788590.8213315811427; Fri, 5 May 2023 07:15:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puwCa-0004x3-JR; Fri, 05 May 2023 10:14:29 -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 1puwCV-0004uO-I9 for qemu-devel@nongnu.org; Fri, 05 May 2023 10:14:23 -0400 Received: from rev.ng ([5.9.113.41]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puwCP-0000zB-NC for qemu-devel@nongnu.org; Fri, 05 May 2023 10:14:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=kQHg5N0/5UTmajh8F0ihHp+8v29KXkEdNsfTf8dLZNA=; b=V0JLsemtPNDVFl4dHqDsbzuy+N dv/4ePkZ16jfwKcMk+cpMRMspQfDLfvcjqmuPqos31myJQE0fGl679Rep68tlnkkJcxdyCZJkijjQ 37+Nf+04uHon3Zuj+UgOnKmmVw8y0QDoFsQ3z1XazPT8V0WL7yyrIwCDemtwzyde3g8Q=; To: qemu-devel@nongnu.org Cc: ale@rev.ng, richard.henderson@linaro.org, pbonzini@redhat.com, eduardo@habkost.net, philmd@linaro.org, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com Subject: [PATCH v2 09/12] accel/tcg: Replace target_ulong with vaddr in *_mmu_lookup() Date: Fri, 5 May 2023 16:14:00 +0200 Message-Id: <20230505141403.25735-10-anjo@rev.ng> In-Reply-To: <20230505141403.25735-1-anjo@rev.ng> References: <20230505141403.25735-1-anjo@rev.ng> MIME-Version: 1.0 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=5.9.113.41; envelope-from=anjo@rev.ng; helo=rev.ng 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, SPF_HELO_PASS=-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: , Reply-to: Anton Johansson From: Anton Johansson via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1683296146467100005 Content-Type: text/plain; charset="utf-8" Update atomic_mmu_lookup() and cpu_mmu_lookup() to take the guest virtual address as a vaddr instead of a target_ulong. Signed-off-by: Anton Johansson Reviewed-by: Richard Henderson --- accel/tcg/cputlb.c | 4 ++-- accel/tcg/user-exec.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 138ce7e697..fb97786dac 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1899,7 +1899,7 @@ static bool mmu_lookup(CPUArchState *env, vaddr addr,= MemOpIdx oi, * * @prot may be PAGE_READ, PAGE_WRITE, or PAGE_READ|PAGE_WRITE. */ -static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, +static void *atomic_mmu_lookup(CPUArchState *env, vaddr addr, MemOpIdx oi, int size, int prot, uintptr_t retaddr) { @@ -1908,7 +1908,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, tar= get_ulong addr, int a_bits =3D get_alignment_bits(mop); uintptr_t index; CPUTLBEntry *tlbe; - target_ulong tlb_addr; + vaddr tlb_addr; void *hostaddr; CPUTLBEntryFull *full; =20 diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 3b92432df9..929f1a4f43 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -889,7 +889,7 @@ void page_reset_target_data(target_ulong start, target_= ulong last) { } =20 /* The softmmu versions of these helpers are in cputlb.c. */ =20 -static void *cpu_mmu_lookup(CPUArchState *env, abi_ptr addr, +static void *cpu_mmu_lookup(CPUArchState *env, vaddr addr, MemOp mop, uintptr_t ra, MMUAccessType type) { int a_bits =3D get_alignment_bits(mop); @@ -1478,7 +1478,7 @@ uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr = addr, * * @prot may be PAGE_READ, PAGE_WRITE, or PAGE_READ|PAGE_WRITE. */ -static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, +static void *atomic_mmu_lookup(CPUArchState *env, vaddr addr, MemOpIdx oi, int size, int prot, uintptr_t retaddr) { --=20 2.39.1