lib{c,sys}: return wrapped syscall APIs to libc

These provide standard APIs, but are implemented using another system call (e.g., pipe implemented in terms of pipe2) or are interposed by the threading library to support cancelation. After discussion with kib (see D44111), I've concluded that it is better to keep most public interfaces in libc with as little as possible in libsys. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44241
CTSRD-CHERI · Mar 13, 2024 · d7847a8 · d7847a8
1 parent ef5fddd
commit d7847a8
Show file tree

Hide file tree

Showing 72 changed files with 125 additions and 94 deletions.
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
@@ -122,8 +122,7 @@ NOASM=
 .include "${LIBC_SRCTOP}/stdlib/Makefile.inc"
 .include "${LIBC_SRCTOP}/stdtime/Makefile.inc"
 .include "${LIBC_SRCTOP}/string/Makefile.inc"
-SHARED_CFLAGS+=	-D'_SYSCALL_BODY(name)='
-.include "${LIBSYS_SRCTOP}/Makefile.sys"
+.include "${LIBC_SRCTOP}/sys/Makefile.inc"
 .include "${LIBC_SRCTOP}/secure/Makefile.inc"
 .include "${LIBC_SRCTOP}/rpc/Makefile.inc"
 .include "${LIBC_SRCTOP}/uuid/Makefile.inc"

diff --git a/lib/libc/amd64/Symbol.map b/lib/libc/amd64/Symbol.map
@@ -6,13 +6,15 @@
 FBSD_1.0 {
 	.mcount;
 	__flt_rounds;
+	brk;
 	fpgetmask;
 	fpgetprec;
 	fpgetround;
 	fpgetsticky;
 	fpsetmask;
 	fpsetprec;
 	fpsetround;
+	sbrk;
 };
 
 /*
@@ -26,4 +28,5 @@ FBSDprivate_1.0 {
 	__signalcontext;
 	signalcontext;
 	__siglongjmp;
+	_brk;
 };
diff --git a/lib/libc/arm/Symbol.map b/lib/libc/arm/Symbol.map
@@ -6,6 +6,8 @@
 FBSD_1.0 {
 	__mcount;
 	alloca;
+	brk;
+	sbrk;
 };
 
 FBSD_1.3 {
@@ -23,6 +25,7 @@ FBSD_1.6 {
 };
 
 FBSDprivate_1.0 {
+	_brk;
 	__aeabi_read_tp;
 	___longjmp;
 	__longjmp;

diff --git a/lib/libc/i386/Symbol.map b/lib/libc/i386/Symbol.map
@@ -5,8 +5,10 @@
  */
 FBSD_1.0 {
 	.mcount;
+	brk;
 	__flt_rounds;
 	___tls_get_addr;
+	sbrk;
 };
 
 FBSDprivate_1.0 {
@@ -15,4 +17,5 @@ FBSDprivate_1.0 {
 	__signalcontext;
 	signalcontext;
 	__siglongjmp;
+	_brk;
 };
diff --git a/lib/libc/powerpc/Symbol.map b/lib/libc/powerpc/Symbol.map
@@ -6,11 +6,13 @@
 FBSD_1.0 {
 	_mcount;
 	__flt_rounds;
+	brk;
 	fpgetmask;
 	fpgetround;
 	fpgetsticky;
 	fpsetmask;
 	fpsetround;
+	sbrk;
 };
 
 FBSD_1.3 {

diff --git a/lib/libc/powerpc64/Symbol.map b/lib/libc/powerpc64/Symbol.map
@@ -6,9 +6,11 @@
 FBSD_1.0 {
 	_mcount;
 	__flt_rounds;
+	brk;
 	fpgetmask;
 	fpgetround;
 	fpgetsticky;
 	fpsetmask;
 	fpsetround;
+	sbrk;
 };
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
@@ -0,0 +1,38 @@
+# libc-specific portion of the system call interface
+
+.PATH: ${LIBC_SRCTOP}/sys
+
+# Most of the implementation is shared with libsys:
+.include "${LIBSYS_SRCTOP}/Makefile.sys"
+
+# emit empty assembly stubs for syscalls in dynamic libc
+SHARED_CFLAGS+=	-D'_SYSCALL_BODY(name)='
+
+SYM_MAPS+=	${LIBC_SRCTOP}/sys/Symbol.map
+
+# Add the interposer wrappers
+SRCS+=	${INTERPOSED:S/$/.c/}
+
+# Pseudo system calls implemented atop other interfaces.
+SRCS+= \
+	POSIX2x_Fork.c \
+	brk.c \
+	closefrom.c \
+	compat-stub.c \
+	creat.c \
+	getdents.c \
+	lockf.c \
+	lstat.c \
+	mknod.c \
+	pipe.c \
+	recv.c \
+	recvmmsg.c \
+	send.c \
+	sendmmsg.c \
+	shm_open.c \
+	stat.c \
+	vadvise.c \
+	wait.c \
+	wait3.c \
+	waitid.c \
+	waitpid.c
diff --git a/lib/libsys/POSIX2x_Fork.c → lib/libc/sys/POSIX2x_Fork.c b/lib/libsys/POSIX2x_Fork.c → lib/libc/sys/POSIX2x_Fork.c
diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map
@@ -0,0 +1,73 @@
+FBSD_1.0 {
+	accept;
+	aio_suspend;
+	close;
+	connect;
+	fcntl;
+	fork;
+	fsync;
+	msync;
+	nanosleep;
+	open;
+	pipe;
+	poll;
+	pselect;
+	ptrace;
+	read;
+	readv;
+	recvfrom;
+	recvmsg;
+	select;
+	sendmsg;
+	sendto;
+	shm_open;
+	sigaction;
+	sigprocmask;
+	sigsuspend;
+	sigtimedwait;
+	sigwait;
+	sigwaitinfo;
+	vadvise;
+	wait4;
+	write;
+	writev;
+};
+
+FBSD_1.1 {
+	closefrom;
+};
+
+FBSD_1.2 {
+	pdfork;
+};
+
+FBSD_1.3 {
+	accept4;
+	wait6;
+};
+
+FBSD_1.4 {
+	ppoll;
+	numa_setaffinity;
+	numa_getaffinity;
+	sendmmsg;
+	recvmmsg;
+};
+
+FBSD_1.5 {
+	clock_nanosleep;
+	fdatasync;
+	getdents;
+	kevent;
+	lstat;
+	mknod;
+	stat;
+};
+
+FBSD_1.6 {
+	shm_create_largepage;
+};
+
+FBSD_1.7 {
+	_Fork;
+};
diff --git a/lib/libsys/accept.c → lib/libc/sys/accept.c b/lib/libsys/accept.c → lib/libc/sys/accept.c
diff --git a/lib/libsys/accept4.c → lib/libc/sys/accept4.c b/lib/libsys/accept4.c → lib/libc/sys/accept4.c
diff --git a/lib/libsys/aio_suspend.c → lib/libc/sys/aio_suspend.c b/lib/libsys/aio_suspend.c → lib/libc/sys/aio_suspend.c
diff --git a/lib/libsys/brk.c → lib/libc/sys/brk.c b/lib/libsys/brk.c → lib/libc/sys/brk.c
diff --git a/lib/libsys/clock_nanosleep.c → lib/libc/sys/clock_nanosleep.c b/lib/libsys/clock_nanosleep.c → lib/libc/sys/clock_nanosleep.c
diff --git a/lib/libsys/close.c → lib/libc/sys/close.c b/lib/libsys/close.c → lib/libc/sys/close.c
diff --git a/lib/libsys/closefrom.c → lib/libc/sys/closefrom.c b/lib/libsys/closefrom.c → lib/libc/sys/closefrom.c
diff --git a/lib/libsys/compat-stub.c → lib/libc/sys/compat-stub.c b/lib/libsys/compat-stub.c → lib/libc/sys/compat-stub.c
diff --git a/lib/libsys/connect.c → lib/libc/sys/connect.c b/lib/libsys/connect.c → lib/libc/sys/connect.c
diff --git a/lib/libsys/creat.c → lib/libc/sys/creat.c b/lib/libsys/creat.c → lib/libc/sys/creat.c
diff --git a/lib/libsys/fcntl.c → lib/libc/sys/fcntl.c b/lib/libsys/fcntl.c → lib/libc/sys/fcntl.c
diff --git a/lib/libsys/fdatasync.c → lib/libc/sys/fdatasync.c b/lib/libsys/fdatasync.c → lib/libc/sys/fdatasync.c
diff --git a/lib/libsys/fork.c → lib/libc/sys/fork.c b/lib/libsys/fork.c → lib/libc/sys/fork.c
diff --git a/lib/libsys/fsync.c → lib/libc/sys/fsync.c b/lib/libsys/fsync.c → lib/libc/sys/fsync.c
diff --git a/lib/libsys/getdents.c → lib/libc/sys/getdents.c b/lib/libsys/getdents.c → lib/libc/sys/getdents.c
diff --git a/lib/libsys/kevent.c → lib/libc/sys/kevent.c b/lib/libsys/kevent.c → lib/libc/sys/kevent.c
diff --git a/lib/libsys/lockf.c → lib/libc/sys/lockf.c b/lib/libsys/lockf.c → lib/libc/sys/lockf.c
diff --git a/lib/libsys/lstat.c → lib/libc/sys/lstat.c b/lib/libsys/lstat.c → lib/libc/sys/lstat.c
diff --git a/lib/libsys/mknod.c → lib/libc/sys/mknod.c b/lib/libsys/mknod.c → lib/libc/sys/mknod.c
diff --git a/lib/libsys/msync.c → lib/libc/sys/msync.c b/lib/libsys/msync.c → lib/libc/sys/msync.c
diff --git a/lib/libsys/nanosleep.c → lib/libc/sys/nanosleep.c b/lib/libsys/nanosleep.c → lib/libc/sys/nanosleep.c
diff --git a/lib/libsys/open.c → lib/libc/sys/open.c b/lib/libsys/open.c → lib/libc/sys/open.c
diff --git a/lib/libsys/openat.c → lib/libc/sys/openat.c b/lib/libsys/openat.c → lib/libc/sys/openat.c
diff --git a/lib/libsys/pdfork.c → lib/libc/sys/pdfork.c b/lib/libsys/pdfork.c → lib/libc/sys/pdfork.c
diff --git a/lib/libsys/pipe.c → lib/libc/sys/pipe.c b/lib/libsys/pipe.c → lib/libc/sys/pipe.c
diff --git a/lib/libsys/poll.c → lib/libc/sys/poll.c b/lib/libsys/poll.c → lib/libc/sys/poll.c
diff --git a/lib/libsys/ppoll.c → lib/libc/sys/ppoll.c b/lib/libsys/ppoll.c → lib/libc/sys/ppoll.c
diff --git a/lib/libsys/pselect.c → lib/libc/sys/pselect.c b/lib/libsys/pselect.c → lib/libc/sys/pselect.c
diff --git a/lib/libsys/read.c → lib/libc/sys/read.c b/lib/libsys/read.c → lib/libc/sys/read.c
diff --git a/lib/libsys/readv.c → lib/libc/sys/readv.c b/lib/libsys/readv.c → lib/libc/sys/readv.c
diff --git a/lib/libsys/recv.c → lib/libc/sys/recv.c b/lib/libsys/recv.c → lib/libc/sys/recv.c
diff --git a/lib/libsys/recvfrom.c → lib/libc/sys/recvfrom.c b/lib/libsys/recvfrom.c → lib/libc/sys/recvfrom.c
diff --git a/lib/libsys/recvmsg.c → lib/libc/sys/recvmsg.c b/lib/libsys/recvmsg.c → lib/libc/sys/recvmsg.c
diff --git a/lib/libsys/select.c → lib/libc/sys/select.c b/lib/libsys/select.c → lib/libc/sys/select.c
diff --git a/lib/libsys/send.c → lib/libc/sys/send.c b/lib/libsys/send.c → lib/libc/sys/send.c
diff --git a/lib/libsys/sendmsg.c → lib/libc/sys/sendmsg.c b/lib/libsys/sendmsg.c → lib/libc/sys/sendmsg.c
diff --git a/lib/libsys/sendto.c → lib/libc/sys/sendto.c b/lib/libsys/sendto.c → lib/libc/sys/sendto.c
diff --git a/lib/libsys/setcontext.c → lib/libc/sys/setcontext.c b/lib/libsys/setcontext.c → lib/libc/sys/setcontext.c
diff --git a/lib/libsys/shm_open.c → lib/libc/sys/shm_open.c b/lib/libsys/shm_open.c → lib/libc/sys/shm_open.c
diff --git a/lib/libsys/sigaction.c → lib/libc/sys/sigaction.c b/lib/libsys/sigaction.c → lib/libc/sys/sigaction.c
diff --git a/lib/libsys/sigprocmask.c → lib/libc/sys/sigprocmask.c b/lib/libsys/sigprocmask.c → lib/libc/sys/sigprocmask.c
diff --git a/lib/libsys/sigsuspend.c → lib/libc/sys/sigsuspend.c b/lib/libsys/sigsuspend.c → lib/libc/sys/sigsuspend.c
diff --git a/lib/libsys/sigtimedwait.c → lib/libc/sys/sigtimedwait.c b/lib/libsys/sigtimedwait.c → lib/libc/sys/sigtimedwait.c
diff --git a/lib/libsys/sigwait.c → lib/libc/sys/sigwait.c b/lib/libsys/sigwait.c → lib/libc/sys/sigwait.c
diff --git a/lib/libsys/sigwaitinfo.c → lib/libc/sys/sigwaitinfo.c b/lib/libsys/sigwaitinfo.c → lib/libc/sys/sigwaitinfo.c
diff --git a/lib/libsys/stat.c → lib/libc/sys/stat.c b/lib/libsys/stat.c → lib/libc/sys/stat.c
diff --git a/lib/libsys/swapcontext.c → lib/libc/sys/swapcontext.c b/lib/libsys/swapcontext.c → lib/libc/sys/swapcontext.c
diff --git a/lib/libsys/vadvise.c → lib/libc/sys/vadvise.c b/lib/libsys/vadvise.c → lib/libc/sys/vadvise.c
diff --git a/lib/libsys/wait.c → lib/libc/sys/wait.c b/lib/libsys/wait.c → lib/libc/sys/wait.c
diff --git a/lib/libsys/wait3.c → lib/libc/sys/wait3.c b/lib/libsys/wait3.c → lib/libc/sys/wait3.c
diff --git a/lib/libsys/wait4.c → lib/libc/sys/wait4.c b/lib/libsys/wait4.c → lib/libc/sys/wait4.c
diff --git a/lib/libsys/wait6.c → lib/libc/sys/wait6.c b/lib/libsys/wait6.c → lib/libc/sys/wait6.c
diff --git a/lib/libsys/waitid.c → lib/libc/sys/waitid.c b/lib/libsys/waitid.c → lib/libc/sys/waitid.c
diff --git a/lib/libsys/waitpid.c → lib/libc/sys/waitpid.c b/lib/libsys/waitpid.c → lib/libc/sys/waitpid.c
diff --git a/lib/libsys/write.c → lib/libc/sys/write.c b/lib/libsys/write.c → lib/libc/sys/write.c
diff --git a/lib/libsys/writev.c → lib/libc/sys/writev.c b/lib/libsys/writev.c → lib/libc/sys/writev.c
diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys
@@ -40,21 +40,6 @@ SRCS+=	\
 	interposing_table.c \
 	libsys_sigwait.c
 
-SRCS+= getdents.c lstat.c mknod.c stat.c
-
-SRCS+=	creat.c
-SRCS+=	lockf.c wait.c wait3.c waitpid.c waitid.c
-SRCS+=	recv.c recvmmsg.c send.c sendmmsg.c
-
-SRCS+= brk.c
-SRCS+= closefrom.c
-SRCS+= pipe.c
-SRCS+= shm_open.c
-SRCS+= vadvise.c
-SRCS+= POSIX2x_Fork.c
-
-SRCS+=	compat-stub.c
-
 .if ${LIB} == "c"
 # Trapping stubs in dynamic libc to be filtered by libsys.
 SOBJS+=	libc_stubs.pico
@@ -113,7 +98,6 @@ INTERPOSED = \
 	write \
 	writev
 
-SRCS+=	${INTERPOSED:S/$/.c/}
 PSEUDO+=	${INTERPOSED}
 
 # Add machine dependent asm sources: