nptl: Move __nptl_initial_report_events into ld.so/startup code

The initialization of the report_events TCB field is now performed
in __tls_init_tp instead of __pthread_initialize_minimal_internal
(in libpthread).

The events interface is difficult to test because GDB stopped using it
in 2015.  The td_thr_get_info change to ignore lookup issues is enough
to support GDB with this change.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2021-05-17 09:59:14 +02:00
parent c1760eaf3b
commit a78e5979a9
7 changed files with 24 additions and 18 deletions

View File

@ -497,6 +497,7 @@ libpthread {
ld { ld {
GLIBC_PRIVATE { GLIBC_PRIVATE {
__nptl_initial_report_events;
__nptl_set_robust_list_avail; __nptl_set_robust_list_avail;
} }
} }

View File

@ -96,21 +96,9 @@ sigcancel_handler (int sig, siginfo_t *si, void *ctx)
extern void **__libc_dl_error_tsd (void) __attribute__ ((const)); extern void **__libc_dl_error_tsd (void) __attribute__ ((const));
/* This can be set by the debugger before initialization is complete. */
static bool __nptl_initial_report_events __attribute_used__;
void void
__pthread_initialize_minimal_internal (void) __pthread_initialize_minimal_internal (void)
{ {
/* Partial initialization of the TCB already happened in TLS_INIT_TP
and __tls_init_tp. */
struct pthread *pd = THREAD_SELF;
/* Before initializing GL (dl_stack_user), the debugger could not
find us and had to set __nptl_initial_report_events. Propagate
its setting. */
THREAD_SETMEM (pd, report_events, __nptl_initial_report_events);
struct sigaction sa; struct sigaction sa;
__sigemptyset (&sa.sa_mask); __sigemptyset (&sa.sa_mask);

View File

@ -328,6 +328,11 @@ extern int __pthread_attr_init (pthread_attr_t *attr);
libc_hidden_proto (__pthread_attr_init) libc_hidden_proto (__pthread_attr_init)
extern int __pthread_attr_init_2_0 (pthread_attr_t *attr); extern int __pthread_attr_init_2_0 (pthread_attr_t *attr);
/* Part of the legacy thread events interface (which has been
superseded by PTRACE_O_TRACECLONE). This can be set by the
debugger before initialization is complete. */
extern bool __nptl_initial_report_events;
rtld_hidden_proto (__nptl_initial_report_events)
/* Event handlers for libthread_db interface. */ /* Event handlers for libthread_db interface. */
extern void __nptl_create_event (void); extern void __nptl_create_event (void);

View File

@ -42,9 +42,6 @@ typedef struct rtld_global rtld_global;
typedef struct dtv_slotinfo_list dtv_slotinfo_list; typedef struct dtv_slotinfo_list dtv_slotinfo_list;
typedef struct dtv_slotinfo dtv_slotinfo; typedef struct dtv_slotinfo dtv_slotinfo;
/* Actually static in nptl/init.c, but we only need it for typeof. */
extern bool __nptl_initial_report_events;
#define schedparam_sched_priority schedparam.sched_priority #define schedparam_sched_priority schedparam.sched_priority
#define eventbuf_eventmask eventbuf.eventmask #define eventbuf_eventmask eventbuf.eventmask

View File

@ -80,7 +80,7 @@ DB_FUNCTION (__nptl_death_event)
DB_SYMBOL (__nptl_threads_events) DB_SYMBOL (__nptl_threads_events)
DB_MAIN_VARIABLE (__nptl_nthreads) DB_MAIN_VARIABLE (__nptl_nthreads)
DB_VARIABLE (__nptl_last_event) DB_VARIABLE (__nptl_last_event)
DB_VARIABLE (__nptl_initial_report_events) DB_RTLD_VARIABLE (__nptl_initial_report_events)
DB_MAIN_ARRAY_VARIABLE (__pthread_keys) DB_MAIN_ARRAY_VARIABLE (__pthread_keys)
DB_STRUCT (pthread_key_struct) DB_STRUCT (pthread_key_struct)

View File

@ -41,8 +41,15 @@ td_thr_get_info (const td_thrhandle_t *th, td_thrinfo_t *infop)
schedpolicy = SCHED_OTHER; schedpolicy = SCHED_OTHER;
schedprio = 0; schedprio = 0;
tid = 0; tid = 0;
err = DB_GET_VALUE (report_events, th->th_ta_p,
/* Ignore errors to obtain the __nptl_initial_report_events
value because GDB no longer uses the events interface, and
other libthread_db consumers hopefully can handle different
libpthread/lds.o load orders. */
report_events = 0;
(void) DB_GET_VALUE (report_events, th->th_ta_p,
__nptl_initial_report_events, 0); __nptl_initial_report_events, 0);
err = TD_OK;
} }
else else
{ {

View File

@ -27,6 +27,9 @@ bool __nptl_set_robust_list_avail __attribute__ ((nocommon));
rtld_hidden_data_def (__nptl_set_robust_list_avail) rtld_hidden_data_def (__nptl_set_robust_list_avail)
#endif #endif
bool __nptl_initial_report_events __attribute__ ((nocommon));
rtld_hidden_def (__nptl_initial_report_events)
#ifdef SHARED #ifdef SHARED
/* Dummy implementation. See __rtld_mutex_init. */ /* Dummy implementation. See __rtld_mutex_init. */
static int static int
@ -63,6 +66,11 @@ __tls_init_tp (void)
THREAD_SETMEM (pd, specific[0], &pd->specific_1stblock[0]); THREAD_SETMEM (pd, specific[0], &pd->specific_1stblock[0]);
THREAD_SETMEM (pd, user_stack, true); THREAD_SETMEM (pd, user_stack, true);
/* Before initializing GL (dl_stack_user), the debugger could not
find us and had to set __nptl_initial_report_events. Propagate
its setting. */
THREAD_SETMEM (pd, report_events, __nptl_initial_report_events);
/* Initialize the robust mutex data. */ /* Initialize the robust mutex data. */
{ {
#if __PTHREAD_MUTEX_HAVE_PREV #if __PTHREAD_MUTEX_HAVE_PREV