From patchwork Sat Apr 8 00:01:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bartell, Paul" X-Patchwork-Id: 1766763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amazon.com header.i=@amazon.com header.a=rsa-sha256 header.s=amazon201209 header.b=PW6rfS36; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PtcD94kK3z1yZF for ; Sat, 8 Apr 2023 10:53:12 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkwop-0003pb-To; Fri, 07 Apr 2023 20:52:39 -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 1pkw1c-0001lG-GI; Fri, 07 Apr 2023 20:01:48 -0400 Received: from smtp-fw-6002.amazon.com ([52.95.49.90]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pkw1a-0002NR-Tq; Fri, 07 Apr 2023 20:01:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1680912107; x=1712448107; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=VTuZJ2V+jdEhbYwqKGb3MGF43M2vOvVB+j7SrKwFTRY=; b=PW6rfS36Q22sCR3x8/c0KTKriRoPFs4y2P6yFSf/qVIgKLUmx/cPc2Qi SC+dThK0wbPP95rMALNCToNJQI3CoBhsifoiIxttkzNcQQAB5hu/eXky/ fpY9G8tx92b7RWRX4uBHwwhZX52oBWA6GuZQ3vZrST3qF0xHdwceQDJt/ o=; X-IronPort-AV: E=Sophos;i="5.98,328,1673913600"; d="scan'208";a="316083244" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-iad-1a-m6i4x-b5bd57cf.us-east-1.amazon.com) ([10.43.8.6]) by smtp-border-fw-6002.iad6.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2023 00:01:41 +0000 Received: from EX19D012EUA002.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan3.iad.amazon.com [10.40.163.38]) by email-inbound-relay-iad-1a-m6i4x-b5bd57cf.us-east-1.amazon.com (Postfix) with ESMTPS id 52D92448A1; Sat, 8 Apr 2023 00:01:40 +0000 (UTC) Received: from EX19D031EUB004.ant.amazon.com (10.252.61.75) by EX19D012EUA002.ant.amazon.com (10.252.50.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Sat, 8 Apr 2023 00:01:39 +0000 Received: from EX19MTAUEC001.ant.amazon.com (10.252.135.222) by EX19D031EUB004.ant.amazon.com (10.252.61.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Sat, 8 Apr 2023 00:01:39 +0000 Received: from 147dda7342a9.ant.amazon.com (10.63.8.32) by mail-relay.amazon.com (10.252.135.200) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Sat, 8 Apr 2023 00:01:38 +0000 From: To: CC: , Peter Maydell , "Richard Henderson" , Paul Bartell Subject: [PATCH] target/arm: Fix debugging of ARMv8M Secure code Date: Fri, 7 Apr 2023 17:01:18 -0700 Message-ID: <20230408000118.50854-1-pbartell@amazon.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Precedence: Bulk Received-SPF: pass client-ip=52.95.49.90; envelope-from=prvs=45500efaa=pbartell@amazon.com; helo=smtp-fw-6002.amazon.com X-Spam_score_int: -118 X-Spam_score: -11.9 X-Spam_bar: ----------- X-Spam_report: (-11.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_SPF_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 07 Apr 2023 20:52:38 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Paul Bartell Revert changes to arm_cpu_get_phys_page_attrs_debug made in commit 4a35855682cebb89f9630b07aa9fd37c4e8c733b. Commit 4a35855682 modifies the arm_cpu_get_phys_page_attrs_debug function so that it calls get_phys_addr_with_struct rather than get_phys_addr, which leads to a variety of memory access errors when debugging secure state code on qemu ARMv8M targets with gdb. This commit fixes a variety of gdb memory access errors including: "error reading variable" and "Cannot access memory at address" when attempting to read any memory address via gdb. Signed-off-by: Paul Bartell --- target/arm/ptw.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index ec3f51782a..5a1339d38f 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2999,16 +2999,12 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, { ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; - S1Translate ptw = { - .in_mmu_idx = arm_mmu_idx(env), - .in_secure = arm_is_secure(env), - .in_debug = true, - }; GetPhysAddrResult res = {}; ARMMMUFaultInfo fi = {}; + ARMMMUIdx mmu_idx = arm_mmu_idx(env); bool ret; - ret = get_phys_addr_with_struct(env, &ptw, addr, MMU_DATA_LOAD, &res, &fi); + ret = get_phys_addr(env, addr, MMU_DATA_LOAD, mmu_idx, &res, &fi); *attrs = res.f.attrs; if (ret) {