From patchwork Tue Jan 14 19:16:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 104780 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F2CCC385608A for ; Tue, 14 Jan 2025 19:27:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F2CCC385608A Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=default header.b=NiZFW73S X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 899DF3856271 for ; Tue, 14 Jan 2025 19:26:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 899DF3856271 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 899DF3856271 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736882801; cv=none; b=PS+xpza+KISJaPH8KicGx1PjHQP2ESUhe5uJPOz+qxvAEYxdt+bG3xGehlzpPyo0HqRRqOMOWDZLISczd83w0QMw/XbriYck/3r4QfDyMJlYBJPpA1tGuFTmgD2PwbhPH6xtSxc6Vw4otlshrF6bZ9PkA/3y/osVtKAMChG029E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736882801; c=relaxed/simple; bh=AaNcjGld+O2IH9oQ6vG4WH7/O9ss1IDgdYJY4z7XoY8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=JBCglIP/zvtjT4sEciaYI4hwbKXBjb23zZvp2AXtK6gfEr4nWhnmV+dq7ZoWt7QPT8OziPwqDMPh7kIdAhv12NVXx4e3gzlVzQ5uxo62YSS9nZNoOXHTdRELKUjolJ6L1GW4Iz613N7HvY4/Cs41csJTrjmk7ATEucgfEGd3oHk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 899DF3856271 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 50EJQa0x068778 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 14 Jan 2025 14:26:41 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 50EJQa0x068778 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1736882801; bh=A4B0eg9WPeDddPC5kpcDSBURyC2iAm1iN1oXZEDeIhM=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=NiZFW73Sqg5s/mk+D/PxjOZpChhDvXJgINU6+6WHYsasQ6K6Mc4GKG/j3dclcuYIz b4ddFg9Wzq1gKAUJ5FON0u+NLTI6mF1N6mkK8pYwpjLYd1NYd+j3AZfO9OJgDvya2i XEVll/qABEfyUQs3fF8dT8PIHf2zmu+N0m42gti8= Received: by simark.ca (Postfix, from userid 112) id 34FE31E11C; Tue, 14 Jan 2025 14:18:22 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-Spam-Level: X-Spam-Status: No, score=-3188.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 Received: from simark.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 410E51E0FE; Tue, 14 Jan 2025 14:18:19 -0500 (EST) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Lancelot SIX , Simon Marchi Subject: [PATCH 1/3] gdb/amd-dbgapi: use gdb::unordered_map Date: Tue, 14 Jan 2025 14:16:21 -0500 Message-ID: <20250114191818.2393132-2-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250114191818.2393132-1-simon.marchi@polymtl.ca> References: <20250114191818.2393132-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Tue, 14 Jan 2025 19:26:36 +0000 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org From: Simon Marchi Since we have gdb::unordered_map, swap std::unordered_map for that. Change-Id: If2ef652fe18c1a440a25cff6131d29e37091bdbe --- gdb/amd-dbgapi-target.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gdb/amd-dbgapi-target.c b/gdb/amd-dbgapi-target.c index 2bb79acd76f0..153a35f788ed 100644 --- a/gdb/amd-dbgapi-target.c +++ b/gdb/amd-dbgapi-target.c @@ -24,6 +24,7 @@ #include "cli/cli-cmds.h" #include "cli/cli-decode.h" #include "cli/cli-style.h" +#include "gdbsupport/unordered_map.h" #include "inf-loop.h" #include "inferior.h" #include "objfiles.h" @@ -207,7 +208,7 @@ struct amd_dbgapi_inferior_info bool enabled = false; } precise_memory; - std::unordered_map breakpoint_map; @@ -221,7 +222,7 @@ struct amd_dbgapi_inferior_info wave_info objects are added when we first see the wave, and removed from a thread_deleted observer. */ - std::unordered_map + gdb::unordered_map wave_info_map; }; From patchwork Tue Jan 14 19:16:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 104782 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1B2D3385608C for ; Tue, 14 Jan 2025 19:28:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B2D3385608C Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=default header.b=WfzazS1O X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 9607F3856087 for ; Tue, 14 Jan 2025 19:26:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9607F3856087 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9607F3856087 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736882801; cv=none; b=rnvwQE/IU9ZF9khspu7vpO00Gy9+y5PXI1k8i54VlBSTDcqcAgIaLsnF7kje1NYu2mBCt0GK0G0mncTOrs01TNZq4uNT0UhH9zNqMJDe7qp2d3N4E9gy1m8LzkQecvjrerEZzwJYOtK4Av40inbjrm3vpwFzFbpm03iM6Yc+gdc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736882801; c=relaxed/simple; bh=uwpSrQ76dclSMK5QCphHcd+csmJ/0ectsg82kSkq7wY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=MlXd/siRaSNJTYnhHB1T3pQ67FUmJod08mq245bulK7HB45W5MuPjHEBpC+xWus42g/4Cy2ptQFZZDyx5CmuWVHs8pR2b+Oml3JLnbpHf0NKncZqYPIH0DjIWqSuSxNvdozrW31m4DMq0asqKJZoL+08Ek2TsJYONlmxhR7oiRQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9607F3856087 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 50EJQaI8068787 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 14 Jan 2025 14:26:41 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 50EJQaI8068787 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1736882801; bh=ZrVd/Tv5mP8hZRBtqvK2Pt9dIrKvp5W7Z1uhVoIi+H0=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=WfzazS1OQ5inyC3n4s2r1SzvNFCN9+e1hSweyH/Qi8+vWyt88WlyTVpTFJ42nix5K e3mspwd7TzaOgPjcdkVK6k9CbFRdSPN5cQUUIq7z8paX/2gt7AzD9+e3iKrRrzFzL7 MZUmlvkBDGLjsw2QGDlVNgsKPiVSPBBjWh8j1fMM= Received: by simark.ca (Postfix, from userid 112) id 9E29B1E114; Tue, 14 Jan 2025 14:18:25 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-Spam-Level: X-Spam-Status: No, score=-3188.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 Received: from simark.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 6692A1E100; Tue, 14 Jan 2025 14:18:19 -0500 (EST) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Lancelot SIX , Simon Marchi Subject: [PATCH 2/3] gdb: add target displaced stepping support Date: Tue, 14 Jan 2025 14:16:22 -0500 Message-ID: <20250114191818.2393132-3-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250114191818.2393132-1-simon.marchi@polymtl.ca> References: <20250114191818.2393132-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Tue, 14 Jan 2025 19:26:36 +0000 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org From: Simon Marchi The amd-dbgapi library, used in the AMD GPU port, has the capability to prepare and cleanup displaced step operations. In order to use it, add the following target_ops methods: - supports_displaced_step - displaced_step_prepare - displaced_step_finish - displaced_step_restore_all_in_ptid Prior to this patch, displaced stepping preparation and cleanup is done solely by gdbarches. Update infrun to use these new target methods instead of gdbarch hooks. To keep the behavior for other architectures unchanged, make the default implementations of the new target_ops method forward to the thread's gdbarch. displaced_step_restore_all_in_ptid won't be needed for the AMD GPU port, but was added for completeness. It would be weird for infrun displaced stepping code to call target methods except for that one thing where it calls a gdbarch method. Since this patch only adds infrastructure, no behavior change is expected. Change-Id: I07c68dddb5759a55cd137a711d2679eedc0d9285 --- gdb/displaced-stepping.c | 43 +++++++++++++++ gdb/displaced-stepping.h | 67 +++++++++++++++++++++++ gdb/infrun.c | 42 ++++++--------- gdb/target-debug.h | 18 +++++++ gdb/target-delegates-gen.c | 108 +++++++++++++++++++++++++++++++++++++ gdb/target.h | 19 +++++++ 6 files changed, 270 insertions(+), 27 deletions(-) diff --git a/gdb/displaced-stepping.c b/gdb/displaced-stepping.c index 7869ebae7714..ff7f91011082 100644 --- a/gdb/displaced-stepping.c +++ b/gdb/displaced-stepping.c @@ -328,3 +328,46 @@ When non-zero, displaced stepping specific debugging is enabled."), show_debug_displaced, &setdebuglist, &showdebuglist); } + +/* See displaced-stepping.h. */ + +bool +default_supports_displaced_step (target_ops *target, thread_info *thread) +{ + /* Only check for the presence of `prepare`. The gdbarch verification ensures + that if `prepare` is provided, so is `finish`. */ + gdbarch *arch = get_thread_regcache (thread)->arch (); + return gdbarch_displaced_step_prepare_p (arch); +} + +/* See displaced-stepping.h. */ + +displaced_step_prepare_status +default_displaced_step_prepare (target_ops *target, thread_info *thread, + CORE_ADDR &displaced_pc) +{ + gdbarch *arch = get_thread_regcache (thread)->arch (); + return gdbarch_displaced_step_prepare (arch, thread, displaced_pc); +} + +/* See displaced-stepping.h. */ + +displaced_step_finish_status +default_displaced_step_finish (target_ops *target, + thread_info *thread, + const target_waitstatus &status) +{ + gdbarch *arch = thread->displaced_step_state.get_original_gdbarch (); + return gdbarch_displaced_step_finish (arch, thread, status); +} + +/* See displaced-stepping.h. */ + +void +default_displaced_step_restore_all_in_ptid (target_ops *target, + inferior *parent_inf, + ptid_t child_ptid) +{ + return gdbarch_displaced_step_restore_all_in_ptid (parent_inf->arch (), + parent_inf, child_ptid); +} diff --git a/gdb/displaced-stepping.h b/gdb/displaced-stepping.h index d7a537a58c92..7949e5dae13f 100644 --- a/gdb/displaced-stepping.h +++ b/gdb/displaced-stepping.h @@ -24,6 +24,8 @@ #include "gdbsupport/byte-vector.h" struct gdbarch; +struct inferior; +struct target_ops; struct thread_info; /* True if we are debugging displaced stepping. */ @@ -48,6 +50,26 @@ enum displaced_step_prepare_status DISPLACED_STEP_PREPARE_STATUS_UNAVAILABLE, }; +/* Return a string representation of STATUS. */ + +static inline const char * +displaced_step_prepare_status_str (displaced_step_prepare_status status) +{ + switch (status) + { + case DISPLACED_STEP_PREPARE_STATUS_OK: + return "OK"; + + case DISPLACED_STEP_PREPARE_STATUS_CANT: + return "CANT"; + + case DISPLACED_STEP_PREPARE_STATUS_UNAVAILABLE: + return "UNAVAILABLE"; + } + + gdb_assert_not_reached ("invalid displaced_step_prepare_status value"); +} + enum displaced_step_finish_status { /* Either the instruction was stepped and fixed up, or the specified thread @@ -59,6 +81,23 @@ enum displaced_step_finish_status DISPLACED_STEP_FINISH_STATUS_NOT_EXECUTED, }; +/* Return a string representation of STATUS. */ + +static inline const char * +displaced_step_finish_status_str (displaced_step_finish_status status) +{ + switch (status) + { + case DISPLACED_STEP_FINISH_STATUS_OK: + return "OK"; + + case DISPLACED_STEP_FINISH_STATUS_NOT_EXECUTED: + return "NOT_EXECUTED"; + } + + gdb_assert_not_reached ("invalid displaced_step_finish_status value"); +} + /* Data returned by a gdbarch displaced_step_copy_insn method, to be passed to the matching displaced_step_fixup method. */ @@ -207,4 +246,32 @@ struct displaced_step_buffers std::vector m_buffers; }; +/* Default implemention of target_ops::supports_displaced_step. + + Forwards the call to the architecture of THREAD. */ + +bool default_supports_displaced_step (target_ops *target, thread_info *thread); + +/* Default implementation of target_ops::displaced_step_prepare. + + Forwards the call to the architecture of THREAD. */ + +displaced_step_prepare_status default_displaced_step_prepare + (target_ops *target, thread_info *thread, CORE_ADDR &displaced_pc); + +/* Default implementation of target_ops::displaced_step_finish. + + Forwards the call to the architecture of THREAD. */ + +displaced_step_finish_status default_displaced_step_finish + (target_ops *target, thread_info *thread, const target_waitstatus &status); + +/* Default implementation of target_ops::displaced_step_restore_all_in_ptid. + + Forwards the call to the architecture of PARENT_INF. */ + +void default_displaced_step_restore_all_in_ptid (target_ops *target, + inferior *parent_inf, + ptid_t child_ptid); + #endif /* GDB_DISPLACED_STEPPING_H */ diff --git a/gdb/infrun.c b/gdb/infrun.c index 4687ee6edb39..79fa31e5ee24 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1699,15 +1699,12 @@ show_can_use_displaced_stepping (struct ui_file *file, int from_tty, "to step over breakpoints is %s.\n"), value); } -/* Return true if the gdbarch implements the required methods to use - displaced stepping. */ +/* Return true if the target behind THREAD supports displaced stepping. */ static bool -gdbarch_supports_displaced_stepping (gdbarch *arch) +target_supports_displaced_stepping (thread_info *thread) { - /* Only check for the presence of `prepare`. The gdbarch verification ensures - that if `prepare` is provided, so is `finish`. */ - return gdbarch_displaced_step_prepare_p (arch); + return thread->inf->top_target ()->supports_displaced_step (thread); } /* Return non-zero if displaced stepping can/should be used to step @@ -1726,11 +1723,8 @@ use_displaced_stepping (thread_info *tp) && !target_is_non_stop_p ()) return false; - gdbarch *gdbarch = get_thread_regcache (tp)->arch (); - - /* If the architecture doesn't implement displaced stepping, don't use - it. */ - if (!gdbarch_supports_displaced_stepping (gdbarch)) + /* If the target doesn't support displaced stepping, don't use it. */ + if (!target_supports_displaced_stepping (tp)) return false; /* If recording, don't use displaced stepping. */ @@ -1784,9 +1778,9 @@ displaced_step_prepare_throw (thread_info *tp) displaced_step_thread_state &disp_step_thread_state = tp->displaced_step_state; - /* We should never reach this function if the architecture does not + /* We should never reach this function if the target does not support displaced stepping. */ - gdb_assert (gdbarch_supports_displaced_stepping (gdbarch)); + gdb_assert (target_supports_displaced_stepping (tp)); /* Nor if the thread isn't meant to step over a breakpoint. */ gdb_assert (tp->control.trap_expected); @@ -1847,8 +1841,8 @@ displaced_step_prepare_throw (thread_info *tp) paddress (gdbarch, original_pc), dislen); } - displaced_step_prepare_status status - = gdbarch_displaced_step_prepare (gdbarch, tp, displaced_pc); + auto status + = tp->inf->top_target ()->displaced_step_prepare (tp, displaced_pc); if (status == DISPLACED_STEP_PREPARE_STATUS_CANT) { @@ -2028,6 +2022,7 @@ displaced_step_finish (thread_info *event_thread, { /* Check whether the parent is displaced stepping. */ inferior *parent_inf = event_thread->inf; + target_ops *top_target = parent_inf->top_target (); /* If this was a fork/vfork/clone, this event indicates that the displaced stepping of the syscall instruction has been done, so @@ -2044,15 +2039,10 @@ displaced_step_finish (thread_info *event_thread, gdbarch_displaced_step_restore_all_in_ptid. This is not enforced during gdbarch validation to support architectures which support displaced stepping but not forks. */ - if (event_status.kind () == TARGET_WAITKIND_FORKED) - { - struct regcache *parent_regcache = get_thread_regcache (event_thread); - struct gdbarch *gdbarch = parent_regcache->arch (); - - if (gdbarch_supports_displaced_stepping (gdbarch)) - gdbarch_displaced_step_restore_all_in_ptid - (gdbarch, parent_inf, event_status.child_ptid ()); - } + if (event_status.kind () == TARGET_WAITKIND_FORKED + && target_supports_displaced_stepping (event_thread)) + top_target->displaced_step_restore_all_in_ptid + (parent_inf, event_status.child_ptid ()); displaced_step_thread_state *displaced = &event_thread->displaced_step_state; @@ -2075,9 +2065,7 @@ displaced_step_finish (thread_info *event_thread, /* Do the fixup, and release the resources acquired to do the displaced step. */ - displaced_step_finish_status status - = gdbarch_displaced_step_finish (displaced->get_original_gdbarch (), - event_thread, event_status); + auto status = top_target->displaced_step_finish (event_thread, event_status); if (event_status.kind () == TARGET_WAITKIND_FORKED || event_status.kind () == TARGET_WAITKIND_VFORKED diff --git a/gdb/target-debug.h b/gdb/target-debug.h index 7530cf06f762..aee7d17f706d 100644 --- a/gdb/target-debug.h +++ b/gdb/target-debug.h @@ -145,6 +145,10 @@ static std::string target_debug_print_CORE_ADDR_p (CORE_ADDR *p) { return core_addr_to_string (*p); } +static std::string +target_debug_print_CORE_ADDR_r (CORE_ADDR &p) +{ return core_addr_to_string (p); } + static std::string target_debug_print_int_p (int *p) { return plongest (*p); } @@ -306,6 +310,10 @@ static std::string target_debug_print_target_waitstatus_p (struct target_waitstatus *status) { return status->to_string (); } +static std::string +target_debug_print_const_target_waitstatus_r (const target_waitstatus &status) +{ return status.to_string (); } + /* Functions that are used via TARGET_DEBUG_PRINTER. */ static std::string @@ -379,4 +387,14 @@ target_debug_print_x86_xsave_layout (const x86_xsave_layout &layout) return s; } + +static std::string +target_debug_print_displaced_step_finish_status (displaced_step_finish_status s) +{ return displaced_step_finish_status_str (s); } + +static std::string +target_debug_print_displaced_step_prepare_status + (displaced_step_prepare_status s) +{ return displaced_step_prepare_status_str (s); } + #endif /* GDB_TARGET_DEBUG_H */ diff --git a/gdb/target-delegates-gen.c b/gdb/target-delegates-gen.c index dd20e1404c32..7d34f80ab2df 100644 --- a/gdb/target-delegates-gen.c +++ b/gdb/target-delegates-gen.c @@ -199,6 +199,10 @@ struct dummy_target : public target_ops bool store_memtags (CORE_ADDR arg0, size_t arg1, const gdb::byte_vector &arg2, int arg3) override; bool is_address_tagged (gdbarch *arg0, CORE_ADDR arg1) override; x86_xsave_layout fetch_x86_xsave_layout () override; + bool supports_displaced_step (thread_info *arg0) override; + displaced_step_prepare_status displaced_step_prepare (thread_info *arg0, CORE_ADDR &arg1) override; + displaced_step_finish_status displaced_step_finish (thread_info *arg0, const target_waitstatus &arg1) override; + void displaced_step_restore_all_in_ptid (inferior *arg0, ptid_t arg1) override; }; struct debug_target : public target_ops @@ -376,6 +380,10 @@ struct debug_target : public target_ops bool store_memtags (CORE_ADDR arg0, size_t arg1, const gdb::byte_vector &arg2, int arg3) override; bool is_address_tagged (gdbarch *arg0, CORE_ADDR arg1) override; x86_xsave_layout fetch_x86_xsave_layout () override; + bool supports_displaced_step (thread_info *arg0) override; + displaced_step_prepare_status displaced_step_prepare (thread_info *arg0, CORE_ADDR &arg1) override; + displaced_step_finish_status displaced_step_finish (thread_info *arg0, const target_waitstatus &arg1) override; + void displaced_step_restore_all_in_ptid (inferior *arg0, ptid_t arg1) override; }; void @@ -4411,3 +4419,103 @@ debug_target::fetch_x86_xsave_layout () target_debug_print_x86_xsave_layout (result).c_str ()); return result; } + +bool +target_ops::supports_displaced_step (thread_info *arg0) +{ + return this->beneath ()->supports_displaced_step (arg0); +} + +bool +dummy_target::supports_displaced_step (thread_info *arg0) +{ + return default_supports_displaced_step (this, arg0); +} + +bool +debug_target::supports_displaced_step (thread_info *arg0) +{ + target_debug_printf_nofunc ("-> %s->supports_displaced_step (...)", this->beneath ()->shortname ()); + bool result + = this->beneath ()->supports_displaced_step (arg0); + target_debug_printf_nofunc ("<- %s->supports_displaced_step (%s) = %s", + this->beneath ()->shortname (), + target_debug_print_thread_info_p (arg0).c_str (), + target_debug_print_bool (result).c_str ()); + return result; +} + +displaced_step_prepare_status +target_ops::displaced_step_prepare (thread_info *arg0, CORE_ADDR &arg1) +{ + return this->beneath ()->displaced_step_prepare (arg0, arg1); +} + +displaced_step_prepare_status +dummy_target::displaced_step_prepare (thread_info *arg0, CORE_ADDR &arg1) +{ + return default_displaced_step_prepare (this, arg0, arg1); +} + +displaced_step_prepare_status +debug_target::displaced_step_prepare (thread_info *arg0, CORE_ADDR &arg1) +{ + target_debug_printf_nofunc ("-> %s->displaced_step_prepare (...)", this->beneath ()->shortname ()); + displaced_step_prepare_status result + = this->beneath ()->displaced_step_prepare (arg0, arg1); + target_debug_printf_nofunc ("<- %s->displaced_step_prepare (%s, %s) = %s", + this->beneath ()->shortname (), + target_debug_print_thread_info_p (arg0).c_str (), + target_debug_print_CORE_ADDR_r (arg1).c_str (), + target_debug_print_displaced_step_prepare_status (result).c_str ()); + return result; +} + +displaced_step_finish_status +target_ops::displaced_step_finish (thread_info *arg0, const target_waitstatus &arg1) +{ + return this->beneath ()->displaced_step_finish (arg0, arg1); +} + +displaced_step_finish_status +dummy_target::displaced_step_finish (thread_info *arg0, const target_waitstatus &arg1) +{ + return default_displaced_step_finish (this, arg0, arg1); +} + +displaced_step_finish_status +debug_target::displaced_step_finish (thread_info *arg0, const target_waitstatus &arg1) +{ + target_debug_printf_nofunc ("-> %s->displaced_step_finish (...)", this->beneath ()->shortname ()); + displaced_step_finish_status result + = this->beneath ()->displaced_step_finish (arg0, arg1); + target_debug_printf_nofunc ("<- %s->displaced_step_finish (%s, %s) = %s", + this->beneath ()->shortname (), + target_debug_print_thread_info_p (arg0).c_str (), + target_debug_print_const_target_waitstatus_r (arg1).c_str (), + target_debug_print_displaced_step_finish_status (result).c_str ()); + return result; +} + +void +target_ops::displaced_step_restore_all_in_ptid (inferior *arg0, ptid_t arg1) +{ + this->beneath ()->displaced_step_restore_all_in_ptid (arg0, arg1); +} + +void +dummy_target::displaced_step_restore_all_in_ptid (inferior *arg0, ptid_t arg1) +{ + default_displaced_step_restore_all_in_ptid (this, arg0, arg1); +} + +void +debug_target::displaced_step_restore_all_in_ptid (inferior *arg0, ptid_t arg1) +{ + target_debug_printf_nofunc ("-> %s->displaced_step_restore_all_in_ptid (...)", this->beneath ()->shortname ()); + this->beneath ()->displaced_step_restore_all_in_ptid (arg0, arg1); + target_debug_printf_nofunc ("<- %s->displaced_step_restore_all_in_ptid (%s, %s)", + this->beneath ()->shortname (), + target_debug_print_inferior_p (arg0).c_str (), + target_debug_print_ptid_t (arg1).c_str ()); +} diff --git a/gdb/target.h b/gdb/target.h index 5b45f152b51f..0729e32b1495 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1376,6 +1376,25 @@ struct target_ops /* Return the x86 XSAVE extended state area layout. */ virtual x86_xsave_layout fetch_x86_xsave_layout () TARGET_DEFAULT_RETURN (x86_xsave_layout ()); + + /* Return true if the target supports displaced stepping for THREAD. */ + virtual bool supports_displaced_step (thread_info *thread) + TARGET_DEFAULT_FUNC (default_supports_displaced_step); + + /* See documentation of gdbarch_displaced_step_prepare. */ + virtual displaced_step_prepare_status displaced_step_prepare (thread_info *thread, + CORE_ADDR &displaced_pc) + TARGET_DEFAULT_FUNC (default_displaced_step_prepare); + + /* See documentation of gdbarch_displaced_step_finish. */ + virtual displaced_step_finish_status displaced_step_finish + (thread_info *thread, const target_waitstatus &status) + TARGET_DEFAULT_FUNC (default_displaced_step_finish); + + /* See documentation of gdbarch_displaced_step_restore_all_in_ptid. */ + virtual void displaced_step_restore_all_in_ptid (inferior *parent_inf, + ptid_t child_ptid) + TARGET_DEFAULT_FUNC (default_displaced_step_restore_all_in_ptid); }; /* Deleter for std::unique_ptr. See comments in From patchwork Tue Jan 14 19:16:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 104781 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 00A7238560A8 for ; Tue, 14 Jan 2025 19:28:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 00A7238560A8 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=default header.b=AssRAIQL X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 90807385627E for ; Tue, 14 Jan 2025 19:26:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 90807385627E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 90807385627E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736882801; cv=none; b=WCbTi42/sIJVNblcirBRF2x0Ozc18acQHxY1vNanSouOxTro405X8YTN+a/+4Z3WsCmamX7E9Hh/NCyQGPRbx4+4dzOnniAbNYVEJ2EuXlcgyrN2uh10Zr1X6SrdZh7wki796Y2go0QZbh5Ea17u9ORkSR5MeWqzOl8bnbpkPCc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736882801; c=relaxed/simple; bh=HzoXbexqiDnWFcUiGFsKWa0VLwoMcAJ/lo+G6S6qtks=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=SoaEwPnSbkVPdehHYsnib3ATmmzmPkw0cx9X9JV1TqQFEZnz5vIrqqTRAFJRsJ7lAv1SpnaMUBQxLvmgD2szcmk/Jz0i+xOCG/8Jcmv2qAaHe0vr6y7CCHUdkTEXJPWwtqy/zml0s7vmAHq+awGvhjhGemMrRSq1sQuxWq2Ctp4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 90807385627E Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 50EJQaXZ068779 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 14 Jan 2025 14:26:41 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 50EJQaXZ068779 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1736882801; bh=ENWX3eI2ez2+hRo7pngnwQSGkYc0lJWqgB7PHWRQXrg=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=AssRAIQLc1M1Mcq8aXA8yjOHJ+1PXPV0Mn3+Cpm31R4Pn7f0ixtMCMPKWtHb1lq4f loaGN4BCDXlu+TZuspTHKLT1Zxt7T4VHPi7vQdWNUAD8CgSSadQrTTzvPkOsYQMnfN ExivOwFEal+tvepBpqSRyYgzP9nax7PUfPumlprc= Received: by simark.ca (Postfix, from userid 112) id 2C6A61E116; Tue, 14 Jan 2025 14:18:26 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-Spam-Level: X-Spam-Status: No, score=-3188.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 Received: from simark.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 9D7D81E105; Tue, 14 Jan 2025 14:18:19 -0500 (EST) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Lancelot SIX , Simon Marchi Subject: [PATCH 3/3] gdb/amd-dbgapi: add displaced stepping support Date: Tue, 14 Jan 2025 14:16:23 -0500 Message-ID: <20250114191818.2393132-4-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250114191818.2393132-1-simon.marchi@polymtl.ca> References: <20250114191818.2393132-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Tue, 14 Jan 2025 19:26:36 +0000 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org From: Simon Marchi Implement the target_ops displaced stepping methods to add displaced stepping support when debugging AMD GPU programs. The knowledge of how to prepare and finish displaced steps is provided by the amd-dbgapi library, so the code here is relatively straightforward. No need to parse instructions or handle fixups, that is done by the lib We just need to remember, for each thread doing a displaced step, the displaced stepping id given by the library. Add a test to exercise the new functionality. The compiler generates DWARF that GDB doesn't understand yet [1], so trying to step over a breakpoint with DWARF present gives: (gdb) si Unhandled dwarf expression opcode 0xe9 The test purposefully builds the binary without DWARF info to circumvent this. [1] https://llvm.org/docs/AMDGPUDwarfExtensionsForHeterogeneousDebugging.html Change-Id: I53f459221a42d4b02a6041eadb8cf554500e2162 --- gdb/amd-dbgapi-target.c | 138 ++++++++++++++++++ gdb/testsuite/gdb.rocm/displaced-stepping.exp | 54 +++++++ 2 files changed, 192 insertions(+) create mode 100644 gdb/testsuite/gdb.rocm/displaced-stepping.exp diff --git a/gdb/amd-dbgapi-target.c b/gdb/amd-dbgapi-target.c index 153a35f788ed..996e16abf591 100644 --- a/gdb/amd-dbgapi-target.c +++ b/gdb/amd-dbgapi-target.c @@ -24,6 +24,7 @@ #include "cli/cli-cmds.h" #include "cli/cli-decode.h" #include "cli/cli-style.h" +#include "gdbcore.h" #include "gdbsupport/unordered_map.h" #include "inf-loop.h" #include "inferior.h" @@ -215,6 +216,12 @@ struct amd_dbgapi_inferior_info /* List of pending events the amd-dbgapi target retrieved from the dbgapi. */ std::list> wave_events; + /* Map of threads with ongoing displaced steps to corresponding amd-dbgapi + displaced stepping handles. */ + gdb::unordered_map + stepping_id_map; + /* Map of wave ID to wave_info. We cache wave_info objects because we need to access the info after the wave is gone, in the thread exit nofication. E.g.: @@ -291,6 +298,21 @@ struct amd_dbgapi_target final : public target_ops bool stopped_by_sw_breakpoint () override; bool stopped_by_hw_breakpoint () override; + bool supports_displaced_step (thread_info *thread) override + { + /* Handle displaced stepping for GPU threads only. */ + if (!ptid_is_gpu (thread->ptid)) + return beneath ()->supports_displaced_step (thread); + + return true; + } + + displaced_step_prepare_status displaced_step_prepare + (thread_info *thread, CORE_ADDR &displaced_pc) override; + + displaced_step_finish_status displaced_step_finish + (thread_info *thread, const target_waitstatus &status) override; + private: /* True if we must report thread events. */ bool m_report_thread_events = false; @@ -1897,6 +1919,122 @@ amd_dbgapi_target::update_thread_list () this->beneath ()->update_thread_list (); } +displaced_step_prepare_status +amd_dbgapi_target::displaced_step_prepare (thread_info *thread, + CORE_ADDR &displaced_pc) +{ + if (!ptid_is_gpu (thread->ptid)) + return beneath ()->displaced_step_prepare (thread, displaced_pc); + + gdb_assert (!thread->displaced_step_state.in_progress ()); + + /* Read the bytes that were overwritten by the breakpoint instruction being + stepped over. */ + CORE_ADDR original_pc = regcache_read_pc (get_thread_regcache (thread)); + gdbarch *arch = get_thread_regcache (thread)->arch (); + size_t size = get_amdgpu_gdbarch_tdep (arch)->breakpoint_instruction_size; + gdb::byte_vector overwritten_bytes (size); + + read_memory (original_pc, overwritten_bytes.data (), size); + + /* Ask dbgapi to start the displaced step. */ + amd_dbgapi_wave_id_t wave_id = get_amd_dbgapi_wave_id (thread->ptid); + amd_dbgapi_displaced_stepping_id_t stepping_id; + amd_dbgapi_status_t status + = amd_dbgapi_displaced_stepping_start (wave_id, overwritten_bytes.data (), + &stepping_id); + + switch (status) + { + case AMD_DBGAPI_STATUS_SUCCESS: + break; + + case AMD_DBGAPI_STATUS_ERROR_DISPLACED_STEPPING_BUFFER_NOT_AVAILABLE: + return DISPLACED_STEP_PREPARE_STATUS_UNAVAILABLE; + + case AMD_DBGAPI_STATUS_ERROR_ILLEGAL_INSTRUCTION: + return DISPLACED_STEP_PREPARE_STATUS_CANT; + + default: + error (_("amd_dbgapi_displaced_stepping_start failed (%s)"), + get_status_string (status)); + } + + /* Save the displaced stepping id in the per-inferior info. */ + amd_dbgapi_inferior_info *info = get_amd_dbgapi_inferior_info (thread->inf); + + bool inserted + = info->stepping_id_map.emplace (thread, stepping_id.handle).second; + gdb_assert (inserted); + + /* Get the new (displaced) PC. */ + status = amd_dbgapi_wave_get_info (wave_id, AMD_DBGAPI_WAVE_INFO_PC, + sizeof (displaced_pc), &displaced_pc); + if (status != AMD_DBGAPI_STATUS_SUCCESS) + { + amd_dbgapi_displaced_stepping_complete (wave_id, stepping_id); + error (_("amd_dbgapi_wave_get_info failed (%s), could not get the " + "thread's displaced PC."), + get_status_string (status)); + } + + displaced_debug_printf ("selected buffer at %#lx", displaced_pc); + + /* We may have written some registers, so flush the register cache. */ + registers_changed_thread (thread); + + return DISPLACED_STEP_PREPARE_STATUS_OK; +} + +displaced_step_finish_status +amd_dbgapi_target::displaced_step_finish (thread_info *thread, + const target_waitstatus &ws) +{ + if (!ptid_is_gpu (thread->ptid)) + return beneath ()->displaced_step_finish (thread, ws); + + gdb_assert (thread->displaced_step_state.in_progress ()); + + /* Find the displaced stepping id for this thread. */ + amd_dbgapi_inferior_info *info = get_amd_dbgapi_inferior_info (thread->inf); + auto entry = info->stepping_id_map.extract (thread); + + gdb_assert (entry.has_value ()); + amd_dbgapi_displaced_stepping_id_t stepping_id {entry->second}; + + /* If the thread exited while stepping, we are done. The code above + cleared our associated resources. We don't want to call dbgapi + below: since the thread is gone, we wouldn't be able to find the + necessary wave ID. dbgapi already took care of releasing its + displaced-stepping-related resources when it deleted the + wave. */ + if (ws.kind () == TARGET_WAITKIND_THREAD_EXITED) + return DISPLACED_STEP_FINISH_STATUS_OK; + + amd_dbgapi_wave_id_t wave_id = get_amd_dbgapi_wave_id (thread->ptid); + amd_dbgapi_wave_stop_reasons_t stop_reason; + amd_dbgapi_status_t status + = amd_dbgapi_wave_get_info (wave_id, AMD_DBGAPI_WAVE_INFO_STOP_REASON, + sizeof (stop_reason), &stop_reason); + + if (status != AMD_DBGAPI_STATUS_SUCCESS) + error (_("wave_get_info for wave_%ld failed (%s)"), wave_id.handle, + get_status_string (status)); + + status = amd_dbgapi_displaced_stepping_complete (wave_id, stepping_id); + + if (status != AMD_DBGAPI_STATUS_SUCCESS) + error (_("amd_dbgapi_displaced_stepping_complete failed (%s)"), + get_status_string (status)); + + /* We may have written some registers, so flush the register cache. */ + registers_changed_thread (thread); + + return (stop_reason & AMD_DBGAPI_WAVE_STOP_REASON_SINGLE_STEP) != 0 + ? DISPLACED_STEP_FINISH_STATUS_OK + : DISPLACED_STEP_FINISH_STATUS_NOT_EXECUTED; +} + /* inferior_created observer. */ static void diff --git a/gdb/testsuite/gdb.rocm/displaced-stepping.exp b/gdb/testsuite/gdb.rocm/displaced-stepping.exp new file mode 100644 index 000000000000..6b26e1adfd7a --- /dev/null +++ b/gdb/testsuite/gdb.rocm/displaced-stepping.exp @@ -0,0 +1,54 @@ +# Copyright 2024 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test displaced stepping on AMD GPUs. + +load_lib rocm.exp + +standard_testfile simple.cpp + +require allow_hipcc_tests + +# Since GDB doesn't yet understand DWARF expressions generated by the HIP +# compiler, purposefully generate the binary without debug info. +if {[build_executable "failed to prepare" $testfile $srcfile {hip}]} { + return +} + +proc do_test {} { + clean_restart $::binfile + + with_rocm_gpu_lock { + if ![runto_main] { + return + } + + gdb_test "with breakpoint pending on -- break do_an_addition" \ + "Breakpoint $::decimal \\(do_an_addition\\) pending." + + gdb_test "continue" \ + "Thread $::decimal hit Breakpoint $::decimal, $::hex in do_an_addition.*" + + gdb_test_no_output "set debug displaced on" + + gdb_test "stepi" "displaced_step_prepare_throw: prepared successfully.*$::hex in do_an_addition.*" + + gdb_test "continue" \ + "Inferior 1 .* exited normally.*" \ + "continue to end" + } +} + +do_test