From patchwork Wed Apr 10 07:46:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Metzger, Markus T" X-Patchwork-Id: 88276 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 AE2063858C39 for ; Wed, 10 Apr 2024 07:47:02 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by sourceware.org (Postfix) with ESMTPS id F08933858D32 for ; Wed, 10 Apr 2024 07:46:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F08933858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org F08933858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=198.175.65.18 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712735184; cv=none; b=JlQ4iwq79ULqjqqiIs9TggVdvaKTRuTrwe1XXUiBtwJYkid1VrzaHY54Ld3CArOFs6TR0UCDMMWBxS//meBQa3z2uaLAW2VP9kleUwkz8queCDeC9xXIyh2ICKP1cXqAH2RsvnhTN8SWw8fcFpBG9SIUwUj4WfGMLFfvji0FoTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712735184; c=relaxed/simple; bh=AxD9w2OwV5s14/Kl42W3Vkl5Hl0G0W2le1esU5Vq7CU=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=AXvLgAhC4hboxVKyoii1QJt15DYNKt3PBjnuiX8o/K5B8tcH3QDxpio9b0KF7Mp7VmLvQ5rNOueY2AO8dN933rTMrl0axZQVXMP699Rcm3q4Z8RzhVueVP3PzPiKBy66puea0b7hMDYnaNITcvt+ghEOxG0U2zpihA94KK6z8EU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712735182; x=1744271182; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AxD9w2OwV5s14/Kl42W3Vkl5Hl0G0W2le1esU5Vq7CU=; b=dyhDr7u5YN4k3eQ80sHJqK2lNvtuO15ZDccUk3jMp1IuUNgEAact8qwX Kr7u40tXhub9HnmCqUAQi4fSwTglCZETbH6KcAzbOtz8BISywZ1VlxtNM Kv2TlUYM7Y+gqNGTPaskcLI+Q9AnCdfKKvWT36MMRSGuQ8Se6Vkf4qmte T4LXubhnGC5hFnXiMjjGzn4uohMYukWxyPW9BeStW9OpTiFIf4e5XA7AE QDUyIw5XTQ0maliWQ6guqPhfnUjBL7Fb1L72SmSwLWQH7Yd1fAcoPANmw lFUB5yDxTonN76pESLeMq5NRNL8yhQ59JlqUqCn6Ek+MAOLUBj+qmVq3o g==; X-CSE-ConnectionGUID: snehmUeZTBKwX2xHmaVI7w== X-CSE-MsgGUID: beC90Hs+TIKXcwiifnCGZg== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8249769" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="8249769" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 00:46:20 -0700 X-CSE-ConnectionGUID: KL/i4MhYTY6KVOzTQGoJlw== X-CSE-MsgGUID: ORB+SIPlSvqtt0TLlfW55w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="24958937" Received: from gkldtt-dev-004.igk.intel.com (HELO localhost) ([10.123.221.202]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 00:46:18 -0700 From: Markus Metzger To: gdb-patches@sourceware.org Cc: pedro@palves.net, Guinevere Larsen Subject: [PATCH v5 1/4] gdb, infrun, btrace: fix reverse/replay stepping at end of execution history Date: Wed, 10 Apr 2024 07:46:10 +0000 Message-Id: <20240410074613.54520-2-markus.t.metzger@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240410074613.54520-1-markus.t.metzger@intel.com> References: <20240410074613.54520-1-markus.t.metzger@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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 When trying to step over a breakpoint at the end of the trace, the step-over will fail with no-history. This does not clear step_over_info so a subsequent resume will cause GDB to not resume the thread and expect a SIGTRAP to complete the step-over. This will never come causing GDB to hang in the wait-for-event poll. That step-over failed after actually completing the step. This is wrong. The step-over itself should have failed and the step should not have completed. Fix it by moving the end of execution history check to before we are stepping. This exposes another issue, however. When completing a step-over at the end of the execution history, we implicitly stop replaying that thread. A continue command would resume after the step-over and, since we're no longer replaying, would continue recording. Fix that by recording the replay state in the thread's control state and failing with no-history in keep_going if we're switching from replay to recording. Reviewed-By: Guinevere Larsen --- gdb/gdbthread.h | 3 ++ gdb/infrun.c | 25 +++++++++++++ gdb/record-btrace.c | 19 +++++----- gdb/testsuite/gdb.btrace/cont-hang.exp | 43 ++++++++++++++++++++++ gdb/testsuite/gdb.btrace/step-hang.exp | 42 ++++++++++++++++++++++ gdb/testsuite/gdb.btrace/stepn.exp | 50 ++++++++++++++++++++++++++ 6 files changed, 173 insertions(+), 9 deletions(-) create mode 100644 gdb/testsuite/gdb.btrace/cont-hang.exp create mode 100644 gdb/testsuite/gdb.btrace/step-hang.exp create mode 100644 gdb/testsuite/gdb.btrace/stepn.exp diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 73f6895fe46..2d6b212cd32 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -176,6 +176,9 @@ struct thread_control_state /* True if the thread is evaluating a BP condition. */ bool in_cond_eval = false; + + /* Whether the thread was replaying when the command was issued. */ + bool is_replaying = false; }; /* Inferior thread specific part of `struct infcall_suspend_state'. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index a5030b16376..05022b0d7bc 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3096,6 +3096,8 @@ clear_proceed_status_thread (struct thread_info *tp) /* Discard any remaining commands or status from previous stop. */ bpstat_clear (&tp->control.stop_bpstat); + + tp->control.is_replaying = target_record_is_replaying (tp->ptid); } /* Notify the current interpreter and observers that the target is about to @@ -9009,6 +9011,29 @@ keep_going_pass_signal (struct execution_control_state *ecs) gdb_assert (ecs->event_thread->ptid == inferior_ptid); gdb_assert (!ecs->event_thread->resumed ()); + /* When a thread reaches the end of its execution history, it automatically + stops replaying. This is so the user doesn't need to explicitly stop it + with a separate command. + + We do not want a single command (e.g. continue) to transition from + replaying to recording, though, e.g. when starting from a breakpoint we + needed to step over at the end of the trace. When we reach the end of the + execution history during stepping, stop with no-history. + + The other direction is fine. When we're at the end of the execution + history, we may reverse-continue to start replaying. */ + if (ecs->event_thread->control.is_replaying + && !target_record_is_replaying (ecs->event_thread->ptid)) + { + interps_notify_no_history (); + ecs->ws.set_no_history (); + set_last_target_status (ecs->target, ecs->ptid, ecs->ws); + stop_print_frame = true; + stop_waiting (ecs); + normal_stop (); + return; + } + /* Save the pc before execution, to compare with pc after stop. */ ecs->event_thread->prev_pc = regcache_read_pc_protected (get_thread_regcache (ecs->event_thread)); diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 0ef1dfbe652..c1bd2b4bc20 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -2339,6 +2339,16 @@ record_btrace_single_step_forward (struct thread_info *tp) if (replay == NULL) return btrace_step_no_history (); + /* The execution trace contains (and ends with) the current instruction. + This instruction has not been executed, yet, so the trace really ends + one instruction earlier. + + We'd fail later on in btrace_insn_next () but we must not trigger + breakpoints as we're not really able to step. */ + btrace_insn_end (&end, btinfo); + if (btrace_insn_cmp (replay, &end) == 0) + return btrace_step_no_history (); + /* Check if we're stepping a breakpoint. */ if (record_btrace_replay_at_breakpoint (tp)) return btrace_step_stopped (); @@ -2361,15 +2371,6 @@ record_btrace_single_step_forward (struct thread_info *tp) } while (btrace_insn_get (replay) == NULL); - /* Determine the end of the instruction trace. */ - btrace_insn_end (&end, btinfo); - - /* The execution trace contains (and ends with) the current instruction. - This instruction has not been executed, yet, so the trace really ends - one instruction earlier. */ - if (btrace_insn_cmp (replay, &end) == 0) - return btrace_step_no_history (); - return btrace_step_spurious (); } diff --git a/gdb/testsuite/gdb.btrace/cont-hang.exp b/gdb/testsuite/gdb.btrace/cont-hang.exp new file mode 100644 index 00000000000..cddcf68b3ab --- /dev/null +++ b/gdb/testsuite/gdb.btrace/cont-hang.exp @@ -0,0 +1,43 @@ +# This testcase is part of GDB, the GNU debugger. +# +# 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 that we do not hang when trying to continue over a breakpoint at +# the end of the trace. + +require allow_btrace_tests + +standard_testfile record_goto.c +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { + return -1 +} + +if ![runto_main] { + return -1 +} + +# Trace the call to the test function. +gdb_test_no_output "record btrace" +gdb_test "next" "main\.3.*" + +# We need to be replaying, otherwise, we'd just continue recording. +gdb_test "reverse-stepi" +gdb_test "break" + +# Continuing will step over the breakpoint and then run into the end of +# the execution history. This ends replay, so we can continue recording. +gdb_test "continue" "No more reverse-execution history.*" +gdb_continue_to_end diff --git a/gdb/testsuite/gdb.btrace/step-hang.exp b/gdb/testsuite/gdb.btrace/step-hang.exp new file mode 100644 index 00000000000..91ea813955d --- /dev/null +++ b/gdb/testsuite/gdb.btrace/step-hang.exp @@ -0,0 +1,42 @@ +# This testcase is part of GDB, the GNU debugger. +# +# 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 that we do not hang when trying to step over a breakpoint at the +# end of the trace. + +require allow_btrace_tests + +standard_testfile record_goto.c +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { + return -1 +} + +if ![runto_main] { + return -1 +} + +# Trace the call to the test function. +gdb_test_no_output "record btrace" +gdb_test "next" "main\.3.*" + +# We need to be replaying, otherwise, we'd just continue recording. +gdb_test "reverse-stepi" +gdb_test "break" + +# Stepping over the breakpoint ends replaying and we can continue recording. +gdb_test "step" "main\.3.*" +gdb_continue_to_end diff --git a/gdb/testsuite/gdb.btrace/stepn.exp b/gdb/testsuite/gdb.btrace/stepn.exp new file mode 100644 index 00000000000..4aec90adc65 --- /dev/null +++ b/gdb/testsuite/gdb.btrace/stepn.exp @@ -0,0 +1,50 @@ +# This testcase is part of GDB, the GNU debugger. +# +# 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 that step n does not start recording when issued while replaying. + +require allow_btrace_tests + +standard_testfile record_goto.c +if [prepare_for_testing "failed to prepare" $testfile $srcfile] { + return -1 +} + +if ![runto_main] { + return -1 +} + +# Trace the call to the test function. +gdb_test_no_output "record btrace" +gdb_test "next" "main\.3.*" + +# Stepping should bring us to the end of the execution history, but should +# not resume recording. +with_test_prefix "stepi" { + gdb_test "reverse-stepi" + gdb_test "stepi 5" "No more reverse-execution history.*main\.3.*" +} + +with_test_prefix "step" { + gdb_test "reverse-step" + gdb_test "step 5" "No more reverse-execution history.*main\.3.*" +} + +with_test_prefix "next" { + gdb_test "reverse-next" + gdb_test "next 5" "No more reverse-execution history.*main\.3.*" +} From patchwork Wed Apr 10 07:46:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Metzger, Markus T" X-Patchwork-Id: 88277 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 2BA213858429 for ; Wed, 10 Apr 2024 07:47:06 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by sourceware.org (Postfix) with ESMTPS id 489E63858D39 for ; Wed, 10 Apr 2024 07:46:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 489E63858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 489E63858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=198.175.65.18 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712735188; cv=none; b=nJk7HsoicCctl26LvA13Mwh2rDk7P5Akxj6J2QEMT/usP3/22SDR4Pu3y9Kb5NSwLuIZ9Xmsl44IM58Eek/HBnvW6V22rNh20sjWHhuJFDHa8rWBaQdzh1elcZZA/nS0Lp+YBqfes5FpUCXxpN6GERHEjmlN3SuZMepB5T0E4T4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712735188; c=relaxed/simple; bh=RVg8gF4E3VIDQ6H+6e446LsFLpQ/RONeNkzv3TSdvrM=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=j/SwhO/jq7E7q04E2QV0yKcwBomHRPElJ1RBGookahFF8XDFBXJbG9HP3hm2zglpFz2SKN1/rIPCO0SKluxlnYVVz6AUkM/8Z0baNq4GjyCu7um0zf9OJIeY8jpm2SMzz6SWRYcIgKwb1fpCsJXx8z7OobLWWSLnGGa7IazSHf4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712735183; x=1744271183; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RVg8gF4E3VIDQ6H+6e446LsFLpQ/RONeNkzv3TSdvrM=; b=lWMRkCQ19BDALgCS3ncbXMnZyeGv1ecg9x73cGGmCClpMyK7W/k5YhgR 2BJC6TiBGML63CA/hclAyi+hznbmE51q7UIlgcKFFvM74qq4Q54eSvs4R GiBluw85eXjogAtnxmwEcu2mvue7/Rvz/CkeCXntjQzHrwQQVg4/SM6E3 WN27Y+jtLlacxOhm6oKu4t0LkzJZVTYIC5VNDs2uJeA88ftlXsfhZssHx 3fij7Zm5sGDx54bAk41GjFp4Y+W85i0IEB3kzJ6vwzwqEdrR09uOw10r8 G7Xb8RlNZ32vgMYQvDV35CT/CdRqSRBnjfCJjB1lFT4BH07zv6Xlgx3Ny A==; X-CSE-ConnectionGUID: u9fSrFhxQ1uY7E0XijAJVQ== X-CSE-MsgGUID: cVoTKVyUQZSeLH3t/PT07w== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8249781" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="8249781" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 00:46:23 -0700 X-CSE-ConnectionGUID: HZrtycNiTT6vsdVGdXHI2g== X-CSE-MsgGUID: 2XNcoeImS06LE/COw/EY+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="24958946" Received: from gkldtt-dev-004.igk.intel.com (HELO localhost) ([10.123.221.202]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 00:46:21 -0700 From: Markus Metzger To: gdb-patches@sourceware.org Cc: pedro@palves.net, Guinevere Larsen Subject: [PATCH v5 2/4] gdb, infrun, record: fix hang when step-over fails with no-history Date: Wed, 10 Apr 2024 07:46:11 +0000 Message-Id: <20240410074613.54520-3-markus.t.metzger@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240410074613.54520-1-markus.t.metzger@intel.com> References: <20240410074613.54520-1-markus.t.metzger@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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 When trying to step over a breakpoint at the end of the trace while another thread is replaying, the step-over will fail with no-history. This does not clear step_over_info so a subsequent resume will cause GDB to not resume the thread and expect a SIGTRAP to complete the step-over. This will never come causing GDB to hang in the wait-for-event poll. This is a variant of the issue fixed in the parent commit. That commit addressed the issue for a single-threaded process and fixed an issue with reverse/replay stepping in general. This commit addresses the issue for a multi-threaded process. In this case, the single-step does not complete. Finish an in-flight step-over when a thread stopped with NO_HISTORY. Since we did not move, we will simply start the step-over again. Hannes Domani reported that this fixes PR gdb/31353. Reviewed-By: Guinevere Larsen --- gdb/infrun.c | 12 +++ .../gdb.btrace/multi-thread-break-hang.exp | 84 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 gdb/testsuite/gdb.btrace/multi-thread-break-hang.exp diff --git a/gdb/infrun.c b/gdb/infrun.c index 05022b0d7bc..cda9afc3dfb 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -77,6 +77,8 @@ #include "disasm.h" #include "interps.h" +struct execution_control_state; + /* Prototypes for local functions */ static void sig_print_info (enum gdb_signal); @@ -6572,6 +6574,16 @@ handle_inferior_event (struct execution_control_state *ecs) return; interps_notify_no_history (); + + /* Cancel an in-flight step-over. It will not succeed since we + won't be able to step at the end of the execution history. */ + { + /* finish_step_over may call restart_threads, which may change the + current thread. make sure we leave the event thread as the + current thread. */ + scoped_restore_current_thread restore_thread; + finish_step_over (ecs); + } stop_waiting (ecs); return; } diff --git a/gdb/testsuite/gdb.btrace/multi-thread-break-hang.exp b/gdb/testsuite/gdb.btrace/multi-thread-break-hang.exp new file mode 100644 index 00000000000..33edcf05612 --- /dev/null +++ b/gdb/testsuite/gdb.btrace/multi-thread-break-hang.exp @@ -0,0 +1,84 @@ +# This testcase is part of GDB, the GNU debugger. +# +# 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 that we cancel an in-flight step-over at the end of the execution +# history as long as some other thread is still replaying. +# +# This used to cause GDB to hang in poll (). + +require allow_btrace_tests + +standard_testfile multi-thread-step.c +if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] { + return -1 +} + +if ![runto_main] { + return -1 +} + +# Set up breakpoints. +set bp_1 [gdb_get_line_number "bp.1" $srcfile] +set bp_2 [gdb_get_line_number "bp.2" $srcfile] + +# Trace the code between the two breakpoints. +gdb_breakpoint $srcfile:$bp_1 +gdb_continue_to_breakpoint "continue to bp.1" ".*$srcfile:$bp_1\r\n.*" + +gdb_test_no_output "record btrace" + +# We have two threads at or close to bp.1 but handled only one stop event. +# Remove the breakpoint so we do not need to deal with the 2nd event. +delete_breakpoints +gdb_breakpoint $srcfile:$bp_2 +gdb_continue_to_breakpoint "continue to bp.2" ".*$srcfile:$bp_2\r\n.*" + +# Determine the thread that reported the breakpoint. +set thread [get_integer_valueof "\$_thread" bad] + +# Determine the other thread. +set other "bad" +if { $thread == 1 } { + set other 2 +} elseif { $thread == 2 } { + set other 1 +} + +# This test requires scheduler-locking 'on' or 'step'; 'replay' would +# implicitly stop replaying, avoiding the problem; 'off' would step one +# and resume the other. +# +# With the current record-btrace implementation that steps all resumed +# threads in lock-step, 'off' might actually pass but we don't want to +# bake that behavior into tests. +gdb_test_no_output "set scheduler-locking step" + +# Start replaying the other thread. This will prevent stepping the thread +# that reported the event. +gdb_test "thread apply $other record goto begin" +gdb_test "thread apply $other info record" "Replay in progress.*" + +# We're at a breakpoint so this triggers step-over. Since we're at the +# end of the trace, the step will fail. +gdb_test "stepi" "No more reverse-execution history.*" "stepi.1" + +# We used to hang at the second step since step-over insisted on polling +# the next event. +gdb_test "stepi" "No more reverse-execution history.*" "stepi.2" + +# Do one more just in case. +gdb_test "stepi" "No more reverse-execution history.*" "stepi.3" From patchwork Wed Apr 10 07:46:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Metzger, Markus T" X-Patchwork-Id: 88279 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 E645F3858CDA for ; Wed, 10 Apr 2024 07:47:37 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by sourceware.org (Postfix) with ESMTPS id 63EBB3858CDA for ; Wed, 10 Apr 2024 07:46:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 63EBB3858CDA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 63EBB3858CDA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=198.175.65.18 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712735189; cv=none; b=TGsWLwBvsa6wOiqQKjq1mJe39ECP/LBAwd1zi/ACLiqdNJ1ZVF7KogYdfBusL0CFcEuePrVbHuei13ighWgb365UdFyv/vaKTFwAnk2XEhQBmxhCxD1hO4klArZQuwpNrk9fdX6cylcFtjrOPCRfNxOEwPALoUD+/l3ttwTtppQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712735189; c=relaxed/simple; bh=eLXfKy/jksuFSw0J/gc5M4W+COJlyDu2bFsoXBshYxM=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=HHDWxmsd+K9U05/bCV/kl3168kqoS+/FzWV7SYP2tGniD1oLEcaSLVttgAf9WYK6ZJHa3sX3tYw4kzpuor221t98qSqwQlwFVLUcbj6JcOgHuYjHavWq/T86PDilhog8xP6rnrh36OdA+kPD9f9x3y+TJGpx3imna67GfVmDRVI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712735186; x=1744271186; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eLXfKy/jksuFSw0J/gc5M4W+COJlyDu2bFsoXBshYxM=; b=EF389jau1/t2Wrn+6LHDYBMXwpmLew25K7utzr6gi3h6REwj30loQ9X3 DZZMvOd1byEEltSoOu3JjTPs36XTEh9LI8ijRvlT8LO6FKxiCKu6/YsnP d25xL+0fJZy5KWwmiOkXgN/mzKV7Pgh00M1P8TaayHYELjG53yjOYsIH2 ISAIMou0tveF1ZOAB0NxdWQDnlCZDG2G8vR5HM2CsQ8N0+1mMkEb2Jutd 9UJfNcC1y89U/J6HY8RqnAGEfa5jbPr3YCkyUxxY9sNn4IBu+ng4xarLv 0o7E89iCqx4yZf4KRjgp9IR6RNK1b5NOKD+K0idv16C75k4UykAcGeSkL w==; X-CSE-ConnectionGUID: c2C7t83nTmi3MGv0szL6tQ== X-CSE-MsgGUID: 9c248IhmQqqolUFXIj1bXA== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8249788" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="8249788" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 00:46:26 -0700 X-CSE-ConnectionGUID: oKnn37DtTdeb7CUt/aYZOA== X-CSE-MsgGUID: BWFsU6CjRFi28gi5ZF9UzQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="24958959" Received: from gkldtt-dev-004.igk.intel.com (HELO localhost) ([10.123.221.202]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 00:46:25 -0700 From: Markus Metzger To: gdb-patches@sourceware.org Cc: pedro@palves.net, Guinevere Larsen Subject: [PATCH v5 3/4] gdb, infrun, record: move no-history notification into normal_stop Date: Wed, 10 Apr 2024 07:46:12 +0000 Message-Id: <20240410074613.54520-4-markus.t.metzger@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240410074613.54520-1-markus.t.metzger@intel.com> References: <20240410074613.54520-1-markus.t.metzger@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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 Leave calling gdb::observers::no_history.notify to normal_stop based on the last waitstatus. Reviewed-By: Guinevere Larsen --- gdb/infrun.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/infrun.c b/gdb/infrun.c index cda9afc3dfb..d3738ebbd66 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -6573,8 +6573,6 @@ handle_inferior_event (struct execution_control_state *ecs) if (handle_stop_requested (ecs)) return; - interps_notify_no_history (); - /* Cancel an in-flight step-over. It will not succeed since we won't be able to step at the end of the execution history. */ { @@ -9037,7 +9035,6 @@ keep_going_pass_signal (struct execution_control_state *ecs) if (ecs->event_thread->control.is_replaying && !target_record_is_replaying (ecs->event_thread->ptid)) { - interps_notify_no_history (); ecs->ws.set_no_history (); set_last_target_status (ecs->target, ecs->ptid, ecs->ws); stop_print_frame = true; @@ -9677,6 +9674,9 @@ normal_stop () if (saved_context.changed ()) return true; + if (last.kind () == TARGET_WAITKIND_NO_HISTORY) + interps_notify_no_history (); + /* Notify observers about the stop. This is where the interpreters print the stop event. */ notify_normal_stop ((inferior_ptid != null_ptid From patchwork Wed Apr 10 07:46:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Metzger, Markus T" X-Patchwork-Id: 88278 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 484EF3858283 for ; Wed, 10 Apr 2024 07:47:31 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by sourceware.org (Postfix) with ESMTPS id 0D4873858C33 for ; Wed, 10 Apr 2024 07:46:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0D4873858C33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0D4873858C33 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=198.175.65.18 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712735195; cv=none; b=ha07tICki91SX6janfe7vHDnXrfnGhqxHTbMwoNHWQqfZ/hs3gl5i3BGooUE1iKQIZxIHIUrJgLR2/A9VqkHJx90K6+6TAD152I1c1WT1yatEmgWYUUgNmY/o7Bu3u8tbZ0lyNmPuNN2QkzM6Wx78ZtJv4yEREBf7bDHtCwfOZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712735195; c=relaxed/simple; bh=YpUskbBtEVgg18P/vNyvZMpH+VLsT5RZFpGakbRs1/Q=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=BWV1y/5I2xxqR7DYKOLIZghEFtBh8lt4SWqCGb3qWli1+xzqDxyXJ6tw0zFhi/kRG1Tt1hzmlgs7AjUoSeCvLJ03K11u4eqE7DM7N/VDXZxhq4QwunlhmFJzFjwdq8crPGVvIMpz19caKh54c6ULabJqeWTOja+SPVOMoNgcwXs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712735190; x=1744271190; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YpUskbBtEVgg18P/vNyvZMpH+VLsT5RZFpGakbRs1/Q=; b=SPgCpG4ifXfsSM3h52ZZWW0L5bzucGxnPrQvCIwXNpH74WgEsseb5b1o PB+wYdZd6CLdwgnHsva01+sAKmRlS/Dh09D9+vNJykWcqFqvvTZT3gbna fwsjZtZnhWiRNWPJrift8Ov28dF94QyEgJjjJ0kYxy8tQYAw6pZPSypwz gcglHR4+M4/X9AJL8Cd3hEgHbg66AOIj416BMKvnFrmqPWcunjlI0YOpF YMzDFzVJ/V20+RQXctZM1NEi8glQoDztT5wdNG3ZHM9vLFyQ/sHTaMOJ0 z/l6B6tM/DKsIzr2qtim/jxjxJA8jfINwY6e/0pkGbnchplLIeMO/zAs8 w==; X-CSE-ConnectionGUID: XVrt84EnRtO8DFb+lLjJrw== X-CSE-MsgGUID: RupkabdITSaFVBEALk+GHw== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8249796" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="8249796" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 00:46:29 -0700 X-CSE-ConnectionGUID: 5TmQ7D78SGmNkD7EoGCzjw== X-CSE-MsgGUID: 6wjr+O4mQlSpnhn8PBID0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="24958990" Received: from gkldtt-dev-004.igk.intel.com (HELO localhost) ([10.123.221.202]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 00:46:28 -0700 From: Markus Metzger To: gdb-patches@sourceware.org Cc: pedro@palves.net Subject: [PATCH v5 4/4] gdb, infrun: fix multi-threaded reverse stepping Date: Wed, 10 Apr 2024 07:46:13 +0000 Message-Id: <20240410074613.54520-5-markus.t.metzger@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240410074613.54520-1-markus.t.metzger@intel.com> References: <20240410074613.54520-1-markus.t.metzger@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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 When reverse-stepping a thread that has a pending breakpoint event, the thread is not resumed as part of the infcmd function. A first resume notices the event and returns without resuming the target. If the corresponding breakpoint has been deleted, event processing results in a second resume that performs the intended stepping action. That resume happens after the infcmd function returned and the temporarily modified execution direction was restored. We end up resuming in the wrong direction. Store the direction in a thread's control state and change most of infrun to take it from there rather than using the global variable. --- gdb/gdbthread.h | 10 +++ gdb/infrun.c | 47 ++++++---- gdb/infrun.h | 7 -- .../gdb.btrace/implicit-stop-replaying.exp | 90 +++++++++++++++++++ 4 files changed, 128 insertions(+), 26 deletions(-) create mode 100644 gdb/testsuite/gdb.btrace/implicit-stop-replaying.exp diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 2d6b212cd32..12773c7bb12 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -92,6 +92,13 @@ enum step_over_calls_kind STEP_OVER_UNDEBUGGABLE }; +/* Reverse execution. */ +enum exec_direction_kind + { + EXEC_FORWARD, + EXEC_REVERSE + }; + /* Inferior thread specific part of `struct infcall_control_state'. Inferior process counterpart is `struct inferior_control_state'. */ @@ -179,6 +186,9 @@ struct thread_control_state /* Whether the thread was replaying when the command was issued. */ bool is_replaying = false; + + /* The execution direction when the command was issued. */ + enum exec_direction_kind execution_direction = EXEC_FORWARD; }; /* Inferior thread specific part of `struct infcall_suspend_state'. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index d3738ebbd66..2cdfc4b8fdc 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -95,7 +95,8 @@ static void insert_step_resume_breakpoint_at_caller (const frame_info_ptr &); static void insert_longjmp_resume_breakpoint (struct gdbarch *, CORE_ADDR); -static bool maybe_software_singlestep (struct gdbarch *gdbarch); +static bool maybe_software_singlestep (const thread_info *tp, + gdbarch *gdbarch, CORE_ADDR pc); static void resume (gdb_signal sig); @@ -2369,11 +2370,12 @@ bool sched_multi = false; GDBARCH the current gdbarch. */ static bool -maybe_software_singlestep (struct gdbarch *gdbarch) +maybe_software_singlestep (const thread_info *tp, gdbarch *gdbarch, + CORE_ADDR pc) { bool hw_step = true; - if (execution_direction == EXEC_FORWARD + if (tp->control.execution_direction == EXEC_FORWARD && gdbarch_software_single_step_p (gdbarch)) hw_step = !insert_single_step_breakpoints (gdbarch); @@ -2532,6 +2534,10 @@ do_target_resume (ptid_t resume_ptid, bool step, enum gdb_signal sig) /* Install inferior's terminal modes. */ target_terminal::inferior (); + scoped_restore save_exec_dir + = make_scoped_restore (&execution_direction, + tp->control.execution_direction); + /* Avoid confusing the next resume, if the next stop/resume happens to apply to another thread. */ tp->set_stop_signal (GDB_SIGNAL_0); @@ -2792,6 +2798,7 @@ resume_1 (enum gdb_signal sig) insert_breakpoints (); resume_ptid = internal_resume_ptid (user_step); + do_target_resume (resume_ptid, false, GDB_SIGNAL_0); tp->set_resumed (true); return; @@ -2841,7 +2848,7 @@ resume_1 (enum gdb_signal sig) set_step_over_info (aspace, regcache_read_pc (regcache), 0, tp->global_num); - step = maybe_software_singlestep (gdbarch); + step = maybe_software_singlestep (tp, gdbarch, pc); insert_breakpoints (); } @@ -2860,7 +2867,7 @@ resume_1 (enum gdb_signal sig) /* Do we need to do it the hard way, w/temp breakpoints? */ else if (step) - step = maybe_software_singlestep (gdbarch); + step = maybe_software_singlestep (tp, gdbarch, pc); /* Currently, our software single-step implementation leads to different results than hardware single-stepping in one situation: when stepping @@ -2931,7 +2938,7 @@ resume_1 (enum gdb_signal sig) else resume_ptid = internal_resume_ptid (user_step); - if (execution_direction != EXEC_REVERSE + if (tp->control.execution_direction != EXEC_REVERSE && step && breakpoint_inserted_here_p (aspace, pc)) { /* There are two cases where we currently need to step a @@ -3100,6 +3107,7 @@ clear_proceed_status_thread (struct thread_info *tp) bpstat_clear (&tp->control.stop_bpstat); tp->control.is_replaying = target_record_is_replaying (tp->ptid); + tp->control.execution_direction = ::execution_direction; } /* Notify the current interpreter and observers that the target is about to @@ -3209,7 +3217,7 @@ schedlock_applies (struct thread_info *tp) && tp->control.stepping_command) || (scheduler_mode == schedlock_replay && target_record_will_replay (minus_one_ptid, - execution_direction))); + tp->control.execution_direction))); } /* When FORCE_P is false, set process_stratum_target::COMMIT_RESUMED_STATE @@ -3646,7 +3654,7 @@ proceed (CORE_ADDR addr, enum gdb_signal siggnal) if (cur_thr->stop_pc_p () && pc == cur_thr->stop_pc () && breakpoint_here_p (aspace, pc) == ordinary_breakpoint_here - && execution_direction != EXEC_REVERSE) + && cur_thr->control.execution_direction != EXEC_REVERSE) /* There is a breakpoint at the address we will resume at, step one instruction before inserting breakpoints so that we do not stop right away (and report a second hit at this @@ -4962,7 +4970,7 @@ adjust_pc_after_break (struct thread_info *thread, breakpoint at PC - 1. We'd then report a hit on B1, although INSN1 hadn't been de-executed yet. Doing nothing is the correct behaviour. */ - if (execution_direction == EXEC_REVERSE) + if (thread->control.execution_direction == EXEC_REVERSE) return; /* If the target can tell whether the thread hit a SW breakpoint, @@ -7561,7 +7569,7 @@ process_event_stop_test (struct execution_control_state *ecs) delete_step_resume_breakpoint (ecs->event_thread); if (ecs->event_thread->control.proceed_to_finish - && execution_direction == EXEC_REVERSE) + && ecs->event_thread->control.execution_direction == EXEC_REVERSE) { struct thread_info *tp = ecs->event_thread; @@ -7576,7 +7584,7 @@ process_event_stop_test (struct execution_control_state *ecs) } fill_in_stop_func (gdbarch, ecs); if (ecs->event_thread->stop_pc () == ecs->stop_func_start - && execution_direction == EXEC_REVERSE) + && ecs->event_thread->control.execution_direction == EXEC_REVERSE) { /* We are stepping over a function call in reverse, and just hit the step-resume breakpoint at the start address of @@ -7701,7 +7709,7 @@ process_event_stop_test (struct execution_control_state *ecs) if (pc_in_thread_step_range (ecs->event_thread->stop_pc (), ecs->event_thread) - && (execution_direction != EXEC_REVERSE + && (ecs->event_thread->control.execution_direction != EXEC_REVERSE || *curr_frame_id == original_frame_id)) { infrun_debug_printf @@ -7720,7 +7728,7 @@ process_event_stop_test (struct execution_control_state *ecs) CORE_ADDR stop_pc = ecs->event_thread->stop_pc (); if (stop_pc == ecs->event_thread->control.step_range_start && stop_pc != ecs->stop_func_start - && execution_direction == EXEC_REVERSE) + && ecs->event_thread->control.execution_direction == EXEC_REVERSE) end_stepping_range (ecs); else keep_going (ecs); @@ -7742,7 +7750,7 @@ process_event_stop_test (struct execution_control_state *ecs) backward through the trampoline code, and that's handled further down, so there is nothing for us to do here. */ - if (execution_direction != EXEC_REVERSE + if (ecs->event_thread->control.execution_direction != EXEC_REVERSE && ecs->event_thread->control.step_over_calls == STEP_OVER_UNDEBUGGABLE && in_solib_dynsym_resolve_code (ecs->event_thread->stop_pc ()) && (ecs->event_thread->control.step_start_function == nullptr @@ -7891,7 +7899,7 @@ process_event_stop_test (struct execution_control_state *ecs) /* Reverse stepping through solib trampolines. */ - if (execution_direction == EXEC_REVERSE + if (ecs->event_thread->control.execution_direction == EXEC_REVERSE && ecs->event_thread->control.step_over_calls != STEP_OVER_NONE && (gdbarch_skip_trampoline_code (gdbarch, frame, stop_pc) || (ecs->stop_func_start == 0 @@ -7919,7 +7927,7 @@ process_event_stop_test (struct execution_control_state *ecs) stepped into (backwards), and continue to there. When we get there, we'll need to single-step back to the caller. */ - if (execution_direction == EXEC_REVERSE) + if (ecs->event_thread->control.execution_direction == EXEC_REVERSE) { /* If we're already at the start of the function, we've either just stepped backward into a single instruction function, @@ -7982,7 +7990,7 @@ process_event_stop_test (struct execution_control_state *ecs) tmp_sal) && !inline_frame_is_marked_for_skip (true, ecs->event_thread)) { - if (execution_direction == EXEC_REVERSE) + if (ecs->event_thread->control.execution_direction == EXEC_REVERSE) handle_step_into_function_backward (gdbarch, ecs); else handle_step_into_function (gdbarch, ecs); @@ -8000,7 +8008,7 @@ process_event_stop_test (struct execution_control_state *ecs) return; } - if (execution_direction == EXEC_REVERSE) + if (ecs->event_thread->control.execution_direction == EXEC_REVERSE) { /* If we're already at the start of the function, we've either just stepped backward into a single instruction function without line @@ -8029,7 +8037,7 @@ process_event_stop_test (struct execution_control_state *ecs) /* Reverse stepping through solib trampolines. */ - if (execution_direction == EXEC_REVERSE + if (ecs->event_thread->control.execution_direction == EXEC_REVERSE && ecs->event_thread->control.step_over_calls != STEP_OVER_NONE) { CORE_ADDR stop_pc = ecs->event_thread->stop_pc (); @@ -8612,6 +8620,7 @@ keep_going_stepped_thread (struct thread_info *tp) tp->set_resumed (true); resume_ptid = internal_resume_ptid (tp->control.stepping_command); + do_target_resume (resume_ptid, false, GDB_SIGNAL_0); } else diff --git a/gdb/infrun.h b/gdb/infrun.h index 5f83ca2b4c3..c3d27c3dea3 100644 --- a/gdb/infrun.h +++ b/gdb/infrun.h @@ -107,13 +107,6 @@ extern bool disable_randomization; current location. */ extern ULONGEST get_stop_id (void); -/* Reverse execution. */ -enum exec_direction_kind - { - EXEC_FORWARD, - EXEC_REVERSE - }; - /* The current execution direction. */ extern enum exec_direction_kind execution_direction; diff --git a/gdb/testsuite/gdb.btrace/implicit-stop-replaying.exp b/gdb/testsuite/gdb.btrace/implicit-stop-replaying.exp new file mode 100644 index 00000000000..20240da1dc1 --- /dev/null +++ b/gdb/testsuite/gdb.btrace/implicit-stop-replaying.exp @@ -0,0 +1,90 @@ +# This testcase is part of GDB, the GNU debugger. +# +# 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 that we stop replaying other threads when stepping a thread at the +# end of its execution history. +# +# This is similar to the last test in multi-thread-step.exp, except that +# we reverse-step instead of record goto begin to start replaying and we +# step instead of continuing. +# +# This triggered a bug where GDB confused the execution direction and kept +# stepping both threads backwards instead of forwards. + +require allow_btrace_tests + +standard_testfile multi-thread-step.c +if [prepare_for_testing "failed to prepare" $testfile $srcfile \ + {debug pthreads}] { + return -1 +} + +if ![runto_main] { + return -1 +} + +# Set up breakpoints. +set bp_1 [gdb_get_line_number "bp.1" $srcfile] +set bp_2 [gdb_get_line_number "bp.2" $srcfile] + +# Trace the code between the two breakpoints. +gdb_breakpoint $srcfile:$bp_1 +gdb_continue_to_breakpoint "continue to bp.1" ".*$srcfile:$bp_1\r\n.*" + +# Make sure GDB knows about the new thread. +gdb_test "info threads" +gdb_test_no_output "record btrace" + +# We have two threads at or close to bp.1 but handled only one stop event. +# Remove the breakpoint so we do not need to deal with the 2nd event. +delete_breakpoints +gdb_breakpoint $srcfile:$bp_2 +gdb_continue_to_breakpoint "continue to bp.2" ".*$srcfile:$bp_2\r\n.*" + +# Determine the thread that reported the breakpoint. +set thread "bad" +gdb_test_multiple "thread" "thread" { + -re -wrap "Current thread is \($decimal\).*" { + set thread $expect_out(1,string) + } +} + +# Determine the other thread. +set other "bad" +if { $thread == 1 } { + set other 2 +} elseif { $thread == 2 } { + set other 1 +} + +# This test only works for scheduler-locking 'replay'. +gdb_test_no_output "set scheduler-locking replay" + +# Remove breakpoints or we might run into it right away. +delete_breakpoints + +# Start replaying the other thread. +gdb_test "thread apply $other reverse-stepi" +gdb_test "thread apply $other info record" "Replay in progress.*" \ + "other thread is replaying" + +# Step the thread that reported the breakpoint, which is not replaying. +gdb_test "next" "return arg;.*" + +# The other thread stopped replaying. +gdb_test "thread apply $other info record" "Recorded \[^\\\r\\\n\]*" \ + "other thread stopped replaying"