mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
329ea513b4
Neither the <dlfcn.h> entry points, nor lazy symbol resolution, nor initial shared library load-up, are cancellation points, so ld.so should exclusively use I/O primitives that are not cancellable. We currently achieve this by having the cancellation hooks compile as no-ops when IS_IN(rtld); this patch changes to using exclusively _nocancel primitives in the source code instead, which makes the intent clearer and significantly reduces the amount of code compiled under IS_IN(rtld) as well as IS_IN(libc) -- in particular, elf/Makefile no longer thinks we require a copy of unwind.c in rtld-libc.a. (The older mechanism is preserved as a backstop.) The bulk of the change is splitting up the files that define the _nocancel I/O functions, so they don't also define the variants that *are* cancellation points; after which, the existing logic for picking out the bits of libc that need to be recompiled as part of ld.so Just Works. I did this for all of the _nocancel functions, not just the ones used by ld.so, for consistency. fcntl was a little tricky because it's only a cancellation point for certain opcodes (F_SETLKW(64), which can block), and the existing __fcntl_nocancel wasn't applying the FCNTL_ADJUST_CMD hook, which strikes me as asking for trouble, especially as the only nontrivial definition of FCNTL_ADJUST_CMD (for powerpc64) changes F_*LK* opcodes. To fix this, fcntl_common moves to fcntl_nocancel.c along with __fcntl_nocancel, and changes its name to the extern (but hidden) symbol __fcntl_nocancel_adjusted, so that regular fcntl can continue calling it. __fcntl_nocancel now applies FCNTL_ADJUST_CMD; so that both both fcntl.c and fcntl_nocancel.c can see it, the only nontrivial definition moves from sysdeps/u/s/l/powerpc/powerpc64/fcntl.c to .../powerpc64/sysdep.h and becomes entirely a macro, instead of a macro that calls an inline function. The nptl version of libpthread also changes a little, because its "compat-routines" formerly included files that defined all the _nocancel functions it uses; instead of continuing to duplicate them, I exported the relevant ones from libc.so as GLIBC_PRIVATE. Since the Linux fcntl.c calls a function defined by fcntl_nocancel.c, it can no longer be used from libpthread.so; instead, introduce a custom forwarder, pt-fcntl.c, and export __libc_fcntl from libc.so as GLIBC_PRIVATE. The nios2-linux ABI doesn't include a copy of vfork() in libpthread, and it was handling that by manipulating libpthread-routines in .../linux/nios2/Makefile; it is cleaner to do what other such ports do, and have a pt-vfork.S that defines no symbols. Right now, it appears that Hurd does not implement _nocancel I/O, so sysdeps/generic/not-cancel.h will forward everything back to the regular functions. This changed the names of some of the functions that sysdeps/mach/hurd/dl-sysdep.c needs to interpose. * elf/dl-load.c, elf/dl-misc.c, elf/dl-profile.c, elf/rtld.c * sysdeps/unix/sysv/linux/dl-sysdep.c Include not-cancel.h. Use __close_nocancel instead of __close, __open64_nocancel instead of __open, __read_nocancel instead of __libc_read, and __write_nocancel instead of __libc_write. * csu/check_fds.c (check_one_fd) * sysdeps/posix/fdopendir.c (__fdopendir) * sysdeps/posix/opendir.c (__alloc_dir): Use __fcntl_nocancel instead of __fcntl and/or __libc_fcntl. * sysdeps/unix/sysv/linux/pthread_setname.c (pthread_setname_np) * sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np) * sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Use __open64_nocancel instead of __open_nocancel. * sysdeps/unix/sysv/linux/not-cancel.h: Move all of the hidden_proto declarations to the end and issue them if either IS_IN(libc) or IS_IN(rtld). * sysdeps/unix/sysv/linux/Makefile [subdir=io] (sysdep_routines): Add close_nocancel, fcntl_nocancel, nanosleep_nocancel, open_nocancel, open64_nocancel, openat_nocancel, pause_nocancel, read_nocancel, waitpid_nocancel, write_nocancel. * io/Versions [GLIBC_PRIVATE]: Add __libc_fcntl, __fcntl_nocancel, __open64_nocancel, __write_nocancel. * posix/Versions: Add __nanosleep_nocancel, __pause_nocancel. * nptl/pt-fcntl.c: New file. * nptl/Makefile (pthread-compat-wrappers): Remove fcntl. (libpthread-routines): Add pt-fcntl. * include/fcntl.h (__fcntl_nocancel_adjusted): New function. (__libc_fcntl): Remove attribute_hidden. * sysdeps/unix/sysv/linux/fcntl.c (__libc_fcntl): Call __fcntl_nocancel_adjusted, not fcntl_common. (__fcntl_nocancel): Move to new file fcntl_nocancel.c. (fcntl_common): Rename to __fcntl_nocancel_adjusted; also move to fcntl_nocancel.c. * sysdeps/unix/sysv/linux/fcntl_nocancel.c: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: Remove file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Define FCNTL_ADJUST_CMD here, as a self-contained macro. * sysdeps/unix/sysv/linux/close.c: Move __close_nocancel to... * sysdeps/unix/sysv/linux/close_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/nanosleep.c: Move __nanosleep_nocancel to... * sysdeps/unix/sysv/linux/nanosleep_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/open.c: Move __open_nocancel to... * sysdeps/unix/sysv/linux/open_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/open64.c: Move __open64_nocancel to... * sysdeps/unix/sysv/linux/open64_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/openat.c: Move __openat_nocancel to... * sysdeps/unix/sysv/linux/openat_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/openat64.c: Move __openat64_nocancel to... * sysdeps/unix/sysv/linux/openat64_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/pause.c: Move __pause_nocancel to... * sysdeps/unix/sysv/linux/pause_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/read.c: Move __read_nocancel to... * sysdeps/unix/sysv/linux/read_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/waitpid.c: Move __waitpid_nocancel to... * sysdeps/unix/sysv/linux/waitpid_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/write.c: Move __write_nocancel to... * sysdeps/unix/sysv/linux/write_nocancel.c: ...this new file. * sysdeps/unix/sysv/linux/nios2/Makefile: Don't override libpthread-routines. * sysdeps/unix/sysv/linux/nios2/pt-vfork.S: New file which defines nothing. * sysdeps/mach/hurd/dl-sysdep.c: Define __read instead of __libc_read, and __write instead of __libc_write. Define __open64 in addition to __open.
145 lines
3.4 KiB
Plaintext
145 lines
3.4 KiB
Plaintext
libc {
|
|
GLIBC_2.0 {
|
|
# functions with special/multiple interfaces
|
|
__bsd_getpgrp; __getpgid; __setpgid;
|
|
|
|
# functions with required interface outside normal name space
|
|
_exit;
|
|
|
|
# functions used in other libraries
|
|
__sched_get_priority_max; __sched_get_priority_min;
|
|
__sched_getparam; __sched_getscheduler; __sched_setscheduler;
|
|
__sched_yield; __fork; __getpid; __wait;
|
|
|
|
# functions used by libstdc++ 2.7.2
|
|
__waitpid;
|
|
|
|
# global variables
|
|
__environ; _environ;
|
|
|
|
# variables in normal name space
|
|
environ; optarg; opterr; optind; optopt;
|
|
re_max_failures; re_syntax_options;
|
|
|
|
# a*
|
|
alarm;
|
|
|
|
# c*
|
|
confstr;
|
|
|
|
# e*
|
|
execl; execle; execlp; execv; execve; execvp; fexecve;
|
|
|
|
# f*
|
|
fnmatch; fork; fpathconf; freeaddrinfo;
|
|
|
|
# g*
|
|
getaddrinfo; getdtablesize; getegid; geteuid; getgid; getopt; getopt_long;
|
|
getopt_long_only; getpgid; getpgrp; getpid; getppid; getsid; getuid; glob;
|
|
glob_pattern_p; globfree; group_member;
|
|
|
|
# n*
|
|
nanosleep;
|
|
|
|
# p*
|
|
pathconf; pause; pselect;
|
|
|
|
# r*
|
|
re_comp; re_compile_fastmap; re_compile_pattern; re_exec; re_match;
|
|
re_match_2; re_search; re_search_2; re_set_registers; re_set_syntax;
|
|
regcomp; regerror; regexec; regfree;
|
|
|
|
# s*
|
|
sched_get_priority_max; sched_get_priority_min; sched_getparam;
|
|
sched_getscheduler; sched_rr_get_interval; sched_setparam;
|
|
sched_setscheduler; sched_yield; setegid; seteuid; setgid;
|
|
setpgid; setpgrp; setsid; setuid; sleep; sysconf;
|
|
|
|
# t*
|
|
times;
|
|
|
|
# u*
|
|
uname;
|
|
|
|
# v*
|
|
vfork;
|
|
|
|
# w*
|
|
wait; wait3; wait4; waitpid;
|
|
}
|
|
GLIBC_2.1 {
|
|
# functions used in other libraries
|
|
__pread64; __pwrite64;
|
|
|
|
# g*
|
|
gai_strerror; getnameinfo; glob64; globfree64;
|
|
|
|
# p*
|
|
pread; pread64; pwrite; pwrite64;
|
|
|
|
# w*
|
|
waitid; wordexp; wordfree;
|
|
}
|
|
GLIBC_2.1.2 {
|
|
# functions used in other libraries
|
|
__vfork;
|
|
}
|
|
GLIBC_2.2 {
|
|
# p*
|
|
posix_spawn_file_actions_init; posix_spawn_file_actions_destroy;
|
|
posix_spawn_file_actions_addclose; posix_spawn_file_actions_addopen;
|
|
posix_spawn_file_actions_adddup2;
|
|
posix_spawnattr_init; posix_spawnattr_destroy;
|
|
posix_spawnattr_getsigdefault; posix_spawnattr_setsigdefault;
|
|
posix_spawnattr_getflags; posix_spawnattr_setflags;
|
|
posix_spawnattr_getpgroup; posix_spawnattr_setpgroup;
|
|
posix_spawnattr_setsigmask; posix_spawnattr_getsigmask;
|
|
posix_spawn; posix_spawnp; posix_spawnattr_getschedpolicy;
|
|
posix_spawnattr_setschedpolicy; posix_spawnattr_getschedparam;
|
|
posix_spawnattr_setschedparam;
|
|
|
|
# Used in macros.
|
|
__sysconf;
|
|
}
|
|
GLIBC_2.2.3 {
|
|
# Extended Interface.
|
|
fnmatch;
|
|
}
|
|
GLIBC_2.2.6 {
|
|
# For syscall wrapper
|
|
__nanosleep;
|
|
}
|
|
GLIBC_2.3.2 {
|
|
# Note that these symbols appear in sysdeps/unix/sysv/linux/Versions
|
|
# under GLIBC_2.0; the first instance in the script is taken as the
|
|
# default, so linux configurations put them in GLIBC_2.0 while other
|
|
# configuration put them in GLIBC_2.3.2.
|
|
getresgid; getresuid; setresgid; setresuid;
|
|
}
|
|
GLIBC_2.3.3 {
|
|
sched_getaffinity; sched_setaffinity;
|
|
}
|
|
GLIBC_2.3.4 {
|
|
regexec;
|
|
}
|
|
GLIBC_2.6 {
|
|
__sched_cpucount;
|
|
}
|
|
GLIBC_2.7 {
|
|
__sched_cpualloc; __sched_cpufree;
|
|
}
|
|
GLIBC_2.10 {
|
|
__posix_getopt;
|
|
}
|
|
GLIBC_2.11 {
|
|
execvpe;
|
|
}
|
|
GLIBC_2.27 {
|
|
glob; glob64;
|
|
}
|
|
GLIBC_PRIVATE {
|
|
__libc_fork; __libc_pread; __libc_pwrite;
|
|
__nanosleep_nocancel; __pause_nocancel;
|
|
}
|
|
}
|