From patchwork Mon Apr 14 15:30:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 881018 Delivered-To: patch@linaro.org Received: by 2002:a5d:4882:0:b0:38f:210b:807b with SMTP id g2csp2031822wrq; Mon, 14 Apr 2025 08:31:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWvSQhTC/bchV05FNn9L/C/qjUbGvZuvPDrdus3j2bbOWKKAe7Lwe7hlllFIEtB2JCw8YrE/A==@linaro.org X-Google-Smtp-Source: AGHT+IEHrlCbMqdp5sppwenWgU2r9UCzPtVHi3JW25o4+hxYT/KG01z31N1KMo72sUQFi0xp0yMr X-Received: by 2002:a05:6122:1e09:b0:524:2fe0:61bc with SMTP id 71dfb90a1353d-527c2fd0e9bmr8719304e0c.5.1744644713135; Mon, 14 Apr 2025 08:31:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744644713; cv=none; d=google.com; s=arc-20240605; b=Md4wi2CX/7pxJxszG2025l5dM0Z27hTDp9gVQRNrXhEbJKhc9DUXD54a/3qVPzxHH1 f1nh1Yn82e6849xY0oSZYNrTHySUS/YzQBiLRVoQiUTmkSPhg5PWmjHj2qoxnoJwGBt6 3LBSmld9QLOeYEy/MqxaxXNRL4mf+mlN4TMeuhO3t9FX5CIKizoM9VOPqgZkoPNALFdo 5NZTyaWJ7pRbGrPU59T33kVbyql+9tFkifGpd0JLh9o2e2AhUvQXqMTGijRNhvNFe4FG QYdQzCFML2XsZnioy8d0OsJDBNvpPk7/BWEmjlviBtaH59Qw/TzFUgRqMXUZRE9PVJ5T 8K5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=e2gWTr/bEI2XvQEhITW5r3zQts/Uh5xUtEqBuh5AV7s=; fh=RwqP4O910s/f7q2v/+od0QqvqOwLDH2tZdCXg6CuwmY=; b=daUzlFjfuAOHQyxPdKZfwjSkK43frhhIu4TvKUKTKp0CjLmXE1UmWRD00ryzUBEBNN QzY9q0lJAlnwqr7YjARupunUtYx00JZZ0UZ7zKxtDq55p0CPPkUQkAWPvyTaRRVTA98I fHb1YTIl2vYVeMjgdW2gjXGQIGRt9cpfQZmuUkK2iZxlJsw/U6SCuJ++V5hppFKMZftq pm/DKq22AAyr9uRiMRh9po0YybeWCvtQhMHq4Pq3cDmKYsmZsJnxZiW2yiupSzqRUr9M a6sr8BIeqa6Iip3ZcuBEKlSPtWzO/oI26/dpSRmEsstwhAVKd9zRsYkzFGgB/AE13cpG 7zjw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Jp1/5zSW"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 71dfb90a1353d-527abe8a78bsi3637706e0c.180.2025.04.14.08.31.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Apr 2025 08:31:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Jp1/5zSW"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4Llx-0000k0-QD; Mon, 14 Apr 2025 11:30:57 -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 1u4Llr-0000e7-MD for qemu-devel@nongnu.org; Mon, 14 Apr 2025 11:30:51 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4Llj-0005Ws-Ji for qemu-devel@nongnu.org; Mon, 14 Apr 2025 11:30:51 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-227cf12df27so36052725ad.0 for ; Mon, 14 Apr 2025 08:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744644637; x=1745249437; 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=e2gWTr/bEI2XvQEhITW5r3zQts/Uh5xUtEqBuh5AV7s=; b=Jp1/5zSWFDLrnCOze76Xh1PpWYj0QlagysyaR+JS/yr0xhaTcEsW9nfJEqfv0S8Yet 3PtBUxn68LIyyroUDOZjZD1Iwp8W5qL4S6xWkeHKzXs4P5tVmPC961y2Mz5Un4POPVA/ vD0EYfBtHASoaqi7eCQe3DBVwjHwFjHehdUDHx/E1aRDQ7p7CfM4aZOPNGQpPqaVyCTW Ud9l3VuQ5RkcwBmrmEp7Kacqku9ECiFK4nWmNq9lWOXYVmtEpg+VZldBqm15kr6PFPww dBBIs4jf2FuGWOmLB2PHWGfJiHXlNAHNmxIlF/0aFNxvN4pRUJJkbl4na80o98yBn5NN OLAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744644637; x=1745249437; 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=e2gWTr/bEI2XvQEhITW5r3zQts/Uh5xUtEqBuh5AV7s=; b=rPyaCn/fYM5/UlKGXOd4eaH/U0eXl3DxSwynqxyMR1shxgBDiukDPveEFgjBGrvSdw KF+8WwYfcYPFMzoC/ZSWZzcln4Bhlh1tu1pVnPspzjcIfnZnU3dn+MApBFW3Z0M3+Y4k yjvz33KPMv0qrhhb0CRvJVVVhVOPnyQBwJk+K2/oJ8duanyx4FHBF6W1DTNv1aNAu4Ou InDX6PVu4uu4uCRx7PPgsUZUJrXCPS+fyVHHjdwaN9RRcO5fAaj909EkU8xKOiz45beU UnixvjQ6QsRstk4J9PBeSaB4PZVKI1fd3D/5FI5or3elszbCouuOKexs5DOwW9zxh3XO T8wQ== X-Gm-Message-State: AOJu0YznDZZ7LCN3FJ8BhbfjvMwIm7Q9i6i/KGXt2xTV4lQWRyMV9FkQ 0D23yIajzl48vo1iiZSjNaaDy7DPPjdQpxZqHUifBV5UmWPb5LHBNci0adcKB7IYKPLJdtpPiMh h X-Gm-Gg: ASbGncv4oLPEl3xkFsCIdnh8HINIXddMixdCPVCsmnZUK8ytBJdabFoNsZ6Ipmz96sR p7IUSpkfUE9CIQDDB3XaYP5ro52B2kTB918WAFRTRMGmaG79Bmr+tX1Z2womb35wWaS3wBhjj31 joD4eFBozPJzxNeXoITvDLcYfgMytpQYttSa3Tr3Uru3tvGjSOHuew2goyE2N7jMAoDxlXCGeFd 0RLthZndrdOCe2f23MyPygvk6Qx+lPqbNPDmNzj83i7iKjfpHlbhZudt2IO1ApD6MdBXPz9oXo0 yvWD/ROFzCO5JAK78Up1aD9h8UaLjm8LugXwmw7i X-Received: by 2002:a17:903:2a90:b0:223:5187:a886 with SMTP id d9443c01a7336-22bea0c6669mr175815615ad.22.1744644637193; Mon, 14 Apr 2025 08:30:37 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7ccbd5esm100735235ad.248.2025.04.14.08.30.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 08:30:36 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Richard Henderson , Yannis Bolliger , qemu-arm@nongnu.org, alex.bennee@linaro.org, Paolo Bonzini , Peter Maydell , Pierrick Bouvier Subject: [PATCH v2 1/4] target/arm/ptw: extract arm_mmu_idx_to_security_space Date: Mon, 14 Apr 2025 08:30:24 -0700 Message-Id: <20250414153027.1486719-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414153027.1486719-1-pierrick.bouvier@linaro.org> References: <20250414153027.1486719-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x635.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, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We'll reuse this function later. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- target/arm/ptw.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 8d4e9e07a94..fdc575ec8c7 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3550,13 +3550,9 @@ bool get_phys_addr_with_space_nogpc(CPUARMState *env, vaddr address, memop, result, fi); } -bool get_phys_addr(CPUARMState *env, vaddr address, - MMUAccessType access_type, MemOp memop, ARMMMUIdx mmu_idx, - GetPhysAddrResult *result, ARMMMUFaultInfo *fi) +static ARMSecuritySpace +arm_mmu_idx_to_security_space(CPUARMState *env, ARMMMUIdx mmu_idx) { - S1Translate ptw = { - .in_mmu_idx = mmu_idx, - }; ARMSecuritySpace ss; switch (mmu_idx) { @@ -3617,7 +3613,18 @@ bool get_phys_addr(CPUARMState *env, vaddr address, g_assert_not_reached(); } - ptw.in_space = ss; + return ss; +} + +bool get_phys_addr(CPUARMState *env, vaddr address, + MMUAccessType access_type, MemOp memop, ARMMMUIdx mmu_idx, + GetPhysAddrResult *result, ARMMMUFaultInfo *fi) +{ + S1Translate ptw = { + .in_mmu_idx = mmu_idx, + .in_space = arm_mmu_idx_to_security_space(env, mmu_idx), + }; + return get_phys_addr_gpc(env, &ptw, address, access_type, memop, result, fi); } From patchwork Mon Apr 14 15:30:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 881015 Delivered-To: patch@linaro.org Received: by 2002:a5d:4882:0:b0:38f:210b:807b with SMTP id g2csp2031696wrq; Mon, 14 Apr 2025 08:31:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVEfNzX8SXlwtIWBLscq0Bie2U4B9QWNwnHUbjX9HyQqfmqi5ZaCcquki8+mDFccsfh7okSwA==@linaro.org X-Google-Smtp-Source: AGHT+IFe+f8+FVWYQhNCz8nR2YGum0YWydi1OmWbhibOzBibCL4ea7jI91rUPEKdZZvsW2RmrVmK X-Received: by 2002:a05:620a:29ca:b0:7c7:a6c1:71bc with SMTP id af79cd13be357-7c7af115f47mr1870592585a.43.1744644700278; Mon, 14 Apr 2025 08:31:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744644700; cv=none; d=google.com; s=arc-20240605; b=StM+gd/WgUegJ5Ae3nf68PNUx94Gj/9cuJcAojrSk1hZEp1BrNGLcQEuZ6amSstbFv qNFVoSEbok1ROf6eILcikQyH//6F7VOgnW5wmBTWzorpngEsfImNXEHJuwkHu6QbXOUk ncCuUcAmQK0RxfjZNakBz5WaeUgcdm+1C+7LaUxPtW/gJp4g6ICMcz1wVCObUXo/0sdb qygjVtREMnVMozzQO/X7s+RNw4XoiAKV5qt/lGqc4yLQrTZ4coMSui3lf2779+R6rcmO 5yjT0VlIVt4t/aPpo8h7nyVrczVvqGULmFX7QT2YnyleCnQxKsOKGgQHqp98AGcJ2GGu GbMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DOhwcP3937IV4/I3AUCZub2ArCcFcEQmAAV0iFEFVrI=; fh=RwqP4O910s/f7q2v/+od0QqvqOwLDH2tZdCXg6CuwmY=; b=IADunv/on0fqlYkyCdT2aylVjyeayHOHGqn01Hq/1cES1PsvA66+ZKl29UZSD5ji/F /aL5ylVGLOQeTbgPJJJnlyYwPjEEUv6dZaFdusycrC2vqne9D/xHURh4McniC5yQ8MaK xME9JcSepMPrO8IGWJoAe5fe0D8P1qcU12x2s/oyNWG2n0JEqGwQGxNgQb+W1ECf6wMa 47SbG6rwkKS3f2OO9nPNxnyONE72Sb6pPqFEDAa5uzaDdt1P5pwBj+1YQaAU3u5s/7f1 ELQGIJVa+yKrvR2QzGlwS2XQ9Y1FgBC8uy26XYwnOfONaet9DeQZNd7O/MYZbjFQ5TSc lmjA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mfOCG3j5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c7a8a0d0a7si830722085a.456.2025.04.14.08.31.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Apr 2025 08:31:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mfOCG3j5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4Llr-0000e1-Nc; Mon, 14 Apr 2025 11:30:51 -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 1u4Lln-0000ce-MB for qemu-devel@nongnu.org; Mon, 14 Apr 2025 11:30:47 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4Llj-0005X5-Ii for qemu-devel@nongnu.org; Mon, 14 Apr 2025 11:30:46 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-224019ad9edso58174255ad.1 for ; Mon, 14 Apr 2025 08:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744644638; x=1745249438; 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=DOhwcP3937IV4/I3AUCZub2ArCcFcEQmAAV0iFEFVrI=; b=mfOCG3j5jT2KAgpvqulZ5Qp3FsIdsha2oUSj3kBX8qS0ZBNGDbrdpR1S2vNhAYxTtc RTF0y6HA0Xz9OrTtlwh2EuRVoBk6Ii39J4dFjyBJSQhAEQGbejbfSZnPA2zbCotcQK3U I6JBDG91GfJ+aEkZ9NhBwk7YbVfKegFvMV5W8KYpcmE/cB2tUd7N59vlMvxGhbHcNTpF YqaIBXtdVjoxikEJdhZrQQzMlqrbizecEpwWF9WRkxTwiQs9zfuhndSGyQD/QKEKt6RR Zir+QLpoSEEhR4QjCCs9PLRB5jnPqzr6M6ZiJxXSISZawp/tJrWwM1kRTC0Key+qmpCS NWUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744644638; x=1745249438; 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=DOhwcP3937IV4/I3AUCZub2ArCcFcEQmAAV0iFEFVrI=; b=MknPoqTlSVu30Psx/qG0a7kcy+sOjvQC9+PWDby7mkxbMTtlYIn+T5ZY4akLCXSGic 20w71L0nLGuq83WAtF1j1w5ygQkK05RjNdR0+DOa70DjDE49KByRWbQS5QFPd1pv7xzL mTEcpB5XxgwaWtcfyeFp1A9u/AzfvOfMJauQvvhq3qwp6P4jwEb5nL+YsD1hh+1+cZ9C iAQUXZe3A9Gt7iD0tIS0+TuPyZg8j+LdBfExDgbzWr9fZIGDBc7sLIlatIXrOuslmW31 c/4J7f6XFN1DBRfTlLdwn6ieUH/7NM0SBJplEjfyJ/g0iA7GHsAowtU7o+o+l6D1zdOy 7DAQ== X-Gm-Message-State: AOJu0YzXdx/7mQcO9fi6cfe/14rIEJMwFPZzCBRMdDZpWYPF0Px4hTeJ gtNOxpErHSWmuGN61M/b4gZCk4lxlSmyVDGuZlF/3mFM26kRW/KmK+SitxT+zLKxgytIRTFH8eQ U X-Gm-Gg: ASbGncuerw3HsYoL04MuoKQR5iL6nTqKuzrthn+d3hnOKZ/icaoqKzJU79RNP0gtILm cI4vUbSWTZn8vSKQgDaK1y4CYGCN1gjgM3TijRksTLx421vKbN2WO8h9Kf0oi+MTJP0Y88lKxay oz94UDTAlkcdCSCqQGBKpgKpeLSzLGRnY7ywPP02fZP4eNThFzSvIafLUc2Q5PkGjef0PIErNMF t7Be0kZrsBxoZpjsMpJqVZGdDTJ1vQCXPJUgtnyAbDezwrmqULLsxwT49I286FzaJSi4TP3seLl gY3vqegWUAwNHGQL64A0v0o4auANCGiRMFZEkT+v X-Received: by 2002:a17:902:f712:b0:21f:35fd:1b6c with SMTP id d9443c01a7336-22bea4fc93emr191716465ad.45.1744644638076; Mon, 14 Apr 2025 08:30:38 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7ccbd5esm100735235ad.248.2025.04.14.08.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 08:30:37 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Richard Henderson , Yannis Bolliger , qemu-arm@nongnu.org, alex.bennee@linaro.org, Paolo Bonzini , Peter Maydell , Pierrick Bouvier Subject: [PATCH v2 2/4] target/arm/ptw: get current security_space for current mmu_idx Date: Mon, 14 Apr 2025 08:30:25 -0700 Message-Id: <20250414153027.1486719-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414153027.1486719-1-pierrick.bouvier@linaro.org> References: <20250414153027.1486719-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x635.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 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org It should be equivalent to previous code. Allow to call common function to get a page address later. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- target/arm/ptw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index fdc575ec8c7..c3e4390175e 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3635,7 +3635,7 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; ARMMMUIdx mmu_idx = arm_mmu_idx(env); - ARMSecuritySpace ss = arm_security_space(env); + ARMSecuritySpace ss = arm_mmu_idx_to_security_space(env, mmu_idx); S1Translate ptw = { .in_mmu_idx = mmu_idx, .in_space = ss, From patchwork Mon Apr 14 15:30:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 881017 Delivered-To: patch@linaro.org Received: by 2002:a5d:4882:0:b0:38f:210b:807b with SMTP id g2csp2031816wrq; Mon, 14 Apr 2025 08:31:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUsf4UAR6/akLM32HWprch7HnKC/H9Hv3qidsk+1xt1XNMg8KZhKeJXNnZkTpMUUtETZ26LUA==@linaro.org X-Google-Smtp-Source: AGHT+IEitHiGSZXRk1ei6LAI5iKWilhp3VOG/UKdKjI+iq6NbWtnbT1gHevTOGmSPtIzk5+b8spg X-Received: by 2002:a05:6102:3308:b0:4ba:95f1:cc83 with SMTP id ada2fe7eead31-4c9e4fffa56mr8386825137.16.1744644712200; Mon, 14 Apr 2025 08:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744644712; cv=none; d=google.com; s=arc-20240605; b=Z//9CAO3+y0LNc1srewyqjVUHYnyrRAXJm76HeKLAbc7FMZa2rIFX0ofj4iLXUHkYP FaXgt72oyI775mUsYjsQRF7+F4nxiOwG/y/ilrTwYXKn58wcA6EImPlmW600hNfLVkDA 9iuXCVNlaEHU8eXd6rN88WIjb5TSr5XoHC/U5iJY7R1FwDrGZQhT8v+ORaPOtJTBEriQ 5YTpvGuqfXBgFnx9+60iQ4oY0vBLzmzMQeJUntBSphUVnVuTaTzSEDdA9lPO/hnbAs54 JR4JXVspcyCPvm9L7AeIBsgnaNZFLYQ4lkvFo/FpWg5jZr6Iq0uXTxA0lKZIRUhMWkff TEHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TqyBJJOm46Sb82n8FzKaMXcdhyeyuBYZxwBUrlvI8+o=; fh=RwqP4O910s/f7q2v/+od0QqvqOwLDH2tZdCXg6CuwmY=; b=WU15qL5QSIuW3eN7jsDLJfOMJeW98W7NM6LvwY9E8tjbjrOQ5wj9Wb+QKECO2+kGHY lWp7r/vfHRGfAnHMbj3dp7LDCJsf4k+vrPwHbUAJ+Fm3CNLwLSNCS/dAuaOra7yho3SO ggmxkX1ZfRtd5MBVfvK1zAbEqjhiKy5f6tGeetKkDkAOpyTnat9akli4XGoIdIhm3rrl 4WRBGvwK91NjcudAxz/Py65IMmwpi2P4xi2IINfLGkq8KFCy6xkX3frhG1wFdFIPky6P Qejuxvz2On9Yd0fCcAWvfoOd/a0INoe6bCNHdsH+6wwPbO1rEjAIHQfPSJ5Z8CWE+KBe bzbw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XAhCQWPt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4c9c976c64dsi3793878137.169.2025.04.14.08.31.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Apr 2025 08:31:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XAhCQWPt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4Llv-0000hq-Gz; Mon, 14 Apr 2025 11:30:55 -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 1u4Llr-0000e5-K8 for qemu-devel@nongnu.org; Mon, 14 Apr 2025 11:30:51 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4Lln-0005XV-E7 for qemu-devel@nongnu.org; Mon, 14 Apr 2025 11:30:50 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2295d78b433so46677525ad.2 for ; Mon, 14 Apr 2025 08:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744644639; x=1745249439; 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=TqyBJJOm46Sb82n8FzKaMXcdhyeyuBYZxwBUrlvI8+o=; b=XAhCQWPtI5b9ASzbVx7HJhZ4N/BwCxKWyyyXrtwUxTrH3om+e9Aru5Krff/pGuprWp cWSOIhu5HkoRn/L89fkPPajOVqlPm1ROeoaMlgAeEB1zSgXFBwOsS5hlqFhOwlffLDA7 FjBllEglTWhOdYEz1CKrqt0ay5oIIyfHU97yQhrBcOi27yIWaZWh1Ce508VuR/D6d5v6 Imyf804pPbdGsP+Z7hywAZMVdzxlXc23kTbJ8zkevv3inUDOsZlm86ZNloi1NhYTob57 dpRMw6ZfuOb4rKMicH75XtHaAo2H6ZthLMDBKvq9axV/ZmakPoMd9q4l6hp7Umz+IPQr Up2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744644639; x=1745249439; 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=TqyBJJOm46Sb82n8FzKaMXcdhyeyuBYZxwBUrlvI8+o=; b=Ua7MOtQDA8ycLmLnMSs/er1PZkCnVZBwU7KdV5L4LffF6ZOMLVu6E+a/w8RwNS4q9K 3vKVwY3jwGX817OVuHvTxesgkb6QF1LO8+i17w/ZuYRNL1gBO7ow9oOTeTcSwe4MnHcX FXenInq8MD1AATyvO7j4sBOIl2KOALSyCGr9IE08aObG4VTpPFSCKV+DLYquJDlQRMsh x/H/n/Bnn5/Sb5EYQpDqSW3jYhF1hoE4iKY3i4NC/4yBvJ4rv1V80iOxcLtlwZXg9BtR C/hgQCBhuKjXZ9euwhLeviNtVwCQMFSdEFlD1gzbBXNcmm6ya62FsTf8Gge2TN+sZLAP ScsQ== X-Gm-Message-State: AOJu0YwwBN4fG3CF8+OWyYn57ZAQH4DZhl101ikY6LWVON4c7VCaCJyq ZjTWCDxqXF5C3zLMzeDyOiRSSAJwHJwXOPiiszeqE5w1LaCiiNgrSOi+r2bWytpiqM9OPQMSp8/ J X-Gm-Gg: ASbGncsbxMdrfj2klgdDw2cpGw4ABTj0iaNMJwAEuT0zShEfiOtwfkFy0g3rXjXADFq t2kXYLZ4AbnsaBSdQxOxD7vc9CER7NdLX/p4l6kT7fEeAB15kOUAMFq4pRdU0Sl7IMKuBrZaRTY Vg3nUqmeUdN7ZUQ3AEl8zOMsoAvWS27BifwxB7R5cDKVwiwLpO1/2Y/4rVbYTj0ths5aU/IB78B 30QuQQXSNwADvGQtY9y0SKbNYJ3Q2EotKXKGrHmleD7EZ03aED/qJXJZsE1PJkqmE3rZ/luB/Ax EVs9/mNFZdUBCvxx2A/V76ky3AAWkU2bdScnYRzsdcM3GSoAWX4= X-Received: by 2002:a17:902:ef0a:b0:21f:2a2:3c8b with SMTP id d9443c01a7336-22bea49d314mr182921865ad.11.1744644638942; Mon, 14 Apr 2025 08:30:38 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7ccbd5esm100735235ad.248.2025.04.14.08.30.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 08:30:38 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Richard Henderson , Yannis Bolliger , qemu-arm@nongnu.org, alex.bennee@linaro.org, Paolo Bonzini , Peter Maydell , Pierrick Bouvier Subject: [PATCH v2 3/4] target/arm/ptw: extract arm_cpu_get_phys_page Date: Mon, 14 Apr 2025 08:30:26 -0700 Message-Id: <20250414153027.1486719-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414153027.1486719-1-pierrick.bouvier@linaro.org> References: <20250414153027.1486719-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x636.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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Allow to call that function easily several times in next commit. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- target/arm/ptw.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index c3e4390175e..bf92c165175 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3629,23 +3629,17 @@ bool get_phys_addr(CPUARMState *env, vaddr address, memop, result, fi); } -hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, - MemTxAttrs *attrs) +static hwaddr arm_cpu_get_phys_page(CPUARMState *env, vaddr addr, + MemTxAttrs *attrs, ARMMMUIdx mmu_idx) { - ARMCPU *cpu = ARM_CPU(cs); - CPUARMState *env = &cpu->env; - ARMMMUIdx mmu_idx = arm_mmu_idx(env); - ARMSecuritySpace ss = arm_mmu_idx_to_security_space(env, mmu_idx); S1Translate ptw = { .in_mmu_idx = mmu_idx, - .in_space = ss, + .in_space = arm_mmu_idx_to_security_space(env, mmu_idx), .in_debug = true, }; GetPhysAddrResult res = {}; ARMMMUFaultInfo fi = {}; - bool ret; - - ret = get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res, &fi); + bool ret = get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res, &fi); *attrs = res.f.attrs; if (ret) { @@ -3653,3 +3647,13 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, } return res.f.phys_addr; } + +hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, + MemTxAttrs *attrs) +{ + ARMCPU *cpu = ARM_CPU(cs); + CPUARMState *env = &cpu->env; + ARMMMUIdx mmu_idx = arm_mmu_idx(env); + + return arm_cpu_get_phys_page(env, addr, attrs, mmu_idx); +} From patchwork Mon Apr 14 15:30:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 881016 Delivered-To: patch@linaro.org Received: by 2002:a5d:4882:0:b0:38f:210b:807b with SMTP id g2csp2031723wrq; Mon, 14 Apr 2025 08:31:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXOez+wCe1GwcvqJOfi33v6Mf9im7NqWm9kDfhJRk253ZjfeuzlLxCADYdJTJDLuwV4aLCcSw==@linaro.org X-Google-Smtp-Source: AGHT+IHcQQkZiz4WgI8VJpSWN/XmLwXP8yMi4kU7tPtvv0+8+6mbYfAobq44CscZT5bTJnSRnF2x X-Received: by 2002:ad4:4ea1:0:b0:6e8:ede1:237 with SMTP id 6a1803df08f44-6f23f187131mr170790516d6.43.1744644702678; Mon, 14 Apr 2025 08:31:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744644702; cv=none; d=google.com; s=arc-20240605; b=MIUUbm0gfP25lw3m/ufnRIE9LWyutoigeabUOZ2EOBEWMMoXy+mPphQrSPAltzw4dK ugc0AhNKzMAj0z12m6Mekd1TCOFp9JXqaQ+9Ht8Q0Sdx6A1JagzlVeI45fXDHQCav73l rk5xECzB9WxkVVNoHwyqWtRwzuCTO2Tt2hneNJQd3QuARcXKa1zKLWf78Y5QxtfXPdux 9NMRuUKU/ruS/pXzz3x+7hS7KOU54yTcG/xbtihMuqvPeZ1ttX/06hODIAaXdQlUp51J ZSOETGph5BacJAtgRnhLQbBs+nKZR9REBD86FVzjzKyEbv4gIV1wlN5PnQ4g4l8tjzg+ Yj+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=c4v87EGjTuaQERVq3RVHNWa3GtHDbP3djfUZXGNYCVw=; fh=RwqP4O910s/f7q2v/+od0QqvqOwLDH2tZdCXg6CuwmY=; b=FPZ60yNRLYCK4MMJouGqUi/BVWyrv6Ysfp60zFbJWV4ieoIpd8O8MsK8KQqVonn7n5 X7UuUn+mWx8U7dB/GmwX2mtHz75kz/yN3VY/LDj6xbM0gbXU90DEFXS95cMD6riqSV2w b2NNc20biy8gEI8Fhb5ZdBCuBNdRf0qwfbkwB2txHCvTE66nwxQhdAiWd6OWrwgZcO73 ML0Eq2pTz7+hvahejMlUv5h+tq0atJSMiyUcA/Pb/oHcCgwI+f73k/qq4IHA+pljOz2g Oi9Igz2aE0p4d2vpHauYYEJUnsjMp5KFIHcecNvwTUps3PwsRnDuV1C/ES7W9u3EFI+X qFnw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M6HZr1Fz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f0de9dcc73si101526496d6.251.2025.04.14.08.31.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Apr 2025 08:31:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M6HZr1Fz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u4Llu-0000gZ-DT; Mon, 14 Apr 2025 11:30:54 -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 1u4Llr-0000e6-Km for qemu-devel@nongnu.org; Mon, 14 Apr 2025 11:30:51 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u4Lln-0005Xn-EF for qemu-devel@nongnu.org; Mon, 14 Apr 2025 11:30:50 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-22a976f3131so46250605ad.3 for ; Mon, 14 Apr 2025 08:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744644640; x=1745249440; 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=c4v87EGjTuaQERVq3RVHNWa3GtHDbP3djfUZXGNYCVw=; b=M6HZr1FzQcGRtOMMrtRblHUGSJ2c/X0+YX7iaYopFIg+SgmUBgPyAwSwyuqeSJcSqP 6vwHmA6LCnfmG7cDsji29aEamHBKNvPJf7s1770g59V6ykY0K+uADtnOJVWZ+qXikWjH pr8R2GGfKOxHDLS88wzG1ae1nPEWpJTMjZBnmbtM/+dlTiL61Rw3nP0Qfywdvq+skF3V BbqF8L1ciK3Z9gO4vtxiullCTnPY20Js29YeDZwUBdyA4jo/y24zszRAOKdOIJxmTM1J 0Mru0m7xunI9UagP2UNuJdWq67kXybBS6uyX0o5vcMiDH0dls2fXOZWaNVJyHck7bCpJ Yffw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744644640; x=1745249440; 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=c4v87EGjTuaQERVq3RVHNWa3GtHDbP3djfUZXGNYCVw=; b=MKbG5XAm27MqB7Unf4NS2V9KM6srcG1jo5wvPhL2mcLGL/5L7gsPdv0GNB+NVKP4Id x3zNPmJWj1HgqG591I3FDOGPP+QrLOw7PXYmGPq5cllVcXKCqB4dObH0O0G03Vl3N51/ hos3UUcL4IlhimUFlKDVN2zT2F/UiKSKHWAIQ9tH+9BAamBCDGLs4P5hklH5akkEsTde 6wZ3I2xtff6jw032zVtebfnE235G/GDO93XlBt1758/a3KbKegA96TwO2DVW40t3iJI5 CjLJDy57ScXZzUkBFtw8oFJL/2AHqcbAHVuD+CxHOE0p+Sm2ViYNVtD+c4o4/u1X8y1R mktw== X-Gm-Message-State: AOJu0YyE26CsYtWyd0JWSQarLpcYtQoc5ci/hu0uAJ3f6sFe6dScCWqF EfAdLxUWnz8S1xUK56OREn6l+Mnnmtr/62jp4QVs3GqEkKtSuwnGORj8Bc+4lhieq6BUisshHBn O X-Gm-Gg: ASbGnctGcOSvcZYQBeYxLCZP8GRdZBL/YmdrV57bKs6uf4ip6IIXKl045rqAuyPTPOB rpW5OXZ138DL8MiI/QrwESMedZ/AKL4PJrSxiKHmwUmSDoed7P+N23gtc+MmvzlsTa9rS+gxzw/ uwNt+6LyZ5bGkMS3iQl8buvq08lLwFae1VAFoA4r9yva/HDhCiGkJ8+noy1h9RIS0NljrP59EMS MnSiytm75zU8GaJFNNNIPJWOqj3O/RqzqA1wtLOurbg/0iz7PZrCYCSIQMzZfGoJ1pQMBQEARo/ 73CCPWzAuHRpWe3KOyQiEKxyy9qAp6qKxBeaRAJKgdfpSgUx0Ic= X-Received: by 2002:a17:902:f64e:b0:223:f9a4:3f99 with SMTP id d9443c01a7336-22bea4c76acmr193097885ad.29.1744644639773; Mon, 14 Apr 2025 08:30:39 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22ac7ccbd5esm100735235ad.248.2025.04.14.08.30.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 08:30:39 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Richard Henderson , Yannis Bolliger , qemu-arm@nongnu.org, alex.bennee@linaro.org, Paolo Bonzini , Peter Maydell , Pierrick Bouvier Subject: [PATCH v2 4/4] target/arm/ptw: fix arm_cpu_get_phys_page_attrs_debug Date: Mon, 14 Apr 2025 08:30:27 -0700 Message-Id: <20250414153027.1486719-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414153027.1486719-1-pierrick.bouvier@linaro.org> References: <20250414153027.1486719-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.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 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org It was reported that QEMU monitor command gva2gpa was reporting unmapped memory for a valid access (qemu-system-aarch64), during a copy from kernel to user space (__arch_copy_to_user symbol in Linux) [1]. This was affecting cpu_memory_rw_debug also, which is used in numerous places in our codebase. After investigating, the problem was specific to arm_cpu_get_phys_page_attrs_debug. When performing user access from a privileged space, we need to do a second lookup for user mmu idx, following what get_a64_user_mem_index is doing at translation time. [1] https://lists.nongnu.org/archive/html/qemu-discuss/2025-04/msg00013.html Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- target/arm/ptw.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index bf92c165175..cdcb6a49fa5 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3655,5 +3655,25 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, CPUARMState *env = &cpu->env; ARMMMUIdx mmu_idx = arm_mmu_idx(env); - return arm_cpu_get_phys_page(env, addr, attrs, mmu_idx); + hwaddr res = arm_cpu_get_phys_page(env, addr, attrs, mmu_idx); + + if (res != -1) { + return res; + } + + /* + * Memory may be accessible for an "unprivileged load/store" variant. + * In this case, get_a64_user_mem_index function generates an op using an + * unprivileged mmu idx, so we need to try with it. + */ + switch (mmu_idx) { + case ARMMMUIdx_E10_1: + case ARMMMUIdx_E10_1_PAN: + return arm_cpu_get_phys_page(env, addr, attrs, ARMMMUIdx_E10_0); + case ARMMMUIdx_E20_2: + case ARMMMUIdx_E20_2_PAN: + return arm_cpu_get_phys_page(env, addr, attrs, ARMMMUIdx_E20_0); + default: + return -1; + } }