From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH] Avoid race when reading dwz file
Date: Thu, 25 Jan 2024 06:51:29 -0700 [thread overview]
Message-ID: <20240125135129.977108-1-tom@tromey.com> (raw)
PR gdb/31260 points out a race introduced by the background reading
changes. If a given objfile is re-opened when it is already being
read, dwarf2_initialize_objfile will call dwarf2_read_dwz_file again,
causing the 'dwz_file' to be reset.
This patch fixes the problem by arranging to open the dwz just once:
when the dwarf2_per_bfd object is created.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31260
---
gdb/dwarf2/dwz.c | 15 ++++++---------
gdb/dwarf2/read.c | 29 ++++++++++++++++++-----------
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/gdb/dwarf2/dwz.c b/gdb/dwarf2/dwz.c
index 5c855f4c265..f53a5b64c4a 100644
--- a/gdb/dwarf2/dwz.c
+++ b/gdb/dwarf2/dwz.c
@@ -188,6 +188,8 @@ dwarf2_read_dwz_file (dwarf2_per_objfile *per_objfile)
only be run in the main thread. */
gdb_assert (is_main_thread ());
+ /* This should only be called once. */
+ gdb_assert (!per_bfd->dwz_file.has_value ());
/* Set this early, so that on error it remains NULL. */
per_bfd->dwz_file.emplace (nullptr);
@@ -281,14 +283,9 @@ dwarf2_read_dwz_file (dwarf2_per_objfile *per_objfile)
struct dwz_file *
dwarf2_get_dwz_file (dwarf2_per_bfd *per_bfd, bool require)
{
- gdb_assert (!require || per_bfd->dwz_file.has_value ());
-
- dwz_file *result = nullptr;
- if (per_bfd->dwz_file.has_value ())
- {
- result = per_bfd->dwz_file->get ();
- if (require && result == nullptr)
- error (_("could not read '.gnu_debugaltlink' section"));
- }
+ gdb_assert (per_bfd->dwz_file.has_value ());
+ dwz_file *result = per_bfd->dwz_file->get ();
+ if (require && result == nullptr)
+ error (_("could not read '.gnu_debugaltlink' section"));
return result;
}
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 925a5ea4a5b..d37d392c90b 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -1367,6 +1367,7 @@ dwarf2_has_info (struct objfile *objfile,
if (per_objfile == NULL)
{
dwarf2_per_bfd *per_bfd;
+ bool just_created = false;
/* We can share a "dwarf2_per_bfd" with other objfiles if the
BFD doesn't require relocations.
@@ -1386,6 +1387,7 @@ dwarf2_has_info (struct objfile *objfile,
per_bfd = new dwarf2_per_bfd (objfile->obfd.get (), names,
can_copy);
dwarf2_per_bfd_bfd_data_key.set (objfile->obfd.get (), per_bfd);
+ just_created = true;
}
}
else
@@ -1393,9 +1395,25 @@ dwarf2_has_info (struct objfile *objfile,
/* No sharing possible, create one specifically for this objfile. */
per_bfd = new dwarf2_per_bfd (objfile->obfd.get (), names, can_copy);
dwarf2_per_bfd_objfile_data_key.set (objfile, per_bfd);
+ just_created = true;
}
per_objfile = dwarf2_objfile_data_key.emplace (objfile, objfile, per_bfd);
+
+ if (just_created)
+ {
+ /* Try to fetch any potential dwz file early, while still on
+ the main thread. Also, be sure to do it just once per
+ BFD, to avoid races. */
+ try
+ {
+ dwarf2_read_dwz_file (per_objfile);
+ }
+ catch (const gdb_exception_error &err)
+ {
+ warning (_("%s"), err.what ());
+ }
+ }
}
return (!per_objfile->per_bfd->info.is_virtual
@@ -3204,17 +3222,6 @@ dwarf2_initialize_objfile (struct objfile *objfile,
dwarf_read_debug_printf ("called");
- /* Try to fetch any potential dwz file early, while still on the
- main thread. */
- try
- {
- dwarf2_read_dwz_file (per_objfile);
- }
- catch (const gdb_exception_error &err)
- {
- warning (_("%s"), err.what ());
- }
-
/* If we're about to read full symbols, don't bother with the
indices. In this case we also don't care if some other debug
format is making psymtabs, because they are all about to be
--
2.43.0
next reply other threads:[~2024-01-25 13:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-25 13:51 Tom Tromey [this message]
2024-03-08 14:09 ` Tom Tromey
2024-03-28 10:37 ` Lancelot SIX
2024-03-28 23:03 ` Tom Tromey
2024-03-30 16:47 ` Six, Lancelot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240125135129.977108-1-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox