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: 879760 Delivered-To: patch@linaro.org Received: by 2002:a5d:4882:0:b0:38f:210b:807b with SMTP id g2csp452788wrq; Thu, 10 Apr 2025 14:02:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXEd0F/N6qjszsQ3RQLgVld31YR6Pl+4r9LgIj5I03PE6L9943lyo6FrDE0PWGcK98DjQ0rtg==@linaro.org X-Google-Smtp-Source: AGHT+IGOSdpgl4579eS151XWsjAMpNHN/0bnsT5J7SWk9AohjDovdM8y9lK+qTnbjXSdGyk5NWv1 X-Received: by 2002:a5d:64c2:0:b0:39c:1257:dbaa with SMTP id ffacd0b85a97d-39eaaed2bf4mr88990f8f.58.1744318931323; Thu, 10 Apr 2025 14:02:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744318931; cv=none; d=google.com; s=arc-20240605; b=lBGwJRZGexUwv+3qZsAU9qTcmMhiXp8mo2jV+eBAF3IEiBm8eNoUXDYqHYp5Xk5KFv 0fK9dpbLBo3jRqoAVHCZDKkHnlBRxruH6vkrHX1GcCQ/+6QyM7bH0RdjWT4Pw1IPPjgS JC3rTvduXoSkTeBXL+hkFXH7VHSrkonIgmYlkyvMWEaMt2j5WOaq3PANBuanl11XPiN0 SbO14cTQQrv+aHWufcRsmPpZksv7fZYCrd2WqUtirjw7j6PMlZ3BErVwcQELJJjNVhtK g0S8squ69SPn3awISKlb1BKurPA6x5xT8SRPu1FWTI0iC4pVagBDVYGv9iaMT3yvXTwv +Prg== 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=3O+ATcLarMi7TZZVeImu0PwvfcFGKqqf7QjA5Mk9PLE=; fh=9zURFNcU6oIvJEyFpefuco3FFmkVuZS76K74T16TMuc=; b=ixvS6eGxoraeXp6TI8xbL3wT24InFVHO3z+2qZxuAgZNYVWATW5m5u3LzPlu9mAHPM M6jpS92bdpBJVlHvnzFzS9IrRcWg1N4cbu9vxll4f2uuSs/mSnG88Gtx/v7sKScWjq7p 1DyZ0Vc5Z+XyFt6EK9NxPaBElfxhmIQ094HIda2uhq3rgBdSLGjJAhA6rI6CaHV3Pfhv KlZCnbniY1sh7bnJ2XA/RMYHiXZO78huIvynU+3BxdRuk9WjOHAK2m5lOv5ROWuXA33i M6qPhRJnWZD410/jmY17Y8eqNEjgGW7orkVFWlmmYbWceZYuvJqrrpls3y/GYSSg0kWj hxWw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CGIxL26A; 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 5b1f17b1804b1-43f20668191si34068875e9.72.2025.04.10.14.02.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Apr 2025 14:02:11 -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=CGIxL26A; 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 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: 879759 Delivered-To: patch@linaro.org Received: by 2002:a5d:4882:0:b0:38f:210b:807b with SMTP id g2csp452727wrq; Thu, 10 Apr 2025 14:02:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVQFh6Q7xwvPmpzMOteXRuVtn946kmIIIRR9xH6PNG5fzkkdg6bmt5NdJs2ZxQqmnJIAGWtQg==@linaro.org X-Google-Smtp-Source: AGHT+IHxepHi6yHB3l3Yyz+dwcM0mLNYSZUtrYr63Kl7UWEyoVmkGVqbSxBXJ3i3ZHpwxn21YNb7 X-Received: by 2002:a05:6214:1c43:b0:6e8:fe60:fded with SMTP id 6a1803df08f44-6f23f17df2bmr4828896d6.30.1744318924843; Thu, 10 Apr 2025 14:02:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744318924; cv=none; d=google.com; s=arc-20240605; b=M9XWHz0EGx+UDZ17386evUYFin8Xy+mk76ekr++yPto8RIs7tWxo03GF4LKuCm+Azt jWy5rxdKeBZp1TT+5XQUE3L6iOv4OOjDfidZDdTP2U9cm+uk/jXtY6q02SKVx02GlcSq I+PFLT/7h67D1X6JfTvhgY8gdNoQ+FBEALWZOjNrw9d9DSgqRnjqJMCznDW85XpHigfR rfT+rS0Ki7ofhQiv8Ri//AjXs8brDBNyVwgWG8NW8sWlj+XwsHtprMloBx+6ECzFUxWq LQsl4upOHCPma73G61qX708mJj+WNHqLS+/LYGc1xI70TYIJRY4gqI4LbaVlRiVi/H25 hJqQ== 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=qQocORlIWShowiqK86UH/3i1rW1ojRKl4ZKvCvKtX1c=; fh=9zURFNcU6oIvJEyFpefuco3FFmkVuZS76K74T16TMuc=; b=FJyQi9OvBWHXz7D4Xglcrwatq/xfCY5b4i0H+HL61IRy7nsBuu5ho33IarbVtUqiqf uEbI+BfJpfrx+ZFWrkLELCMOYI4YDsPSDtNBFNnTPCecx1ymDkqkxtYZMx1tm1IN5Zof p0K5ZyMGja9yofB0KeKzweWSoejjE35sb4Z5uPyuVgZOqBXdqzEo7aF5UHCvqSXvxb7S wlz1fqtZgz5CJ4OVz+5R4ItkvUT0uWj6VIbd0vQXqi69cDIoe/mmkRYkbMRFgEHHIDSA 6VpCSQGHIipSCe3Z/ZI3rZymdWMEa1SDoM95jqDcfFMg2EdNhSiPaJNaZdkJ0Wy+vX3A VrKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tf9Lszg0; 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-6f0dea12dd0si35967606d6.491.2025.04.10.14.02.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Apr 2025 14:02:04 -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=Tf9Lszg0; 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 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-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+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. 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: 879762 Delivered-To: patch@linaro.org Received: by 2002:a5d:4882:0:b0:38f:210b:807b with SMTP id g2csp453033wrq; Thu, 10 Apr 2025 14:02:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVnca8hpxV6y2+Obb92qlxps82HvSDbnz6kb5vz2NUiFQELv69j6UmFGGcjApTOJkcVvszyNg==@linaro.org X-Google-Smtp-Source: AGHT+IHDlWskQQKsbRLbSUr64oST+XY7gMTBhwW+vCTEKUJZ9TZwJD43I4BBVimvMn4Rn6bptqO2 X-Received: by 2002:a05:620a:2906:b0:7c5:5692:ee95 with SMTP id af79cd13be357-7c7af12ae32mr64638685a.51.1744318959301; Thu, 10 Apr 2025 14:02:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744318959; cv=none; d=google.com; s=arc-20240605; b=GdIri/cOizbiZg13VVgzsVZPOWHfqVZkzp/5xKohI7ORhjOHPiUcQTzAhRHiRfdw4I Ln/E+w6xOEfIeCcmHdGZLMUX4qR796TZxnXNoddc+t1JQxha54EGsKldp9cleROfaSDs jDCjSf2NGpLM+acosF7Z0SrP2HHp/vHiyNBAfKryjycGLBf7cl3690SEYL8Pdc5yXOZG nW/RxLMrV/B7ntSR7z075++z8y1FjWsy9vtMSKt6T9KM0vaWMF6LyI3xVlbNUMnbekWE 4eJrsKV7eSxwJsnP4ptukWkg7Gq0hSeC4U+Ebf8A8sejrKqPCcrcLMGy1Kc91poGbS9J k/PQ== 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=PmeV86UWNxMTSPkNU4LeBxv7d2QnrBx0YubZlLs/qhU=; fh=9zURFNcU6oIvJEyFpefuco3FFmkVuZS76K74T16TMuc=; b=JJpBS0iOxY/6FezghvbmOU/n1ORjLZFjUtl6+n9aKRVfjVeYMD6MWQ33Yb2wAxVIsQ 3tHmNxWV2ufHwxcAWdc/BQ/N7LOmkd71oVlezNhdqQjsbMNLRd/4/Q/fMFjcWw3hIYlG yF3NHRYzOv2qeUbQzYxm1UAcNHs3oKntjglugH9SMjbi+9NxLseGjs/8At1oKBoTqqI9 MOV303K2MK5G2MgIfei3Ek0XNIUrhnKq2WQ0jqTO/69A7oDv1JfdCx5tKOZOvU3uCTRF CkV9h9Dagpqn8iCTxtHnonrz4kg5uojZGFZ5RxFythcpaLugKt3EkcFw/9q9ckk+whAD /fjw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jgMVDr2b; 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-7c7a895de5dsi168487885a.165.2025.04.10.14.02.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Apr 2025 14:02:39 -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=jgMVDr2b; 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 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-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+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. 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: 879761 Delivered-To: patch@linaro.org Received: by 2002:a5d:4882:0:b0:38f:210b:807b with SMTP id g2csp452971wrq; Thu, 10 Apr 2025 14:02:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX99RT3OhTJJCipru+6es4oVjocbiQXixS2bRNkSUlbgtKK65B7PVFyfuttN+U9hfyiZxLOQg==@linaro.org X-Google-Smtp-Source: AGHT+IEZvEKqinrFhUm7wnrZz5H6BxSfmvFKBMnTBELeGvte2ghHEtKv+g0ph27wLem4iiYTziC+ X-Received: by 2002:a05:622a:14d3:b0:477:6e69:ebc0 with SMTP id d75a77b69052e-47977405f0amr4301351cf.0.1744318953692; Thu, 10 Apr 2025 14:02:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744318953; cv=none; d=google.com; s=arc-20240605; b=V1Z/pMYnVdkFxvJufm26hyCJON9JQDn6nGeMSPWM92kiyk6Trndfeo2pL1UCCbXkAH 8xclicz6DJbO3TvaGcnAMyE8N1YALzZcDJ1G6EL8gIbsAXtkibVpnw9m/AKLJYsmS9Zn CXvBM7jSjqVAP3BwiWjsJ5PPspjhH/mRIjvBCAXYWPy34ZsufZ7Hh7Zmong2SBDD51kA 31SWTaWJK4AcMwDAJ1z306jviWSOJH90EQEHAq+OfqFqEosFmCqqJn52eXrFtgNWwUwD gFQSalOKB0MbbCzN6is1AsqwtKGJSVlMP+5Dp3e2n5Ydho4bc9Xvzhd4Gr+hTBqqt3Za sXqw== 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=M9OwVMJQ+nPgoXVT+v3WG48aEZrZJjJFRvNoKJmm5KU=; fh=9zURFNcU6oIvJEyFpefuco3FFmkVuZS76K74T16TMuc=; b=Qp49EnqCo83+xPJKNkcslpDnkFwKLpqDb/i+ewYRvex1NlQBWbJfG4g5028vwH6/du 8yFqyx85sSc3PMfsFqbflmvvftUoerzo09fGQ9ddK/8ZSQVliBivLbksya/J0p7ZBLnv HEFwYWiamtsSEk5z2QdyVe5fYx4YXVuOVNA6UL1pIwtqlhpxBbcvCUNht1vvPBpI9eVV ziwBWa+woHsXs9B6rW9dFTK0Z5R+KcIl20PNm3cf5v68UtlLBnmYwk9L4LfestQWTzOM MIm5/1FjLIVBVgSyvofs5zepCy1qgWmvsXBeBCL56G3XIegK/c77FJdTSCo6+BlYe6Yf HDEg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=genz2iH7; 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 d75a77b69052e-4796eb0db03si17852151cf.106.2025.04.10.14.02.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Apr 2025 14:02:33 -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=genz2iH7; 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 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-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+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 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; + } }