d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce the size of the interposing table and amount of

Browse Source 
cancellation-handling code in the libthr.  Translate some syscalls
into their more generic counterpart, and remove translated syscalls
from the table.

List of the affected syscalls:
creat, open -> openat
raise -> thr_kill
sleep, usleep -> nanosleep
pause -> sigsuspend
wait, wait3, waitpid -> wait4

Suggested and reviewed by:	jilles (previous version)
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2015-01-11 22:16:31 +00:00
parent e88f89a393
commit 397d851d66
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=277032
16 changed files with 49 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libc/compat-43/Symbol.map
View File

@ -28,5 +28,4 @@ FBSD_1.2 {
FBSDprivate_1.0 {
__creat;
_creat;
__libc_creat;
};

17
lib/libc/compat-43/creat.c
View File

@ -38,21 +38,16 @@ __FBSDID("$FreeBSD$");
#include "un-namespace.h"
#include "libc_private.h"
__weak_reference(__libc_creat, __creat);
__weak_reference(__libc_creat, _creat);
__weak_reference(__creat, creat);
__weak_reference(__creat, _creat);
#pragma weak creat
int
creat(const char *path, mode_t mode)
__creat(const char *path, mode_t mode)
{
return (((int (*)(const char *, mode_t))
__libc_interposing[INTERPOS_creat])(path, mode));
return (((int (*)(int, const char *, int, ...))
__libc_interposing[INTERPOS_openat])(AT_FDCWD, path, O_WRONLY |
O_CREAT | O_TRUNC, mode));
}
int
__libc_creat(const char *path, mode_t mode)
{
return(__sys_open(path, O_WRONLY | O_CREAT | O_TRUNC, mode));
}

7
lib/libc/gen/Symbol.map
View File

@ -533,14 +533,7 @@ FBSDprivate_1.0 {
_libc_sem_post_compat;
_libc_sem_getvalue_compat;
__libc_pause;
__libc_raise;
__libc_sleep;
__libc_tcdrain;
__libc_usleep;
__libc_wait;
__libc_wait3;
__libc_waitpid;
__elf_aux_vector;
__pthread_map_stacks_exec;

21
lib/libc/gen/pause.c
View File

@ -33,10 +33,8 @@ static char sccsid[] = "@(#)pause.c 8.1 (Berkeley) 6/4/93";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include "namespace.h"
#include <signal.h>
#include <unistd.h>
#include "un-namespace.h"
#include "libc_private.h"
@ -44,23 +42,14 @@ __FBSDID("$FreeBSD$");
* Backwards compatible pause.
*/
int
__libc_pause(void)
__pause(void)
{
sigset_t oset;
if (_sigprocmask(SIG_BLOCK, NULL, &oset) == -1)
if (sigprocmask(SIG_BLOCK, NULL, &oset) == -1)
return (-1);
return (_sigsuspend(&oset));
return (sigsuspend(&oset));
}
#pragma weak pause
int
pause(void)
{
return (((int (*)(void))
__libc_interposing[INTERPOS_pause])());
}
__weak_reference(__libc_pause, __pause);
__weak_reference(__libc_pause, _pause);
__weak_reference(__pause, pause);
__weak_reference(__pause, _pause);

20
lib/libc/gen/raise.c
View File

@ -38,21 +38,15 @@ __FBSDID("$FreeBSD$");
#include "libc_private.h"
__weak_reference(__libc_raise, __raise);
__weak_reference(__libc_raise, _raise);
#pragma weak raise
int
raise(int s)
{
return (((int (*)(int))
__libc_interposing[INTERPOS_raise])(s));
}
__weak_reference(__raise, raise);
__weak_reference(__raise, _raise);
int
__libc_raise(int s)
__raise(int s)
{
long id;
return (kill(getpid(), s));
if (__sys_thr_self(&id) == -1)
return (-1);
return (__sys_thr_kill(id, s));
}

23
lib/libc/gen/sleep.c
View File

@ -42,17 +42,8 @@ __FBSDID("$FreeBSD$");
#include "libc_private.h"
#pragma weak sleep
unsigned int
sleep(unsigned int seconds)
{
return (((unsigned int (*)(unsigned int))
__libc_interposing[INTERPOS_sleep])(seconds));
}
unsigned int
__libc_sleep(unsigned int seconds)
__sleep(unsigned int seconds)
{
struct timespec time_to_sleep;
struct timespec time_remaining;
@ -62,17 +53,19 @@ __libc_sleep(unsigned int seconds)
* the maximum value for a time_t is >= INT_MAX.
*/
if (seconds > INT_MAX)
return (seconds - INT_MAX + __libc_sleep(INT_MAX));
return (seconds - INT_MAX + __sleep(INT_MAX));
time_to_sleep.tv_sec = seconds;
time_to_sleep.tv_nsec = 0;
if (_nanosleep(&time_to_sleep, &time_remaining) != -1)
if (((int (*)(const struct timespec *, struct timespec *))
__libc_interposing[INTERPOS_nanosleep])(
&time_to_sleep, &time_remaining) != -1)
return (0);
if (errno != EINTR)
return (seconds); /* best guess */
return (time_remaining.tv_sec +
(time_remaining.tv_nsec != 0)); /* round up */
(time_remaining.tv_nsec != 0)); /* round up */
}
__weak_reference(__libc_sleep, __sleep);
__weak_reference(__libc_sleep, _sleep);
__weak_reference(__sleep, sleep);
__weak_reference(__sleep, _sleep);

18
lib/libc/gen/usleep.c
View File

@ -40,24 +40,16 @@ __FBSDID("$FreeBSD$");
#include "libc_private.h"
#pragma weak usleep
int
usleep(useconds_t useconds)
{
return (((int (*)(useconds_t))
__libc_interposing[INTERPOS_usleep])(useconds));
}
int
__libc_usleep(useconds_t useconds)
__usleep(useconds_t useconds)
{
struct timespec time_to_sleep;
time_to_sleep.tv_nsec = (useconds % 1000000) * 1000;
time_to_sleep.tv_sec = useconds / 1000000;
return (_nanosleep(&time_to_sleep, NULL));
return (((int (*)(const struct timespec *, struct timespec *))
__libc_interposing[INTERPOS_nanosleep])(&time_to_sleep, NULL));
}
__weak_reference(__libc_usleep, __usleep);
__weak_reference(__libc_usleep, _usleep);
__weak_reference(__usleep, usleep);
__weak_reference(__usleep, _usleep);

18
lib/libc/gen/wait.c
View File

@ -42,21 +42,13 @@ __FBSDID("$FreeBSD$");
#include "libc_private.h"
#pragma weak wait
pid_t
wait(int *istat)
__wait(int *istat)
{
return (((pid_t (*)(int *))
__libc_interposing[INTERPOS_wait])(istat));
return (((pid_t (*)(pid_t, int *, int, struct rusage *))
__libc_interposing[INTERPOS_wait4])(WAIT_ANY, istat, 0, NULL));
}
pid_t
__libc_wait(int *istat)
{
return (__sys_wait4(WAIT_ANY, istat, 0, NULL));
}
__weak_reference(__libc_wait, __wait);
__weak_reference(__libc_wait, _wait);
__weak_reference(__wait, wait);
__weak_reference(__wait, _wait);

16
lib/libc/gen/wait3.c
View File

@ -42,20 +42,12 @@ __FBSDID("$FreeBSD$");
#include "libc_private.h"
#pragma weak wait3
pid_t
wait3(int *istat, int options, struct rusage *rup)
__wait3(int *istat, int options, struct rusage *rup)
{
return (((pid_t (*)(int *, int, struct rusage *))
__libc_interposing[INTERPOS_wait3])(istat, options, rup));
return (((pid_t (*)(pid_t, int *, int, struct rusage *))
__libc_interposing[INTERPOS_wait4])(WAIT_ANY, istat, options, rup));
}
__weak_reference(__libc_wait3, __wait3);
pid_t
__libc_wait3(int *istat, int options, struct rusage *rup)
{
return (__sys_wait4(WAIT_ANY, istat, options, rup));
}
__weak_reference(__wait3, wait3);

18
lib/libc/gen/waitpid.c
View File

@ -42,21 +42,13 @@ __FBSDID("$FreeBSD$");
#include "libc_private.h"
#pragma weak waitpid
pid_t
waitpid(pid_t pid, int *istat, int options)
__waitpid(pid_t pid, int *istat, int options)
{
return (((pid_t (*)(pid_t, int *, int))
__libc_interposing[INTERPOS_waitpid])(pid, istat, options));
return (((pid_t (*)(pid_t, int *, int, struct rusage *))
__libc_interposing[INTERPOS_wait4])(pid, istat, options, NULL));
}
pid_t
__libc_waitpid(pid_t pid, int *istat, int options)
{
return (__sys_wait4(pid, istat, options, NULL));
}
__weak_reference(__libc_waitpid, __waitpid);
__weak_reference(__libc_waitpid, _waitpid);
__weak_reference(__waitpid, waitpid);
__weak_reference(__waitpid, _waitpid);

19
lib/libc/include/libc_private.h
View File

@ -187,17 +187,14 @@ enum {
INTERPOS_aio_suspend,
INTERPOS_close,
INTERPOS_connect,
INTERPOS_creat,
INTERPOS_fcntl,
INTERPOS_fsync,
INTERPOS_fork,
INTERPOS_msync,
INTERPOS_nanosleep,
INTERPOS_open,
INTERPOS_openat,
INTERPOS_poll,
INTERPOS_pselect,
INTERPOS_raise,
INTERPOS_recvfrom,
INTERPOS_recvmsg,
INTERPOS_select,
@ -212,16 +209,10 @@ enum {
INTERPOS_sigwaitinfo,
INTERPOS_swapcontext,
INTERPOS_system,
INTERPOS_sleep,
INTERPOS_tcdrain,
INTERPOS_usleep,
INTERPOS_pause,
INTERPOS_read,
INTERPOS_readv,
INTERPOS_wait,
INTERPOS_wait3,
INTERPOS_wait4,
INTERPOS_waitpid,
INTERPOS_write,
INTERPOS_writev,
INTERPOS__pthread_mutex_init_calloc_cb,
@ -353,23 +344,17 @@ int __sys_sigwait(const __sigset_t *, int *);
int __sys_sigwaitinfo(const __sigset_t *, struct __siginfo *);
int __sys_swapcontext(struct __ucontext *,
const struct __ucontext *);
int __sys_thr_kill(long, int);
int __sys_thr_self(long *);
int __sys_truncate(const char *, __off_t);
__pid_t __sys_wait4(__pid_t, int *, int, struct rusage *);
__ssize_t __sys_write(int, const void *, __size_t);
__ssize_t __sys_writev(int, const struct iovec *, int);
int __libc_creat(const char *path, __mode_t mode);
int __libc_pause(void);
int __libc_raise(int);
int __libc_sigwait(const __sigset_t * __restrict,
int * restrict sig);
int __libc_system(const char *);
unsigned int __libc_sleep(unsigned int);
int __libc_tcdrain(int);
int __libc_usleep(__useconds_t);
__pid_t __libc_wait(int *);
__pid_t __libc_wait3(int *, int, struct rusage *);
__pid_t __libc_waitpid(__pid_t, int *, int);
int __fcntl_compat(int fd, int cmd, ...);
/* execve() with PATH processing to implement posix_spawnp() */

9
lib/libc/sys/interposing_table.c
View File

@ -44,17 +44,14 @@ interpos_func_t __libc_interposing[INTERPOS_MAX] = {
SLOT(aio_suspend, __sys_aio_suspend),
SLOT(close, __sys_close),
SLOT(connect, __sys_connect),
SLOT(creat, __libc_creat),
SLOT(fcntl, __fcntl_compat),
SLOT(fsync, __sys_fsync),
SLOT(fork, __sys_fork),
SLOT(msync, __sys_msync),
SLOT(nanosleep, __sys_nanosleep),
SLOT(open, __sys_open),
SLOT(openat, __sys_openat),
SLOT(poll, __sys_poll),
SLOT(pselect, __sys_pselect),
SLOT(raise, __libc_raise),
SLOT(read, __sys_read),
SLOT(readv, __sys_readv),
SLOT(recvfrom, __sys_recvfrom),
@ -71,14 +68,8 @@ interpos_func_t __libc_interposing[INTERPOS_MAX] = {
SLOT(sigwaitinfo, __sys_sigwaitinfo),
SLOT(swapcontext, __sys_swapcontext),
SLOT(system, __libc_system),
SLOT(sleep, __libc_sleep),
SLOT(tcdrain, __libc_tcdrain),
SLOT(usleep, __libc_usleep),
SLOT(pause, __libc_pause),
SLOT(wait, __libc_wait),
SLOT(wait3, __libc_wait3),
SLOT(wait4, __sys_wait4),
SLOT(waitpid, __libc_waitpid),
SLOT(write, __sys_write),
SLOT(writev, __sys_writev),
SLOT(_pthread_mutex_init_calloc_cb, _pthread_mutex_init_calloc_cb_stub),

4
lib/libc/sys/open.c
View File

@ -54,6 +54,6 @@ open(const char *path, int flags, ...)
} else {
mode = 0;
}
return (((int (*)(const char *, int, ...))
__libc_interposing[INTERPOS_open])(path, flags, mode));
return (((int (*)(int, const char *, int, ...))
__libc_interposing[INTERPOS_openat])(AT_FDCWD, path, flags, mode));
}

2
lib/libthr/thread/thr_private.h
View File

@ -917,8 +917,6 @@ void _thr_stack_fix_protection(struct pthread *thrd);
int *__error_threaded(void) __hidden;
void __thr_interpose_libc(void) __hidden;
pid_t __thr_fork(void);
int __thr_pause(void) __hidden;
int __thr_raise(int sig);
int __thr_setcontext(const ucontext_t *ucp);
int __thr_sigaction(int sig, const struct sigaction *act,
struct sigaction *oact) __hidden;

17
lib/libthr/thread/thr_sig.c
View File

@ -514,23 +514,6 @@ _thr_signal_deinit(void)
{
}
int
__thr_pause(void)
{
sigset_t oset;
if (_sigprocmask(SIG_BLOCK, NULL, &oset) == -1)
return (-1);
return (__thr_sigsuspend(&oset));
}
int
__thr_raise(int sig)
{
return (_thr_send_sig(_get_curthread(), sig));
}
int
__thr_sigaction(int sig, const struct sigaction *act, struct sigaction *oact)
{

141
lib/libthr/thread/thr_syscalls.c
View File

@ -99,10 +99,6 @@ __FBSDID("$FreeBSD$");
extern int __fcntl_compat(int, int, ...);
#endif
/*
* Cancellation behavior:
* If thread is canceled, no socket is created.
*/
static int
__thr_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
{
@ -189,25 +185,6 @@ __thr_connect(int fd, const struct sockaddr *name, socklen_t namelen)
return (ret);
}
/*
* Cancellation behavior:
* If thread is canceled, file is not created.
*/
static int
__thr_creat(const char *path, mode_t mode)
{
struct pthread *curthread;
int ret;
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __libc_creat(path, mode);
_thr_cancel_leave(curthread, ret == -1);
return (ret);
}
/*
* Cancellation behavior:
* According to specification, only F_SETLKW is a cancellation point.
@ -295,35 +272,6 @@ __thr_nanosleep(const struct timespec *time_to_sleep,
return (ret);
}
/*
* Cancellation behavior:
* If the thread is canceled, file is not opened.
*/
static int
__thr_open(const char *path, int flags,...)
{
struct pthread *curthread;
int mode, ret;
va_list ap;
/* Check if the file is being created: */
if ((flags & O_CREAT) != 0) {
/* Get the creation mode: */
va_start(ap, flags);
mode = va_arg(ap, int);
va_end(ap);
} else {
mode = 0;
}
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __sys_open(path, flags, mode);
_thr_cancel_leave(curthread, ret == -1);
return (ret);
}
/*
* Cancellation behavior:
* If the thread is canceled, file is not opened.
@ -523,19 +471,6 @@ __thr_sendto(int s, const void *m, size_t l, int f, const struct sockaddr *t,
return (ret);
}
static unsigned int
__thr_sleep(unsigned int seconds)
{
struct pthread *curthread;
unsigned int ret;
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __libc_sleep(seconds);
_thr_cancel_leave(curthread, 1);
return (ret);
}
static int
__thr_system(const char *string)
{
@ -567,55 +502,6 @@ __thr_tcdrain(int fd)
return (ret);
}
static int
__thr_usleep(useconds_t useconds)
{
struct pthread *curthread;
int ret;
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __libc_usleep(useconds);
_thr_cancel_leave(curthread, 1);
return (ret);
}
/*
* Cancellation behavior:
* Thread may be canceled at start, but if the system call returns
* a child pid, the thread is not canceled.
*/
static pid_t
__thr_wait(int *istat)
{
struct pthread *curthread;
pid_t ret;
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __libc_wait(istat);
_thr_cancel_leave(curthread, ret <= 0);
return (ret);
}
/*
* Cancellation behavior:
* Thread may be canceled at start, but if the system call returns
* a child pid, the thread is not canceled.
*/
static pid_t
__thr_wait3(int *status, int options, struct rusage *rusage)
{
struct pthread *curthread;
pid_t ret;
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __libc_wait3(status, options, rusage);
_thr_cancel_leave(curthread, ret <= 0);
return (ret);
}
/*
* Cancellation behavior:
* Thread may be canceled at start, but if the system call returns
@ -634,24 +520,6 @@ __thr_wait4(pid_t pid, int *status, int options, struct rusage *rusage)
return (ret);
}
/*
* Cancellation behavior:
* Thread may be canceled at start, but if the system call returns
* a child pid, the thread is not canceled.
*/
static pid_t
__thr_waitpid(pid_t wpid, int *status, int options)
{
struct pthread *curthread;
pid_t ret;
curthread = _get_curthread();
_thr_cancel_enter(curthread);
ret = __libc_waitpid(wpid, status, options);
_thr_cancel_leave(curthread, ret <= 0);
return (ret);
}
/*
* Cancellation behavior:
* Thread may be canceled at start, but if the thread wrote some data,
@ -701,17 +569,14 @@ __thr_interpose_libc(void)
SLOT(aio_suspend);
SLOT(close);
SLOT(connect);
SLOT(creat);
SLOT(fcntl);
SLOT(fsync);
SLOT(fork);
SLOT(msync);
SLOT(nanosleep);
SLOT(open);
SLOT(openat);
SLOT(poll);
SLOT(pselect);
SLOT(raise);
SLOT(read);
SLOT(readv);
SLOT(recvfrom);
@ -728,14 +593,8 @@ __thr_interpose_libc(void)
SLOT(sigwaitinfo);
SLOT(swapcontext);
SLOT(system);
SLOT(sleep);
SLOT(tcdrain);
SLOT(usleep);
SLOT(pause);
SLOT(wait);
SLOT(wait3);
SLOT(wait4);
SLOT(waitpid);
SLOT(write);
SLOT(writev);
#undef SLOT