diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index bbd090e46b27..8d30e06cfed9 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,568 +1,570 @@
# machine-independent gen sources
.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen ${SRCTOP}/etc
CONFS+= group master.passwd shells
CONFSMODE_master.passwd= 600
CONFSPACKAGE= runtime
SRCS+= \
__pthread_mutex_init_calloc_cb_stub.c \
__xuname.c \
_pthread_stubs.c \
_rand48.c \
_spinlock_stub.c \
_thread_init.c \
+ aio_read2.c \
+ aio_write2.c \
alarm.c \
arc4random.c \
arc4random-compat.c \
arc4random_uniform.c \
assert.c \
basename.c \
basename_compat.c \
cap_sandboxed.c \
check_utility_compat.c \
clock.c \
clock_getcpuclockid.c \
closedir.c \
confstr.c \
cpuset_alloc.c \
cpuset_free.c \
crypt.c \
ctermid.c \
daemon.c \
devname.c \
devname-compat11.c \
dirfd.c \
dirname.c \
dirname_compat.c \
disklabel.c \
dlfcn.c \
drand48.c \
dup3.c \
elf_utils.c \
erand48.c \
err.c \
errlst.c \
errno.c \
eventfd.c \
exec.c \
exect.c \
fdevname.c \
feature_present.c \
fmtcheck.c \
fmtmsg.c \
fnmatch.c \
fpclassify.c \
frexp.c \
fstab.c \
ftok.c \
fts.c \
fts-compat.c \
fts-compat11.c \
ftw.c \
ftw-compat11.c \
getbootfile.c \
getbsize.c \
getcap.c \
getcwd.c \
getdomainname.c \
getentropy.c \
getgrent.c \
getgrouplist.c \
gethostname.c \
getloadavg.c \
getlogin.c \
getmntinfo.c \
getmntinfo-compat11.c \
getnetgrent.c \
getosreldate.c \
getpeereid.c \
getprogname.c \
getpwent.c \
getttyent.c \
getusershell.c \
getutxent.c \
getvfsbyname.c \
glob.c \
glob-compat11.c \
initgroups.c \
isatty.c \
isinf.c \
isnan.c \
jrand48.c \
kqueue1.c \
lcong48.c \
libc_dlopen.c \
libc_interposing_table.c \
lrand48.c \
memalign.c \
memfd_create.c \
mrand48.c \
nftw.c \
nftw-compat11.c \
nice.c \
nlist.c \
nrand48.c \
opendir.c \
pause.c \
pmadvise.c \
popen.c \
posix_spawn.c \
psignal.c \
pututxline.c \
pw_scan.c \
raise.c \
readdir.c \
readdir-compat11.c \
readpassphrase.c \
rewinddir.c \
scandir.c \
scandir_b.c \
scandir-compat11.c \
sched_getaffinity.c \
sched_setaffinity.c \
seed48.c \
seekdir.c \
semctl.c \
setdomainname.c \
sethostname.c \
setjmperr.c \
setmode.c \
setproctitle.c \
setprogname.c \
siginterrupt.c \
siglist.c \
signal.c \
sigsetops.c \
srand48.c \
statvfs.c \
stringlist.c \
strtofflags.c \
sysconf.c \
sysctl.c \
sysctlbyname.c \
sysctlnametomib.c \
syslog.c \
telldir.c \
termios.c \
time.c \
times.c \
timespec_get.c \
timespec_getres.c \
timezone.c \
tls.c \
ttyname.c \
ttyslot.c \
ualarm.c \
ulimit.c \
uname.c \
unvis-compat.c \
utime.c \
utxdb.c \
valloc.c \
wordexp.c
CFLAGS.arc4random.c= -I${SRCTOP}/sys -I${SRCTOP}/sys/crypto/chacha20
CFLAGS.sysconf.c= -I${SRCTOP}/contrib/tzcode
CFLAGS.dlfcn.c= ${RTLD_HDRS}
CFLAGS.tls.c= ${RTLD_HDRS}
.PATH: ${SRCTOP}/contrib/libc-pwcache
SRCS+= pwcache.c pwcache.h
.PATH: ${SRCTOP}/contrib/libc-vis
CFLAGS+= -I${SRCTOP}/contrib/libc-vis
SRCS+= unvis.c vis.c
MISRCS+=modf.c
CANCELPOINTS_SRCS=sem.c sem_new.c
.for src in ${CANCELPOINTS_SRCS}
SRCS+=cancelpoints_${src}
CLEANFILES+=cancelpoints_${src}
cancelpoints_${src}: ${LIBC_SRCTOP}/gen/${src} .NOMETA
ln -sf ${.ALLSRC} ${.TARGET}
.endfor
SYM_MAPS+=${LIBC_SRCTOP}/gen/Symbol.map
# machine-dependent gen sources
.sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/gen/Makefile.inc"
MAN+= alarm.3 \
arc4random.3 \
basename.3 \
cap_rights_get.3 \
cap_sandboxed.3 \
check_utility_compat.3 \
clock.3 \
clock_getcpuclockid.3 \
confstr.3 \
ctermid.3 \
daemon.3 \
devname.3 \
directory.3 \
dirname.3 \
dl_iterate_phdr.3 \
dladdr.3 \
dlinfo.3 \
dllockinit.3 \
dlopen.3 \
dup3.3 \
err.3 \
exec.3 \
feature_present.3 \
fmtcheck.3 \
fmtmsg.3 \
fnmatch.3 \
fpclassify.3 \
frexp.3 \
ftok.3 \
fts.3 \
ftw.3 \
getbootfile.3 \
getbsize.3 \
getcap.3 \
getcontext.3 \
getcwd.3 \
getdiskbyname.3 \
getdomainname.3 \
getentropy.3 \
getfsent.3 \
getgrent.3 \
getgrouplist.3 \
gethostname.3 \
getloadavg.3 \
getmntinfo.3 \
getnetgrent.3 \
getosreldate.3 \
getpass.3 \
getpeereid.3 \
getprogname.3 \
getpwent.3 \
getttyent.3 \
getusershell.3 \
getutxent.3 \
getvfsbyname.3 \
glob.3 \
initgroups.3 \
isgreater.3 \
ldexp.3 \
makecontext.3 \
modf.3 \
nice.3 \
nlist.3 \
pause.3 \
popen.3 \
posix_spawn.3 \
posix_spawn_file_actions_addopen.3 \
posix_spawn_file_actions_init.3 \
posix_spawnattr_getflags.3 \
posix_spawnattr_getpgroup.3 \
posix_spawnattr_getschedparam.3 \
posix_spawnattr_getschedpolicy.3 \
posix_spawnattr_init.3 \
posix_spawnattr_getsigdefault.3 \
posix_spawnattr_getsigmask.3 \
psignal.3 \
pwcache.3 \
raise.3 \
rand48.3 \
readpassphrase.3 \
scandir.3 \
sem_destroy.3 \
sem_getvalue.3 \
sem_init.3 \
sem_open.3 \
sem_post.3 \
sem_timedwait.3 \
sem_wait.3 \
setjmp.3 \
setmode.3 \
setproctitle.3 \
siginterrupt.3 \
signal.3 \
sigsetops.3 \
statvfs.3 \
stringlist.3 \
strtofflags.3 \
sysconf.3 \
sysctl.3 \
syslog.3 \
tcgetpgrp.3 \
tcgetsid.3 \
tcgetwinsize.3 \
tcsendbreak.3 \
tcsetattr.3 \
tcsetpgrp.3 \
tcsetsid.3 \
time.3 \
times.3 \
timespec_get.3 \
timespec_getres.3 \
timezone.3 \
ttyname.3 \
tzset.3 \
ualarm.3 \
ucontext.3 \
ulimit.3 \
uname.3 \
unvis.3 \
utime.3 \
valloc.3 \
vis.3 \
wordexp.3
MLINKS+=arc4random.3 arc4random_buf.3 \
arc4random.3 arc4random_uniform.3
MLINKS+=ctermid.3 ctermid_r.3
MLINKS+=daemon.3 daemonfd.3
MLINKS+=devname.3 devname_r.3
MLINKS+=devname.3 fdevname.3
MLINKS+=devname.3 fdevname_r.3
MLINKS+=directory.3 closedir.3 \
directory.3 dirfd.3 \
directory.3 fdclosedir.3 \
directory.3 fdopendir.3 \
directory.3 opendir.3 \
directory.3 readdir.3 \
directory.3 readdir_r.3 \
directory.3 rewinddir.3 \
directory.3 seekdir.3 \
directory.3 telldir.3
MLINKS+=dlopen.3 fdlopen.3 \
dlopen.3 dlclose.3 \
dlopen.3 dlerror.3 \
dlopen.3 dlfunc.3 \
dlopen.3 dlsym.3 \
dlopen.3 dlvsym.3
MLINKS+=err.3 err_set_exit.3 \
err.3 err_set_file.3 \
err.3 errc.3 \
err.3 errx.3 \
err.3 verr.3 \
err.3 verrc.3 \
err.3 verrx.3 \
err.3 vwarn.3 \
err.3 vwarnc.3 \
err.3 vwarnx.3 \
err.3 warnc.3 \
err.3 warn.3 \
err.3 warnx.3
MLINKS+=exec.3 execl.3 \
exec.3 execle.3 \
exec.3 execlp.3 \
exec.3 exect.3 \
exec.3 execv.3 \
exec.3 execvP.3 \
exec.3 execvp.3
MLINKS+=fpclassify.3 finite.3 \
fpclassify.3 finitef.3 \
fpclassify.3 isfinite.3 \
fpclassify.3 isinf.3 \
fpclassify.3 isnan.3 \
fpclassify.3 isnormal.3
MLINKS+=frexp.3 frexpf.3 \
frexp.3 frexpl.3
MLINKS+=fts.3 fts_children.3 \
fts.3 fts_close.3 \
fts.3 fts_open.3 \
fts.3 fts_read.3 \
fts.3 fts_set.3 \
fts.3 fts_set_clientptr.3 \
fts.3 fts_get_clientptr.3 \
fts.3 fts_get_stream.3
MLINKS+=ftw.3 nftw.3
MLINKS+=getcap.3 cgetcap.3 \
getcap.3 cgetclose.3 \
getcap.3 cgetent.3 \
getcap.3 cgetfirst.3 \
getcap.3 cgetmatch.3 \
getcap.3 cgetnext.3 \
getcap.3 cgetnum.3 \
getcap.3 cgetset.3 \
getcap.3 cgetstr.3 \
getcap.3 cgetustr.3
MLINKS+=getcwd.3 getwd.3
MLINKS+=getcontext.3 getcontextx.3
MLINKS+=getcontext.3 setcontext.3
MLINKS+=getdomainname.3 setdomainname.3
MLINKS+=getfsent.3 endfsent.3 \
getfsent.3 getfsfile.3 \
getfsent.3 getfsspec.3 \
getfsent.3 getfstype.3 \
getfsent.3 setfsent.3 \
getfsent.3 setfstab.3 \
getfsent.3 getfstab.3
MLINKS+=getgrent.3 endgrent.3 \
getgrent.3 getgrgid.3 \
getgrent.3 getgrnam.3 \
getgrent.3 setgrent.3 \
getgrent.3 setgroupent.3 \
getgrent.3 getgrent_r.3 \
getgrent.3 getgrnam_r.3 \
getgrent.3 getgrgid_r.3
MLINKS+=gethostname.3 sethostname.3
MLINKS+=getnetgrent.3 endnetgrent.3 \
getnetgrent.3 getnetgrent_r.3 \
getnetgrent.3 innetgr.3 \
getnetgrent.3 setnetgrent.3
MLINKS+=getprogname.3 setprogname.3
MLINKS+=getpwent.3 endpwent.3 \
getpwent.3 getpwnam.3 \
getpwent.3 getpwuid.3 \
getpwent.3 setpassent.3 \
getpwent.3 setpwent.3 \
getpwent.3 setpwfile.3 \
getpwent.3 getpwent_r.3 \
getpwent.3 getpwnam_r.3 \
getpwent.3 getpwuid_r.3
MLINKS+=getttyent.3 endttyent.3 \
getttyent.3 getttynam.3 \
getttyent.3 isdialuptty.3 \
getttyent.3 isnettty.3 \
getttyent.3 setttyent.3
MLINKS+=getusershell.3 endusershell.3 \
getusershell.3 setusershell.3
MLINKS+=getutxent.3 endutxent.3 \
getutxent.3 getutxid.3 \
getutxent.3 getutxline.3 \
getutxent.3 getutxuser.3 \
getutxent.3 pututxline.3 \
getutxent.3 setutxdb.3 \
getutxent.3 setutxent.3 \
getutxent.3 utmpx.3
MLINKS+=glob.3 globfree.3
MLINKS+=isgreater.3 isgreaterequal.3 \
isgreater.3 isless.3 \
isgreater.3 islessequal.3 \
isgreater.3 islessgreater.3 \
isgreater.3 isunordered.3
MLINKS+=ldexp.3 ldexpf.3 \
ldexp.3 ldexpl.3
MLINKS+=makecontext.3 swapcontext.3
MLINKS+=modf.3 modff.3 \
modf.3 modfl.3
MLINKS+=popen.3 pclose.3
MLINKS+=posix_spawn.3 posix_spawnp.3 \
posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addclose.3 \
posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addclosefrom_np.3 \
posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_adddup2.3 \
posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addchdir_np.3 \
posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addfchdir_np.3 \
posix_spawn_file_actions_init.3 posix_spawn_file_actions_destroy.3 \
posix_spawnattr_getflags.3 posix_spawnattr_setflags.3 \
posix_spawnattr_getpgroup.3 posix_spawnattr_setpgroup.3 \
posix_spawnattr_getschedparam.3 posix_spawnattr_setschedparam.3 \
posix_spawnattr_getschedpolicy.3 posix_spawnattr_setschedpolicy.3 \
posix_spawnattr_getsigdefault.3 posix_spawnattr_setsigdefault.3 \
posix_spawnattr_getsigmask.3 posix_spawnattr_setsigmask.3 \
posix_spawnattr_init.3 posix_spawnattr_destroy.3
MLINKS+=psignal.3 strsignal.3 \
psignal.3 sys_siglist.3 \
psignal.3 sys_signame.3
MLINKS+=pwcache.3 gid_from_group.3 \
pwcache.3 group_from_gid.3 \
pwcache.3 pwcache_groupdb.3 \
pwcache.3 pwcache_userdb.3 \
pwcache.3 uid_from_user.3 \
pwcache.3 user_from_uid.3
MLINKS+=rand48.3 _rand48.3 \
rand48.3 drand48.3 \
rand48.3 erand48.3 \
rand48.3 jrand48.3 \
rand48.3 lcong48.3 \
rand48.3 lrand48.3 \
rand48.3 mrand48.3 \
rand48.3 nrand48.3 \
rand48.3 seed48.3 \
rand48.3 srand48.3
MLINKS+=scandir.3 alphasort.3 \
scandir.3 scandirat.3 \
scandir.3 scandir_b.3 \
scandir.3 versionsort.3
MLINKS+=sem_open.3 sem_close.3 \
sem_open.3 sem_unlink.3
MLINKS+=sem_wait.3 sem_trywait.3
MLINKS+=sem_timedwait.3 sem_clockwait_np.3
MLINKS+=setjmp.3 _longjmp.3 \
setjmp.3 _setjmp.3 \
setjmp.3 longjmp.3 \
setjmp.3 longjmperr.3 \
setjmp.3 longjmperror.3 \
setjmp.3 siglongjmp.3 \
setjmp.3 sigsetjmp.3
MLINKS+=setmode.3 getmode.3
MLINKS+=setproctitle.3 setproctitle_fast.3
MLINKS+=sigsetops.3 sigaddset.3 \
sigsetops.3 sigandset.3 \
sigsetops.3 sigdelset.3 \
sigsetops.3 sigemptyset.3 \
sigsetops.3 sigfillset.3 \
sigsetops.3 sigisemptyset.3 \
sigsetops.3 sigismember.3 \
sigsetops.3 sigorset.3
MLINKS+=statvfs.3 fstatvfs.3
MLINKS+=stringlist.3 sl_add.3 \
stringlist.3 sl_find.3 \
stringlist.3 sl_free.3 \
stringlist.3 sl_init.3
MLINKS+=strtofflags.3 fflagstostr.3
MLINKS+=sysctl.3 sysctlbyname.3 \
sysctl.3 sysctlnametomib.3
MLINKS+=syslog.3 closelog.3 \
syslog.3 openlog.3 \
syslog.3 setlogmask.3 \
syslog.3 vsyslog.3
MLINKS+=tcgetwinsize.3 tcsetwinsize.3
MLINKS+=tcsendbreak.3 tcdrain.3 \
tcsendbreak.3 tcflow.3 \
tcsendbreak.3 tcflush.3
MLINKS+=tcsetattr.3 cfgetispeed.3 \
tcsetattr.3 cfgetospeed.3 \
tcsetattr.3 cfmakeraw.3 \
tcsetattr.3 cfmakesane.3 \
tcsetattr.3 cfsetispeed.3 \
tcsetattr.3 cfsetospeed.3 \
tcsetattr.3 cfsetspeed.3 \
tcsetattr.3 tcgetattr.3
MLINKS+=ttyname.3 isatty.3 \
ttyname.3 ttyname_r.3
MLINKS+=unvis.3 strunvis.3 \
unvis.3 strunvisx.3
MLINKS+=vis.3 nvis.3 \
vis.3 snvis.3 \
vis.3 strenvisx.3 \
vis.3 strnunvis.3 \
vis.3 strnunvisx.3 \
vis.3 strnvis.3 \
vis.3 strnvisx.3 \
vis.3 strsenvisx.3 \
vis.3 strsnvis.3 \
vis.3 strsnvisx.3 \
vis.3 strsvis.3 \
vis.3 strsvisx.3 \
vis.3 strvis.3 \
vis.3 strvisx.3 \
vis.3 svis.3
MLINKS+=wordexp.3 wordfree.3
.include <src.tools.mk>
afterinstallconfig: install-passwd
install-passwd: .PHONY
.if ${MK_TCSH} == "no"
sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
.endif
${PWD_MKDB_CMD} -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
.if defined(NO_ROOT) && defined(METALOG)
( \
echo ".${DISTBASE}/etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \
echo ".${DISTBASE}/etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
echo ".${DISTBASE}/etc/passwd type=file mode=0644 uname=root gname=wheel"; \
) | cat -l >> ${METALOG}
.endif
diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map
index 7d1fe00284fd..0821563e0c9f 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -1,588 +1,590 @@
FBSD_1.0 {
__xuname;
pthread_atfork;
pthread_attr_destroy;
pthread_attr_get_np;
pthread_attr_getdetachstate;
pthread_attr_getguardsize;
pthread_attr_getinheritsched;
pthread_attr_getschedparam;
pthread_attr_getschedpolicy;
pthread_attr_getscope;
pthread_attr_getstackaddr;
pthread_attr_getstacksize;
pthread_attr_init;
pthread_attr_setdetachstate;
pthread_attr_setguardsize;
pthread_attr_setinheritsched;
pthread_attr_setschedparam;
pthread_attr_setschedpolicy;
pthread_attr_setscope;
pthread_attr_setstackaddr;
pthread_attr_setstacksize;
pthread_cancel;
pthread_cleanup_pop;
pthread_cleanup_push;
pthread_cond_broadcast;
pthread_cond_destroy;
pthread_cond_init;
pthread_cond_signal;
pthread_cond_timedwait;
pthread_cond_wait;
pthread_detach;
pthread_equal;
pthread_exit;
pthread_getspecific;
pthread_join;
pthread_key_create;
pthread_key_delete;
pthread_kill;
pthread_main_np;
pthread_mutex_destroy;
pthread_mutex_init;
pthread_mutex_lock;
pthread_mutex_trylock;
pthread_mutex_unlock;
pthread_mutexattr_destroy;
pthread_mutexattr_init;
pthread_mutexattr_settype;
pthread_once;
pthread_rwlock_destroy;
pthread_rwlock_init;
pthread_rwlock_rdlock;
pthread_rwlock_tryrdlock;
pthread_rwlock_trywrlock;
pthread_rwlock_unlock;
pthread_rwlock_wrlock;
pthread_self;
pthread_setcancelstate;
pthread_setcanceltype;
pthread_setspecific;
pthread_sigmask;
pthread_testcancel;
alarm;
arc4random;
__assert;
check_utility_compat;
clock;
closedir;
confstr;
ctermid;
ctermid_r;
daemon;
getdiskbyname;
dladdr;
dlclose;
dlerror;
dlfunc;
dllockinit;
dlopen;
dlsym;
dlvsym;
dlinfo;
dl_iterate_phdr;
drand48;
erand48;
err_set_file;
err_set_exit;
err;
verr;
errc;
verrc;
errx;
verrx;
warn;
vwarn;
warnc;
vwarnc;
warnx;
vwarnx;
sys_errlist;
sys_nerr;
errno;
exect;
execl;
execle;
execlp;
execv;
execvp;
execvP;
fabs;
fmtcheck;
fmtmsg;
fnmatch;
__fpclassifyf;
__fpclassifyd;
__fpclassifyl;
frexp;
setfstab;
getfstab;
getfsent;
getfsspec;
getfsfile;
setfsent;
endfsent;
ftok;
getbootfile;
getbsize;
cgetset;
cgetcap;
cgetent;
cgetmatch;
cgetfirst;
cgetclose;
cgetnext;
cgetstr;
cgetustr;
cgetnum;
getcwd;
getdomainname;
setgrent;
setgroupent;
endgrent;
getgrent_r;
getgrnam_r;
getgrgid_r;
getgrnam;
getgrgid;
getgrent;
/*
* Why are __gr_parse_entry() and __gr_match_entry() not static in
* gen/getgrent.c?
*/
getgrouplist;
gethostname;
getloadavg;
getlogin;
setnetgrent;
getnetgrent;
endnetgrent;
innetgr;
getosreldate;
getpeereid;
_getprogname;
getprogname;
setpwent;
setpassent;
endpwent;
getpwent_r;
getpwnam_r;
getpwuid_r;
getpwnam;
getpwuid;
getpwent;
getttynam;
getttyent;
setttyent;
endttyent;
isdialuptty;
isnettty;
getusershell;
endusershell;
setusershell;
getvfsbyname;
__nan;
__isnan;
isnan;
__isnanf;
isnanf;
__infinity;
__isinf;
isinf;
__isinff;
__isinfl;
isatty;
initgroups;
jrand48;
lcong48;
ldexp;
lockf;
lrand48;
makecontext;
modf;
mrand48;
nice;
nlist;
nrand48;
opendir;
pause;
posix_madvise;
popen;
pclose;
psignal;
raise;
readpassphrase;
getpass;
rewinddir;
seed48;
seekdir;
user_from_uid;
group_from_gid;
setdomainname;
sethostname;
_setjmp;
_longjmp;
setjmp;
longjmp;
sigsetjmp;
siglongjmp;
longjmperror;
getmode;
setmode;
setproctitle;
setprogname;
siginterrupt;
sys_signame;
sys_siglist;
sys_nsig;
signal;
sigaddset;
sigdelset;
sigemptyset;
sigfillset;
sigismember;
sleep;
srand48;
fstatvfs;
statvfs;
sl_init;
sl_add;
sl_free;
sl_find;
fflagstostr;
strtofflags;
sysconf;
sysctl;
sysctlbyname;
sysctlnametomib;
syslog;
vsyslog;
openlog;
closelog;
setlogmask;
ttyname_r;
ttyname;
timezone;
times;
time;
telldir;
tcgetattr;
tcsetattr;
tcsetpgrp;
tcgetpgrp;
cfgetospeed;
cfgetispeed;
cfsetospeed;
cfsetispeed;
cfsetspeed;
cfmakeraw;
tcsendbreak;
_init_tls;
__tls_get_addr;
tcdrain;
tcflush;
tcflow;
ualarm;
ulimit;
uname;
strunvis;
strunvisx;
usleep;
utime;
valloc;
vis;
strvis;
strvisx;
wait;
wait3;
waitpid;
wordexp;
wordfree;
};
FBSD_1.1 {
arc4random_buf;
arc4random_uniform;
fdevname;
fdevname_r;
fdopendir;
feature_present;
posix_spawn;
posix_spawn_file_actions_addclose;
posix_spawn_file_actions_adddup2;
posix_spawn_file_actions_addopen;
posix_spawn_file_actions_destroy;
posix_spawn_file_actions_init;
posix_spawnattr_destroy;
posix_spawnattr_getflags;
posix_spawnattr_getpgroup;
posix_spawnattr_getschedparam;
posix_spawnattr_getschedpolicy;
posix_spawnattr_getsigdefault;
posix_spawnattr_getsigmask;
posix_spawnattr_init;
posix_spawnattr_setflags;
posix_spawnattr_setpgroup;
posix_spawnattr_setschedparam;
posix_spawnattr_setschedpolicy;
posix_spawnattr_setsigdefault;
posix_spawnattr_setsigmask;
posix_spawnp;
semctl;
tcgetsid;
tcsetsid;
__pthread_cleanup_pop_imp;
__pthread_cleanup_push_imp;
};
FBSD_1.2 {
cfmakesane;
endutxent;
getutxent;
getutxid;
getutxline;
getutxuser;
pthread_getthreadid_np;
pututxline;
sem_close;
sem_destroy;
sem_getvalue;
sem_init;
sem_open;
sem_post;
sem_timedwait;
sem_trywait;
sem_unlink;
sem_wait;
setutxdb;
setutxent;
};
FBSD_1.3 {
clock_getcpuclockid;
dirfd;
dup3;
fdclosedir;
fdlopen;
__FreeBSD_libc_enter_restricted_mode;
getcontextx;
gid_from_group;
nvis;
pwcache_userdb;
pwcache_groupdb;
snvis;
strenvisx;
strnunvis;
strnunvisx;
strnvis;
strnvisx;
strsenvisx;
strsnvis;
strsnvisx;
strsvis;
strsvisx;
svis;
uid_from_user;
unvis;
waitid;
};
FBSD_1.4 {
getnetgrent_r;
pthread_mutex_consistent;
pthread_mutexattr_getrobust;
pthread_mutexattr_setrobust;
stravis;
};
FBSD_1.5 {
alphasort;
basename;
daemonfd;
devname;
devname_r;
dirname;
fts_children;
fts_close;
fts_get_clientptr;
fts_get_stream;
fts_open;
fts_read;
fts_set;
fts_set_clientptr;
ftw;
getentropy;
getmntinfo;
glob;
globfree;
nftw;
readdir;
readdir_r;
scandir;
sem_clockwait_np;
setproctitle_fast;
timespec_get;
};
FBSD_1.6 {
eventfd;
eventfd_read;
eventfd_write;
getlogin_r;
memalign;
memfd_create;
pthread_getname_np;
scandir_b;
sigandset;
sigisemptyset;
sigorset;
tcgetwinsize;
tcsetwinsize;
};
FBSD_1.7 {
kqueue1;
posix_spawn_file_actions_addchdir_np;
posix_spawn_file_actions_addclosefrom_np;
posix_spawn_file_actions_addfchdir_np;
scandirat;
sched_getaffinity;
sched_setaffinity;
sched_getcpu;
versionsort;
__cpuset_alloc;
__cpuset_free;
};
FBSD_1.8 {
+ aio_read2;
+ aio_write2;
execvpe;
};
FBSDprivate_1.0 {
/* needed by thread libraries */
__thr_jtable;
_pthread_atfork;
_pthread_attr_destroy;
_pthread_attr_getdetachstate;
_pthread_attr_getguardsize;
_pthread_attr_getinheritsched;
_pthread_attr_getschedparam;
_pthread_attr_getschedpolicy;
_pthread_attr_getscope;
_pthread_attr_getstackaddr;
_pthread_attr_getstacksize;
_pthread_attr_init;
_pthread_attr_setdetachstate;
_pthread_attr_setguardsize;
_pthread_attr_setinheritsched;
_pthread_attr_setschedparam;
_pthread_attr_setschedpolicy;
_pthread_attr_setscope;
_pthread_attr_setstackaddr;
_pthread_attr_setstacksize;
_pthread_cancel;
_pthread_cancel_enter;
_pthread_cancel_leave;
_pthread_cleanup_pop;
_pthread_cleanup_push;
_pthread_cond_broadcast;
_pthread_cond_destroy;
_pthread_cond_init;
_pthread_cond_signal;
_pthread_cond_timedwait;
_pthread_cond_wait;
_pthread_detach;
_pthread_equal;
_pthread_exit;
_pthread_getspecific;
_pthread_join;
_pthread_key_create;
_pthread_key_delete;
_pthread_kill;
_pthread_main_np;
_pthread_mutex_destroy;
_pthread_mutex_init_calloc_cb;
_pthread_mutex_init;
_pthread_mutex_lock;
_pthread_mutex_trylock;
_pthread_mutex_unlock;
_pthread_mutexattr_destroy;
_pthread_mutexattr_init;
_pthread_mutexattr_settype;
_pthread_once;
_pthread_rwlock_destroy;
_pthread_rwlock_init;
_pthread_rwlock_rdlock;
_pthread_rwlock_tryrdlock;
_pthread_rwlock_trywrlock;
_pthread_rwlock_unlock;
_pthread_rwlock_wrlock;
_pthread_self;
_pthread_setcancelstate;
_pthread_setcanceltype;
_pthread_setspecific;
_pthread_sigmask;
_pthread_testcancel;
_spinlock;
_spinunlock;
_rtld_addr_phdr;
_rtld_atfork_pre;
_rtld_atfork_post;
_rtld_error; /* for private use */
_rtld_get_stack_prot;
_rtld_is_dlopened;
_rtld_thread_init; /* for private use */
__elf_phdr_match_addr;
_err;
_warn;
__fmtcheck;
/* __pw_match_entry; */
/* __pw_parse_entry; */
__fdnlist; /* used by libkvm */
/* __elf_is_okay__; */
/* __elf_fdnlist; */
__opendir2;
__pause;
_pause;
__raise;
_raise;
__sleep;
_sleep;
_rtld_allocate_tls;
_rtld_free_tls;
#if defined(i386)
___libc_tls_get_addr; /* x86 only */
#endif
__libc_tls_get_addr;
__tcdrain;
_tcdrain;
__usleep;
_usleep;
__wait;
_wait;
__waitpid;
_waitpid;
__libc_interposing_slot;
_libc_sem_init_compat;
_libc_sem_destroy_compat;
_libc_sem_open_compat;
_libc_sem_close_compat;
_libc_sem_unlink_compat;
_libc_sem_wait_compat;
_libc_sem_trywait_compat;
_libc_sem_timedwait_compat;
_libc_sem_post_compat;
_libc_sem_getvalue_compat;
__libc_tcdrain;
__pthread_distribute_static_tls;
__pthread_map_stacks_exec;
__fillcontextx;
__fillcontextx2;
__getcontextx_size;
__makecontext;
};
diff --git a/lib/libc/gen/aio_read2.c b/lib/libc/gen/aio_read2.c
new file mode 100644
index 000000000000..3a783e1b1b15
--- /dev/null
+++ b/lib/libc/gen/aio_read2.c
@@ -0,0 +1,56 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2024 The FreeBSD Foundation
+ *
+ * This software were developed by Konstantin Belousov <kib@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/aio.h>
+#include <errno.h>
+#include <stddef.h>
+
+int
+aio_read2(struct aiocb *iocb, int flags)
+{
+ int error;
+
+ if ((flags & ~(AIO_OP2_FOFFSET)) != 0) {
+ errno = EINVAL;
+ return (-1);
+ }
+ iocb->aio_lio_opcode = LIO_READ;
+ if ((flags & AIO_OP2_FOFFSET) != 0)
+ iocb->aio_lio_opcode |= LIO_FOFFSET;
+
+ error = lio_listio(LIO_NOWAIT, &iocb, 1, NULL);
+ if (error == -1 && errno == EIO) {
+ error = aio_error(iocb);
+ if (error != -1 && error != 0)
+ errno = error;
+ error = -1;
+ }
+ return (error);
+}
diff --git a/lib/libc/gen/aio_write2.c b/lib/libc/gen/aio_write2.c
new file mode 100644
index 000000000000..8b5d4a38a6c5
--- /dev/null
+++ b/lib/libc/gen/aio_write2.c
@@ -0,0 +1,56 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2024 The FreeBSD Foundation
+ *
+ * This software were developed by Konstantin Belousov <kib@FreeBSD.org>
+ * under sponsorship from the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/aio.h>
+#include <errno.h>
+#include <stddef.h>
+
+int
+aio_write2(struct aiocb *iocb, int flags)
+{
+ int error;
+
+ if ((flags & ~(AIO_OP2_FOFFSET)) != 0) {
+ errno = EINVAL;
+ return (-1);
+ }
+ iocb->aio_lio_opcode = LIO_WRITE;
+ if ((flags & AIO_OP2_FOFFSET) != 0)
+ iocb->aio_lio_opcode |= LIO_FOFFSET;
+
+ error = lio_listio(LIO_NOWAIT, &iocb, 1, NULL);
+ if (error == -1 && errno == EIO) {
+ error = aio_error(iocb);
+ if (error != -1 && error != 0)
+ errno = error;
+ error = -1;
+ }
+ return (error);
+}
diff --git a/sys/sys/aio.h b/sys/sys/aio.h
index f987f1e1dbd4..6680f9fed3fa 100644
--- a/sys/sys/aio.h
+++ b/sys/sys/aio.h
@@ -1,285 +1,292 @@
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 1997 John S. Dyson. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. John S. Dyson's name may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* DISCLAIMER: This code isn't warranted to do anything useful. Anything
* bad that happens because of using this software isn't the responsibility
* of the author. This software is distributed AS-IS.
*/
#ifndef _SYS_AIO_H_
#define _SYS_AIO_H_
#include <sys/types.h>
#include <sys/signal.h>
#ifdef _KERNEL
#include <sys/queue.h>
#include <sys/event.h>
#include <sys/signalvar.h>
#include <sys/uio.h>
#endif
/*
* Returned by aio_cancel:
*/
#define AIO_CANCELED 0x1
#define AIO_NOTCANCELED 0x2
#define AIO_ALLDONE 0x3
/*
* LIO opcodes
*/
#define LIO_NOP 0x0
#define LIO_WRITE 0x1
#define LIO_READ 0x2
#if __BSD_VISIBLE
#define LIO_VECTORED 0x4
#define LIO_WRITEV (LIO_WRITE | LIO_VECTORED)
#define LIO_READV (LIO_READ | LIO_VECTORED)
#endif
#if defined(_KERNEL) || defined(_WANT_ALL_LIO_OPCODES)
#define LIO_SYNC 0x8
#define LIO_DSYNC (0x10 | LIO_SYNC)
#define LIO_MLOCK 0x20
#endif
#if __BSD_VISIBLE
#define LIO_FOFFSET 0x40
#endif
+/* aio_read2/aio_write2 flags */
+#if __BSD_VISIBLE
+#define AIO_OP2_FOFFSET 0x00000001
+#endif
+
/*
* LIO modes
*/
#define LIO_NOWAIT 0x0
#define LIO_WAIT 0x1
/*
* Maximum number of operations in a single lio_listio call
*/
#define AIO_LISTIO_MAX 16
#ifdef _KERNEL
/* Default values of tunables for the AIO worker pool. */
#ifndef MAX_AIO_PROCS
#define MAX_AIO_PROCS 32
#endif
#ifndef TARGET_AIO_PROCS
#define TARGET_AIO_PROCS 4
#endif
#ifndef AIOD_LIFETIME_DEFAULT
#define AIOD_LIFETIME_DEFAULT (30 * hz)
#endif
#endif
/*
* Private members for aiocb -- don't access
* directly.
*/
struct __aiocb_private {
long status;
long error;
void *kernelinfo;
};
/*
* I/O control block
*/
typedef struct aiocb {
int aio_fildes; /* File descriptor */
off_t aio_offset; /* File offset for I/O */
volatile void *aio_buf; /* I/O buffer in process space */
size_t aio_nbytes; /* Number of bytes for I/O */
int __spare__[2];
void *__spare2__;
int aio_lio_opcode; /* LIO opcode */
int aio_reqprio; /* Request priority -- ignored */
struct __aiocb_private _aiocb_private;
struct sigevent aio_sigevent; /* Signal to deliver */
} aiocb_t;
#define aio_iov aio_buf /* I/O scatter/gather list */
#define aio_iovcnt aio_nbytes /* Length of aio_iov */
#ifdef _KERNEL
typedef void aio_cancel_fn_t(struct kaiocb *);
typedef void aio_handle_fn_t(struct kaiocb *);
/*
* Kernel version of an I/O control block.
*
* Locking key:
* * - need not protected
* a - locked by kaioinfo lock
* b - locked by backend lock
* c - locked by aio_job_mtx
*/
struct kaiocb {
TAILQ_ENTRY(kaiocb) list; /* (b) backend-specific list of jobs */
TAILQ_ENTRY(kaiocb) plist; /* (a) lists of pending / done jobs */
TAILQ_ENTRY(kaiocb) allist; /* (a) list of all jobs in proc */
int jobflags; /* (a) job flags */
int ioflags; /* (*) io flags */
int inblock; /* (*) input blocks */
int outblock; /* (*) output blocks */
int msgsnd; /* (*) messages sent */
int msgrcv; /* (*) messages received */
struct proc *userproc; /* (*) user process */
struct ucred *cred; /* (*) active credential when created */
struct file *fd_file; /* (*) pointer to file structure */
struct aioliojob *lio; /* (*) optional lio job */
struct aiocb *ujob; /* (*) pointer in userspace of aiocb */
struct knlist klist; /* (a) list of knotes */
struct aiocb uaiocb; /* (*) copy of user I/O control block */
struct uio uio; /* (*) storage for non-vectored uio */
struct iovec iov[1]; /* (*) storage for non-vectored uio */
struct uio *uiop; /* (*) Possibly malloced uio */
ksiginfo_t ksi; /* (a) realtime signal info */
uint64_t seqno; /* (*) job number */
aio_cancel_fn_t *cancel_fn; /* (a) backend cancel function */
aio_handle_fn_t *handle_fn; /* (c) backend handle function */
union { /* Backend-specific data fields */
struct { /* BIO backend */
volatile u_int nbio; /* Number of remaining bios */
int error; /* Worst error of all bios */
long nbytes; /* Bytes completed so far */
};
struct { /* fsync() requests */
int pending; /* (a) number of pending I/O */
};
struct { /* socket backend */
void *backend1;
long backend3;
int backend4;
};
};
};
struct socket;
struct sockbuf;
/*
* AIO backends should permit cancellation of queued requests waiting to
* be serviced by installing a cancel routine while the request is
* queued. The cancellation routine should dequeue the request if
* necessary and cancel it. Care must be used to handle races between
* queueing and dequeueing requests and cancellation.
*
* When queueing a request somewhere such that it can be cancelled, the
* caller should:
*
* 1) Acquire lock that protects the associated queue.
* 2) Call aio_set_cancel_function() to install the cancel routine.
* 3) If that fails, the request has a pending cancel and should be
* cancelled via aio_cancel().
* 4) Queue the request.
*
* When dequeueing a request to service it or hand it off to somewhere else,
* the caller should:
*
* 1) Acquire the lock that protects the associated queue.
* 2) Dequeue the request.
* 3) Call aio_clear_cancel_function() to clear the cancel routine.
* 4) If that fails, the cancel routine is about to be called. The
* caller should ignore the request.
*
* The cancel routine should:
*
* 1) Acquire the lock that protects the associated queue.
* 2) Call aio_cancel_cleared() to determine if the request is already
* dequeued due to a race with dequeueing thread.
* 3) If that fails, dequeue the request.
* 4) Cancel the request via aio_cancel().
*/
bool aio_cancel_cleared(struct kaiocb *job);
void aio_cancel(struct kaiocb *job);
bool aio_clear_cancel_function(struct kaiocb *job);
void aio_complete(struct kaiocb *job, long status, int error);
void aio_schedule(struct kaiocb *job, aio_handle_fn_t *func);
bool aio_set_cancel_function(struct kaiocb *job, aio_cancel_fn_t *func);
void aio_switch_vmspace(struct kaiocb *job);
#else /* !_KERNEL */
struct timespec;
__BEGIN_DECLS
/*
* Asynchronously read from a file
*/
int aio_read(struct aiocb *);
#if __BSD_VISIBLE
int aio_readv(struct aiocb *);
#endif
/*
* Asynchronously write to file
*/
int aio_write(struct aiocb *);
#if __BSD_VISIBLE
int aio_writev(struct aiocb *);
#endif
/*
* List I/O Asynchronously/synchronously read/write to/from file
* "lio_mode" specifies whether or not the I/O is synchronous.
* "acb_list" is an array of "nacb_listent" I/O control blocks.
* when all I/Os are complete, the optional signal "sig" is sent.
*/
int lio_listio(int, struct aiocb *__restrict const *__restrict, int,
struct sigevent *);
/*
* Get completion status
* returns EINPROGRESS until I/O is complete.
* this routine does not block.
*/
int aio_error(const struct aiocb *);
/*
* Finish up I/O, releasing I/O resources and returns the value
* that would have been associated with a synchronous I/O request.
* This routine must be called once and only once for each
* I/O control block who has had I/O associated with it.
*/
ssize_t aio_return(struct aiocb *);
/*
* Cancel I/O
*/
int aio_cancel(int, struct aiocb *);
/*
* Suspend until all specified I/O or timeout is complete.
*/
int aio_suspend(const struct aiocb * const[], int, const struct timespec *);
/*
* Asynchronous mlock
*/
int aio_mlock(struct aiocb *);
#if __BSD_VISIBLE
ssize_t aio_waitcomplete(struct aiocb **, struct timespec *);
+int aio_read2(struct aiocb *, int);
+int aio_write2(struct aiocb *, int);
#endif
int aio_fsync(int op, struct aiocb *aiocbp);
__END_DECLS
#endif /* !_KERNEL */
#endif /* !_SYS_AIO_H_ */