26cb8b7c1a
While reviewing the native AArch64 patch, I noticed a problem:
On 02/06/2013 08:46 PM, Pedro Alves wrote:
>
>> > +static void
>> > +aarch64_linux_prepare_to_resume (struct lwp_info *lwp)
>> > +{
>> > + struct arch_lwp_info *info = lwp->arch_private;
>> > +
>> > + /* NULL means this is the main thread still going through the shell,
>> > + or, no watchpoint has been set yet. In that case, there's
>> > + nothing to do. */
>> > + if (info == NULL)
>> > + return;
>> > +
>> > + if (DR_HAS_CHANGED (info->dr_changed_bp)
>> > + || DR_HAS_CHANGED (info->dr_changed_wp))
>> > + {
>> > + int tid = GET_LWP (lwp->ptid);
>> > + struct aarch64_debug_reg_state *state = aarch64_get_debug_reg_state ();
> Hmm. This is always fetching the debug_reg_state of
> the current inferior, but may not be the inferior of lwp.
> I see the same bug on x86. Sorry about that. I'll fix it.
A natural fix would be to make xxx_get_debug_reg_state take an
inferior argument, but that doesn't work because of the case where we
detach breakpoints/watchpoints from the child fork, at a time there's
no inferior for the child fork at all. We do a nasty hack in
i386_inferior_data_get, but that relies on all callers pointing the
current inferior to the correct inferior, which isn't actually being
done by all callers, and I don't think we want to enforce that -- deep
in the bowls of linux-nat.c, there are many cases we resume lwps
behind the scenes, and it's be better to not have that code rely on
global state (as it doesn't today).
The fix is to decouple the watchpoints code from inferiors, making it
track target processes instead. This way, we can freely keep track of
the watchpoint mirrors for these processes behind the core's back.
Checkpoints also play dirty tricks with swapping the process behind
the inferior, so they get special treatment too in the patch (which
just amounts to calling a new hook). Instead of the old hack in
i386_inferior_data_get, where we returned a copy of the current
inferior's debug registers mirror, as soon as we detect a fork in the
target, we copy the debug register mirror from the parent to the child
process.
I don't have an old kernel handy to test, but I stepped through gdb doing
the watchpoint removal in the fork child in the watchpoint-fork test
seeing that the debug registers end up cleared in the child.
I didn't find the need for linux_nat_iterate_watchpoint_lwps. If
we use plain iterate_over_lwps instead, what happens is that
when removing watchpoints, that iterate_over_lwps doesn't actually
iterate over anything, since the fork child is not added to the
lwp list until later, at detach time, in linux_child_follow_fork.
And if we don't iterate over that lwp, we don't mark its debug
registers as needing update. But linux_child_follow_fork takes
care of doing that explicitly:
child_lp = add_lwp (inferior_ptid);
child_lp->stopped = 1;
child_lp->last_resume_kind = resume_stop;
make_cleanup (delete_lwp_cleanup, child_lp);
/* CHILD_LP has new PID, therefore linux_nat_new_thread is not called for it.
See i386_inferior_data_get for the Linux kernel specifics.
Ensure linux_nat_prepare_to_resume will reset the hardware debug
registers. It is done by the linux_nat_new_thread call, which is
being skipped in add_lwp above for the first lwp of a pid. */
gdb_assert (num_lwps (GET_PID (child_lp->ptid)) == 1);
if (linux_nat_new_thread != NULL)
linux_nat_new_thread (child_lp);
if (linux_nat_prepare_to_resume != NULL)
linux_nat_prepare_to_resume (child_lp);
ptrace (PTRACE_DETACH, child_pid, 0, 0);
so unless I'm missing something (quite possible) it ends up all
the same. But, the !detach-on-fork, and the "follow-fork child" paths
should also call linux_nat_new_thread, and they don't presently. It
seems to me in those cases we're not clearing debug regs correctly
when that's needed. Instead of copying that bit that works around
add_lwp bypassing the linux_nat_new_thread call, I thought it'd
be better to add an add_initial_lwp call to be used in the case we
really need to bypass linux_nat_new_thread, and make
add_lwp always call linux_nat_new_thread.
i386_cleanup_dregs is rewritten to forget about the current process
debug mirrors, which takes cares of other i386 ports. Only a couple
of extra tweaks here and there were needed, as some targets wheren't
actually calling i386_cleanup_dregs.
Tested on Fedora 17 x86_64 -m64/-m32.
GDBserver already fetches the i386_debug_reg_state from the right
process, and, it doesn't handle forks at all, so no fix is needed over
there.
gdb/
2013-02-13 Pedro Alves <palves@redhat.com>
* amd64-linux-nat.c (update_debug_registers_callback):
Update comment.
(amd64_linux_dr_set_control, amd64_linux_dr_set_addr): Use
iterate_over_lwps.
(amd64_linux_prepare_to_resume): Pass the lwp's pid to
i386_debug_reg_state.
(amd64_linux_new_fork): New function.
(_initialize_amd64_linux_nat): Install amd64_linux_new_fork as
linux_nat_new_fork hook, and i386_forget_process as
linux_nat_forget_process hook.
* i386-linux-nat.c (update_debug_registers_callback):
Update comment.
(amd64_linux_dr_set_control, amd64_linux_dr_set_addr): Use
iterate_over_lwps.
(i386_linux_prepare_to_resume): Pass the lwp's pid to
i386_debug_reg_state.
(i386_linux_new_fork): New function.
(_initialize_i386_linux_nat): Install i386_linux_new_fork as
linux_nat_new_fork hook, and i386_forget_process as
linux_nat_forget_process hook.
* i386-nat.c (i386_init_dregs): Delete.
(i386_inferior_data, struct i386_inferior_data):
Delete.
(struct i386_process_info): New.
(i386_process_list): New global.
(i386_find_process_pid, i386_add_process, i386_process_info_get):
New functions.
(i386_inferior_data_get): Delete.
(i386_process_info_get): New function.
(i386_debug_reg_state): New parameter 'pid'. Reimplement.
(i386_forget_process): New function.
(i386_cleanup_dregs): Rewrite.
(i386_update_inferior_debug_regs, i386_insert_watchpoint)
(i386_remove_watchpoint, i386_region_ok_for_watchpoint)
(i386_stopped_data_address, i386_insert_hw_breakpoint)
(i386_remove_hw_breakpoint): Adjust to pass the current process id
to i386_debug_reg_state.
(i386_use_watchpoints): Don't register inferior data.
* i386-nat.h (i386_debug_reg_state): Add new 'pid' parameter, and
adjust comment.
(i386_forget_process): Declare.
* linux-fork.c (delete_fork): Call linux_nat_forget_process.
* linux-nat.c (linux_nat_new_fork, linux_nat_forget_process_hook):
New static globals.
(linux_child_follow_fork): Don't call linux_nat_new_thread here.
(add_initial_lwp): New, factored out from ...
(add_lwp): ... this. Don't check the number of lwps before
calling linux_nat_new_thread.
(linux_nat_iterate_watchpoint_lwps): Delete.
(linux_nat_attach): Use add_initial_lwp instead of add_lwp.
(linux_handle_extended_wait): Call the linux_nat_new_fork hook on
forks and vforks.
(linux_nat_wait_1): Use add_initial_lwp instead of add_lwp for the
initial lwp.
(linux_nat_kill, linux_nat_mourn_inferior): Call
linux_nat_forget_process.
(linux_nat_set_new_fork, linux_nat_set_forget_process)
(linux_nat_forget_process): New functions.
* linux-nat.h (linux_nat_iterate_watchpoint_lwps_ftype): Delete
type.
(linux_nat_iterate_watchpoint_lwps): Delete declaration.
(linux_nat_new_fork_ftype, linux_nat_forget_process_ftype): New
types.
(linux_nat_set_new_fork, linux_nat_set_forget_process)
(linux_nat_forget_process): New declarations.
* amd64fbsd-nat.c (super_mourn_inferior): New global.
(amd64fbsd_mourn_inferior): New function.
(_initialize_amd64fbsd_nat): Override to_mourn_inferior.
* windows-nat.c (windows_detach): Call i386_cleanup_dregs.
214 lines
7 KiB
C
214 lines
7 KiB
C
/* Native debugging support for GNU/Linux (LWP layer).
|
|
|
|
Copyright (C) 2000-2013 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 "target.h"
|
|
|
|
#include <signal.h>
|
|
|
|
struct arch_lwp_info;
|
|
|
|
/* Ways to "resume" a thread. */
|
|
|
|
enum resume_kind
|
|
{
|
|
/* Thread should continue. */
|
|
resume_continue,
|
|
|
|
/* Thread should single-step. */
|
|
resume_step,
|
|
|
|
/* Thread should be stopped. */
|
|
resume_stop
|
|
};
|
|
|
|
/* Structure describing an LWP. This is public only for the purposes
|
|
of ALL_LWPS; target-specific code should generally not access it
|
|
directly. */
|
|
|
|
struct lwp_info
|
|
{
|
|
/* The process id of the LWP. This is a combination of the LWP id
|
|
and overall process id. */
|
|
ptid_t ptid;
|
|
|
|
/* Non-zero if this LWP is cloned. In this context "cloned" means
|
|
that the LWP is reporting to its parent using a signal other than
|
|
SIGCHLD. */
|
|
int cloned;
|
|
|
|
/* Non-zero if we sent this LWP a SIGSTOP (but the LWP didn't report
|
|
it back yet). */
|
|
int signalled;
|
|
|
|
/* Non-zero if this LWP is stopped. */
|
|
int stopped;
|
|
|
|
/* Non-zero if this LWP will be/has been resumed. Note that an LWP
|
|
can be marked both as stopped and resumed at the same time. This
|
|
happens if we try to resume an LWP that has a wait status
|
|
pending. We shouldn't let the LWP run until that wait status has
|
|
been processed, but we should not report that wait status if GDB
|
|
didn't try to let the LWP run. */
|
|
int resumed;
|
|
|
|
/* The last resume GDB requested on this thread. */
|
|
enum resume_kind last_resume_kind;
|
|
|
|
/* If non-zero, a pending wait status. */
|
|
int status;
|
|
|
|
/* Non-zero if we were stepping this LWP. */
|
|
int step;
|
|
|
|
/* STOPPED_BY_WATCHPOINT is non-zero if this LWP stopped with a data
|
|
watchpoint trap. */
|
|
int stopped_by_watchpoint;
|
|
|
|
/* On architectures where it is possible to know the data address of
|
|
a triggered watchpoint, STOPPED_DATA_ADDRESS_P is non-zero, and
|
|
STOPPED_DATA_ADDRESS contains such data address. Otherwise,
|
|
STOPPED_DATA_ADDRESS_P is false, and STOPPED_DATA_ADDRESS is
|
|
undefined. Only valid if STOPPED_BY_WATCHPOINT is true. */
|
|
int stopped_data_address_p;
|
|
CORE_ADDR stopped_data_address;
|
|
|
|
/* Non-zero if we expect a duplicated SIGINT. */
|
|
int ignore_sigint;
|
|
|
|
/* If WAITSTATUS->KIND != TARGET_WAITKIND_SPURIOUS, the waitstatus
|
|
for this LWP's last event. This may correspond to STATUS above,
|
|
or to a local variable in lin_lwp_wait. */
|
|
struct target_waitstatus waitstatus;
|
|
|
|
/* Signal wether we are in a SYSCALL_ENTRY or
|
|
in a SYSCALL_RETURN event.
|
|
Values:
|
|
- TARGET_WAITKIND_SYSCALL_ENTRY
|
|
- TARGET_WAITKIND_SYSCALL_RETURN */
|
|
int syscall_state;
|
|
|
|
/* The processor core this LWP was last seen on. */
|
|
int core;
|
|
|
|
/* Arch-specific additions. */
|
|
struct arch_lwp_info *arch_private;
|
|
|
|
/* Next LWP in list. */
|
|
struct lwp_info *next;
|
|
};
|
|
|
|
/* The global list of LWPs, for ALL_LWPS. Unlike the threads list,
|
|
there is always at least one LWP on the list while the GNU/Linux
|
|
native target is active. */
|
|
extern struct lwp_info *lwp_list;
|
|
|
|
/* Iterate over each active thread (light-weight process). */
|
|
#define ALL_LWPS(LP) \
|
|
for ((LP) = lwp_list; \
|
|
(LP) != NULL; \
|
|
(LP) = (LP)->next)
|
|
|
|
#define GET_LWP(ptid) ptid_get_lwp (ptid)
|
|
#define GET_PID(ptid) ptid_get_pid (ptid)
|
|
#define is_lwp(ptid) (GET_LWP (ptid) != 0)
|
|
#define BUILD_LWP(lwp, pid) ptid_build (pid, lwp, 0)
|
|
|
|
/* Attempt to initialize libthread_db. */
|
|
void check_for_thread_db (void);
|
|
|
|
int thread_db_attach_lwp (ptid_t ptid);
|
|
|
|
/* Return the set of signals used by the threads library. */
|
|
extern void lin_thread_get_thread_signals (sigset_t *mask);
|
|
|
|
/* Find process PID's pending signal set from /proc/pid/status. */
|
|
void linux_proc_pending_signals (int pid, sigset_t *pending,
|
|
sigset_t *blocked, sigset_t *ignored);
|
|
|
|
/* linux-nat functions for handling fork events. */
|
|
extern void linux_enable_event_reporting (ptid_t ptid);
|
|
|
|
extern int lin_lwp_attach_lwp (ptid_t ptid);
|
|
|
|
extern void linux_stop_lwp (struct lwp_info *lwp);
|
|
|
|
/* Iterator function for lin-lwp's lwp list. */
|
|
struct lwp_info *iterate_over_lwps (ptid_t filter,
|
|
int (*callback) (struct lwp_info *,
|
|
void *),
|
|
void *data);
|
|
|
|
/* Create a prototype generic GNU/Linux target. The client can
|
|
override it with local methods. */
|
|
struct target_ops * linux_target (void);
|
|
|
|
/* Create a generic GNU/Linux target using traditional
|
|
ptrace register access. */
|
|
struct target_ops *
|
|
linux_trad_target (CORE_ADDR (*register_u_offset)(struct gdbarch *, int, int));
|
|
|
|
/* Register the customized GNU/Linux target. This should be used
|
|
instead of calling add_target directly. */
|
|
void linux_nat_add_target (struct target_ops *);
|
|
|
|
/* Register a method to call whenever a new thread is attached. */
|
|
void linux_nat_set_new_thread (struct target_ops *, void (*) (struct lwp_info *));
|
|
|
|
|
|
/* Register a method to call whenever a new fork is attached. */
|
|
typedef void (linux_nat_new_fork_ftype) (struct lwp_info *parent,
|
|
pid_t child_pid);
|
|
void linux_nat_set_new_fork (struct target_ops *ops,
|
|
linux_nat_new_fork_ftype *fn);
|
|
|
|
/* Register a method to call whenever a process is killed or
|
|
detached. */
|
|
typedef void (linux_nat_forget_process_ftype) (pid_t pid);
|
|
void linux_nat_set_forget_process (struct target_ops *ops,
|
|
linux_nat_forget_process_ftype *fn);
|
|
|
|
/* Call the method registered with the function above. PID is the
|
|
process to forget about. */
|
|
void linux_nat_forget_process (pid_t pid);
|
|
|
|
/* Register a method that converts a siginfo object between the layout
|
|
that ptrace returns, and the layout in the architecture of the
|
|
inferior. */
|
|
void linux_nat_set_siginfo_fixup (struct target_ops *,
|
|
int (*) (siginfo_t *,
|
|
gdb_byte *,
|
|
int));
|
|
|
|
/* Register a method to call prior to resuming a thread. */
|
|
|
|
void linux_nat_set_prepare_to_resume (struct target_ops *,
|
|
void (*) (struct lwp_info *));
|
|
|
|
/* Update linux-nat internal state when changing from one fork
|
|
to another. */
|
|
void linux_nat_switch_fork (ptid_t new_ptid);
|
|
|
|
/* Store the saved siginfo associated with PTID in *SIGINFO.
|
|
Return 1 if it was retrieved successfully, 0 otherwise (*SIGINFO is
|
|
uninitialized in such case). */
|
|
int linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo);
|
|
|
|
/* Set alternative SIGTRAP-like events recognizer. */
|
|
void linux_nat_set_status_is_event (struct target_ops *t,
|
|
int (*status_is_event) (int status));
|