From patchwork Wed Jun 7 10:01:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 70722 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 E0560385588D for ; Wed, 7 Jun 2023 10:03:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E0560385588D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1686132231; bh=5F+lji7+s4RrCo72kNnNfQdsLUhjBLykrQJZMOurtxs=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=E8KCS6lnov048/UW9mwVFOgdEHibZ3CAmZpP4rM6p2i1iwZnh2iWy+GBbTgdZAF7n KsTE3V5M6jz69anhwhxuWJheWO/lDwWKy678pk3dBj6KRPgOBOhYlHZNffm6LAgUhs 2PjZ1u1HM5dLVQG2iGpVjapDIjYyj4s6ptmr7ybw= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 840843857729 for ; Wed, 7 Jun 2023 10:01:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 840843857729 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-651-s11lZfNEPLqyPFlohDZOpw-1; Wed, 07 Jun 2023 06:01:32 -0400 X-MC-Unique: s11lZfNEPLqyPFlohDZOpw-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-3f42bcef2acso34109655e9.2 for ; Wed, 07 Jun 2023 03:01:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686132091; x=1688724091; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5F+lji7+s4RrCo72kNnNfQdsLUhjBLykrQJZMOurtxs=; b=EQQA7iz4VhmSScwMNzTueDZHVBeWEZ5VhhlzpfQua7BRJgn6LMiWQsxK85/2MJI8sd 4IFWAbx5E4xk9VrpXxDWrGzVM1v09PlPzPlAN8tbRm6+KnMK5B4bmtPUeK+Bn9VKdhU2 9K5JS8xUV8/HIdywFY8rOglFCy+wZtQPkQckY5ebyuTRA6AE6HZaZ4ZdE0e+DUniJBNd PsQ88Kz9pEszbo1fpTQOFRbbEFZ3ms8Q+Y95UchQFuHPU9nPSitgkt1yUvGXV+v4JQVR D2/fo7eaN50HTLvajNdBpkIOj4HJ8YXCYPeD3mKQTa7BAF7Ox3zyyjUPsdqujLSS9YXL 780Q== X-Gm-Message-State: AC+VfDxsH+weA1ctCUFT4FVk8TKLGhQ1MkKeJsG6nn1NJCLj5keODQSq Lv1FDLzD+KMYPslOU9CPqrmyvXo56RRUsEwOavE7yOLFI9kXkl4TvZUAzoxap5ScbZKYEMgxYrk KUf3NrgrOBNmopLxYb1TVhiXcqi0J22TgUO3seSqPRhLVE0mt5idCRKHLfIrTqNdBI48HtPKIRt KJRZeF8g== X-Received: by 2002:a05:600c:290c:b0:3f5:d313:db5e with SMTP id i12-20020a05600c290c00b003f5d313db5emr3899530wmd.15.1686132090970; Wed, 07 Jun 2023 03:01:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ54tOnN1cy0RoShlRgybbrq2nGr8Ac2BuTRU7L/ccldCgRhNafFSOTEFWBuGcX6P7cV1yhZ/g== X-Received: by 2002:a05:600c:290c:b0:3f5:d313:db5e with SMTP id i12-20020a05600c290c00b003f5d313db5emr3899505wmd.15.1686132090463; Wed, 07 Jun 2023 03:01:30 -0700 (PDT) Received: from localhost (11.72.115.87.dyn.plus.net. [87.115.72.11]) by smtp.gmail.com with ESMTPSA id n2-20020a05600c294200b003f7ba52eeccsm1633010wmd.7.2023.06.07.03.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 03:01:30 -0700 (PDT) To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv8 5/6] gdb: introduce unwind-on-timeout setting Date: Wed, 7 Jun 2023 11:01:17 +0100 Message-Id: <871a8d1e8da3df77b82da060b9cfbfc7848a1300.1686131880.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 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_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Now that inferior function calls can timeout (see the recent introduction of direct-call-timeout and indirect-call-timeout), this commit adds a new setting unwind-on-timeout. This new setting is just like the existing unwindonsignal and unwind-on-terminating-exception, but the new setting will cause GDB to unwind the stack if an inferior function call times out. The existing inferior function call timeout tests have been updated to cover the new setting. --- gdb/NEWS | 9 +++ gdb/doc/gdb.texinfo | 25 ++++++-- gdb/infcall.c | 62 ++++++++++++++++--- gdb/testsuite/gdb.base/infcall-timeout.exp | 49 +++++++++++---- .../infcall-from-bp-cond-timeout.exp | 55 +++++++++++----- 5 files changed, 160 insertions(+), 40 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index 4ddc0a047f0..81eb270c5ae 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -129,6 +129,15 @@ show indirect-call-timeout ignored, GDB will wait indefinitely for an inferior function to complete, unless interrupted by the user using Ctrl-C. +set unwind-on-timeout on|off +show unwind-on-timeout + These commands control whether GDB should unwind the stack when a + timeout occurs during an inferior function call. The default is + off, in which case the inferior will remain in the frame where the + timeout occurred. When on, GDB will unwind the stack removing the + dummy frame that was added for the inferior call, and restoring the + inferior state to how it was before the inferior call started. + * MI changes ** mi now reports 'no-history' as a stop reason when hitting the end of the diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index f27ec719d11..4f2062ff7e2 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -20865,6 +20865,21 @@ Show the current setting of stack unwinding in the functions called by @value{GDBN}. +@item set unwind-on-timeout +@kindex set unwind-on-timeout +@cindex unwind stack in called functions when timing out +@cindex call dummy stack unwinding on timeout. +Set unwinding of the stack if a function called from @value{GDBN} +times out. If set to @code{off} (the default), @value{GDBN} stops in +the frame where the timeout occurred. If set to @code{on}, +@value{GDBN} unwinds the stack it created for the call and restores +the context to what it was before the call. + +@item show unwind-on-timeout +@kindex show unwind-on-timeout +Show whether @value{GDBN} will unwind the stack if a function called +from @value{GDBN} times out. + @item set may-call-functions @kindex set may-call-functions @cindex disabling calling functions in the program @@ -20896,11 +20911,11 @@ If a called function is interrupted for any reason, including hitting a breakpoint, or triggering a watchpoint, and the stack is not unwound -due to @code{set unwind-on-terminating-exception on} or @code{set -unwindonsignal on} (@pxref{stack unwind settings}), -then the dummy-frame, created by @value{GDBN} to facilitate the call -to the program function, will be visible in the backtrace, for example -frame @code{#3} in the following backtrace: +due to @code{set unwind-on-terminating-exception on}, @code{set +unwind-on-timeout on}, or @code{set unwindonsignal on} (@pxref{stack +unwind settings}), then the dummy-frame, created by @value{GDBN} to +facilitate the call to the program function, will be visible in the +backtrace, for example frame @code{#3} in the following backtrace: @smallexample (@value{GDBP}) backtrace diff --git a/gdb/infcall.c b/gdb/infcall.c index 162659ca8e6..526be837248 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -218,6 +218,27 @@ show_unwind_on_terminating_exception_p (struct ui_file *file, int from_tty, value); } +/* This boolean tells GDB what to do if an inferior function, called from + GDB, times out. If true, GDB unwinds the stack and restores the context + to what it was before the call. When false, GDB leaves the thread as it + is at the point of the timeout. + + The default is to stop in the frame where the timeout occurred. */ + +static bool unwind_on_timeout_p = false; + +/* Implement 'show unwind-on-timeout'. */ + +static void +show_unwind_on_timeout_p (struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) +{ + gdb_printf (file, + _("Unwinding of stack if a timeout occurs " + "while in a call dummy is %s.\n"), + value); +} + /* Perform the standard coercions that are specified for arguments to be passed to C, Ada or Fortran functions. @@ -1700,14 +1721,27 @@ When the function is done executing, GDB will silently stop."), /* A timeout results in a signal being sent to the inferior. */ gdb_assert (stopped_by_random_signal); - /* Indentation is weird here. A later patch is going to move the - following block into an if/else, so I'm leaving the indentation - here to minimise the later patch. + if (unwind_on_timeout_p) + { + /* The user wants the context restored. */ + + /* We must get back to the frame we were before the + dummy call. */ + dummy_frame_pop (dummy_id, call_thread.get ()); - Also, the error message used below refers to 'set - unwind-on-timeout' which doesn't exist yet. This will be added - in a later commit, I'm leaving this in for now to minimise the - churn caused by the commit that adds unwind-on-timeout. */ + /* We also need to restore inferior status to that before the + dummy call. */ + restore_infcall_control_state (inf_status.release ()); + + error (_("\ +The program being debugged timed out while in a function called from GDB.\n\ +GDB has restored the context to what it was before the call.\n\ +To change this behavior use \"set unwind-on-timeout off\".\n\ +Evaluation of the expression containing the function\n\ +(%s) will be abandoned."), + name.c_str ()); + } + else { /* The user wants to stay in the frame where we stopped (default). Discard inferior status, we're not at the same @@ -1833,6 +1867,20 @@ The default is to unwind the frame."), show_unwind_on_terminating_exception_p, &setlist, &showlist); + add_setshow_boolean_cmd ("unwind-on-timeout", no_class, + &unwind_on_timeout_p, _("\ +Set unwinding of stack if a timeout occurs while in a call dummy."), _("\ +Show unwinding of stack if a timeout occurs while in a call dummy."), + _("\ +The unwind on timeout flag lets the user determine what gdb should do if\n\ +gdb times out while in a function called from gdb. If set, gdb unwinds\n\ +the stack and restores the context to what it was before the call. If\n\ +unset, gdb leaves the inferior in the frame where the timeout occurred.\n\ +The default is to stop in the frame where the timeout occurred."), + NULL, + show_unwind_on_timeout_p, + &setlist, &showlist); + add_setshow_uinteger_cmd ("direct-call-timeout", no_class, &direct_call_timeout, _("\ Set the timeout, for direct calls to inferior function calls."), _("\ diff --git a/gdb/testsuite/gdb.base/infcall-timeout.exp b/gdb/testsuite/gdb.base/infcall-timeout.exp index 2af598e044d..1f47d143699 100644 --- a/gdb/testsuite/gdb.base/infcall-timeout.exp +++ b/gdb/testsuite/gdb.base/infcall-timeout.exp @@ -28,7 +28,11 @@ if { [build_executable "failed to prepare" ${binfile} "${srcfile}" \ # the direct-call-timeout, and make an inferior function call that # will never return. GDB should eventually timeout and stop the # inferior. -proc_with_prefix run_test { target_async target_non_stop } { +# +# When UNWIND is "off" the inferior wil be left in the frame where the +# timeout occurs, otherwise, when UNWIND is "on", GDB should unwind +# back to the frame where the inferior call was made. +proc_with_prefix run_test { target_async target_non_stop unwind } { save_vars { ::GDBFLAGS } { append ::GDBFLAGS \ " -ex \"maint set target-non-stop $target_non_stop\"" @@ -43,19 +47,36 @@ proc_with_prefix run_test { target_async target_non_stop } { } gdb_test_no_output "set direct-call-timeout 5" + gdb_test_no_output "set unwind-on-timeout $unwind" + + if { $unwind } { + gdb_test "print function_that_never_returns ()" \ + [multi_line \ + "Program stopped\\." \ + ".*" \ + "The program being debugged timed out while in a function called from GDB\\." \ + "GDB has restored the context to what it was before the call\\." \ + "To change this behavior use \"set unwind-on-timeout off\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(function_that_never_returns\\) will be abandoned\\."] - gdb_test "print function_that_never_returns ()" \ - [multi_line \ - "Program stopped\\." \ - ".*" \ - "The program being debugged timed out while in a function called from GDB\\." \ - "GDB remains in the frame where the timeout occurred\\." \ - "To change this behavior use \"set unwind-on-timeout on\"\\." \ - "Evaluation of the expression containing the function" \ - "\\(function_that_never_returns\\) will be abandoned\\." \ - "When the function is done executing, GDB will silently stop\\."] + gdb_test "bt" \ + "#0\\s+main \\(\\).*" + } else { + gdb_test "print function_that_never_returns ()" \ + [multi_line \ + "Program stopped\\." \ + ".*" \ + "The program being debugged timed out while in a function called from GDB\\." \ + "GDB remains in the frame where the timeout occurred\\." \ + "To change this behavior use \"set unwind-on-timeout on\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(function_that_never_returns\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\."] - gdb_test "bt" ".* function_that_never_returns .*.*" + gdb_test "bt" \ + ".* function_that_never_returns .*.*" + } } foreach_with_prefix target_async { "on" "off" } { @@ -69,6 +90,8 @@ foreach_with_prefix target_async { "on" "off" } { } foreach_with_prefix target_non_stop { "on" "off" } { - run_test $target_async $target_non_stop + foreach_with_prefix unwind { "on" "off" } { + run_test $target_async $target_non_stop $unwind + } } } diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp index a94c6a58192..fedcad3d6c0 100644 --- a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-timeout.exp @@ -41,7 +41,12 @@ set segfault_line [gdb_get_line_number "Segfault here"] # thread, on which the inferior call relies, either hits a breakpoint # (when OTHER_THREAD_BP is true), or crashes (when OTHER_THREAD_BP is # false). -proc run_test { target_async target_non_stop other_thread_bp } { +# +# When UNWIND is "on" GDB will unwind the thread which performed the +# inferior function call back to the state where the inferior call was +# made (when the inferior call times out). Otherwise, when UNWIND is +# "off", the inferior is left in the frame where the timeout occurred. +proc run_test { target_async target_non_stop other_thread_bp unwind } { save_vars { ::GDBFLAGS } { append ::GDBFLAGS " -ex \"maint set target-non-stop $target_non_stop\"" append ::GDBFLAGS " -ex \"maintenance set target-async ${target_async}\"" @@ -71,6 +76,7 @@ proc run_test { target_async target_non_stop other_thread_bp } { # for this timeout. For now though, we just hope 5 seconds is # enough. gdb_test_no_output "set indirect-call-timeout 5" + gdb_test_no_output "set unwind-on-timeout $unwind" gdb_breakpoint \ "${::srcfile}:${::cond_bp_line} if (condition_func ())" @@ -91,18 +97,35 @@ proc run_test { target_async target_non_stop other_thread_bp } { "get number for segfault breakpoint"] } - gdb_test "continue" \ - [multi_line \ - "Thread ${::decimal} \"\[^\r\n\"\]+\" stopped\\." \ - ".*" \ - "Error in testing condition for breakpoint ${bp_num}:" \ - "The program being debugged timed out while in a function called from GDB\\." \ - "GDB remains in the frame where the timeout occurred\\." \ - "To change this behavior use \"set unwind-on-timeout on\"\\." \ - "Evaluation of the expression containing the function" \ - "\\(condition_func\\) will be abandoned\\." \ - "When the function is done executing, GDB will silently stop\\."] \ - "expected timeout waiting for inferior call to complete" + if { $unwind } { + gdb_test "continue" \ + [multi_line \ + "Thread ${::decimal} \"\[^\r\n\"\]+\" stopped\\." \ + ".*" \ + "Error in testing condition for breakpoint ${bp_num}:" \ + "The program being debugged timed out while in a function called from GDB\\." \ + "GDB has restored the context to what it was before the call\\." \ + "To change this behavior use \"set unwind-on-timeout off\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(condition_func\\) will be abandoned\\." \ + "" \ + "Thread ${::decimal}\[^\r\n\]*hit Breakpoint ${bp_num}, \[^\r\n\]+" \ + "\[^\r\n\]+ Conditional breakpoint here\\. \[^\r\n\]+"] \ + "expected timeout waiting for inferior call to complete" + } else { + gdb_test "continue" \ + [multi_line \ + "Thread ${::decimal} \"\[^\r\n\"\]+\" stopped\\." \ + ".*" \ + "Error in testing condition for breakpoint ${bp_num}:" \ + "The program being debugged timed out while in a function called from GDB\\." \ + "GDB remains in the frame where the timeout occurred\\." \ + "To change this behavior use \"set unwind-on-timeout on\"\\." \ + "Evaluation of the expression containing the function" \ + "\\(condition_func\\) will be abandoned\\." \ + "When the function is done executing, GDB will silently stop\\."] \ + "expected timeout waiting for inferior call to complete" + } # Remember that other thread that either crashed (with a segfault) # or hit a breakpoint? Now that the inferior call has timed out, @@ -141,8 +164,10 @@ foreach_with_prefix target_async {"on" "off" } { } foreach_with_prefix target_non_stop {"off" "on"} { - foreach_with_prefix other_thread_bp { true false } { - run_test $target_async $target_non_stop $other_thread_bp + foreach_with_prefix unwind {"off" "on"} { + foreach_with_prefix other_thread_bp { true false } { + run_test $target_async $target_non_stop $other_thread_bp $unwind + } } } }