From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by sourceware.org (Postfix) with ESMTPS id 18DDB385703A for ; Fri, 30 Jun 2023 08:10:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 18DDB385703A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688112628; x=1719648628; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=LbcVRRRrsyHCarc09/3naxbqVrXjLrGVoeWvAH0wSEY=; b=bJ/xVhiVqWyaJDjbTb+GwNlozTbjCHHmRTTOX3WtfP70G0X9wE52/VyC GSicsVNcMu4w5f0bQ8Wdatmxa4uCeCq/FSRzJ2E2/eJSwHDmkGCOUzhSE UYqXB7WNwOlofrtnr6deYyLufDbDCoI5ZdkIZpklmM+YtLrfcFoAl8p8B UYu7LqF54NBbvtQcIBYwz406JlGsycCBSU2sLaYUiuoitKVtmPDZWDLyQ ZLHCCcyoxsxTKNVEgFMqjqp7hl8V9Zimrg/HXeuB99y4C5lKWkE413dGf D+CM1b3XE6+hQaGQ+pi9KpqcCc1BMlDQvdL5tyRkFKCsH8deghn/bDVKl g==; X-IronPort-AV: E=McAfee;i="6600,9927,10756"; a="362381553" X-IronPort-AV: E=Sophos;i="6.01,170,1684825200"; d="scan'208";a="362381553" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2023 01:10:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10756"; a="717708707" X-IronPort-AV: E=Sophos;i="6.01,170,1684825200"; d="scan'208";a="717708707" Received: from mbouhaou-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.49.159]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2023 01:10:24 -0700 From: Mohamed Bouhaouel To: gdb-patches@sourceware.org Cc: blarsen@redhat.com, aburgess@redhat.com, tom@tromey.com, mohamed.bouhaouel@intel.com Subject: [PATCH v3 1/1] gdb, breakpoint: add a destructor to the watchpoint struct Date: Fri, 30 Jun 2023 10:10:15 +0200 Message-Id: <20230630081015.17380-1-mohamed.bouhaouel@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.9 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,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 List-Id: 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 | 14 +++++++ gdb/breakpoint.h | 3 ++ .../gdb.base/scope-hw-watch-disable.c | 26 ++++++++++++ .../gdb.base/scope-hw-watch-disable.exp | 40 +++++++++++++++++++ 4 files changed, 83 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 da6c8de9d14..8e14b3ba939 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9597,6 +9597,20 @@ 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; + while (bpt->related_breakpoint != this) + bpt = bpt->related_breakpoint; + + bpt->related_breakpoint = this->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 da150585f73..2de3fcec823 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -992,6 +992,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 -- 2.25.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, 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