From nobody Wed May 15 03:41:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1676950950; cv=none; d=zohomail.com; s=zohoarc; b=nL0kfYSoRxY4ttxN/FW7URFiOmRMRXLaOVLmVAW8tCGz77WfCi+KWbY1cadaDnlYP4NqgWGfLFdN0Q9DHCytKEdHgcH5sznL+QYc0yRt10EnEw4515+iEQRgdMcOOo9AZoc8ACgoYPOwPwuHpO7pAHQAnIk8UeSWPLSnSKUsM1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676950950; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=USvyAWS7YOmlNqdzjMZCrgQ9PLeHSNl5QsdKClpEEQE=; b=hoXDJiHP662nuZkN8FQtpjQANAAVicEwRcQeAGlSRycrb79h6jC8rDkz6647zc2CeDXb0pP11jnmpgWW//KGmD81up7ZTU1xJz1oOyIYTG4bzBgq1BUaM9yZ/YmwV2bJx6ac1jDw68PlTb+shcRyNBGvBnVV8HGO4+bXMhVar64= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676950950624257.2138938369643; Mon, 20 Feb 2023 19:42:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUJXH-0005wp-H3; Mon, 20 Feb 2023 22:41:47 -0500 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 1pUJX6-0005rV-Sx for qemu-devel@nongnu.org; Mon, 20 Feb 2023 22:41:37 -0500 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUJX4-0005ni-1T for qemu-devel@nongnu.org; Mon, 20 Feb 2023 22:41:36 -0500 Received: by mail-pj1-x1032.google.com with SMTP id u10so3311212pjc.5 for ; Mon, 20 Feb 2023 19:41:28 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id c4-20020a170902c1c400b0019a88c1cf63sm69851plc.180.2023.02.20.19.41.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 19:41:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=USvyAWS7YOmlNqdzjMZCrgQ9PLeHSNl5QsdKClpEEQE=; b=VJSlB+IthyNd5xGbDwPNfOHWJzFrxxwlNLpKSGrcRCkeh5AKVQvmqApq5hekejityD 4cd0Ji+4CJ7mxn8lpqdG37OFqAQqc7lzGlFdTq6lTs0b9NZ+xKtFh5LrPTRRYIc1HZ7m AD676o7cNgYsU3a9/yEuXYrIbmT1wUWFjaREu8dtN0gs0S12/4MUDYijDKJ4/adzpvS/ 0XghpoP1y52oBei/OUM8Yrub5hS68resd7g47poajDOYP/TnZbfeM/k/It9cGxk2n6G4 29kqPW9P6yV7Mgmxw87W3b5EhtJGtoBrq7i0Uk3+PSyg30bZNReszyUI1NSfmbGPUvHe 0uag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=USvyAWS7YOmlNqdzjMZCrgQ9PLeHSNl5QsdKClpEEQE=; b=8QLRwBaQeQ4Z8H8BcMRZQLhEQdqZ+XzO214Fh6cboDLA9WQdOZd35d6BosKWBEh+p6 f3M9GYVgjCHWPc7H3zO8yEWDdiJizUHtNX3X1IxEFajM8HpwoKSVXeU17g77HrFMTVXT IgJ2O8dCcOzTlGXb8r8D7HGY/wj7c7rtIOScoMscH7aShIJHM/esx3gvYXXLBEMJXBS8 sVAfDlcRa1trLMKuL+dJK7Iwgpred0OzCwrZpBGUvLcgWODpllpSWVC+EjBzsr4mSPYW l/zEqUBNXyxtUvWFlpbFP1jtY2CxnsMkIEXIKiqUwfKi2F/xb4I0OWqILBBLNUyxJQKI WYXg== X-Gm-Message-State: AO0yUKUzxyYjzzGACO6z9ZKyqx810HTQuvn65PPOxWnLy4vEIRwGTcE0 QiBYISAXTXEbE3GftdS8QCPeLRE+2P31TvG8PjA= X-Google-Smtp-Source: AK7set/dBXgpaToQ3NRQjHLmF7P9qsPu1IVPtugAieLUXw3XJ83B6sWhdOsm+PjIYloASpc+d6gdxA== X-Received: by 2002:a17:902:f90d:b0:19a:8680:ba87 with SMTP id kw13-20020a170902f90d00b0019a8680ba87mr3014347plb.11.1676950887157; Mon, 20 Feb 2023 19:41:27 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 1/2] Revert "target/arm: Merge regime_is_secure into get_phys_addr" Date: Mon, 20 Feb 2023 17:41:21 -1000 Message-Id: <20230221034122.471707-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230221034122.471707-1-richard.henderson@linaro.org> References: <20230221034122.471707-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676950952189100001 Content-Type: text/plain; charset="utf-8" This reverts commit 03bea66e7fa3af42976ceafb20512c59abf2e699, but restore into ptw.c instead of internals.h. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/ptw.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 2b125fff44..cb073ac477 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2926,12 +2926,9 @@ bool get_phys_addr_with_secure(CPUARMState *env, tar= get_ulong address, result, fi); } =20 -bool get_phys_addr(CPUARMState *env, target_ulong address, - MMUAccessType access_type, ARMMMUIdx mmu_idx, - GetPhysAddrResult *result, ARMMMUFaultInfo *fi) +/* Return true if this address translation regime is secure */ +static bool regime_is_secure(CPUARMState *env, ARMMMUIdx mmu_idx) { - bool is_secure; - switch (mmu_idx) { case ARMMMUIdx_E10_0: case ARMMMUIdx_E10_1: @@ -2943,16 +2940,14 @@ bool get_phys_addr(CPUARMState *env, target_ulong a= ddress, case ARMMMUIdx_Stage1_E1: case ARMMMUIdx_Stage1_E1_PAN: case ARMMMUIdx_E2: - is_secure =3D arm_is_secure_below_el3(env); - break; + return arm_is_secure_below_el3(env); case ARMMMUIdx_Stage2: case ARMMMUIdx_Phys_NS: case ARMMMUIdx_MPrivNegPri: case ARMMMUIdx_MUserNegPri: case ARMMMUIdx_MPriv: case ARMMMUIdx_MUser: - is_secure =3D false; - break; + return false; case ARMMMUIdx_E3: case ARMMMUIdx_Stage2_S: case ARMMMUIdx_Phys_S: @@ -2960,13 +2955,18 @@ bool get_phys_addr(CPUARMState *env, target_ulong a= ddress, case ARMMMUIdx_MSUserNegPri: case ARMMMUIdx_MSPriv: case ARMMMUIdx_MSUser: - is_secure =3D true; - break; - default: - g_assert_not_reached(); + return true; } + g_assert_not_reached(); +} + +bool get_phys_addr(CPUARMState *env, target_ulong address, + MMUAccessType access_type, ARMMMUIdx mmu_idx, + GetPhysAddrResult *result, ARMMMUFaultInfo *fi) +{ return get_phys_addr_with_secure(env, address, access_type, mmu_idx, - is_secure, result, fi); + regime_is_secure(env, mmu_idx), + result, fi); } =20 hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, --=20 2.34.1 From nobody Wed May 15 03:41:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1676950955; cv=none; d=zohomail.com; s=zohoarc; b=nvJ+WWFQcAW8xco0jyfJZ9b058DEeZmEyYOfaYPOrSEPDqnEqyslKyp0dPly4rvBzYow4z9qJi/tX86mX9Zadao7Z8tP9EED5eRZo8L9ZOm5Lr8zbsfnDd6R5+tbtJjyz4TIq9MUzyLvcM7sRBlPLoJhJJTP9qsR16AwHYOb63Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676950955; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dV3tomdbYmAqkN5Vs+1qw+A5YDs8BGZbPqInFvA+4kU=; b=SVioOdloGq52H9MAREiBET6FYZGbBd0XoIyOecZ3bDZxmvWZRETfhOTCed9AW/i6swTytERnnqzldyiPgKKFQu8QSNz/Gm4dC3N1n4SDjzPjJivn8iH3EWjlHHqhKzuFZVjQUmEYq7tMqwrZNGXDG8ZYwZXpaxPj/JxCvYxTNOw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676950955473241.37015128952487; Mon, 20 Feb 2023 19:42:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUJXG-0005wb-Op; Mon, 20 Feb 2023 22:41:46 -0500 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 1pUJX6-0005rY-U2 for qemu-devel@nongnu.org; Mon, 20 Feb 2023 22:41:38 -0500 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUJX4-0005nq-1S for qemu-devel@nongnu.org; Mon, 20 Feb 2023 22:41:36 -0500 Received: by mail-pj1-x1043.google.com with SMTP id u10so3311245pjc.5 for ; Mon, 20 Feb 2023 19:41:29 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id c4-20020a170902c1c400b0019a88c1cf63sm69851plc.180.2023.02.20.19.41.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 19:41:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=dV3tomdbYmAqkN5Vs+1qw+A5YDs8BGZbPqInFvA+4kU=; b=EWO5prRUt3P9m/uqTJ/VzV/p820sQhFivmFxggKSP31SBrSYiIrxJXyW6P4h7UnCGI ZePg6+RFkeUao384uAKkNTguxD+DLYblGgp4ZwN8ICkR8FSzYbvOEblsDKE4ochkMGiF SpoTfEmGQHYbkxL2VKFAbFP3uVVFaxi66lwJzBK637trjEVY8oG+iK+9f5Re6/is/ft2 MNsUzk3RQWiYE5X9zis1lVGyp5HYMiZeRbDfr9U7btaCNkIADufRp7YvnIOg3RcyBYLd D3TBBEasZliVfhHbRVxIDTCKy1SMN7DIknzIlaY5nkZ7156jx7BJGILabuddqwZBDAsS CWBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=dV3tomdbYmAqkN5Vs+1qw+A5YDs8BGZbPqInFvA+4kU=; b=RPvYSo5OCL5BP5w5RDQf6nuBIxc1L4pbGtdXAB+20d9pYVQwRE0Ph7z83CCiU6y4hH hs6B6tp8vnfIZFBpxFusZWzXpme4EIn1T/iIrNCDtDDjB6WNnr//615JLG7nA6YruvaL 5284OLNDzdtzS4viC/FBvuIf68236Zye6euOvxF65jlTMHAzCOvXo8DGJXhS540ey4QG HSUZDyhscXSiQQp/ydEgCLNdrfzWtm0BxUssx9tFzoRRnOaokpnisTaqLb6V0H1TWqWM +/W+0Ua6y+kaK2geQh8nyfYmLIj6a7XfdKjqdC91oB2veP6Q5WH/z1HdN4g+CnKSvLix AKRA== X-Gm-Message-State: AO0yUKXwww94C9WdIkdxmfWcFb9Vjnd/prE4WsbNtloNl9GEXFH2pjgY eJxwCvht7UMVlEd7kHWUFgzXIl527WWlQPV4WHHB+w== X-Google-Smtp-Source: AK7set/a8OpPIZLaekJ77IGK5mdKo3cj8Ks9foCnIVgxkQeW4MdUmTVCYoFTff9hYsYkJP5zvFwboQ== X-Received: by 2002:a17:902:f947:b0:19a:968d:26f9 with SMTP id kx7-20020a170902f94700b0019a968d26f9mr3669853plb.54.1676950888490; Mon, 20 Feb 2023 19:41:28 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 2/2] target/arm: Fix arm_cpu_get_phys_page_attrs_debug for m-profile Date: Mon, 20 Feb 2023 17:41:22 -1000 Message-Id: <20230221034122.471707-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230221034122.471707-1-richard.henderson@linaro.org> References: <20230221034122.471707-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1043; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1043.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1676950956209100001 Content-Type: text/plain; charset="utf-8" M-profile is not supported by arm_is_secure, so using it as a replacement when bypassing get_phys_addr was incorrect. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1421 Fixes: 4a35855682ce ("target/arm: Plumb debug into S1Translate") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/ptw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index cb073ac477..057cc9f641 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2974,9 +2974,10 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *c= s, vaddr addr, { ARMCPU *cpu =3D ARM_CPU(cs); CPUARMState *env =3D &cpu->env; + ARMMMUIdx mmu_idx =3D arm_mmu_idx(env); S1Translate ptw =3D { - .in_mmu_idx =3D arm_mmu_idx(env), - .in_secure =3D arm_is_secure(env), + .in_mmu_idx =3D mmu_idx, + .in_secure =3D regime_is_secure(env, mmu_idx), .in_debug =3D true, }; GetPhysAddrResult res =3D {}; --=20 2.34.1