mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
183be22290
I stumbled on a bug caused by the fact that a code path read target_waitstatus::value::sig (expecting it to contain a gdb_signal value) while target_waitstatus::kind was TARGET_WAITKIND_FORKED. This meant that the active union field was in fact target_waitstatus::value::related_pid, and contained a ptid. The read signal value was therefore garbage, and that caused GDB to crash soon after. Or, since that GDB was built with ubsan, this nice error message: /home/simark/src/binutils-gdb/gdb/linux-nat.c:1271:12: runtime error: load of value 2686365, which is not a valid value for type 'gdb_signal' Despite being a large-ish change, I think it would be nice to make target_waitstatus safe against that kind of bug. As already done elsewhere (e.g. dynamic_prop), validate that the type of value read from the union matches what is supposed to be the active field. - Make the kind and value of target_waitstatus private. - Make the kind initialized to TARGET_WAITKIND_IGNORE on target_waitstatus construction. This is what most users appear to do explicitly. - Add setters, one for each kind. Each setter takes as a parameter the data associated to that kind, if any. This makes it impossible to forget to attach the associated data. - Add getters, one for each associated data type. Each getter validates that the data type fetched by the user matches the wait status kind. - Change "integer" to "exit_status", "related_pid" to "child_ptid", just because that's more precise terminology. - Fix all users. That last point is semi-mechanical. There are a lot of obvious changes, but some less obvious ones. For example, it's not possible to set the kind at some point and the associated data later, as some users did. But in any case, the intent of the code should not change in this patch. This was tested on x86-64 Linux (unix, native-gdbserver and native-extended-gdbserver boards). It was built-tested on x86-64 FreeBSD, NetBSD, MinGW and macOS. The rest of the changes to native files was done as a best effort. If I forgot any place to update in these files, it should be easy to fix (unless the change happens to reveal an actual bug). Change-Id: I0ae967df1ff6e28de78abbe3ac9b4b2ff4ad03b7
561 lines
15 KiB
C
561 lines
15 KiB
C
/* BSD user-level threads support.
|
||
|
||
Copyright (C) 2005-2021 Free Software Foundation, Inc.
|
||
|
||
This file is part of GDB.
|
||
|
||
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 <http://www.gnu.org/licenses/>. */
|
||
|
||
#include "defs.h"
|
||
#include "gdbcore.h"
|
||
#include "gdbthread.h"
|
||
#include "inferior.h"
|
||
#include "objfiles.h"
|
||
#include "observable.h"
|
||
#include "regcache.h"
|
||
#include "solib.h"
|
||
#include "solist.h"
|
||
#include "symfile.h"
|
||
#include "target.h"
|
||
|
||
#include "gdb_obstack.h"
|
||
|
||
#include "bsd-uthread.h"
|
||
|
||
static const target_info bsd_uthread_target_info = {
|
||
"bsd-uthreads",
|
||
N_("BSD user-level threads"),
|
||
N_("BSD user-level threads")
|
||
};
|
||
|
||
struct bsd_uthread_target final : public target_ops
|
||
{
|
||
const target_info &info () const override
|
||
{ return bsd_uthread_target_info; }
|
||
|
||
strata stratum () const override { return thread_stratum; }
|
||
|
||
void close () override;
|
||
|
||
void mourn_inferior () override;
|
||
|
||
void fetch_registers (struct regcache *, int) override;
|
||
void store_registers (struct regcache *, int) override;
|
||
|
||
ptid_t wait (ptid_t, struct target_waitstatus *, target_wait_flags) override;
|
||
void resume (ptid_t, int, enum gdb_signal) override;
|
||
|
||
bool thread_alive (ptid_t ptid) override;
|
||
|
||
void update_thread_list () override;
|
||
|
||
const char *extra_thread_info (struct thread_info *) override;
|
||
|
||
std::string pid_to_str (ptid_t) override;
|
||
};
|
||
|
||
static bsd_uthread_target bsd_uthread_ops;
|
||
|
||
|
||
/* Architecture-specific operations. */
|
||
|
||
/* Per-architecture data key. */
|
||
static struct gdbarch_data *bsd_uthread_data;
|
||
|
||
struct bsd_uthread_ops
|
||
{
|
||
/* Supply registers for an inactive thread to a register cache. */
|
||
void (*supply_uthread)(struct regcache *, int, CORE_ADDR);
|
||
|
||
/* Collect registers for an inactive thread from a register cache. */
|
||
void (*collect_uthread)(const struct regcache *, int, CORE_ADDR);
|
||
};
|
||
|
||
static void *
|
||
bsd_uthread_init (struct obstack *obstack)
|
||
{
|
||
struct bsd_uthread_ops *ops;
|
||
|
||
ops = OBSTACK_ZALLOC (obstack, struct bsd_uthread_ops);
|
||
return ops;
|
||
}
|
||
|
||
/* Set the function that supplies registers from an inactive thread
|
||
for architecture GDBARCH to SUPPLY_UTHREAD. */
|
||
|
||
void
|
||
bsd_uthread_set_supply_uthread (struct gdbarch *gdbarch,
|
||
void (*supply_uthread) (struct regcache *,
|
||
int, CORE_ADDR))
|
||
{
|
||
struct bsd_uthread_ops *ops
|
||
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
|
||
|
||
ops->supply_uthread = supply_uthread;
|
||
}
|
||
|
||
/* Set the function that collects registers for an inactive thread for
|
||
architecture GDBARCH to SUPPLY_UTHREAD. */
|
||
|
||
void
|
||
bsd_uthread_set_collect_uthread (struct gdbarch *gdbarch,
|
||
void (*collect_uthread) (const struct regcache *,
|
||
int, CORE_ADDR))
|
||
{
|
||
struct bsd_uthread_ops *ops
|
||
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
|
||
|
||
ops->collect_uthread = collect_uthread;
|
||
}
|
||
|
||
/* Magic number to help recognize a valid thread structure. */
|
||
#define BSD_UTHREAD_PTHREAD_MAGIC 0xd09ba115
|
||
|
||
/* Check whether the thread structure at ADDR is valid. */
|
||
|
||
static void
|
||
bsd_uthread_check_magic (CORE_ADDR addr)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
||
ULONGEST magic = read_memory_unsigned_integer (addr, 4, byte_order);
|
||
|
||
if (magic != BSD_UTHREAD_PTHREAD_MAGIC)
|
||
error (_("Bad magic"));
|
||
}
|
||
|
||
/* Thread states. */
|
||
#define BSD_UTHREAD_PS_RUNNING 0
|
||
#define BSD_UTHREAD_PS_DEAD 18
|
||
|
||
/* Address of the pointer to the thread structure for the running
|
||
thread. */
|
||
static CORE_ADDR bsd_uthread_thread_run_addr;
|
||
|
||
/* Address of the list of all threads. */
|
||
static CORE_ADDR bsd_uthread_thread_list_addr;
|
||
|
||
/* Offsets of various "interesting" bits in the thread structure. */
|
||
static int bsd_uthread_thread_state_offset = -1;
|
||
static int bsd_uthread_thread_next_offset = -1;
|
||
static int bsd_uthread_thread_ctx_offset;
|
||
|
||
/* Name of shared threads library. */
|
||
static const char *bsd_uthread_solib_name;
|
||
|
||
/* Non-zero if the thread startum implemented by this module is active. */
|
||
static int bsd_uthread_active;
|
||
|
||
static CORE_ADDR
|
||
bsd_uthread_lookup_address (const char *name, struct objfile *objfile)
|
||
{
|
||
struct bound_minimal_symbol sym;
|
||
|
||
sym = lookup_minimal_symbol (name, NULL, objfile);
|
||
if (sym.minsym)
|
||
return BMSYMBOL_VALUE_ADDRESS (sym);
|
||
|
||
return 0;
|
||
}
|
||
|
||
static int
|
||
bsd_uthread_lookup_offset (const char *name, struct objfile *objfile)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
||
CORE_ADDR addr;
|
||
|
||
addr = bsd_uthread_lookup_address (name, objfile);
|
||
if (addr == 0)
|
||
return 0;
|
||
|
||
return read_memory_unsigned_integer (addr, 4, byte_order);
|
||
}
|
||
|
||
static CORE_ADDR
|
||
bsd_uthread_read_memory_address (CORE_ADDR addr)
|
||
{
|
||
struct type *ptr_type = builtin_type (target_gdbarch ())->builtin_data_ptr;
|
||
return read_memory_typed_address (addr, ptr_type);
|
||
}
|
||
|
||
/* If OBJFILE contains the symbols corresponding to one of the
|
||
supported user-level threads libraries, activate the thread stratum
|
||
implemented by this module. */
|
||
|
||
static int
|
||
bsd_uthread_activate (struct objfile *objfile)
|
||
{
|
||
struct gdbarch *gdbarch = target_gdbarch ();
|
||
struct bsd_uthread_ops *ops
|
||
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
|
||
|
||
/* Skip if the thread stratum has already been activated. */
|
||
if (bsd_uthread_active)
|
||
return 0;
|
||
|
||
/* There's no point in enabling this module if no
|
||
architecture-specific operations are provided. */
|
||
if (!ops->supply_uthread)
|
||
return 0;
|
||
|
||
bsd_uthread_thread_run_addr =
|
||
bsd_uthread_lookup_address ("_thread_run", objfile);
|
||
if (bsd_uthread_thread_run_addr == 0)
|
||
return 0;
|
||
|
||
bsd_uthread_thread_list_addr =
|
||
bsd_uthread_lookup_address ("_thread_list", objfile);
|
||
if (bsd_uthread_thread_list_addr == 0)
|
||
return 0;
|
||
|
||
bsd_uthread_thread_state_offset =
|
||
bsd_uthread_lookup_offset ("_thread_state_offset", objfile);
|
||
if (bsd_uthread_thread_state_offset == 0)
|
||
return 0;
|
||
|
||
bsd_uthread_thread_next_offset =
|
||
bsd_uthread_lookup_offset ("_thread_next_offset", objfile);
|
||
if (bsd_uthread_thread_next_offset == 0)
|
||
return 0;
|
||
|
||
bsd_uthread_thread_ctx_offset =
|
||
bsd_uthread_lookup_offset ("_thread_ctx_offset", objfile);
|
||
|
||
current_inferior ()->push_target (&bsd_uthread_ops);
|
||
bsd_uthread_active = 1;
|
||
return 1;
|
||
}
|
||
|
||
/* Cleanup due to deactivation. */
|
||
|
||
void
|
||
bsd_uthread_target::close ()
|
||
{
|
||
bsd_uthread_active = 0;
|
||
bsd_uthread_thread_run_addr = 0;
|
||
bsd_uthread_thread_list_addr = 0;
|
||
bsd_uthread_thread_state_offset = 0;
|
||
bsd_uthread_thread_next_offset = 0;
|
||
bsd_uthread_thread_ctx_offset = 0;
|
||
bsd_uthread_solib_name = NULL;
|
||
}
|
||
|
||
/* Deactivate the thread stratum implemented by this module. */
|
||
|
||
static void
|
||
bsd_uthread_deactivate (void)
|
||
{
|
||
/* Skip if the thread stratum has already been deactivated. */
|
||
if (!bsd_uthread_active)
|
||
return;
|
||
|
||
current_inferior ()->unpush_target (&bsd_uthread_ops);
|
||
}
|
||
|
||
static void
|
||
bsd_uthread_inferior_created (inferior *inf)
|
||
{
|
||
bsd_uthread_activate (NULL);
|
||
}
|
||
|
||
/* Likely candidates for the threads library. */
|
||
static const char * const bsd_uthread_solib_names[] =
|
||
{
|
||
"/usr/lib/libc_r.so", /* FreeBSD */
|
||
"/usr/lib/libpthread.so", /* OpenBSD */
|
||
NULL
|
||
};
|
||
|
||
static void
|
||
bsd_uthread_solib_loaded (struct so_list *so)
|
||
{
|
||
const char * const *names = bsd_uthread_solib_names;
|
||
|
||
for (names = bsd_uthread_solib_names; *names; names++)
|
||
{
|
||
if (startswith (so->so_original_name, *names))
|
||
{
|
||
solib_read_symbols (so, 0);
|
||
|
||
if (bsd_uthread_activate (so->objfile))
|
||
{
|
||
bsd_uthread_solib_name = so->so_original_name;
|
||
return;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
static void
|
||
bsd_uthread_solib_unloaded (struct so_list *so)
|
||
{
|
||
if (!bsd_uthread_solib_name)
|
||
return;
|
||
|
||
if (strcmp (so->so_original_name, bsd_uthread_solib_name) == 0)
|
||
bsd_uthread_deactivate ();
|
||
}
|
||
|
||
void
|
||
bsd_uthread_target::mourn_inferior ()
|
||
{
|
||
beneath ()->mourn_inferior ();
|
||
bsd_uthread_deactivate ();
|
||
}
|
||
|
||
void
|
||
bsd_uthread_target::fetch_registers (struct regcache *regcache, int regnum)
|
||
{
|
||
struct gdbarch *gdbarch = regcache->arch ();
|
||
struct bsd_uthread_ops *uthread_ops
|
||
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
|
||
ptid_t ptid = regcache->ptid ();
|
||
CORE_ADDR addr = ptid.tid ();
|
||
CORE_ADDR active_addr;
|
||
scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
|
||
|
||
/* We are doing operations (e.g. reading memory) that rely on
|
||
inferior_ptid. */
|
||
inferior_ptid = ptid;
|
||
|
||
/* Always fetch the appropriate registers from the layer beneath. */
|
||
beneath ()->fetch_registers (regcache, regnum);
|
||
|
||
/* FIXME: That might have gotten us more than we asked for. Make
|
||
sure we overwrite all relevant registers with values from the
|
||
thread structure. This can go once we fix the underlying target. */
|
||
regnum = -1;
|
||
|
||
active_addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr);
|
||
if (addr != 0 && addr != active_addr)
|
||
{
|
||
bsd_uthread_check_magic (addr);
|
||
uthread_ops->supply_uthread (regcache, regnum,
|
||
addr + bsd_uthread_thread_ctx_offset);
|
||
}
|
||
}
|
||
|
||
void
|
||
bsd_uthread_target::store_registers (struct regcache *regcache, int regnum)
|
||
{
|
||
struct gdbarch *gdbarch = regcache->arch ();
|
||
struct bsd_uthread_ops *uthread_ops
|
||
= (struct bsd_uthread_ops *) gdbarch_data (gdbarch, bsd_uthread_data);
|
||
ptid_t ptid = regcache->ptid ();
|
||
CORE_ADDR addr = ptid.tid ();
|
||
CORE_ADDR active_addr;
|
||
scoped_restore save_inferior_ptid = make_scoped_restore (&inferior_ptid);
|
||
|
||
/* We are doing operations (e.g. reading memory) that rely on
|
||
inferior_ptid. */
|
||
inferior_ptid = ptid;
|
||
|
||
active_addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr);
|
||
if (addr != 0 && addr != active_addr)
|
||
{
|
||
bsd_uthread_check_magic (addr);
|
||
uthread_ops->collect_uthread (regcache, regnum,
|
||
addr + bsd_uthread_thread_ctx_offset);
|
||
}
|
||
else
|
||
{
|
||
/* Updating the thread that is currently running; pass the
|
||
request to the layer beneath. */
|
||
beneath ()->store_registers (regcache, regnum);
|
||
}
|
||
}
|
||
|
||
ptid_t
|
||
bsd_uthread_target::wait (ptid_t ptid, struct target_waitstatus *status,
|
||
target_wait_flags options)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
||
CORE_ADDR addr;
|
||
process_stratum_target *beneath
|
||
= as_process_stratum_target (this->beneath ());
|
||
|
||
/* Pass the request to the layer beneath. */
|
||
ptid = beneath->wait (ptid, status, options);
|
||
|
||
/* If the process is no longer alive, there's no point in figuring
|
||
out the thread ID. It will fail anyway. */
|
||
if (status->kind () == TARGET_WAITKIND_SIGNALLED
|
||
|| status->kind () == TARGET_WAITKIND_EXITED)
|
||
return ptid;
|
||
|
||
/* Fetch the corresponding thread ID, and augment the returned
|
||
process ID with it. */
|
||
addr = bsd_uthread_read_memory_address (bsd_uthread_thread_run_addr);
|
||
if (addr != 0)
|
||
{
|
||
gdb_byte buf[4];
|
||
|
||
/* FIXME: For executables linked statically with the threads
|
||
library, we end up here before the program has actually been
|
||
executed. In that case ADDR will be garbage since it has
|
||
been read from the wrong virtual memory image. */
|
||
if (target_read_memory (addr, buf, 4) == 0)
|
||
{
|
||
ULONGEST magic = extract_unsigned_integer (buf, 4, byte_order);
|
||
if (magic == BSD_UTHREAD_PTHREAD_MAGIC)
|
||
ptid = ptid_t (ptid.pid (), 0, addr);
|
||
}
|
||
}
|
||
|
||
/* If INFERIOR_PTID doesn't have a tid member yet, and we now have a
|
||
ptid with tid set, then ptid is still the initial thread of
|
||
the process. Notify GDB core about it. */
|
||
if (inferior_ptid.tid () == 0
|
||
&& ptid.tid () != 0 && !in_thread_list (beneath, ptid))
|
||
thread_change_ptid (beneath, inferior_ptid, ptid);
|
||
|
||
/* Don't let the core see a ptid without a corresponding thread. */
|
||
thread_info *thread = find_thread_ptid (beneath, ptid);
|
||
if (thread == NULL || thread->state == THREAD_EXITED)
|
||
add_thread (beneath, ptid);
|
||
|
||
return ptid;
|
||
}
|
||
|
||
void
|
||
bsd_uthread_target::resume (ptid_t ptid, int step, enum gdb_signal sig)
|
||
{
|
||
/* Pass the request to the layer beneath. */
|
||
beneath ()->resume (ptid, step, sig);
|
||
}
|
||
|
||
bool
|
||
bsd_uthread_target::thread_alive (ptid_t ptid)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
||
CORE_ADDR addr = ptid.tid ();
|
||
|
||
if (addr != 0)
|
||
{
|
||
int offset = bsd_uthread_thread_state_offset;
|
||
ULONGEST state;
|
||
|
||
bsd_uthread_check_magic (addr);
|
||
|
||
state = read_memory_unsigned_integer (addr + offset, 4, byte_order);
|
||
if (state == BSD_UTHREAD_PS_DEAD)
|
||
return false;
|
||
}
|
||
|
||
return beneath ()->thread_alive (ptid);
|
||
}
|
||
|
||
void
|
||
bsd_uthread_target::update_thread_list ()
|
||
{
|
||
pid_t pid = inferior_ptid.pid ();
|
||
int offset = bsd_uthread_thread_next_offset;
|
||
CORE_ADDR addr;
|
||
|
||
prune_threads ();
|
||
|
||
addr = bsd_uthread_read_memory_address (bsd_uthread_thread_list_addr);
|
||
while (addr != 0)
|
||
{
|
||
ptid_t ptid = ptid_t (pid, 0, addr);
|
||
|
||
process_stratum_target *proc_target
|
||
= as_process_stratum_target (this->beneath ());
|
||
thread_info *thread = find_thread_ptid (proc_target, ptid);
|
||
if (thread == nullptr || thread->state == THREAD_EXITED)
|
||
{
|
||
/* If INFERIOR_PTID doesn't have a tid member yet, then ptid
|
||
is still the initial thread of the process. Notify GDB
|
||
core about it. */
|
||
if (inferior_ptid.tid () == 0)
|
||
thread_change_ptid (proc_target, inferior_ptid, ptid);
|
||
else
|
||
add_thread (proc_target, ptid);
|
||
}
|
||
|
||
addr = bsd_uthread_read_memory_address (addr + offset);
|
||
}
|
||
}
|
||
|
||
/* Possible states a thread can be in. */
|
||
static const char * const bsd_uthread_state[] =
|
||
{
|
||
"RUNNING",
|
||
"SIGTHREAD",
|
||
"MUTEX_WAIT",
|
||
"COND_WAIT",
|
||
"FDLR_WAIT",
|
||
"FDLW_WAIT",
|
||
"FDR_WAIT",
|
||
"FDW_WAIT",
|
||
"FILE_WAIT",
|
||
"POLL_WAIT",
|
||
"SELECT_WAIT",
|
||
"SLEEP_WAIT",
|
||
"WAIT_WAIT",
|
||
"SIGSUSPEND",
|
||
"SIGWAIT",
|
||
"SPINBLOCK",
|
||
"JOIN",
|
||
"SUSPENDED",
|
||
"DEAD",
|
||
"DEADLOCK"
|
||
};
|
||
|
||
/* Return a string describing th state of the thread specified by
|
||
INFO. */
|
||
|
||
const char *
|
||
bsd_uthread_target::extra_thread_info (thread_info *info)
|
||
{
|
||
enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
|
||
CORE_ADDR addr = info->ptid.tid ();
|
||
|
||
if (addr != 0)
|
||
{
|
||
int offset = bsd_uthread_thread_state_offset;
|
||
ULONGEST state;
|
||
|
||
state = read_memory_unsigned_integer (addr + offset, 4, byte_order);
|
||
if (state < ARRAY_SIZE (bsd_uthread_state))
|
||
return bsd_uthread_state[state];
|
||
}
|
||
|
||
return NULL;
|
||
}
|
||
|
||
std::string
|
||
bsd_uthread_target::pid_to_str (ptid_t ptid)
|
||
{
|
||
if (ptid.tid () != 0)
|
||
return string_printf ("process %d, thread 0x%s",
|
||
ptid.pid (),
|
||
phex_nz (ptid.tid (), sizeof (ULONGEST)));
|
||
|
||
return normal_pid_to_str (ptid);
|
||
}
|
||
|
||
void _initialize_bsd_uthread ();
|
||
void
|
||
_initialize_bsd_uthread ()
|
||
{
|
||
bsd_uthread_data = gdbarch_data_register_pre_init (bsd_uthread_init);
|
||
|
||
gdb::observers::inferior_created.attach (bsd_uthread_inferior_created,
|
||
"bsd-uthread");
|
||
gdb::observers::solib_loaded.attach (bsd_uthread_solib_loaded,
|
||
"bsd-uthread");
|
||
gdb::observers::solib_unloaded.attach (bsd_uthread_solib_unloaded,
|
||
"bsd-uthread");
|
||
}
|