From patchwork Wed Apr 5 13:34:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bouhaouel, Mohamed" X-Patchwork-Id: 67305 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 2922E3858404 for ; Wed, 5 Apr 2023 13:35:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2922E3858404 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680701748; bh=4jVuIPDIJgR4hoLhVVZasqdEXXU2gRcvVKlGQRVa1P0=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=rTOOp9UM94zfu3IumffmH2sD4cxnwYj7+Y/pZ5k+VrLFqnuFZrG/7Hhq6GodNnlgU quYptK+SW8QAqPJmrF6vKzvSJmwjZYj4VKJyIkwB/7qN2HRwm3VF5g+tRbj8hrgaQD wyLIkHyCcK5qqA81pIXL9JdMwAX3d/9w/feCsQi0= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by sourceware.org (Postfix) with ESMTPS id 2DEFA3858D20 for ; Wed, 5 Apr 2023 13:35:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2DEFA3858D20 X-IronPort-AV: E=McAfee;i="6600,9927,10670"; a="322832093" X-IronPort-AV: E=Sophos;i="5.98,319,1673942400"; d="scan'208";a="322832093" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2023 06:35:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10670"; a="1016460895" X-IronPort-AV: E=Sophos;i="5.98,319,1673942400"; d="scan'208";a="1016460895" Received: from mbouhaou-mobl1.ger.corp.intel.com (HELO localhost) ([10.62.142.9]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2023 06:35:21 -0700 To: gdb-patches@sourceware.org Cc: tom@tromey.com, aburgess@redhat.com Subject: [PATCH v2 1/1] gdb, breakpoint: add a destructor to the watchpoint struct Date: Wed, 5 Apr 2023 15:34:56 +0200 Message-Id: <20230405133456.16087-1-mohamed.bouhaouel@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Mohamed Bouhaouel via Gdb-patches From: "Bouhaouel, Mohamed" Reply-To: Mohamed Bouhaouel Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Make sure to unlink the related breakpoint when the watchpoint instance is deleted. This prevents having a wp-related breakpoint that is linked to a NULL watchpoint (e.g. the watchpoint instance is being deleted when the 'watch' command fails). With the below scenario, having such a left out breakpoint will lead to a GDB hang, and this is due to an infinite loop when deleting all inferior breakpoints. Scenario: (gdb) set can-use-hw-watchpoints 0 (gdb) awatch Can't set read/access watchpoint when hardware watchpoints are disabled. (gdb) rwatch Can't set read/access watchpoint when hardware watchpoints are disabled. (gdb) >> HANG << Signed-off-by: Mohamed Bouhaouel Reviewed-By: Bruno Larsen --- gdb/breakpoint.c | 15 +++++++ gdb/breakpoint.h | 3 ++ .../gdb.base/scope-hw-watch-disable.c | 26 ++++++++++++ .../gdb.base/scope-hw-watch-disable.exp | 40 +++++++++++++++++++ 4 files changed, 84 insertions(+) create mode 100644 gdb/testsuite/gdb.base/scope-hw-watch-disable.c create mode 100644 gdb/testsuite/gdb.base/scope-hw-watch-disable.exp diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index ebe97940f54..862e9a372ab 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9594,6 +9594,21 @@ break_range_command (const char *arg, int from_tty) install_breakpoint (false, std::move (br), true); } +/* See breakpoint.h. */ + +watchpoint::~watchpoint () +{ + /* Make sure to unlink the destroyed watchpoint from the related + breakpoint ring. */ + + breakpoint *bpt = this; + breakpoint *related = bpt; + while (related->related_breakpoint != bpt) + related = related->related_breakpoint; + + related->related_breakpoint = bpt->related_breakpoint; +} + /* Return non-zero if EXP is verified as constant. Returned zero means EXP is variable. Also the constant detection may fail for some constant expressions and in such case still falsely return diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 7c5cf3f2bef..cccd331e6e8 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -933,6 +933,9 @@ struct watchpoint : public breakpoint void print_recreate (struct ui_file *fp) const override; bool explains_signal (enum gdb_signal) override; + /* Destructor for WATCHPOINT. */ + ~watchpoint (); + /* String form of exp to use for displaying to the user (malloc'd), or NULL if none. */ gdb::unique_xmalloc_ptr exp_string; diff --git a/gdb/testsuite/gdb.base/scope-hw-watch-disable.c b/gdb/testsuite/gdb.base/scope-hw-watch-disable.c new file mode 100644 index 00000000000..30956fe1b84 --- /dev/null +++ b/gdb/testsuite/gdb.base/scope-hw-watch-disable.c @@ -0,0 +1,26 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2023 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 . */ + +int +main () +{ + int a = 0, b = 0; + b = a; + a = b + 10; + + return 0; +} diff --git a/gdb/testsuite/gdb.base/scope-hw-watch-disable.exp b/gdb/testsuite/gdb.base/scope-hw-watch-disable.exp new file mode 100644 index 00000000000..54ebb4e4226 --- /dev/null +++ b/gdb/testsuite/gdb.base/scope-hw-watch-disable.exp @@ -0,0 +1,40 @@ +# Copyright 2023 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 GDB displays the correct error message when hardware watchpoints +# are not supported or explicitly disabled. Test also that GDB terminates +# successfully after several attempts to insert a hardware watchpoint. + +standard_testfile + +if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} { + return -1 +} + +gdb_test_no_output "set can-use-hw-watchpoints 0" + +if {![runto_main]} { + return -1 +} + +gdb_test "awatch a" \ + "Can't set read/access watchpoint when hardware watchpoints are disabled." \ + "unsuccessful attempt to create an access watchpoint" +gdb_test "rwatch b" \ + "Can't set read/access watchpoint when hardware watchpoints are disabled." \ + "unsuccessful attempt to create a read watchpoint" + +# The program continues until termination. +gdb_continue_to_end