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
237 lines
5.9 KiB
C++
237 lines
5.9 KiB
C++
/* Multi-thread control defs for remote server for GDB.
|
|
Copyright (C) 1993-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/>. */
|
|
|
|
#ifndef GDBSERVER_GDBTHREAD_H
|
|
#define GDBSERVER_GDBTHREAD_H
|
|
|
|
#include "gdbsupport/common-gdbthread.h"
|
|
#include "inferiors.h"
|
|
|
|
#include <list>
|
|
|
|
struct btrace_target_info;
|
|
struct regcache;
|
|
|
|
struct thread_info
|
|
{
|
|
thread_info (ptid_t id, void *target_data)
|
|
: id (id), target_data (target_data)
|
|
{}
|
|
|
|
~thread_info ()
|
|
{
|
|
free_register_cache (this->regcache_data);
|
|
}
|
|
|
|
/* The id of this thread. */
|
|
ptid_t id;
|
|
|
|
void *target_data;
|
|
struct regcache *regcache_data = nullptr;
|
|
|
|
/* The last resume GDB requested on this thread. */
|
|
enum resume_kind last_resume_kind = resume_continue;
|
|
|
|
/* The last wait status reported for this thread. */
|
|
struct target_waitstatus last_status;
|
|
|
|
/* True if LAST_STATUS hasn't been reported to GDB yet. */
|
|
int status_pending_p = 0;
|
|
|
|
/* Given `while-stepping', a thread may be collecting data for more
|
|
than one tracepoint simultaneously. E.g.:
|
|
|
|
ff0001 INSN1 <-- TP1, while-stepping 10 collect $regs
|
|
ff0002 INSN2
|
|
ff0003 INSN3 <-- TP2, collect $regs
|
|
ff0004 INSN4 <-- TP3, while-stepping 10 collect $regs
|
|
ff0005 INSN5
|
|
|
|
Notice that when instruction INSN5 is reached, the while-stepping
|
|
actions of both TP1 and TP3 are still being collected, and that TP2
|
|
had been collected meanwhile. The whole range of ff0001-ff0005
|
|
should be single-stepped, due to at least TP1's while-stepping
|
|
action covering the whole range.
|
|
|
|
On the other hand, the same tracepoint with a while-stepping action
|
|
may be hit by more than one thread simultaneously, hence we can't
|
|
keep the current step count in the tracepoint itself.
|
|
|
|
This is the head of the list of the states of `while-stepping'
|
|
tracepoint actions this thread is now collecting; NULL if empty.
|
|
Each item in the list holds the current step of the while-stepping
|
|
action. */
|
|
struct wstep_state *while_stepping = nullptr;
|
|
|
|
/* Branch trace target information for this thread. */
|
|
struct btrace_target_info *btrace = nullptr;
|
|
};
|
|
|
|
extern std::list<thread_info *> all_threads;
|
|
|
|
void remove_thread (struct thread_info *thread);
|
|
struct thread_info *add_thread (ptid_t ptid, void *target_data);
|
|
|
|
/* Return a pointer to the first thread, or NULL if there isn't one. */
|
|
|
|
struct thread_info *get_first_thread (void);
|
|
|
|
struct thread_info *find_thread_ptid (ptid_t ptid);
|
|
|
|
/* Find any thread of the PID process. Returns NULL if none is
|
|
found. */
|
|
struct thread_info *find_any_thread_of_pid (int pid);
|
|
|
|
/* Find the first thread for which FUNC returns true. Return NULL if no thread
|
|
satisfying FUNC is found. */
|
|
|
|
template <typename Func>
|
|
static thread_info *
|
|
find_thread (Func func)
|
|
{
|
|
std::list<thread_info *>::iterator next, cur = all_threads.begin ();
|
|
|
|
while (cur != all_threads.end ())
|
|
{
|
|
next = cur;
|
|
next++;
|
|
|
|
if (func (*cur))
|
|
return *cur;
|
|
|
|
cur = next;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Like the above, but only consider threads with pid PID. */
|
|
|
|
template <typename Func>
|
|
static thread_info *
|
|
find_thread (int pid, Func func)
|
|
{
|
|
return find_thread ([&] (thread_info *thread)
|
|
{
|
|
return thread->id.pid () == pid && func (thread);
|
|
});
|
|
}
|
|
|
|
/* Find the first thread that matches FILTER for which FUNC returns true.
|
|
Return NULL if no thread satisfying these conditions is found. */
|
|
|
|
template <typename Func>
|
|
static thread_info *
|
|
find_thread (ptid_t filter, Func func)
|
|
{
|
|
return find_thread ([&] (thread_info *thread) {
|
|
return thread->id.matches (filter) && func (thread);
|
|
});
|
|
}
|
|
|
|
/* Invoke FUNC for each thread. */
|
|
|
|
template <typename Func>
|
|
static void
|
|
for_each_thread (Func func)
|
|
{
|
|
std::list<thread_info *>::iterator next, cur = all_threads.begin ();
|
|
|
|
while (cur != all_threads.end ())
|
|
{
|
|
next = cur;
|
|
next++;
|
|
func (*cur);
|
|
cur = next;
|
|
}
|
|
}
|
|
|
|
/* Like the above, but only consider threads with pid PID. */
|
|
|
|
template <typename Func>
|
|
static void
|
|
for_each_thread (int pid, Func func)
|
|
{
|
|
for_each_thread ([&] (thread_info *thread)
|
|
{
|
|
if (pid == thread->id.pid ())
|
|
func (thread);
|
|
});
|
|
}
|
|
|
|
/* Find the a random thread for which FUNC (THREAD) returns true. If
|
|
no entry is found then return NULL. */
|
|
|
|
template <typename Func>
|
|
static thread_info *
|
|
find_thread_in_random (Func func)
|
|
{
|
|
int count = 0;
|
|
int random_selector;
|
|
|
|
/* First count how many interesting entries we have. */
|
|
for_each_thread ([&] (thread_info *thread) {
|
|
if (func (thread))
|
|
count++;
|
|
});
|
|
|
|
if (count == 0)
|
|
return NULL;
|
|
|
|
/* Now randomly pick an entry out of those. */
|
|
random_selector = (int)
|
|
((count * (double) rand ()) / (RAND_MAX + 1.0));
|
|
|
|
thread_info *thread = find_thread ([&] (thread_info *thr_arg) {
|
|
return func (thr_arg) && (random_selector-- == 0);
|
|
});
|
|
|
|
gdb_assert (thread != NULL);
|
|
|
|
return thread;
|
|
}
|
|
|
|
/* Get current thread ID (Linux task ID). */
|
|
#define current_ptid (current_thread->id)
|
|
|
|
/* Get the ptid of THREAD. */
|
|
|
|
static inline ptid_t
|
|
ptid_of (const thread_info *thread)
|
|
{
|
|
return thread->id;
|
|
}
|
|
|
|
/* Get the pid of THREAD. */
|
|
|
|
static inline int
|
|
pid_of (const thread_info *thread)
|
|
{
|
|
return thread->id.pid ();
|
|
}
|
|
|
|
/* Get the lwp of THREAD. */
|
|
|
|
static inline long
|
|
lwpid_of (const thread_info *thread)
|
|
{
|
|
return thread->id.lwp ();
|
|
}
|
|
|
|
#endif /* GDBSERVER_GDBTHREAD_H */
|