[PATCH v2 1/4] gdb, infrun, btrace: fix reverse/replay stepping at end of execution history
Markus Metzger
markus.t.metzger@intel.com
Thu Dec 2 07:23:17 GMT 2021
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.
gdb/ChangeLog:
2021-01-14 Markus Metzger <markus.t.metzger@intel.com>
* gdbthread.h (struct thread_control_state) <is_replaying>: New.
* infrun.c (clear_proceed_status_thread): Set
thread_control_state.is_replaying.
(keep_going_pass_signal): Check thread_control_state.is_replaying.
* record-btrace.c (record_btrace_single_step_forward): Move end of
execution history check.
gdb/testsuite/ChangeLog:
2021-01-13 Markus Metzger <markus.t.metzger@intel.com>
* gdb.btrace/cont-hang.exp: New file.
* gdb.btrace/step-hang.exp: New file.
* gdb.btrace/stepn.exp: New file.
---
gdb/gdbthread.h | 3 ++
gdb/infrun.c | 25 ++++++++++++
gdb/record-btrace.c | 19 ++++-----
gdb/testsuite/gdb.btrace/cont-hang.exp | 47 ++++++++++++++++++++++
gdb/testsuite/gdb.btrace/step-hang.exp | 46 ++++++++++++++++++++++
gdb/testsuite/gdb.btrace/stepn.exp | 54 ++++++++++++++++++++++++++
6 files changed, 185 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 a4c1244a3e1..44211ffd61b 100644
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -160,6 +160,9 @@ struct thread_control_state
command. This is used to decide whether "set scheduler-locking
step" behaves like "on" or "off". */
int stepping_command = 0;
+
+ /* 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 e4739ed14f6..68732dcc6bb 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2663,6 +2663,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);
}
void
@@ -7969,6 +7971,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))
+ {
+ gdb::observers::no_history.notify ();
+ 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 3fcfd6a4761..9b6f453d5f2 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -2351,6 +2351,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 ();
@@ -2373,15 +2383,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..59d0e17599e
--- /dev/null
+++ b/gdb/testsuite/gdb.btrace/cont-hang.exp
@@ -0,0 +1,47 @@
+# This testcase is part of GDB, the GNU debugger.
+#
+# Copyright 2021 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 <http://www.gnu.org/licenses/>.
+
+# Test that we do not hang when trying to continue over a breakpoint at
+# the end of the trace.
+
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}
+
+standard_testfile record_goto.c
+if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
+ return -1
+}
+
+if ![runto_main] {
+ untested "failed to run to 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..e175ff5c35d
--- /dev/null
+++ b/gdb/testsuite/gdb.btrace/step-hang.exp
@@ -0,0 +1,46 @@
+# This testcase is part of GDB, the GNU debugger.
+#
+# Copyright 2021 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 <http://www.gnu.org/licenses/>.
+
+# Test that we do not hang when trying to step over a breakpoint at the
+# end of the trace.
+
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}
+
+standard_testfile record_goto.c
+if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
+ return -1
+}
+
+if ![runto_main] {
+ untested "failed to run to 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..51ba3c3ac9b
--- /dev/null
+++ b/gdb/testsuite/gdb.btrace/stepn.exp
@@ -0,0 +1,54 @@
+# This testcase is part of GDB, the GNU debugger.
+#
+# Copyright 2021 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 <http://www.gnu.org/licenses/>.
+
+# Test that step n does not start recording when issued while replaying.
+
+if { [skip_btrace_tests] } {
+ unsupported "target does not support record-btrace"
+ return -1
+}
+
+standard_testfile record_goto.c
+if [prepare_for_testing "failed to prepare" $testfile $srcfile] {
+ return -1
+}
+
+if ![runto_main] {
+ untested "failed to run to 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-step"
+ gdb_test "next 5" "No more reverse-execution history.*main\.3.*"
+}
--
2.31.1
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
More information about the Gdb-patches
mailing list