From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 92AC73858408 for ; Tue, 8 Mar 2022 00:33:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 92AC73858408 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-411-Zw9WSioMMFO5IfDUw18WpQ-1; Mon, 07 Mar 2022 19:33:36 -0500 X-MC-Unique: Zw9WSioMMFO5IfDUw18WpQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0818E8145F6; Tue, 8 Mar 2022 00:33:35 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.2.16.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FDC94D721; Tue, 8 Mar 2022 00:33:33 +0000 (UTC) From: Aaron Merey To: tom@tromey.com Cc: gdb-patches@sourceware.org, aburgess@redhat.com, lsix@lancelot.com, Aaron Merey Subject: [PATCH 2/2] PR gdb/27570: missing support for debuginfod in core_target::build_file_mappings Date: Mon, 7 Mar 2022 19:33:31 -0500 Message-Id: <20220308003331.171162-1-amerey@redhat.com> In-Reply-To: <87wnh9u4m2.fsf@tromey.com> References: <87wnh9u4m2.fsf@tromey.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.9 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, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Tue, 08 Mar 2022 00:33:41 -0000 Hi Tom, On Fri, Mar 4, 2022 at 10:20 AM Tom Tromey wrote: > Aaron> +          if (execbfd == nullptr) > Aaron> +            warning (_("File \"%s\" from debuginfod cannot be opened as bfd"), > Aaron> +                     execpath.get ()); > > I suspect this should use gdb_bfd_errmsg. Fixed. > Aaron> +  char *dname = nullptr; > > Aaron> +  scoped_fd fd (debuginfod_find_executable (c, build_id, build_id_len, &dname)); > Aaron> +  debuginfod_set_user_data (c, nullptr); > > Aaron> +  if (fd.get () >= 0) > Aaron> +    destname->reset (dname); > > Is it possible for fd.get()<0 and dname!=nullptr?  If so there's a > memory leak. If fd.get()<0 then dname is always nullptr. > Aaron> +  gdb::unique_xmalloc_ptr build_id_hexstr = > Aaron> +    get_cbfd_soname_build_id (current_program_space->cbfd, so->so_name); > > '=' on the next line. Fixed. Aaron --- gdb/corelow.c | 28 ++++++++++ gdb/debuginfod-support.c | 51 +++++++++++++++++++ gdb/debuginfod-support.h | 17 +++++++ gdb/gcore.in | 2 +- gdb/solib.c | 32 ++++++++++++ .../gdb.debuginfod/fetch_src_and_symbols.exp | 22 ++++++++ 6 files changed, 151 insertions(+), 1 deletion(-) diff --git a/gdb/corelow.c b/gdb/corelow.c index 83d3c89656f..3ad03fadc4b 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -46,6 +46,8 @@ #include "gdbsupport/filestuff.h" #include "build-id.h" #include "gdbsupport/pathstuff.h" +#include "gdbsupport/scoped_fd.h" +#include "debuginfod-support.h" #include #include #include "gdbcmd.h" @@ -229,6 +231,11 @@ core_target::build_file_mappings () canonical) pathname will be provided. */ gdb::unique_xmalloc_ptr expanded_fname = exec_file_find (filename, NULL); + + if (expanded_fname == nullptr && build_id != nullptr) + debuginfod_exec_query (build_id->data, build_id->size, + filename, &expanded_fname); + if (expanded_fname == nullptr) { m_core_unavailable_mappings.emplace_back (start, end - start); @@ -410,6 +417,27 @@ locate_exec_from_corefile_build_id (bfd *abfd, int from_tty) gdb_bfd_ref_ptr execbfd = build_id_to_exec_bfd (build_id->size, build_id->data); + if (execbfd == nullptr) + { + /* Attempt to query debuginfod for the executable. */ + gdb::unique_xmalloc_ptr execpath; + scoped_fd fd = debuginfod_exec_query (build_id->data, build_id->size, + abfd->filename, &execpath); + + if (fd.get () >= 0) + { + execbfd = gdb_bfd_open (execpath.get (), gnutarget); + + if (execbfd == nullptr) + warning (_("\"%s\" from debuginfod cannot be opened as bfd: %s"), + execpath.get (), + gdb_bfd_errmsg (bfd_get_error (), nullptr).c_str ()); + else if (!build_id_verify (execbfd.get (), build_id->size, + build_id->data)) + execbfd.reset (nullptr); + } + } + if (execbfd != nullptr) { exec_file_attach (bfd_get_filename (execbfd.get ()), from_tty); diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c index 56d8e7781c5..6dbe40a14e3 100644 --- a/gdb/debuginfod-support.c +++ b/gdb/debuginfod-support.c @@ -69,6 +69,15 @@ debuginfod_debuginfo_query (const unsigned char *build_id, return scoped_fd (-ENOSYS); } +scoped_fd +debuginfod_exec_query (const unsigned char *build_id, + int build_id_len, + const char *filename, + gdb::unique_xmalloc_ptr *destname) +{ + return scoped_fd (-ENOSYS); +} + #define NO_IMPL _("Support for debuginfod is not compiled into GDB.") #else @@ -271,6 +280,48 @@ debuginfod_debuginfo_query (const unsigned char *build_id, return fd; } + +/* See debuginfod-support.h */ + +scoped_fd +debuginfod_exec_query (const unsigned char *build_id, + int build_id_len, + const char *filename, + gdb::unique_xmalloc_ptr *destname) +{ + if (!debuginfod_is_enabled ()) + return scoped_fd (-ENOSYS); + + debuginfod_client *c = get_debuginfod_client (); + + if (c == nullptr) + return scoped_fd (-ENOMEM); + + char *dname = nullptr; + user_data data ("executable for", filename); + + debuginfod_set_user_data (c, &data); + gdb::optional term_state; + if (target_supports_terminal_ours ()) + { + term_state.emplace (); + target_terminal::ours (); + } + + scoped_fd fd (debuginfod_find_executable (c, build_id, build_id_len, &dname)); + debuginfod_set_user_data (c, nullptr); + + if (debuginfod_verbose > 0 && fd.get () < 0 && fd.get () != -ENOENT) + printf_filtered (_("Download failed: %s. " \ + "Continuing without executable for %ps.\n"), + safe_strerror (-fd.get ()), + styled_string (file_name_style.style (), filename)); + + if (fd.get () >= 0) + destname->reset (dname); + + return fd; +} #endif /* Set callback for "set debuginfod enabled". */ diff --git a/gdb/debuginfod-support.h b/gdb/debuginfod-support.h index 29e361bb76f..5b1c1cb91f4 100644 --- a/gdb/debuginfod-support.h +++ b/gdb/debuginfod-support.h @@ -61,4 +61,21 @@ debuginfod_debuginfo_query (const unsigned char *build_id, const char *filename, gdb::unique_xmalloc_ptr *destname); +/* Query debuginfod servers for an executable file with BUILD_ID. + BUILD_ID can be given as a binary blob or a null-terminated string. + If given as a binary blob, BUILD_ID_LEN should be the number of bytes. + If given as a null-terminated string, BUILD_ID_LEN should be 0. + + FILENAME should be the name or path associated with the executable. + It is used for printing messages to the user. + + If the file is successfully retrieved, its path on the local machine + is stored in DESTNAME. If GDB is not built with debuginfod, this + function returns -ENOSYS. */ + +extern scoped_fd debuginfod_exec_query (const unsigned char *build_id, + int build_id_len, + const char *filename, + gdb::unique_xmalloc_ptr + *destname); #endif /* DEBUGINFOD_SUPPORT_H */ diff --git a/gdb/gcore.in b/gdb/gcore.in index 7038c0c394c..ed7abf2d29b 100644 --- a/gdb/gcore.in +++ b/gdb/gcore.in @@ -98,7 +98,7 @@ do # ` filename (tilde_expand (so->so_name)); gdb_bfd_ref_ptr abfd (ops->bfd_open (filename.get ())); + gdb::unique_xmalloc_ptr build_id_hexstr + = get_cbfd_soname_build_id (current_program_space->cbfd, so->so_name); + + /* If we already know the build-id of this solib from a core file, verify + it matches ABFD's build-id. If there is a mismatch or the solib wasn't + found, attempt to query debuginfod for the correct solib. */ + if (build_id_hexstr.get () != nullptr) + { + bool mismatch = false; + + if (abfd != nullptr && abfd->build_id != nullptr) + { + std::string build_id = build_id_to_string (abfd->build_id); + + if (build_id != build_id_hexstr.get ()) + mismatch = true; + } + if (abfd == nullptr || mismatch) + { + scoped_fd fd = debuginfod_exec_query ((const unsigned char*) + build_id_hexstr.get (), + 0, so->so_name, &filename); + + if (fd.get () >= 0) + abfd = ops->bfd_open (filename.get ()); + else if (mismatch) + warning (_("Build-id of %ps does not match core file."), + styled_string (file_name_style.style (), filename.get ())); + } + } if (abfd == NULL) return 0; diff --git a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp index 5912c38c266..f12ed7d486c 100644 --- a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp +++ b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp @@ -63,6 +63,11 @@ if { [gdb_compile "$sourcetmp" "$binfile" executable {debug}] != "" } { return -1 } +if { [gdb_compile "$sourcetmp" "${binfile}2" executable {debug}] != "" } { + fail "compile" + return -1 +} + # Write some assembly that just has a .gnu_debugaltlink section. # Copied from testsuite/gdb.dwarf2/dwzbuildid.exp. proc write_just_debugaltlink {filename dwzname buildid} { @@ -114,6 +119,8 @@ proc write_dwarf_file {filename buildid {value 99}} { } } +set corefile [standard_output_file "corefile"] + proc no_url { } { global binfile outputdir debugdir @@ -167,6 +174,16 @@ proc no_url { } { gdb_test "file ${binfile}_alt.o" \ ".*could not find '.gnu_debugaltlink'.*" \ "file [file tail ${binfile}_alt.o]" + + # Generate a core file and test that gdb cannot find the executable + clean_restart ${binfile}2 + gdb_test "start" "Temporary breakpoint.*" + gdb_test "generate-core-file $::corefile" "Saved corefile $::corefile" \ + "file [file tail $::corefile] gen" + file rename -force ${binfile}2 $debugdir + + clean_restart + gdb_test "core $::corefile" ".*in ?? ().*" "file [file tail $::corefile]" } proc local_url { } { @@ -234,6 +251,11 @@ proc local_url { } { gdb_test "br main" "Breakpoint 1 at.*file.*" gdb_test "l" ".*This program is distributed in the hope.*" + # gdb should now find the executable file + clean_restart + gdb_test "core $::corefile" ".*return 0.*" "file [file tail $::corefile]" \ + "Enable debuginfod?.*" "y" + # gdb should now find the debugaltlink file clean_restart gdb_test "file ${binfile}_alt.o" \ -- 2.35.1