From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by sourceware.org (Postfix) with ESMTPS id 18FB73841445 for ; Mon, 20 Jun 2022 22:54:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 18FB73841445 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f47.google.com with SMTP id w17so16479718wrg.7 for ; Mon, 20 Jun 2022 15:54:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LjkUkfSSUQByIvKfDqAVCSeJxhX7O7Pd+cJlX81pEc0=; b=fzxTpCROHIsMW+3QQ4N8yIa3/GIv6tt145mc9HOKGl6N+bx+oNrr9r9VVh8lJRLtVv ai6gyaf0zk9SiIesCwxqhkr6Va3tHEd7ciVrl7gJY0QIRA4BXKXy+V+EWyCLUibf8/Qu EYTaKkx+eW2L+RyMQC5+X/xB5sHYitzNgaZQgSj+myh2eFiHMuKuPWJguNUEgaN3ZaRS Ru2NDkc6NIO4FXNvU1sYWYPFPeeWmwtMaAtJ1J/sYGoYO+U/GoQnWvTxH/yeidjxH885 FNczDPa/guq7WHXMCsfFAspXbGgyJoYDtq1rROrdUxdZ5UGTyjNO64upJ0HaVP8jPasd Rm9Q== X-Gm-Message-State: AJIora9mYgWtj/3E+o7XirVaNUVRCt3IkdcR4lP81cfJJDOwqKqUxA8z SpmhNhQSEvzUmbei6XdhvFz+IVLBmbo= X-Google-Smtp-Source: AGRyM1tSBCn8oN/gqUy0uFxeyI4o669vGxSezsY7VN/BVXjMPnqDS99HDZz8/ynF2cL6YbuEHUveWg== X-Received: by 2002:a05:6000:1569:b0:216:725:f097 with SMTP id 9-20020a056000156900b002160725f097mr25674339wrz.331.1655765691160; Mon, 20 Jun 2022 15:54:51 -0700 (PDT) Received: from localhost ([2001:8a0:f924:2600:209d:85e2:409e:8726]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b0020fe35aec4bsm14752852wrr.70.2022.06.20.15.54.50 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Jun 2022 15:54:50 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 13/25] Introduce GDB_TO_EXIT thread option, fix step-over-thread-exit Date: Mon, 20 Jun 2022 23:54:07 +0100 Message-Id: <20220620225419.382221-14-pedro@palves.net> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220620225419.382221-1-pedro@palves.net> References: <20220620225419.382221-1-pedro@palves.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, 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-List-Received-Date: Mon, 20 Jun 2022 22:54:54 -0000 When stepping over a breakpoint with displaced stepping, GDB needs to be informed if the stepped thread exits, otherwise the displaced stepping buffer that was allocated to that thread leaks, and this can result in deadlock, with other threads waiting for their turn to displaced step, but their turn never comes. Similarly, when stepping over a breakpoint in line, GDB also needs to be informed if the stepped thread exits, so that is can clear the step over state and re-resume threads. This commit makes it possible for GDB to ask the target to report thread exit events for a given thread, using the new "thread options" mechanism introduced by a previous patch. This only adds the core bits. Following patches in the series will teach the Linux backends (native & gdbserver) to handle the GDB_TO_EXIT option, and then a later patch will make use of these thread exit events to clean up displaced stepping and inline stepping state properly. Change-Id: I96b719fdf7fee94709e98bb3a90751d8134f3a38 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=27338 --- gdb/infrun.c | 14 +++++++++----- gdb/remote.c | 9 +++++++++ gdb/target/target.h | 4 ++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/gdb/infrun.c b/gdb/infrun.c index 78ba81f530f..c6df86fadaf 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2376,24 +2376,28 @@ do_target_resume (ptid_t resume_ptid, bool step, enum gdb_signal sig) else target_pass_signals (signal_pass); - /* Request that the target report thread-{created,cloned} events in - the following situations: + /* Request that the target report thread-{created,cloned,exited} + events in the following situations: - If we are performing an in-line step-over-breakpoint, then we will remove a breakpoint from the target and only run the current thread. We don't want any new thread (spawned by the - step) to start running, as it might miss the breakpoint. + step) to start running, as it might miss the breakpoint. We + need to clear the step-over state if the stepped thread exits, + so we also enable thread-exit events. - If we are stepping over a breakpoint out of line (displaced stepping) then we won't remove a breakpoint from the target, but, if the step spawns a new clone thread, then we will need to fixup the $pc address in the clone child too, so we need it - to start stopped. + to start stopped. We need to release the displaced stepping + buffer if the stepped thread exits, so we also enable + thread-exit events. */ if (step_over_info_valid_p () || displaced_step_in_progress_thread (tp)) { - gdb_thread_options options = GDB_TO_CLONE; + gdb_thread_options options = GDB_TO_CLONE | GDB_TO_EXIT; if (target_supports_set_thread_options (options)) target_set_thread_options (tp, options); else diff --git a/gdb/remote.c b/gdb/remote.c index 5bfbe28b8c3..e445959ccf0 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -3995,6 +3995,15 @@ remote_target::update_thread_list () if (has_single_non_exited_thread (tp->inf)) continue; + /* Do not remove the thread if we've requested to be + notified of its exit. For example, the thread may be + displaced stepping, infrun will need to handle the + exit event, and displaced stepping info is recorded + in the thread object. If we deleted the thread now, + we'd lose that info. */ + if ((tp->thread_options () & GDB_TO_EXIT) != 0) + continue; + /* Not found. */ delete_thread (tp); } diff --git a/gdb/target/target.h b/gdb/target/target.h index cba98114b5d..571d90cf7c0 100644 --- a/gdb/target/target.h +++ b/gdb/target/target.h @@ -31,6 +31,10 @@ enum gdb_thread_option : unsigned /* Tell the target to report TARGET_WAITKIND_THREAD_CLONED events for the thread. */ GDB_TO_CLONE = 1 << 0, + + /* Tell the target to report TARGET_WAITKIND_THREAD_EXIT events for + the thread. */ + GDB_TO_EXIT = 1 << 1, }; DEF_ENUM_FLAGS_TYPE (enum gdb_thread_option, gdb_thread_options); -- 2.36.0