public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] linux: Add close_range
@ 2021-07-08 17:19 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2021-07-08 17:19 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=286286283e9bdc7ef894306e2dbcf4c115b97ba2
commit 286286283e9bdc7ef894306e2dbcf4c115b97ba2
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Mar 10 12:26:31 2021 -0300
linux: Add close_range
It was added on Linux 5.9 (278a5fbaed89) with CLOSE_RANGE_CLOEXEC
added on 5.11 (582f1fb6b721f). Although FreeBSD has added the same
syscall, this only adds the symbol on Linux ports. This syscall is
required to provided a fail-safe way to implement the closefrom
symbol (BZ #10353).
Checked on x86_64-linux-gnu and i686-linux-gnu on kernel 5.11 and 4.15.
Diff:
---
NEWS | 3 +
include/bits/unistd_ext.h | 6 +
manual/llio.texi | 51 ++++
sysdeps/unix/sysv/linux/Makefile | 3 +-
sysdeps/unix/sysv/linux/Versions | 1 +
sysdeps/unix/sysv/linux/aarch64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/alpha/libc.abilist | 1 +
sysdeps/unix/sysv/linux/arc/libc.abilist | 1 +
sysdeps/unix/sysv/linux/arm/be/libc.abilist | 1 +
sysdeps/unix/sysv/linux/arm/le/libc.abilist | 1 +
sysdeps/unix/sysv/linux/bits/unistd_ext.h | 23 ++
sysdeps/unix/sysv/linux/csky/libc.abilist | 1 +
sysdeps/unix/sysv/linux/hppa/libc.abilist | 1 +
sysdeps/unix/sysv/linux/i386/libc.abilist | 1 +
sysdeps/unix/sysv/linux/ia64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist | 1 +
sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist | 1 +
sysdeps/unix/sysv/linux/microblaze/be/libc.abilist | 1 +
sysdeps/unix/sysv/linux/microblaze/le/libc.abilist | 1 +
.../unix/sysv/linux/mips/mips32/fpu/libc.abilist | 1 +
.../unix/sysv/linux/mips/mips32/nofpu/libc.abilist | 1 +
.../unix/sysv/linux/mips/mips64/n32/libc.abilist | 1 +
.../unix/sysv/linux/mips/mips64/n64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/nios2/libc.abilist | 1 +
.../sysv/linux/powerpc/powerpc32/fpu/libc.abilist | 1 +
.../linux/powerpc/powerpc32/nofpu/libc.abilist | 1 +
.../sysv/linux/powerpc/powerpc64/be/libc.abilist | 1 +
.../sysv/linux/powerpc/powerpc64/le/libc.abilist | 1 +
sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist | 1 +
sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist | 1 +
sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/sh/be/libc.abilist | 1 +
sysdeps/unix/sysv/linux/sh/le/libc.abilist | 1 +
sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist | 1 +
sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/syscalls.list | 1 +
sysdeps/unix/sysv/linux/tst-close_range.c | 303 +++++++++++++++++++++
sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist | 1 +
40 files changed, 422 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 8e72946c3f..be04b217fe 100644
--- a/NEWS
+++ b/NEWS
@@ -60,6 +60,9 @@ Major new features:
to call async-signal-safe functions (such as raise or execve). This function
is currently a GNU extension.
+* On Linux, the close_range function has been added. It allows efficiently
+ closing a range of file descriptors on recent kernels (version 5.9).
+
Deprecated and removed features, and other changes affecting compatibility:
* The function pthread_mutex_consistent_np has been deprecated; programs
diff --git a/include/bits/unistd_ext.h b/include/bits/unistd_ext.h
new file mode 100644
index 0000000000..277be05746
--- /dev/null
+++ b/include/bits/unistd_ext.h
@@ -0,0 +1,6 @@
+#include_next <bits/unistd_ext.h>
+
+#ifndef _ISOMAC
+extern int __close_range (unsigned int lowfd, unsigned int highfd, int flags);
+libc_hidden_proto (__close_range);
+#endif
diff --git a/manual/llio.texi b/manual/llio.texi
index eafc27120d..e21a71fdd0 100644
--- a/manual/llio.texi
+++ b/manual/llio.texi
@@ -284,6 +284,57 @@ of trying to close its underlying file descriptor with @code{close}.
This flushes any buffered output and updates the stream object to
indicate that it is closed.
+@deftypefun int close_range (unsigned int @var{lowfd}, unsigned int @var{maxfd}, int @var{flags})
+@standards{Linux, unistd.h}
+@safety{@prelim{}@mtsafe{}@assafe{}@acsafe{@acsfd{}}}
+@c This is a syscall for Linux v5.9. There is no fallback emulation for
+@c older kernels.
+
+The function @code{close_range} closes the file descriptor from @var{lowfd}
+to @var{maxfd} (inclusive). This function is similar to call @code{close} in
+specified file descriptor range depending on the @var{flags}.
+
+This is function is only supported on recent Linux versions and @theglibc{}
+does not provide any fallback (the application will need to handle possible
+@code{ENOSYS}).
+
+The @var{flags} add options on how the files are closes. Linux currently
+supports:
+
+@vtable @code
+@item CLOSE_RANGE_UNSHARE
+Unshare the file descriptor table before closing file descriptors.
+
+@item CLOSE_RANGE_CLOEXEC
+Set the @code{FD_CLOEXEC} bit instead of closing the file descriptor.
+@end vtable
+
+The normal return value from @code{close_range} is @math{0}; a value
+of @math{-1} is returned in case of failure. The following @code{errno} error
+conditions are defined for this function:
+
+@table @code
+@item EINVAL
+The @var{lowfd} value is larger than @var{maxfd} or an unsupported @var{flags}
+is used.
+
+@item ENOMEM
+Either there is not enough memory for the operation, or the process is
+out of address space. It can only happnes when @code{CLOSE_RANGE_UNSHARED}
+flag is used.
+
+@item EMFILE
+The process has too many files open and it can only happens when
+@code{CLOSE_RANGE_UNSHARED} flag is used.
+The maximum number of file descriptors is controlled by the
+@code{RLIMIT_NOFILE} resource limit; @pxref{Limits on Resources}.
+
+@item ENOSYS
+The kernel does not implement the required functionality.
+@end table
+@end deftypefun
+
+
@node I/O Primitives
@section Input and Output Primitives
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index faea02bd1b..e308711168 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -116,7 +116,8 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \
tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \
tst-timerfd tst-ppoll \
tst-clock_adjtime tst-adjtimex tst-ntp_adjtime tst-ntp_gettime \
- tst-ntp_gettimex tst-sigtimedwait tst-misalign-clone
+ tst-ntp_gettimex tst-sigtimedwait tst-misalign-clone \
+ tst-close_range
# Test for the symbol version of fcntl that was replaced in glibc 2.28.
ifeq ($(have-GLIBC_2.27)$(build-shared),yesyes)
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index 53cb7b23e2..4884216825 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -283,6 +283,7 @@ libc {
__wait3_time64;
__wait4_time64;
%endif
+ close_range;
}
GLIBC_PRIVATE {
# functions used in other libraries
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 6f19b07b47..428b23fc65 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -2407,6 +2407,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 6ece449d4b..d5c24d09ee 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2506,6 +2506,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 3bf846349f..6213e42bba 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -2166,6 +2166,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 08be998d35..37c395e4cb 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -300,6 +300,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index ebd767ed96..dd850ce035 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -297,6 +297,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/bits/unistd_ext.h b/sysdeps/unix/sysv/linux/bits/unistd_ext.h
index 2e529be577..ae9994403c 100644
--- a/sysdeps/unix/sysv/linux/bits/unistd_ext.h
+++ b/sysdeps/unix/sysv/linux/bits/unistd_ext.h
@@ -33,4 +33,27 @@
not detached and has not been joined. */
extern __pid_t gettid (void) __THROW;
+#ifdef __has_include
+# if __has_include ("linux/close_range.h")
+# include "linux/close_range.h"
+# endif
#endif
+/* Unshare the file descriptor table before closing file descriptors. */
+#ifndef CLOSE_RANGE_UNSHARE
+# define CLOSE_RANGE_UNSHARE (1U << 1)
+#endif
+/* Set the FD_CLOEXEC bit instead of closing the file descriptor. */
+#ifndef CLOSE_RANGE_CLOEXEC
+# define CLOSE_RANGE_CLOEXEC (1U << 2)
+#endif
+
+/* Close all file descriptors in the range FD up to MAX_FD. The flag FLAGS
+ are define by the CLOSE_RANGE prefix. This function behaves like close
+ on the range, but in a fail-safe where it will either fail and not close
+ any file descriptor or close all of them. Gaps where the file descriptor
+ is invalid are ignored. Returns 0 on successor or -1 for failure (and
+ sets errno accordingly). */
+extern int close_range (unsigned int __fd, unsigned int __max_fd,
+ int __flags) __THROW;
+
+#endif /* __USE_GNU */
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index 4a467e706e..48dc96e2d5 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -2432,6 +2432,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index bdef8d2a34..13772d42d3 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -2385,6 +2385,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index eba95a2cf0..6613f4c5f0 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -2569,6 +2569,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 3fbc5ae978..06d096d945 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -2344,6 +2344,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index 0aef2ec43a..dc2466f3cd 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -301,6 +301,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index a4704f7e96..d425dbad0b 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -2512,6 +2512,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index 8f135f30c0..f1fc79525c 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -2483,6 +2483,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index 719609ac10..7cf1c864b7 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -2480,6 +2480,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index f9a6bccdc5..41b7927b86 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -2477,6 +2477,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index cee02495c6..91f06d23ca 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -2475,6 +2475,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index c9fdfe3a55..a4d3e06941 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -2483,6 +2483,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index d27c97094e..3e96b69ba4 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -2395,6 +2395,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index 25f270403f..3618eaa4e0 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -2522,6 +2522,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 0256a272dd..3951054b61 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -2539,6 +2539,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index 946f855c64..4c2adbd8ab 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -2572,6 +2572,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index 602da17327..e9d30b1ed7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -2308,6 +2308,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 287285a21a..81c1eac79c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -2603,6 +2603,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index cdeee28d0f..6fa30b247b 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -2168,6 +2168,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index a74b54d6bb..7c20b71f7a 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -2368,6 +2368,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index e96371317c..fe0c9a2d06 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -2537,6 +2537,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index aadc7c1d66..da52d75a7d 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -2345,6 +2345,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index cc4a625cb4..6f022d19e8 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -2392,6 +2392,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 163d2cd613..a4934d88e9 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -2389,6 +2389,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 6eceee6b88..684e9d7b06 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -2532,6 +2532,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index e6bac469ba..af10195edb 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -2367,6 +2367,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 62329abb49..29899eb264 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -99,3 +99,4 @@ pkey_alloc EXTRA pkey_alloc i:ii pkey_alloc
pkey_free EXTRA pkey_free i:i pkey_free
gettid EXTRA gettid Ei: __gettid gettid
tgkill EXTRA tgkill i:iii __tgkill tgkill
+close_range EXTRA close_range i:iii __close_range close_range
diff --git a/sysdeps/unix/sysv/linux/tst-close_range.c b/sysdeps/unix/sysv/linux/tst-close_range.c
new file mode 100644
index 0000000000..dccb6189c5
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-close_range.c
@@ -0,0 +1,303 @@
+/* Test for the close_range system call.
+ Copyright (C) 2021 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <getopt.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include <array_length.h>
+#include <support/capture_subprocess.h>
+#include <support/check.h>
+#include <support/descriptors.h>
+#include <support/support.h>
+#include <support/xsched.h>
+#include <support/xunistd.h>
+
+#define NFDS 100
+
+static int
+open_multiple_temp_files (void)
+{
+ /* Check if the temporary file descriptor has no no gaps. */
+ int lowfd = xopen ("/dev/null", O_RDONLY, 0600);
+ for (int i = 1; i <= NFDS; i++)
+ TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600),
+ lowfd + i);
+ return lowfd;
+}
+
+static void
+close_range_test_max_upper_limit (void)
+{
+ struct support_descriptors *descrs = support_descriptors_list ();
+
+ int lowfd = open_multiple_temp_files ();
+
+ {
+ int r = close_range (lowfd, ~0U, 0);
+ if (r == -1 && errno == ENOSYS)
+ FAIL_UNSUPPORTED ("close_range not supported");
+ TEST_COMPARE (r, 0);
+ }
+
+ support_descriptors_check (descrs);
+ support_descriptors_free (descrs);
+}
+
+static void
+close_range_test_common (int lowfd, unsigned int flags)
+{
+ const int maximum_fd = lowfd + NFDS;
+ const int half_fd = lowfd + NFDS / 2;
+ const int gap_1 = maximum_fd - 8;
+
+ /* Close half of the descriptors and check result. */
+ TEST_COMPARE (close_range (lowfd, half_fd, flags), 0);
+ for (int i = lowfd; i <= half_fd; i++)
+ {
+ TEST_COMPARE (fcntl (i, F_GETFL), -1);
+ TEST_COMPARE (errno, EBADF);
+ }
+ for (int i = half_fd + 1; i < maximum_fd; i++)
+ TEST_VERIFY (fcntl (i, F_GETFL) > -1);
+
+ /* Create some gaps, close up to a threshold, and check result. */
+ xclose (lowfd + 57);
+ xclose (lowfd + 78);
+ xclose (lowfd + 81);
+ xclose (lowfd + 82);
+ xclose (lowfd + 84);
+ xclose (lowfd + 90);
+
+ TEST_COMPARE (close_range (half_fd + 1, gap_1, flags), 0);
+ for (int i = half_fd + 1; i < gap_1; i++)
+ {
+ TEST_COMPARE (fcntl (i, F_GETFL), -1);
+ TEST_COMPARE (errno, EBADF);
+ }
+ for (int i = gap_1 + 1; i < maximum_fd; i++)
+ TEST_VERIFY (fcntl (i, F_GETFL) > -1);
+
+ /* Close the remaining but the last one. */
+ TEST_COMPARE (close_range (gap_1 + 1, maximum_fd - 1, flags), 0);
+ for (int i = gap_1 + 1; i < maximum_fd - 1; i++)
+ {
+ TEST_COMPARE (fcntl (i, F_GETFL), -1);
+ TEST_COMPARE (errno, EBADF);
+ }
+ TEST_VERIFY (fcntl (maximum_fd, F_GETFL) > -1);
+
+ /* Close the last one. */
+ TEST_COMPARE (close_range (maximum_fd, maximum_fd, flags), 0);
+ TEST_COMPARE (fcntl (maximum_fd, F_GETFL), -1);
+ TEST_COMPARE (errno, EBADF);
+}
+
+/* Basic tests: check if the syscall close ranges with and without gaps. */
+static void
+close_range_test (void)
+{
+ struct support_descriptors *descrs = support_descriptors_list ();
+
+ /* Check if the temporary file descriptor has no no gaps. */
+ int lowfd = open_multiple_temp_files ();
+
+ close_range_test_common (lowfd, 0);
+
+ /* Double check by check the /proc. */
+ support_descriptors_check (descrs);
+ support_descriptors_free (descrs);
+}
+
+_Noreturn static int
+close_range_test_fn (void *arg)
+{
+ int lowfd = (int) ((uintptr_t) arg);
+ close_range_test_common (lowfd, 0);
+ exit (EXIT_SUCCESS);
+}
+
+/* Check if a clone_range on a subprocess created with CLONE_FILES close
+ the shared file descriptor table entries in the parent. */
+static void
+close_range_test_subprocess (void)
+{
+ struct support_descriptors *descrs = support_descriptors_list ();
+
+ /* Check if the temporary file descriptor has no no gaps. */
+ int lowfd = open_multiple_temp_files ();
+
+ struct support_stack stack = support_stack_alloc (4096);
+
+ pid_t pid = xclone (close_range_test_fn, (void*) (uintptr_t) lowfd,
+ stack.stack, stack.size, CLONE_FILES | SIGCHLD);
+ TEST_VERIFY_EXIT (pid > 0);
+ int status;
+ xwaitpid (pid, &status, 0);
+ TEST_VERIFY (WIFEXITED (status));
+ TEST_COMPARE (WEXITSTATUS (status), 0);
+
+ support_stack_free (&stack);
+
+ for (int i = lowfd; i < NFDS; i++)
+ TEST_VERIFY (fcntl (i, F_GETFL) < 0);
+
+ support_descriptors_check (descrs);
+ support_descriptors_free (descrs);
+}
+
+
+_Noreturn static int
+close_range_unshare_test_fn (void *arg)
+{
+ int lowfd = (int) ((uintptr_t) arg);
+ close_range_test_common (lowfd, CLOSE_RANGE_UNSHARE);
+ exit (EXIT_SUCCESS);
+}
+
+/* Check if a close_range with CLOSE_RANGE_UNSHARE issued from a subprocess
+ created with CLONE_FILES does not close the parent file descriptor list. */
+static void
+close_range_unshare_test (void)
+{
+ struct support_descriptors *descrs1 = support_descriptors_list ();
+
+ /* Check if the temporary file descriptor has no no gaps. */
+ int lowfd = open_multiple_temp_files ();
+
+ struct support_descriptors *descrs2 = support_descriptors_list ();
+
+ struct support_stack stack = support_stack_alloc (4096);
+
+ pid_t pid = xclone (close_range_unshare_test_fn, (void*) (uintptr_t) lowfd,
+ stack.stack, stack.size, CLONE_FILES | SIGCHLD);
+ TEST_VERIFY_EXIT (pid > 0);
+ int status;
+ xwaitpid (pid, &status, 0);
+ TEST_VERIFY (WIFEXITED (status));
+ TEST_COMPARE (WEXITSTATUS (status), 0);
+
+ support_stack_free (&stack);
+
+ for (int i = 0; i < NFDS; i++)
+ TEST_VERIFY (fcntl (i, F_GETFL) > -1);
+
+ support_descriptors_check (descrs2);
+ support_descriptors_free (descrs2);
+
+ TEST_COMPARE (close_range (lowfd, lowfd + NFDS, 0), 0);
+
+ support_descriptors_check (descrs1);
+ support_descriptors_free (descrs1);
+}
+
+static bool
+is_in_array (int *arr, size_t len, int fd)
+{
+ bool r = false;
+ for (int i = 0; i < len; i++)
+ if (arr[i] == fd)
+ return true;
+ return r;
+}
+
+static void
+close_range_cloexec_test (void)
+{
+ /* Check if the temporary file descriptor has no no gaps. */
+ const int lowfd = open_multiple_temp_files ();
+
+ const int maximum_fd = lowfd + NFDS;
+ const int half_fd = lowfd + NFDS / 2;
+ const int gap_1 = maximum_fd - 8;
+
+ /* Close half of the descriptors and check result. */
+ int r = close_range (lowfd, half_fd, CLOSE_RANGE_CLOEXEC);
+ if (r == -1 && errno == EINVAL)
+ {
+ printf ("%s: CLOSE_RANGE_CLOEXEC not supported\n", __func__);
+ return;
+ }
+ for (int i = lowfd; i <= half_fd; i++)
+ {
+ int flags = fcntl (i, F_GETFD);
+ TEST_VERIFY (flags > -1);
+ TEST_COMPARE (flags & FD_CLOEXEC, FD_CLOEXEC);
+ }
+ for (int i = half_fd + 1; i < maximum_fd; i++)
+ TEST_VERIFY (fcntl (i, F_GETFL) > -1);
+
+ /* Create some gaps, close up to a threshold, and check result. */
+ static int gap_close[] = { 57, 78, 81, 82, 84, 90 };
+ for (int i = 0; i < array_length (gap_close); i++)
+ xclose (gap_close[i]);
+
+ TEST_COMPARE (close_range (half_fd + 1, gap_1, CLOSE_RANGE_CLOEXEC), 0);
+ for (int i = half_fd + 1; i < gap_1; i++)
+ {
+ int flags = fcntl (i, F_GETFD);
+ if (is_in_array (gap_close, array_length (gap_close), i))
+ TEST_COMPARE (flags, -1);
+ else
+ {
+ TEST_VERIFY (flags > -1);
+ TEST_COMPARE (flags & FD_CLOEXEC, FD_CLOEXEC);
+ }
+ }
+ for (int i = gap_1 + 1; i < maximum_fd; i++)
+ TEST_VERIFY (fcntl (i, F_GETFL) > -1);
+
+ /* Close the remaining but the last one. */
+ TEST_COMPARE (close_range (gap_1 + 1, maximum_fd - 1, CLOSE_RANGE_CLOEXEC),
+ 0);
+ for (int i = gap_1 + 1; i < maximum_fd - 1; i++)
+ {
+ int flags = fcntl (i, F_GETFD);
+ TEST_VERIFY (flags > -1);
+ TEST_COMPARE (flags & FD_CLOEXEC, FD_CLOEXEC);
+ }
+ TEST_VERIFY (fcntl (maximum_fd, F_GETFL) > -1);
+
+ /* Close the last one. */
+ TEST_COMPARE (close_range (maximum_fd, maximum_fd, CLOSE_RANGE_CLOEXEC), 0);
+ {
+ int flags = fcntl (maximum_fd, F_GETFD);
+ TEST_VERIFY (flags > -1);
+ TEST_COMPARE (flags & FD_CLOEXEC, FD_CLOEXEC);
+ }
+}
+
+static int
+do_test (void)
+{
+ close_range_test_max_upper_limit ();
+ close_range_test ();
+ close_range_test_subprocess ();
+ close_range_unshare_test ();
+ close_range_cloexec_test ();
+
+ return 0;
+}
+
+#include <support/test-driver.c>
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index e90f3e54c0..b5e2710a97 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -2323,6 +2323,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 792f681bba..ecd0b4efb8 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -2422,6 +2422,7 @@ GLIBC_2.34 aio_suspend64 F
GLIBC_2.34 aio_write F
GLIBC_2.34 aio_write64 F
GLIBC_2.34 call_once F
+GLIBC_2.34 close_range F
GLIBC_2.34 cnd_broadcast F
GLIBC_2.34 cnd_destroy F
GLIBC_2.34 cnd_init F
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-08 17:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-08 17:19 [glibc] linux: Add close_range Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).