From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org,
Luca Boccassi <luca.boccassi@gmail.com>,
Philip Withnall <bugzilla@tecnocode.co.uk>
Subject: [PATCH v6 5/5] linux: Add pidfd_getpid
Date: Thu, 6 Jul 2023 10:45:08 -0300 [thread overview]
Message-ID: <20230706134508.422526-6-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20230706134508.422526-1-adhemerval.zanella@linaro.org>
This interface allows to obtain the associated process ID from the
process file descriptor. It is done by parsing the procps fdinfo
information. Its prototype is:
pid_t pidfd_getpid (int fd)
It returns the associated pid or -1 in case of an error and sets the
errno accordingly. The possible errno values are those from open,
read, and close (used on procps parsing), along with:
- EBADF if the FD is negative, does not have a PID associatedi, or
if the fdinfo fields contains a value larger than pid_t.
- EREMOTE if the PID is in a separate namespace.
- ESRCH if the process is already terminated.
Checked on x86_64-linux-gnu on Linux 4.15 (no CLONE_PID or waitid
support), Linux 5.15 (only clone support), and Linux 5.19 (full
support including clone3).
---
NEWS | 4 +
manual/process.texi | 31 +++
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/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 +
.../sysv/linux/loongarch/lp64/libc.abilist | 1 +
.../sysv/linux/m68k/coldfire/libc.abilist | 1 +
.../unix/sysv/linux/m68k/m680x0/libc.abilist | 1 +
.../sysv/linux/microblaze/be/libc.abilist | 1 +
.../sysv/linux/microblaze/le/libc.abilist | 1 +
.../sysv/linux/mips/mips32/fpu/libc.abilist | 1 +
.../sysv/linux/mips/mips32/nofpu/libc.abilist | 1 +
.../sysv/linux/mips/mips64/n32/libc.abilist | 1 +
.../sysv/linux/mips/mips64/n64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/nios2/libc.abilist | 1 +
sysdeps/unix/sysv/linux/or1k/libc.abilist | 1 +
sysdeps/unix/sysv/linux/pidfd_getpid.c | 122 ++++++++++++
.../linux/powerpc/powerpc32/fpu/libc.abilist | 1 +
.../powerpc/powerpc32/nofpu/libc.abilist | 1 +
.../linux/powerpc/powerpc64/be/libc.abilist | 1 +
.../linux/powerpc/powerpc64/le/libc.abilist | 1 +
sysdeps/unix/sysv/linux/procutils.c | 104 ++++++++++
sysdeps/unix/sysv/linux/procutils.h | 35 ++++
.../unix/sysv/linux/riscv/rv32/libc.abilist | 1 +
.../unix/sysv/linux/riscv/rv64/libc.abilist | 1 +
.../unix/sysv/linux/s390/s390-32/libc.abilist | 1 +
.../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 +
.../sysv/linux/sparc/sparc32/libc.abilist | 1 +
.../sysv/linux/sparc/sparc64/libc.abilist | 1 +
sysdeps/unix/sysv/linux/sys/pidfd.h | 4 +
sysdeps/unix/sysv/linux/tst-pidfd.c | 47 +++++
sysdeps/unix/sysv/linux/tst-pidfd_getpid.c | 187 ++++++++++++++++++
.../unix/sysv/linux/x86_64/64/libc.abilist | 1 +
.../unix/sysv/linux/x86_64/x32/libc.abilist | 1 +
44 files changed, 572 insertions(+)
create mode 100644 sysdeps/unix/sysv/linux/pidfd_getpid.c
create mode 100644 sysdeps/unix/sysv/linux/procutils.c
create mode 100644 sysdeps/unix/sysv/linux/procutils.h
create mode 100644 sysdeps/unix/sysv/linux/tst-pidfd_getpid.c
diff --git a/NEWS b/NEWS
index 378cc720bf..8af66d3a4f 100644
--- a/NEWS
+++ b/NEWS
@@ -72,6 +72,10 @@ Major new features:
of return a process ID, it returns a file descriptor that can be used
along other pidfd functions.
+* On Linux, the pidfd_getpid function has been added. It allows to retrieve
+ the process ID associated with process file descriptor created with
+ pid_spawn, pidfd_fork, or pidfd_open.
+
Deprecated and removed features, and other changes affecting compatibility:
* In the Linux kernel for the hppa/parisc architecture some of the
diff --git a/manual/process.texi b/manual/process.texi
index c60701aeb8..a74f316ddc 100644
--- a/manual/process.texi
+++ b/manual/process.texi
@@ -33,6 +33,7 @@ primitive functions to do each step individually instead.
* Process Creation Concepts:: An overview of the hard way to do it.
* Process Identification:: How to get the process ID of a process.
* Creating a Process:: How to fork a child process.
+* Querying a Process:: How to query a child process.
* Executing a File:: How to make a process execute another program.
* Process Completion:: How to tell when a child process has completed.
* Process Completion Status:: How to interpret the status value
@@ -401,6 +402,36 @@ Do not send a @code{SIGCHLD} termination signal when child terminates.
This function is specific to Linux.
+@node Querying a Process
+@section Querying a Process
+
+The file descriptor returned by the @code{pidfd_fork} function can be used to
+query process extra information.
+
+@deftypefun pid_t pidfd_getpid (int @var{fd})
+@standards{GNU, sys/pidfd.h}
+@safety{@prelim{}@mtsafe{}@assafe{}@acsafe{}}
+
+The @code{pidfd_getpid} function retrieves the process ID associated with process
+file descriptor created with @code{pid_spawn}, @code{pidfd_fork}, or
+@code{pidfd_open}.
+
+If the operation fails, @code{pidfd_getpid} return @code{-1} and the following
+@code{errno} error conditionas are defined:
+
+@table @code
+@item EBADF
+The input file descriptor is invalid, does not have a pidfd associated, or an
+error has occurred parsing the kernel data.
+@item EREMOTE
+There is no process ID to denote the process in the current namespace.
+@item ESRCH
+The process for which the file descriptor refers to is terminated.
+@end table
+
+This function is specific to Linux.
+@end deftypefun
+
@node Executing a File
@section Executing a File
@cindex executing a file
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 58dc23a2fb..ee1f40883c 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -213,6 +213,7 @@ tests += \
tst-ofdlocks \
tst-personality \
tst-pidfd \
+ tst-pidfd_getpid \
tst-pkey \
tst-ppoll \
tst-prctl \
@@ -494,8 +495,10 @@ sysdep_routines += \
getcpu \
oldglob \
pidfd_fork \
+ pidfd_getpid \
pidfd_spawn \
pidfd_spawnp \
+ procutils \
sched_getcpu \
spawnattr_getcgroup_np \
spawnattr_setcgroup_np \
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index e9eecfecc0..47a5fddaa4 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -325,6 +325,7 @@ libc {
posix_spawnattr_getcgroup_np;
posix_spawnattr_setcgroup_np;
pidfd_fork;
+ pidfd_getpid;
pidfd_spawn;
pidfd_spawnp;
}
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index e81e56f88c..8bfbb0b483 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -2670,6 +2670,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 0640fd71b9..c75b2fb07a 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2779,6 +2779,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 4c9dd624ca..f998cb5bde 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -2431,6 +2431,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index e45af835ff..6ae97d8d73 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -551,6 +551,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index 17abecc580..6c4b0092a6 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -548,6 +548,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index 360a60980d..9ad97fbc95 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -2707,6 +2707,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 2aa63e2860..6e1e9b445b 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -2656,6 +2656,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index 2ee3d027ac..0e17c4d7fc 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -2840,6 +2840,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 262e0b3f59..1cd7bb2955 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -2605,6 +2605,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/loongarch/lp64/libc.abilist b/sysdeps/unix/sysv/linux/loongarch/lp64/libc.abilist
index 0e5b4da990..952d488956 100644
--- a/sysdeps/unix/sysv/linux/loongarch/lp64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/loongarch/lp64/libc.abilist
@@ -2191,6 +2191,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index b33dc8f04a..a59dd88476 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -552,6 +552,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index 0b8bfb07d3..f0bbc9bf6b 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -2783,6 +2783,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index d70ae3c2d3..25a8de52f8 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -2756,6 +2756,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index c9dea106b8..03179cb364 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -2753,6 +2753,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index 542d9b464e..1730e758a2 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -2748,6 +2748,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index 5839437940..8ec65b98be 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -2746,6 +2746,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 3d5a63c979..25bb055593 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -2754,6 +2754,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index 3aa747d1b8..5ffda82120 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -2656,6 +2656,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index ed7da52383..40e37d4ebc 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -2795,6 +2795,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/or1k/libc.abilist b/sysdeps/unix/sysv/linux/or1k/libc.abilist
index e75c55efa0..b2587a7ee2 100644
--- a/sysdeps/unix/sysv/linux/or1k/libc.abilist
+++ b/sysdeps/unix/sysv/linux/or1k/libc.abilist
@@ -2177,6 +2177,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/pidfd_getpid.c b/sysdeps/unix/sysv/linux/pidfd_getpid.c
new file mode 100644
index 0000000000..46848a5983
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/pidfd_getpid.c
@@ -0,0 +1,122 @@
+/* pidfd_getpid - Get the associated pid from the pid file descriptor.
+ Copyright (C) 2023 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 <_itoa.h>
+#include <errno.h>
+#include <intprops.h>
+#include <procutils.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysdep.h>
+#include <unistd.h>
+
+#define FDINFO_TO_FILENAME_PREFIX "/proc/self/fdinfo/"
+
+#define FDINFO_FILENAME_LEN \
+ (sizeof (FDINFO_TO_FILENAME_PREFIX) + INT_STRLEN_BOUND (int))
+
+struct parse_fdinfo_t
+{
+ bool found;
+ pid_t pid;
+};
+
+/* Parse the PID field in the fdinfo entry, if existent. Avoid strtol or
+ similar to not be locale dependent. */
+static int
+parse_fdinfo (const char *l, void *arg)
+{
+ enum { fieldlen = sizeof ("Pid:") - 1 };
+ if (strncmp (l, "Pid:", fieldlen) != 0)
+ return 0;
+
+ l += fieldlen;
+
+ /* Skip leading spaces. */
+ while (*l == ' ' || (unsigned int)(*l) -'\t' < 5)
+ l++;
+
+ bool neg = false;
+ switch (*l)
+ {
+ case '-': neg = true;
+ case '+': l++;
+ }
+
+ if (*l == '\0')
+ return 0;
+
+ int n = 0;
+ while (*l != '\0')
+ {
+ /* Check if '*l' is a digit. */
+ if ((unsigned int)(*l) - '0' >= 10)
+ return 0;
+
+ /* Ignore invalid large values. */
+ if (INT_MULTIPLY_WRAPV (10, n, &n)
+ || INT_ADD_WRAPV (n, *l++ - '0', &n))
+ return 0;
+ }
+
+ /* -1 indicates that the process is terminated. */
+ if (neg && n != 1)
+ return 0;
+
+ struct parse_fdinfo_t *fdinfo = arg;
+ fdinfo->pid = neg ? -n : n;
+ fdinfo->found = true;
+
+ return 1;
+}
+
+pid_t
+pidfd_getpid (int fd)
+{
+ if (__glibc_unlikely (fd < 0))
+ {
+ __set_errno (EBADF);
+ return -1;
+ }
+
+ char fdinfoname[FDINFO_FILENAME_LEN];
+
+ char *p = mempcpy (fdinfoname, FDINFO_TO_FILENAME_PREFIX,
+ strlen (FDINFO_TO_FILENAME_PREFIX));
+ *_fitoa_word (fd, p, 10, 0) = '\0';
+
+ struct parse_fdinfo_t fdinfo = { .found = false, .pid = -1 };
+ if (procutils_read_file (fdinfoname, parse_fdinfo, &fdinfo) == -1)
+ /* The fdinfo contains an invalid 'Pid:' value. */
+ return INLINE_SYSCALL_ERROR_RETURN_VALUE (EBADF);
+
+ /* The FD does not have a 'Pid:' entry associated. */
+ if (!fdinfo.found)
+ return INLINE_SYSCALL_ERROR_RETURN_VALUE (EBADF);
+
+ /* The pidfd cannot be resolved because it is in a separate pid
+ namespace. */
+ if (fdinfo.pid == 0)
+ return INLINE_SYSCALL_ERROR_RETURN_VALUE (EREMOTE);
+
+ /* A negative value means the process is terminated. */
+ if (fdinfo.pid < 0)
+ return INLINE_SYSCALL_ERROR_RETURN_VALUE (ESRCH);
+
+ return fdinfo.pid;
+}
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 82eb6e1be0..569af00040 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -2822,6 +2822,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index c188bb00f2..956e610cbc 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -2855,6 +2855,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index f68077e425..61ffafe996 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -2576,6 +2576,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 8aa9ce6859..062e4732b4 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -2890,6 +2890,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/procutils.c b/sysdeps/unix/sysv/linux/procutils.c
new file mode 100644
index 0000000000..83b327cb9a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/procutils.c
@@ -0,0 +1,104 @@
+/* Utilities functions to read/parse Linux procfs and sysfs.
+ Copyright (C) 2023 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 <assert.h>
+#include <not-cancel.h>
+#include <procutils.h>
+#include <string.h>
+
+static int
+next_line (char **r, int fd, char *const buffer, char **cp, char **re,
+ char *const buffer_end)
+{
+ char *res = *cp;
+ char *nl = memchr (*cp, '\n', *re - *cp);
+ if (nl == NULL)
+ {
+ if (*cp != buffer)
+ {
+ if (*re == buffer_end)
+ {
+ memmove (buffer, *cp, *re - *cp);
+ *re = buffer + (*re - *cp);
+ *cp = buffer;
+
+ ssize_t n = __read_nocancel (fd, *re, buffer_end - *re);
+ if (n < 0)
+ return -1;
+
+ *re += n;
+
+ nl = memchr (*cp, '\n', *re - *cp);
+ while (nl == NULL && *re == buffer_end)
+ {
+ /* Truncate too long lines. */
+ *re = buffer + 3 * (buffer_end - buffer) / 4;
+ n = __read_nocancel (fd, *re, buffer_end - *re);
+ if (n < 0)
+ return -1;
+
+ nl = memchr (*re, '\n', n);
+ **re = '\0';
+ *re += n;
+ }
+ }
+ else
+ nl = memchr (*cp, '\n', *re - *cp);
+
+ res = *cp;
+ }
+
+ if (nl == NULL)
+ nl = *re - 1;
+ }
+
+ *nl = '\0';
+ *cp = nl + 1;
+ assert (*cp <= *re);
+
+ if (res == *re)
+ return 0;
+
+ *r = res;
+ return 1;
+}
+
+int
+procutils_read_file (const char *filename, procutils_closure_t closure,
+ void *arg)
+{
+ enum { buffer_size = 1024 };
+ char buffer[buffer_size];
+ char *buffer_end = buffer + buffer_size;
+ char *cp = buffer_end;
+ char *re = buffer_end;
+
+ int fd = __open64_nocancel (filename, O_RDONLY | O_CLOEXEC);
+ if (fd == -1)
+ return -1;
+
+ char *l;
+ int r;
+ while ((r = next_line (&l, fd, buffer, &cp, &re, buffer_end)) > 0)
+ if (closure (l, arg) != 0)
+ break;
+
+ __close_nocancel_nostatus (fd);
+
+ return r;
+}
diff --git a/sysdeps/unix/sysv/linux/procutils.h b/sysdeps/unix/sysv/linux/procutils.h
new file mode 100644
index 0000000000..64e1080920
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/procutils.h
@@ -0,0 +1,35 @@
+/* Utilities functions to read/parse Linux procfs and sysfs.
+ Copyright (C) 2023 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/>. */
+
+#ifndef _PROCUTILS_H
+#define _PROCUTILS_H
+
+typedef int (*procutils_closure_t)(const char *line, void *arg);
+
+/* Open and read the path FILENAME, line per line, and call CLOSURE with
+ argument ARG on each line. The read is done with a static buffer,
+ with non-cancellable calls, and the line is null terminated.
+
+ The CLOSURE should return true if the read should continue, or false
+ if the function should stop.
+
+ It returns 0 in case of success, or -1 otherwise. */
+int procutils_read_file (const char *filename, procutils_closure_t closure,
+ void *arg) attribute_hidden;
+
+#endif
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index 3a1e55073a..95002b44c3 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -2433,6 +2433,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index 312b0860b3..118319ebc0 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -2633,6 +2633,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index b702ceb160..2189782b92 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -2820,6 +2820,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index 0d9f2c0ea7..0b59b52fba 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -2613,6 +2613,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index a99bd972e5..91507508ab 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -2663,6 +2663,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 76fdafd7df..8e42578fe2 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -2660,6 +2660,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index 9201f21b4e..e93ea5511d 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -2815,6 +2815,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index 5337df989d..ad6cc27fbf 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -2628,6 +2628,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/sys/pidfd.h b/sysdeps/unix/sysv/linux/sys/pidfd.h
index 87095212a7..8cf4df6b81 100644
--- a/sysdeps/unix/sysv/linux/sys/pidfd.h
+++ b/sysdeps/unix/sysv/linux/sys/pidfd.h
@@ -67,4 +67,8 @@ extern int pidfd_send_signal (int __pidfd, int __sig, siginfo_t *__info,
extern pid_t pidfd_fork (int *__pidfd, int __cgroup, unsigned int __flags)
__THROW;
+/* Query the process ID (PID) from process descriptor __FD. Return the PID
+ or -1 in case of an error. */
+extern pid_t pidfd_getpid (int __fd) __THROW;
+
#endif /* _PIDFD_H */
diff --git a/sysdeps/unix/sysv/linux/tst-pidfd.c b/sysdeps/unix/sysv/linux/tst-pidfd.c
index 64d8a2ef40..53d223f702 100644
--- a/sysdeps/unix/sysv/linux/tst-pidfd.c
+++ b/sysdeps/unix/sysv/linux/tst-pidfd.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <fcntl.h>
+#include <limits.h>
#include <support/capture_subprocess.h>
#include <support/check.h>
#include <support/process_state.h>
@@ -27,6 +28,9 @@
#include <support/xsocket.h>
#include <sys/pidfd.h>
#include <sys/wait.h>
+#include <stdlib.h>
+
+#include <string.h>
#define REMOTE_PATH "/dev/null"
@@ -102,6 +106,43 @@ do_test (void)
ppid = getpid ();
puid = getuid ();
+ /* Sanity check for invalid inputs. */
+ TEST_COMPARE (pidfd_getpid (-1), -1);
+ TEST_COMPARE (errno, EBADF);
+
+ {
+ pid_t pid = pidfd_getpid (STDOUT_FILENO);
+ TEST_COMPARE (pid, -1);
+ TEST_COMPARE (errno, EBADF);
+ }
+
+ /* Check if pidfd_getpid returns ESRCH for exited subprocess. */
+ {
+ int pidfd;
+ pid_t pidfork = pidfd_fork (&pidfd, -1, 0);
+ if (pidfork == 0)
+ _exit (EXIT_SUCCESS);
+
+ /* The process might be still running or already in zombie state, in any
+ case the PID is still allocated to the process. */
+ pid_t pid = pidfd_getpid (pidfd);
+ if (pid > 0)
+ support_process_state_wait (pid, support_process_state_zombie);
+
+ siginfo_t info;
+ TEST_COMPARE (waitid (P_PIDFD, pidfd, &info, WEXITED), 0);
+ TEST_COMPARE (info.si_pid, pidfork);
+ TEST_COMPARE (info.si_status, 0);
+ TEST_COMPARE (info.si_code, CLD_EXITED);
+
+ /* Once the process is reaped the associated PID is not available. */
+ pid = pidfd_getpid (pidfd);
+ TEST_COMPARE (pid, -1);
+ TEST_COMPARE (errno, ESRCH);
+
+ xclose (pidfd);
+ }
+
TEST_COMPARE (socketpair (AF_UNIX, SOCK_STREAM, 0, sockets), 0);
pid_t pid = xfork ();
@@ -118,6 +159,12 @@ do_test (void)
int pidfd = pidfd_open (pid, 0);
TEST_VERIFY (pidfd != -1);
+ TEST_COMPARE (pidfd_getpid (INT_MAX), -1);
+ {
+ pid_t querypid = pidfd_getpid (pidfd);
+ TEST_COMPARE (querypid, pid);
+ }
+
/* Wait for first sigtimedwait. */
support_process_state_wait (pid, support_process_state_sleeping);
TEST_COMPARE (pidfd_send_signal (pidfd, SIGUSR1, NULL, 0), 0);
diff --git a/sysdeps/unix/sysv/linux/tst-pidfd_getpid.c b/sysdeps/unix/sysv/linux/tst-pidfd_getpid.c
new file mode 100644
index 0000000000..41d03a04ad
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/tst-pidfd_getpid.c
@@ -0,0 +1,187 @@
+/* Specific tests for Linux pidfd_getpid.
+ Copyright (C) 2023 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 <errno.h>
+#include <sched.h>
+#include <stdlib.h>
+#include <support/check.h>
+#include <support/xsocket.h>
+#include <support/xunistd.h>
+#include <support/test-driver.h>
+#include <sys/pidfd.h>
+#include <sys/wait.h>
+#include <sys/mount.h>
+#include <string.h>
+
+#include <stdio.h>
+
+static int sockfd[2];
+
+static void
+send_fd (const int sock, const int fd)
+{
+ union
+ {
+ struct cmsghdr hdr;
+ char buf[CMSG_SPACE (sizeof (int))];
+ } cmsgbuf = {0};
+ struct cmsghdr *cmsg;
+ char ch = 'A';
+ struct iovec vec =
+ {
+ .iov_base = &ch,
+ .iov_len = sizeof ch
+ };
+ struct msghdr msg =
+ {
+ .msg_control = &cmsgbuf.buf,
+ .msg_controllen = sizeof (cmsgbuf.buf),
+ .msg_iov = &vec,
+ .msg_iovlen = 1,
+ };
+
+ cmsg = CMSG_FIRSTHDR (&msg);
+ cmsg->cmsg_len = CMSG_LEN (sizeof (int));
+ cmsg->cmsg_level = SOL_SOCKET;
+ cmsg->cmsg_type = SCM_RIGHTS;
+ memcpy (CMSG_DATA (cmsg), &fd, sizeof (fd));
+
+ ssize_t n;
+ while ((n = sendmsg (sock, &msg, 0)) == -1 && errno == EINTR);
+
+ TEST_VERIFY_EXIT (n == 1);
+}
+
+static int
+recv_fd (const int sock)
+{
+ union
+ {
+ struct cmsghdr hdr;
+ char buf[CMSG_SPACE(sizeof(int))];
+ } cmsgbuf = {0};
+ struct cmsghdr *cmsg;
+ char ch = '\0';
+ struct iovec vec =
+ {
+ .iov_base = &ch,
+ .iov_len = sizeof ch
+ };
+ struct msghdr msg =
+ {
+ .msg_control = &cmsgbuf.buf,
+ .msg_controllen = sizeof (cmsgbuf.buf),
+ .msg_iov = &vec,
+ .msg_iovlen = 1,
+ };
+
+ ssize_t n;
+ while ((n = recvmsg (sock, &msg, 0)) == -1 && errno == EINTR);
+ if (n != 1 || ch != 'A')
+ return -1;
+
+ cmsg = CMSG_FIRSTHDR (&msg);
+ if (cmsg == NULL)
+ return -1;
+ if (cmsg->cmsg_type != SCM_RIGHTS)
+ return -1;
+
+ int fd = -1;
+ memcpy (&fd, CMSG_DATA (cmsg), sizeof (fd));
+ if (fd < 0)
+ return -1;
+ return fd;
+}
+
+static int
+do_test (void)
+{
+ {
+ /* The pidfd_getfd syscall was the last in the set of pidfd related
+ syscalls added to the kernel. Use pidfd_getfd to decide if this
+ kernel has pidfd support that we can test. */
+ int r = pidfd_getfd (0, 0, 1);
+ TEST_VERIFY_EXIT (r == -1);
+ if (errno == ENOSYS)
+ FAIL_UNSUPPORTED ("kernel does not support pidfd_getfd, skipping test");
+ }
+
+ TEST_VERIFY_EXIT (socketpair (AF_UNIX, SOCK_STREAM, 0, sockfd) == 0);
+
+ /* Check if pidfd_getpid returns EREMOTE for process not in current
+ namespace. */
+ {
+ int pidfd;
+ pid_t pid = pidfd_fork (&pidfd, -1, 0);
+ TEST_VERIFY_EXIT (pid >= 0);
+ if (pid == 0)
+ {
+ if (unshare (CLONE_NEWNS | CLONE_NEWUSER | CLONE_NEWPID) < 0)
+ {
+ /* Older kernels may not support all the options, or security
+ policy may block this call. */
+ if (errno == EINVAL || errno == EPERM || errno == ENOSPC)
+ exit (EXIT_UNSUPPORTED);
+ FAIL_EXIT1 ("unshare user/fs/pid failed: %m");
+ }
+
+ TEST_VERIFY_EXIT (mount (NULL, "/", NULL, MS_REC | MS_PRIVATE, 0)
+ == 0);
+
+ pid_t child = xfork ();
+ if (child > 0)
+ {
+ int status;
+ xwaitpid (child, &status, 0);
+ TEST_VERIFY (WIFEXITED (status));
+ exit (WEXITSTATUS (status));
+ }
+
+ /* Now that we're pid 1 (effectively "root") we can mount /proc */
+ if (mount ("proc", "/proc", "proc", 0, NULL) != 0)
+ /* This happens if we're trying to create a nested container,
+ like if the build is running under podman, and we lack
+ priviledges. */
+ {
+ if (errno == EPERM)
+ _exit (EXIT_UNSUPPORTED);
+ else
+ _exit (EXIT_FAILURE);
+ }
+
+ int ppidfd = recv_fd (sockfd[0]);
+ TEST_COMPARE (pidfd_getpid (ppidfd), -1);
+ TEST_COMPARE (errno, EREMOTE);
+
+ _exit (EXIT_SUCCESS);
+ }
+
+ send_fd (sockfd[1], pidfd);
+
+ siginfo_t info;
+ TEST_COMPARE (waitid (P_PIDFD, pidfd, &info, WEXITED), 0);
+ if (info.si_status == EXIT_UNSUPPORTED)
+ FAIL_UNSUPPORTED ("unable to unshare user/fs/pid");
+ TEST_COMPARE (info.si_status, 0);
+ TEST_COMPARE (info.si_code, CLD_EXITED);
+ }
+
+ 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 fa0ffd975f..a3b77fe8fb 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -2579,6 +2579,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index cf4d2b2573..944d0bad53 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -2685,6 +2685,7 @@ GLIBC_2.38 __strlcpy_chk F
GLIBC_2.38 __wcslcat_chk F
GLIBC_2.38 __wcslcpy_chk F
GLIBC_2.38 pidfd_fork F
+GLIBC_2.38 pidfd_getpid F
GLIBC_2.38 pidfd_spawn F
GLIBC_2.38 pidfd_spawnp F
GLIBC_2.38 posix_spawnattr_getcgroup_np F
--
2.34.1
next prev parent reply other threads:[~2023-07-06 13:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-06 13:45 [PATCH v6 0/5] Add pidfd and cgroupv2 support for process creation (resend) Adhemerval Zanella
2023-07-06 13:45 ` [PATCH v6 1/5] linux: Add posix_spawnattr_{get,set}cgroup_np (BZ 26731) Adhemerval Zanella
2023-07-06 13:45 ` [PATCH v6 2/5] posix: Add pidfd_spawn and pidfd_spawnp (BZ 30349) Adhemerval Zanella
2023-07-06 13:45 ` [PATCH v6 3/5] posix: Add pidfd_fork (BZ 26371) Adhemerval Zanella
2023-07-06 13:45 ` [PATCH v6 4/5] posix: Add PIDFDFORK_NOSIGCHLD for pidfd_fork Adhemerval Zanella
2023-07-06 13:45 ` Adhemerval Zanella [this message]
2023-08-08 19:35 ` [PATCH v6 0/5] Add pidfd and cgroupv2 support for process creation (resend) Luca Boccassi
2023-08-10 18:19 ` Adhemerval Zanella Netto
-- strict thread matches above, loose matches on Subject: below --
2023-07-05 20:43 [PATCH v6 0/5] Add pidfd and cgroupv2 support for process creation Adhemerval Zanella
2023-07-05 20:43 ` [PATCH v6 5/5] linux: Add pidfd_getpid Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230706134508.422526-6-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=bugzilla@tecnocode.co.uk \
--cc=libc-alpha@sourceware.org \
--cc=luca.boccassi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).