From: Tom de Vries via Gdb-patches <gdb-patches@sourceware.org>
To: gdb-patches@sourceware.org
Subject: [committed][gdb/symtab] Make per_cu->unit_type atomic
Date: Thu, 14 Jul 2022 08:19:41 +0200 [thread overview]
Message-ID: <20220714061940.GA575@delia.home> (raw)
Hi,
With gdb with -fsanitize=thread and test-case gdb.ada/array_bounds.exp, I run
into a data race between:
...
Read of size 1 at 0x7b2000025f0f by main thread:
#0 packed<dwarf_unit_type, 1ul>::operator dwarf_unit_type() const packed.h:54
#1 dwarf2_per_cu_data::set_unit_type(dwarf_unit_type) read.h:339
...
and:
...
Previous write of size 1 at 0x7b2000025f0f by thread T3:
#0 dwarf2_per_cu_data::set_unit_type(dwarf_unit_type) read.h:341
...
Fix this by making per_cu->unit_type atomic.
Tested on x86_64-linux.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29286
Committed to trunk.
Thanks,
- Tom
[gdb/symtab] Make per_cu->unit_type atomic
---
gdb/dwarf2/read.h | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index fcf0cd70530..acbe298b310 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -178,7 +178,7 @@ struct dwarf2_per_cu_data
private:
/* The unit type of this CU. */
- packed<dwarf_unit_type, 1> m_unit_type = (dwarf_unit_type) 0;
+ std::atomic<packed<dwarf_unit_type, 1>> m_unit_type {(dwarf_unit_type)0};
/* The language of this CU. */
packed<language, LANGUAGE_BYTES> m_lang = language_unknown;
@@ -329,19 +329,24 @@ struct dwarf2_per_cu_data
dwarf_unit_type unit_type (bool strict_p = true) const
{
+ dwarf_unit_type ut = m_unit_type.load ();
if (strict_p)
- gdb_assert (m_unit_type != 0);
- return m_unit_type;
+ gdb_assert (ut != 0);
+ return ut;
}
void set_unit_type (dwarf_unit_type unit_type)
{
- if (m_unit_type == 0)
- /* Set if not set already. */
- m_unit_type = unit_type;
- else
- /* If already set, verify that it's the same value. */
- gdb_assert (m_unit_type == unit_type);
+ /* Set if not set already. */
+ packed<dwarf_unit_type, 1> nope = (dwarf_unit_type)0;
+ if (m_unit_type.compare_exchange_strong (nope, unit_type))
+ return;
+
+ /* If already set, verify that it's the same value. */
+ nope = unit_type;
+ if (m_unit_type.compare_exchange_strong (nope, unit_type))
+ return;
+ gdb_assert_not_reached ();
}
enum language lang (bool strict_p = true) const
next reply other threads:[~2022-07-14 6:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 6:19 Tom de Vries via Gdb-patches [this message]
2022-07-16 16:04 ` Tom Tromey
2022-07-17 13:15 ` Tom de Vries via Gdb-patches
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=20220714061940.GA575@delia.home \
--to=gdb-patches@sourceware.org \
--cc=tdevries@suse.de \
/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