From patchwork Thu Apr 10 21:00:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14047221 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7EEBBC369A6 for ; Thu, 10 Apr 2025 21:02:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2z0t-0005yc-RM; Thu, 10 Apr 2025 17:00:43 -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 1u2z0r-0005x9-DO for qemu-devel@nongnu.org; Thu, 10 Apr 2025 17:00:42 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2z0o-0001l7-R9 for qemu-devel@nongnu.org; Thu, 10 Apr 2025 17:00:41 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-736b350a22cso1102742b3a.1 for ; Thu, 10 Apr 2025 14:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744318837; x=1744923637; 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=3O+ATcLarMi7TZZVeImu0PwvfcFGKqqf7QjA5Mk9PLE=; b=CGIxL26AA10ZS4wXmRj5Z150a1ynIzeTelyFyJQgdj8hvo6OIgsFiaJhPijSCQ/rXE QUdWhmsLmMeRRU/1M5Wof9Aqg+Vawn26kusVLQY2fSv/6gulf7c7Im4b2T2/Ga+Asqzy T3tLSKFHSv45wxDJRUuITTbpN9tndBbUnUXcx1JtWN9bFtPSuqcA7QG4VjeflwVC0dB/ /T6KKzLpNZU/EQJH66PWxV3iseXFBzog8PUrNmY62x47LTmZOdsJtwQoiEYD5F/Co2s4 oyE6KzoJIfjM9QGAwh6i+9ZGmvuJCak6WHY75Y1Z7jES2+xNbw9cr1FEkK9M32aidode HP9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744318837; x=1744923637; 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=3O+ATcLarMi7TZZVeImu0PwvfcFGKqqf7QjA5Mk9PLE=; b=g1LFCdjiqA5yLNjkEL2JUcAdFcpocNmVyMvVS7Qyn5T6OuD6Q3AvIMyedVYuazKZSv nMJRuFRllP/CXRMTf9I+4ZyC3h52ksXCYjyVKjrzCqFC3SJ8MAeFxWVhy0zygu3aBidx XF0SK8oIy+u+9xDiK+J3a0wmmarnCZpAY/S26AgScYh6RUDxd2ttA+hvPt4YZKO4NlRX PfGGUF+g7bPNGcDUqXjwyRjExr6e+ibTjDI0gfKTDoDYCSoc9ozra6IttH++TTO1sBgT KqwN/1njh4nlW/3wEEBMgQZQrrzhFwobNTYNUrg58zwjm5E42QIUjEjuh4FAxM9HBg+a +83A== X-Gm-Message-State: AOJu0Yzcpgp3PM/ozGlJ6XRNn0cVkz720RmPgzJjei9OKZKQo+J88Fc1 ZymZTusnfGBk4JP0boJLKYfA2wVm5KPK99YDSj906i9nIJmJ6JgfZDP3ZYUpPGjd9Y8IWwzrqgv g X-Gm-Gg: ASbGncuIxQCBFqsWOWaaBf14iPSe+tbmWzWWFLTsIumqMDjww+3ttgf4XV2GG6hsuMS xV7fgLcZmuqZ4YDXNiwt4+vJmLDaz9MeFL2WL8pE2TdsaVBKwmPrSpNpxgVX849mHUtMVYbyZNx K6A1qSZYURAHZGFD3sb3ZJXYOzmbAOuW/JABY+I4I7SQTs78RZ1pD25jDDPc7MDsjg3s8yQ8S/E 8v5nLhBWF9QuOGXVAdGEw6oSTDog+1zuPvK9CH8zl/RWAEZ8YCfj0kgIkxpwDpLQVklNdcWa2M9 iJpjc+NpWkqhL3/edpjlj2XRWix+a+Jo3GoUBOPa X-Google-Smtp-Source: AGHT+IHYmNsR4rzKKdqHaVRrwg0X9ECfGeohZSUpsRRprGst6uEADC8CnJXXG71yiK/pVkD2wl2tgA== X-Received: by 2002:a05:6a00:4644:b0:736:9e40:13b1 with SMTP id d2e1a72fcca58-73bd12b1315mr371116b3a.23.1744318836380; Thu, 10 Apr 2025 14:00:36 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd22f82a3sm12431b3a.90.2025.04.10.14.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 14:00:35 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Paolo Bonzini , philmd@linaro.org, alex.bennee@linaro.org, qemu-arm@nongnu.org, Yannis Bolliger , Pierrick Bouvier Subject: [PATCH 1/4] target/arm/ptw: extract arm_mmu_idx_to_security_space Date: Thu, 10 Apr 2025 14:00:19 -0700 Message-Id: <20250410210022.809905-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410210022.809905-1-pierrick.bouvier@linaro.org> References: <20250410210022.809905-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x42c.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org We'll reuse this function later. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé --- 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..5e196cfa955 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 Thu Apr 10 21:00:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14047220 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1B348C369A6 for ; Thu, 10 Apr 2025 21:02:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2z0s-0005xE-Ks; Thu, 10 Apr 2025 17:00:42 -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 1u2z0q-0005w9-7l for qemu-devel@nongnu.org; Thu, 10 Apr 2025 17:00:40 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2z0o-0001l8-Fx for qemu-devel@nongnu.org; Thu, 10 Apr 2025 17:00:39 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-736b350a22cso1102744b3a.1 for ; Thu, 10 Apr 2025 14:00:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744318837; x=1744923637; 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=qQocORlIWShowiqK86UH/3i1rW1ojRKl4ZKvCvKtX1c=; b=Tf9Lszg03CbeOjREJHpkDMjVGwB4TBi8NBoUQ5dAspJbJeocMKfsyiMBanSmugWaEs wx5PW5TpyGgmhmG57rMJmgAwhKSsbECgxJorgR577/bpYecRkRT9/m7R4NF1z2bNz4Zs SPUUeshBWz5p2PuOYCd2Y4pQ5RYceN0qQ/dvPYC0b9RwXAAdCWGydjXIZipW/EpA68gm DfnwyI+npId+u5gVZgLeZ/3o9Xxtkvgm53uwAC+K7mYtYYDVD8edwEwazfkkfMN98kTy mVX31sK1i8R4fOjs4gcO4QWjNEiMwctU4Qft/TVxNbZIpBqKV6CZ0A4NKNZxDh2Lk1jS C4TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744318837; x=1744923637; 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=qQocORlIWShowiqK86UH/3i1rW1ojRKl4ZKvCvKtX1c=; b=gOm5zxbCQ/PJcCyLNHttHpmUGg5RKZFs0sY0YXd96FhT8jWcOeEiWB1TkOG20UsgEx R4VPWUiIyJ/5/P1DiuVE/7d1101pSD6zSMuRGH1i4itP3wV/OBPd4fGoo5IQ4omHHWyM cjAQ6n7D7ufbJ1e0PYROaXj1MfESu7j7f81U6de7bVTbix5HdJzrNqPkJHWPcVjDf6Qw OZPosBfs+8cp129PjEct37v/2/omTNrouy2/y06ecwMWdzdxnoMjOP//swT88PapjsH6 d1lLLbJ9X6K4LS9beHLw64eSZomPe2lRon0meBdGMz+p+HTyb9OPiXOieOcolxp7J74L cObA== X-Gm-Message-State: AOJu0YxgNC57w7Yk+iAOUUGZlVnb1dLWfsfxD/KC/tYi3B/hIZZqORr7 j5zfBU7sM82Lb3qhi3S4NOUREvL8KLgN1/PQL4Hy4RifpjqhhzAq4CXsa1aj73b3b7Sh/Wqc2Ws Q X-Gm-Gg: ASbGnctqqfKEm/FGoxJWNUk+0dCUPWjCQhaiXk5iNA5sUP8U4qk/apu2NLpwBAX7CSt /eeHDHgdIl23zljMR38kylCubnPHzBDClskEtcCM7ciaKqEcki4Dz3erTf7sfxArCDnmYtDxuLm zQxTm2imdiEa0tiViu56AWgNdI26QaLQG9mTNRA6BkhCKf5RNoW4EBWJmVPYIj0ZsmUM7NlYFIS nMiC7aAaZkWOrGGJV9K+BvzSB+hg1AkBRhJjz7V3ZuZ/VGCGwRIZ7WQ9ugfCJ6mgOrW73d7CirE 3+qzDZ6DO9SPhBdYqqWUOpTNpgyyvYkWcyhT1kAPXszYyDO8q5Q= X-Google-Smtp-Source: AGHT+IGzeww3U8kOE0MMW031fRG2ZvP0muFJ3dukUFGeGEgW/yFFEZB8SP3ucUih1wFJ97p4lnaXDg== X-Received: by 2002:a05:6a00:179e:b0:736:a6e0:e66d with SMTP id d2e1a72fcca58-73bd11e7135mr381290b3a.6.1744318837234; Thu, 10 Apr 2025 14:00:37 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd22f82a3sm12431b3a.90.2025.04.10.14.00.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 14:00:36 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Paolo Bonzini , philmd@linaro.org, alex.bennee@linaro.org, qemu-arm@nongnu.org, Yannis Bolliger , Pierrick Bouvier Subject: [PATCH 2/4] target/arm/ptw: get current security_space for current mmu_idx Date: Thu, 10 Apr 2025 14:00:20 -0700 Message-Id: <20250410210022.809905-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410210022.809905-1-pierrick.bouvier@linaro.org> References: <20250410210022.809905-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x42d.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org It should be equivalent to previous code. Allow to call common function to get a page address later. 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 5e196cfa955..754ef0d3a25 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 Thu Apr 10 21:00:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14047223 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7A0F2C3601E for ; Thu, 10 Apr 2025 21:02:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2z0u-0005yt-4u; Thu, 10 Apr 2025 17:00:44 -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 1u2z0r-0005xC-GY for qemu-devel@nongnu.org; Thu, 10 Apr 2025 17:00:42 -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 1u2z0p-0001lb-Fq for qemu-devel@nongnu.org; Thu, 10 Apr 2025 17:00:41 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-224019ad9edso18111725ad.1 for ; Thu, 10 Apr 2025 14:00:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744318838; x=1744923638; 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=PmeV86UWNxMTSPkNU4LeBxv7d2QnrBx0YubZlLs/qhU=; b=jgMVDr2bdgdohL8//DMrQBoIzFy/nWB3riBShponSud05c2Xik7TvRg2Lsmhmx71HT vIC8f9SGY1VPZ5h/EyijedNssgNrBY+zSNYHCq+gi7MsD8e93knRdmmV0inYOOcgLooc WzXKOK/rL0ibM54AVn128jVGeZdtO3UgDYyPLqIkBNL8bloNpb58ix6RlcaRH6kStryY VezNqXfP5550QG1Ox6OF24XWG3FXq3NTA79I+RTn4QewSVIp5xfE7dIs+7wuCMusbRx2 J6cFzv1brczCxJcDInhbY0BG2YHHrg6cCop2WZddNmpQdanhQy+VkoES0LZUVUSBniQw Vejg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744318838; x=1744923638; 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=PmeV86UWNxMTSPkNU4LeBxv7d2QnrBx0YubZlLs/qhU=; b=Au277q/OP3MVMGW+alfjW6pL2DfotXNR/5LK0KvbmOTAb2xdqCWS0pb9jHpf9xGpDL gKn/nsPbcyBq6gm+PpHNHLM2j3d86GWg9XiKDnjH7ocY68h49tCAYOICflbRHaQxaHPd /rjg8U2N5ol/HoWcY3ZCrCdo/r+dJ3ldojctQz3BsZ+TPktxTBUUMqd+Nj8SdKZh9PHJ MzDHbubiQBpXtMDwHOkajbSODieTE6pkGFej4eumSNgNSbkSPB03WVgbxI54PKNI/RSC 3hhwPqSuwiXHXvD/BAbzwU84ntKVZ7+XoNQ+d7uiv5ZhSGB6tw58GrPLeh70YT2Uj/mo Q/Aw== X-Gm-Message-State: AOJu0YxJkLr+qhNLGE1H7z1xWclqxySUQOAcUDxru9DUXduybBXUiqHJ bjwoQaI8BmjSTCGGkX8R9byMytdPygFz+KafrbIE0nqJ5AkkHvQkHLftah9oUZgh/gJBBjVMLBc Z X-Gm-Gg: ASbGncubDBwE01rHIkIb/rO5VQmXS3dDHP4oIQbiDZCk9yCk+7dBMl/jsqlRxqh072S 8IRljsKFSLICEAYNY3EzoqetwGUDkZqo+Gg9ZZU3mXdlCsTEEQ1fC75OparmVBr4123qNic2P7N YfzxI4iNs4TqGSqFWDc6ZmAgHXrKVajaA9kvC+rfuBUdwOex9De1wN7MIOYaG2nDGkenJNk6aBu 3CiPtUokjNcTc04Eg+vKEKEpZwET2Nist6UeIm+TWg90oyKCJvP+C1iMNBlfM2olYcjn61nDzqH 1MU/eyZtkayl+3rcfxzJe1ApqX4xWsbBo55iNX4UIa1MzJSLOic= X-Google-Smtp-Source: AGHT+IH9ApjVDIlbHEiORAEkYyrDKhJ0F9TX9kzkMWvWD3E2WfGbbgaIrvceXWKN9jCNTc4t82oH1Q== X-Received: by 2002:a17:902:e5cf:b0:215:94eb:adb6 with SMTP id d9443c01a7336-22bea4efe58mr4867695ad.40.1744318838103; Thu, 10 Apr 2025 14:00:38 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd22f82a3sm12431b3a.90.2025.04.10.14.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 14:00:37 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Paolo Bonzini , philmd@linaro.org, alex.bennee@linaro.org, qemu-arm@nongnu.org, Yannis Bolliger , Pierrick Bouvier Subject: [PATCH 3/4] target/arm/ptw: extract arm_cpu_get_phys_page Date: Thu, 10 Apr 2025 14:00:21 -0700 Message-Id: <20250410210022.809905-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410210022.809905-1-pierrick.bouvier@linaro.org> References: <20250410210022.809905-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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Allow to call that function easily several times in next commit. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé --- 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 754ef0d3a25..6ea39ee5755 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 Thu Apr 10 21:00:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14047222 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D455FC3601E for ; Thu, 10 Apr 2025 21:02:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2z0u-0005z2-S3; Thu, 10 Apr 2025 17:00:44 -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 1u2z0s-0005y2-VC for qemu-devel@nongnu.org; Thu, 10 Apr 2025 17:00:43 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2z0q-0001m5-VR for qemu-devel@nongnu.org; Thu, 10 Apr 2025 17:00:42 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-7369ce5d323so1170190b3a.1 for ; Thu, 10 Apr 2025 14:00:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744318839; x=1744923639; 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=M9OwVMJQ+nPgoXVT+v3WG48aEZrZJjJFRvNoKJmm5KU=; b=genz2iH7VjZDoX8FyfqXEJoTHv8CZ3qUiUBLr5eyU7AWxndlM3cDNQr4DAvJgZwMCC oh+ZZSjU0ai+i3KlRR960zsFB2Ggk23Ivx2Lr9PZQaYC8RXaUNUu6CGvsxLhHAlUq3TP yEhY2F8mh/y72bj+dXB6cBcAGraep0ejqfD3YjLC3kxLaNNLM/HtIaPJMVR+fHjbBzCa 3vRhfGmFhp76enPILSxNSdu2F0LYDUYEv9b9DG5r2IZEfywxBzi16s/Jn3sI6xcizTL8 EvVV31mVxoSxRWpIWnO3AHSW1jbzDsgcxwisFEyLeD5+ftHOSab79RenZ+jT6q3jcVIn iT+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744318839; x=1744923639; 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=M9OwVMJQ+nPgoXVT+v3WG48aEZrZJjJFRvNoKJmm5KU=; b=l4o70oU7bDeT6Jp2QB+Z00YwBau/7zlJGyTL4bzK9Hk1Na8P5KIkKK50AIdm0y/GNk kh86FQRDBQTd3EHgC5uq/d1asGNRjcQ/iOWkd/NBz6Pcg9QV0cDKMPsIC5qw7QAttd2z Np2gTj5f4Q+iX0kpOjEr/klx+9oD2b9MSPtAC5n6jzXQ/Qrg25l+IEE3TDMuhxEyxAs+ D2hIBoqYdQCpJaXUMrc3u+W3LrEaepMCK6tXhjq7ACqCXMkgE/XNMuCwr2fi9wH6fxSb qsFufGHHV3UMTk4qQmxv5gEImzxJ/nvtcwAMIt4WmAvvWtgfWqH7NBOWqh61tzUyWx+I NA4g== X-Gm-Message-State: AOJu0YwRxsorzxeCcuDK7frsgkRsQ2/m2cApd0Ip+zXgdwhGu4uZh5Pu NHCdgdKNkuAVBw82R11jBaXRMI/MvNuyYXpfGBa9Hp2aYiYRyrxix2iIWIQQqhecWR8c8fVPWq4 F X-Gm-Gg: ASbGncsgBXlyAApPtl1cS7ysW4klKHSUBcf0A1y9eaUNlAuq3BT7ReBporJfj2uD/DM 3vZ4vgbT1AWye8kR0IxMQfLuuu7IS+c++ZXvpfPJ+NZsVuljccnFkgVuia8X7TTeU33SkFF+6R5 /uWwqbEGOIR3O2K/YtrlDJlniBNk9kZeFG8N4qM1yK+VaDnkRpq+iIT3bLtMcTyOnXudjCtVmy5 Fc9HQEFHFWmkG2e1guJFZbHlad6g2EnU+4gOta2BIes/Um6JYKI7Jj/Zmow3P6cBZtcewmJQxh2 Tqb1qTB64+3W6f6CYt5mXXyhawnHLl0hbDaqr2Lf X-Google-Smtp-Source: AGHT+IE2yp1m6sBCLp+wVAJ0VFY7M3tuLn6xaXJpPkEtHMIenwsxdNR9U7U4c12ls+Lzhnd5joWPeQ== X-Received: by 2002:a05:6a00:2284:b0:736:34ca:dee2 with SMTP id d2e1a72fcca58-73bd119993dmr361114b3a.4.1744318839065; Thu, 10 Apr 2025 14:00:39 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd22f82a3sm12431b3a.90.2025.04.10.14.00.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 14:00:38 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Paolo Bonzini , philmd@linaro.org, alex.bennee@linaro.org, qemu-arm@nongnu.org, Yannis Bolliger , Pierrick Bouvier Subject: [PATCH 4/4] target/arm/ptw: fix arm_cpu_get_phys_page_attrs_debug Date: Thu, 10 Apr 2025 14:00:22 -0700 Message-Id: <20250410210022.809905-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410210022.809905-1-pierrick.bouvier@linaro.org> References: <20250410210022.809905-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x42b.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.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 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 6ea39ee5755..5b8d84d44df 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; + } }