From eb54c8bf087f434b0cb91b35e7cde68a69ac9193 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 19 Mar 2015 12:20:25 +0000 Subject: [PATCH] native/Linux: internal error if resume is short-circuited If the linux_nat_resume's short-circuits the resume because the current thread has a pending status, and, a thread with a higher number was previously stopped for a breakpoint, GDB internal errors, like: /home/pedro/gdb/mygit/src/gdb/linux-nat.c:2590: internal-error: status_callback: Assertion `lp->status != 0' failed. Fix this by make status_callback bail out earlier. GDBserver is already doing the same. New test added that exercises this. gdb/ChangeLog: 2015-03-19 Pedro Alves * linux-nat.c (status_callback): Return early if the LWP has no status pending. gdb/testsuite/ChangeLog: 2015-03-19 Pedro Alves * gdb.threads/continue-pending-status.c: New file. * gdb.threads/continue-pending-status.exp: New file. --- gdb/ChangeLog | 5 + gdb/linux-nat.c | 8 +- gdb/testsuite/ChangeLog | 5 + .../gdb.threads/continue-pending-status.c | 58 +++++++++ .../gdb.threads/continue-pending-status.exp | 110 ++++++++++++++++++ 5 files changed, 182 insertions(+), 4 deletions(-) create mode 100644 gdb/testsuite/gdb.threads/continue-pending-status.c create mode 100644 gdb/testsuite/gdb.threads/continue-pending-status.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 45e50291fba..7ae3c583477 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-03-19 Pedro Alves + + * linux-nat.c (status_callback): Return early if the LWP has no + status pending. + 2015-03-19 Pedro Alves * linux-nat.c (select_event_lwp_callback): Update comment to no diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index f5622ac3bbe..f5f92d9d96b 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -2543,6 +2543,9 @@ status_callback (struct lwp_info *lp, void *data) if (!lp->resumed) return 0; + if (!lwp_status_pending_p (lp)) + return 0; + if (lp->stop_reason == TARGET_STOPPED_BY_SW_BREAKPOINT || lp->stop_reason == TARGET_STOPPED_BY_HW_BREAKPOINT) { @@ -2551,8 +2554,6 @@ status_callback (struct lwp_info *lp, void *data) CORE_ADDR pc; int discard = 0; - gdb_assert (lp->status != 0); - pc = regcache_read_pc (regcache); if (pc != lp->stop_pc) @@ -2590,10 +2591,9 @@ status_callback (struct lwp_info *lp, void *data) linux_resume_one_lwp (lp, lp->step, GDB_SIGNAL_0); return 0; } - return 1; } - return lwp_status_pending_p (lp); + return 1; } /* Return non-zero if LP isn't stopped. */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d9f4ecfae7d..94dae82fe98 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-03-19 Pedro Alves + + * gdb.threads/continue-pending-status.c: New file. + * gdb.threads/continue-pending-status.exp: New file. + 2015-03-18 Pedro Alves * gdb.base/disp-step-syscall.exp (disp_step_cross_syscall): diff --git a/gdb/testsuite/gdb.threads/continue-pending-status.c b/gdb/testsuite/gdb.threads/continue-pending-status.c new file mode 100644 index 00000000000..eea0c7eb3bb --- /dev/null +++ b/gdb/testsuite/gdb.threads/continue-pending-status.c @@ -0,0 +1,58 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2015 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 . */ + +#include +#include +#include +#include +#include + +pthread_barrier_t barrier; + +#define NUM_THREADS 2 + +void * +thread_function (void *arg) +{ + /* This ensures that the breakpoint is only hit after both threads + are created, so the test can always switch to the non-event + thread when the breakpoint triggers. */ + pthread_barrier_wait (&barrier); + + while (1); /* break here */ +} + +int +main (void) +{ + int i; + + pthread_barrier_init (&barrier, NULL, NUM_THREADS); + + for (i = 0; i < NUM_THREADS; i++) + { + pthread_t thread; + int res; + + res = pthread_create (&thread, NULL, + thread_function, NULL); + assert (res == 0); + } + + sleep (300); + return 0; +} diff --git a/gdb/testsuite/gdb.threads/continue-pending-status.exp b/gdb/testsuite/gdb.threads/continue-pending-status.exp new file mode 100644 index 00000000000..ff73ce4abbb --- /dev/null +++ b/gdb/testsuite/gdb.threads/continue-pending-status.exp @@ -0,0 +1,110 @@ +# Copyright (C) 2015 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 . + +# This test exercises the case of stopping for a breakpoint hit of one +# thread, then switching to a thread that has a status pending and +# continuing. + +standard_testfile + +if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] { + return -1 +} + +if ![runto_main] { + untested "could not run to main" + return -1 +} + +set break_line [gdb_get_line_number "break here"] + +# Return current thread's number. + +proc get_current_thread {} { + global gdb_prompt + + set thread "" + set msg "get thread number" + gdb_test_multiple "print /x \$_thread" $msg { + -re "\\$\[0-9\]* = (0x\[0-9a-zA-Z\]+).*$gdb_prompt $" { + set thread $expect_out(1,string) + pass "$msg" + } + } + return ${thread} +} + +# There are two threads in the program that are running the same tight +# loop, where we place a breakpoint. Sometimes we'll get a breakpoint +# trigger for thread 2, with the breakpoint event of thread 3 pending, +# other times the opposite. The original bug that motivated this test +# depended on the event thread being the highest numbered thread. We +# try the same multiple times, which should cover both threads +# reporting the event. + +set attempts 20 + +for {set i 0} {$i < $attempts} {incr i} { + with_test_prefix "attempt $i" { + gdb_test "b $srcfile:$break_line" \ + "Breakpoint .* at .*$srcfile, line $break_line.*" \ + "set break in tight loop" + gdb_test "continue" \ + "$srcfile:$break_line.*" \ + "continue to tight loop" + + # Switch to the thread that did _not_ report the event (and + # thus may have a pending status). At the time this test was + # written this was necessary to make linux-nat.c short-circuit + # the resume and go straight to consuming the pending event. + set thread [get_current_thread] + if {$thread == 2} { + set thread 3 + } else { + set thread 2 + } + gdb_test "thread $thread" \ + "Switching to thread $thread .*" \ + "switch to non-event thread" + + # Delete all breakpoints so that continuing doesn't switch + # back to the event thread to do a step-over, which would mask + # away the original bug, which depended on the event thread + # still having TARGET_STOPPED_BY_SW_BREAKPOINT stop_reason. + delete_breakpoints + + # In the original bug, continuing would trigger an internal + # error in the linux-nat.c backend. + + set msg "continue for ctrl-c" + gdb_test_multiple "continue" $msg { + -re "Continuing" { + pass $msg + } + } + + # Wait a bit for GDB to give the terminal to the inferior, + # otherwise ctrl-c too soon can result in a "Quit". + sleep 1 + send_gdb "\003" + + set msg "caught interrupt" + gdb_test_multiple "" $msg { + -re "Program received signal SIGINT.*$gdb_prompt $" { + pass $msg + } + } + } +} -- 2.30.2