From 29d079c9649174a36a87a26d1f99e3c0b3e78e0c Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Tue, 16 Jan 2024 22:25:07 +0000 Subject: [PATCH] libsys: move __libsys_interposer consumers These system call wrappers call interposed system calls in fairly trivial ways. Move them over to libsys so all __libsys_interposer consumers end up in libsys. Also move recvmmsg and sendmmsg as they are documented with recv and send. Reviewed by: kib, emaste, imp Pull Request: https://github.com/freebsd/freebsd-src/pull/908 --- lib/libc/compat-43/Makefile.inc | 4 ++-- lib/libc/gen/Makefile.inc | 14 -------------- lib/libc/net/Makefile.inc | 2 +- lib/libsys/Makefile.sys | 10 ++++++++++ lib/{libc/compat-43 => libsys}/creat.2 | 0 lib/{libc/compat-43 => libsys}/creat.c | 0 lib/{libc/gen => libsys}/lockf.c | 0 lib/{libc/net => libsys}/recv.c | 0 lib/{libc/gen => libsys}/recvmmsg.c | 0 lib/{libc/net => libsys}/send.c | 0 lib/{libc/gen => libsys}/sendmmsg.c | 0 lib/{libc/gen => libsys}/sleep.c | 0 lib/{libc/gen => libsys}/usleep.c | 0 lib/{libc/gen => libsys}/wait.c | 0 lib/{libc/gen => libsys}/wait3.c | 0 lib/{libc/gen => libsys}/waitid.c | 0 lib/{libc/gen => libsys}/waitpid.c | 0 17 files changed, 13 insertions(+), 17 deletions(-) rename lib/{libc/compat-43 => libsys}/creat.2 (100%) rename lib/{libc/compat-43 => libsys}/creat.c (100%) rename lib/{libc/gen => libsys}/lockf.c (100%) rename lib/{libc/net => libsys}/recv.c (100%) rename lib/{libc/gen => libsys}/recvmmsg.c (100%) rename lib/{libc/net => libsys}/send.c (100%) rename lib/{libc/gen => libsys}/sendmmsg.c (100%) rename lib/{libc/gen => libsys}/sleep.c (100%) rename lib/{libc/gen => libsys}/usleep.c (100%) rename lib/{libc/gen => libsys}/wait.c (100%) rename lib/{libc/gen => libsys}/wait3.c (100%) rename lib/{libc/gen => libsys}/waitid.c (100%) rename lib/{libc/gen => libsys}/waitpid.c (100%) diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc index f0b385e8372c..b0fcd0d4af8b 100644 --- a/lib/libc/compat-43/Makefile.inc +++ b/lib/libc/compat-43/Makefile.inc @@ -2,12 +2,12 @@ # compat-43 sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/compat-43 ${LIBC_SRCTOP}/compat-43 -SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ +SRCS+= gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ setrgid.c setruid.c sigcompat.c SYM_MAPS+=${LIBC_SRCTOP}/compat-43/Symbol.map -MAN+= creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2 +MAN+= killpg.2 sigpause.2 sigsetmask.2 sigvec.2 MAN+= gethostid.3 setruid.3 MLINKS+=gethostid.3 sethostid.3 diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 5c3f029586b8..b7eb92090722 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -99,7 +99,6 @@ SRCS+= __getosreldate.c \ lcong48.c \ libc_dlopen.c \ libc_interposing_table.c \ - lockf.c \ lrand48.c \ memalign.c \ memfd_create.c \ @@ -121,7 +120,6 @@ SRCS+= __getosreldate.c \ readdir.c \ readdir-compat11.c \ readpassphrase.c \ - recvmmsg.c \ rewinddir.c \ scandir.c \ scandir_b.c \ @@ -131,7 +129,6 @@ SRCS+= __getosreldate.c \ seed48.c \ seekdir.c \ semctl.c \ - sendmmsg.c \ setdomainname.c \ sethostname.c \ setjmperr.c \ @@ -142,7 +139,6 @@ SRCS+= __getosreldate.c \ siglist.c \ signal.c \ sigsetops.c \ - sleep.c \ srand48.c \ statvfs.c \ stringlist.c \ @@ -166,14 +162,9 @@ SRCS+= __getosreldate.c \ ulimit.c \ uname.c \ unvis-compat.c \ - usleep.c \ utime.c \ utxdb.c \ valloc.c \ - wait.c \ - wait3.c \ - waitpid.c \ - waitid.c \ wordexp.c CFLAGS.arc4random.c= -I${SRCTOP}/sys -I${SRCTOP}/sys/crypto/chacha20 @@ -267,7 +258,6 @@ MAN+= alarm.3 \ initgroups.3 \ isgreater.3 \ ldexp.3 \ - lockf.3 \ makecontext.3 \ modf.3 \ nice.3 \ @@ -304,7 +294,6 @@ MAN+= alarm.3 \ siginterrupt.3 \ signal.3 \ sigsetops.3 \ - sleep.3 \ statvfs.3 \ stringlist.3 \ strtofflags.3 \ @@ -330,7 +319,6 @@ MAN+= alarm.3 \ ulimit.3 \ uname.3 \ unvis.3 \ - usleep.3 \ utime.3 \ valloc.3 \ vis.3 \ @@ -501,7 +489,6 @@ MLINKS+=rand48.3 _rand48.3 \ rand48.3 nrand48.3 \ rand48.3 seed48.3 \ rand48.3 srand48.3 -MLINKS+=recv.2 recvmmsg.2 MLINKS+=scandir.3 alphasort.3 \ scandir.3 scandirat.3 \ scandir.3 scandir_b.3 \ @@ -510,7 +497,6 @@ 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+=send.2 sendmmsg.2 MLINKS+=setjmp.3 _longjmp.3 \ setjmp.3 _setjmp.3 \ setjmp.3 longjmp.3 \ diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index d75d42fb0679..1305500176a3 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -12,7 +12,7 @@ SRCS+= base64.c ether_addr.c eui64.c \ if_indextoname.c if_nameindex.c if_nametoindex.c \ ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \ nsdispatch.c nslexer.l nsparser.y nss_compat.c \ - rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \ + rcmd.c rcmdsh.c rthdr.c sctp_sys_calls.c \ sockatmark.c sourcefilter.c vars.c .if ${MK_NS_CACHING} != "no" diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 2c7472ebad06..42409c35121b 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -34,6 +34,10 @@ SRCS+= \ SRCS+= getdents.c lstat.c mknod.c stat.c +SRCS+= creat.c +SRCS+= lockf.c sleep.c usleep.c wait.c wait3.c waitpid.c waitid.c +SRCS+= recv.c recvmmsg.c send.c sendmmsg.c + NOASM+= sched_getcpu.o PSEUDO+= _sched_getcpu.o @@ -177,6 +181,7 @@ MAN+= abort2.2 \ cpuset.2 \ cpuset_getaffinity.2 \ cpuset_getdomain.2 \ + creat.2 \ dup.2 \ eventfd.2 \ execve.2 \ @@ -356,6 +361,11 @@ MAN+= abort2.2 \ write.2 \ _umtx_op.2 +MAN+= \ + lockf.3 \ + sleep.3 \ + usleep.3 + MLINKS+=aio_read.2 aio_readv.2 MLINKS+=aio_write.2 aio_writev.2 MLINKS+=accept.2 accept4.2 diff --git a/lib/libc/compat-43/creat.2 b/lib/libsys/creat.2 similarity index 100% rename from lib/libc/compat-43/creat.2 rename to lib/libsys/creat.2 diff --git a/lib/libc/compat-43/creat.c b/lib/libsys/creat.c similarity index 100% rename from lib/libc/compat-43/creat.c rename to lib/libsys/creat.c diff --git a/lib/libc/gen/lockf.c b/lib/libsys/lockf.c similarity index 100% rename from lib/libc/gen/lockf.c rename to lib/libsys/lockf.c diff --git a/lib/libc/net/recv.c b/lib/libsys/recv.c similarity index 100% rename from lib/libc/net/recv.c rename to lib/libsys/recv.c diff --git a/lib/libc/gen/recvmmsg.c b/lib/libsys/recvmmsg.c similarity index 100% rename from lib/libc/gen/recvmmsg.c rename to lib/libsys/recvmmsg.c diff --git a/lib/libc/net/send.c b/lib/libsys/send.c similarity index 100% rename from lib/libc/net/send.c rename to lib/libsys/send.c diff --git a/lib/libc/gen/sendmmsg.c b/lib/libsys/sendmmsg.c similarity index 100% rename from lib/libc/gen/sendmmsg.c rename to lib/libsys/sendmmsg.c diff --git a/lib/libc/gen/sleep.c b/lib/libsys/sleep.c similarity index 100% rename from lib/libc/gen/sleep.c rename to lib/libsys/sleep.c diff --git a/lib/libc/gen/usleep.c b/lib/libsys/usleep.c similarity index 100% rename from lib/libc/gen/usleep.c rename to lib/libsys/usleep.c diff --git a/lib/libc/gen/wait.c b/lib/libsys/wait.c similarity index 100% rename from lib/libc/gen/wait.c rename to lib/libsys/wait.c diff --git a/lib/libc/gen/wait3.c b/lib/libsys/wait3.c similarity index 100% rename from lib/libc/gen/wait3.c rename to lib/libsys/wait3.c diff --git a/lib/libc/gen/waitid.c b/lib/libsys/waitid.c similarity index 100% rename from lib/libc/gen/waitid.c rename to lib/libsys/waitid.c diff --git a/lib/libc/gen/waitpid.c b/lib/libsys/waitpid.c similarity index 100% rename from lib/libc/gen/waitpid.c rename to lib/libsys/waitpid.c