Commit 4da9af00 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'threads-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux

Pull pidfd updates from Christian Brauner:
 "This introduces a new extension to the pidfd_open() syscall. Users can
  now raise the new PIDFD_NONBLOCK flag to support non-blocking pidfd
  file descriptors. This has been requested for uses in async process
  management libraries such as async-pidfd in Rust.

  Ever since the introduction of pidfds and more advanced async io
  various programming languages such as Rust have grown support for
  async event libraries. These libraries are created to help build
  epoll-based event loops around file descriptors. A common pattern is
  to automatically make all file descriptors they manage to O_NONBLOCK.

  For such libraries the EAGAIN error code is treated specially. When a
  function is called that returns EAGAIN the function isn't called again
  until the event loop indicates the the file descriptor is ready.
  Supporting EAGAIN when waiting on pidfds makes such libraries just
  work with little effort.

  This introduces a new flag PIDFD_NONBLOCK that is equivalent to
  O_NONBLOCK. This follows the same patterns we have for other (anon
  inode) file descriptors such as EFD_NONBLOCK, IN_NONBLOCK,
  SFD_NONBLOCK, TFD_NONBLOCK and the same for close-on-exec flags.

  Passing a non-blocking pidfd to waitid() currently has no effect, i.e.
  is not supported. There are users which would like to use waitid() on
  pidfds that are O_NONBLOCK and mix it with pidfds that are blocking
  and both pass them to waitid().

  The expected behavior is to have waitid() return -EAGAIN for
  non-blocking pidfds and to block for blocking pidfds without needing
  to perform any additional checks for flags set on the pidfd before
  passing it to waitid(). Non-blocking pidfds will return EAGAIN from
  waitid() when no child process is ready yet. Returning -EAGAIN for
  non-blocking pidfds makes it easier for event loops that handle EAGAIN
  specially.

  It also makes the API more consistent and uniform. In essence,
  waitid() is treated like a read on a non-blocking pidfd or a recvmsg()
  on a non-blocking socket.

  With the addition of support for non-blocking pidfds we support the
  same functionality that sockets do. For sockets() recvmsg() supports
  MSG_DONTWAIT for pidfds waitid() supports WNOHANG. Both flags are
  per-call options. In contrast non-blocking pidfds and non-blocking
  sockets are a setting on an open file description affecting all
  threads in the calling process as well as other processes that hold
  file descriptors referring to the same open file description. Both
  behaviors, per call and per open file description, have genuine
  use-cases.

  The interaction with the WNOHANG flag is documented as follows:

   - If a non-blocking pidfd is passed and WNOHANG is not raised we
     simply raise the WNOHANG flag internally. When do_wait() returns
     indicating that there are eligible child processes but none have
     exited yet we set EAGAIN. If no child process exists we continue
     returning ECHILD.

   - If a non-blocking pidfd is passed and WNOHANG is raised waitid()
     will continue returning 0, i.e. it will not set EAGAIN. This ensure
     backwards compatibility with applications passing WNOHANG
     explicitly with pidfds"

* tag 'threads-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
  tests: remove O_NONBLOCK before waiting for WSTOPPED
  tests: add waitid() tests for non-blocking pidfds
  tests: port pidfd_wait to kselftest harness
  pidfd: support PIDFD_NONBLOCK in pidfd_open()
  exit: support non-blocking pidfds
parents 612e7a4c 01361b66
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
#ifndef _UAPI_LINUX_PIDFD_H
#define _UAPI_LINUX_PIDFD_H
#include <linux/types.h>
#include <linux/fcntl.h>
/* Flags for pidfd_open(). */
#define PIDFD_NONBLOCK O_NONBLOCK
#endif /* _UAPI_LINUX_PIDFD_H */
...@@ -1474,7 +1474,7 @@ static long do_wait(struct wait_opts *wo) ...@@ -1474,7 +1474,7 @@ static long do_wait(struct wait_opts *wo)
return retval; return retval;
} }
static struct pid *pidfd_get_pid(unsigned int fd) static struct pid *pidfd_get_pid(unsigned int fd, unsigned int *flags)
{ {
struct fd f; struct fd f;
struct pid *pid; struct pid *pid;
...@@ -1484,8 +1484,10 @@ static struct pid *pidfd_get_pid(unsigned int fd) ...@@ -1484,8 +1484,10 @@ static struct pid *pidfd_get_pid(unsigned int fd)
return ERR_PTR(-EBADF); return ERR_PTR(-EBADF);
pid = pidfd_pid(f.file); pid = pidfd_pid(f.file);
if (!IS_ERR(pid)) if (!IS_ERR(pid)) {
get_pid(pid); get_pid(pid);
*flags = f.file->f_flags;
}
fdput(f); fdput(f);
return pid; return pid;
...@@ -1498,6 +1500,7 @@ static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop, ...@@ -1498,6 +1500,7 @@ static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop,
struct pid *pid = NULL; struct pid *pid = NULL;
enum pid_type type; enum pid_type type;
long ret; long ret;
unsigned int f_flags = 0;
if (options & ~(WNOHANG|WNOWAIT|WEXITED|WSTOPPED|WCONTINUED| if (options & ~(WNOHANG|WNOWAIT|WEXITED|WSTOPPED|WCONTINUED|
__WNOTHREAD|__WCLONE|__WALL)) __WNOTHREAD|__WCLONE|__WALL))
...@@ -1531,9 +1534,10 @@ static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop, ...@@ -1531,9 +1534,10 @@ static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop,
if (upid < 0) if (upid < 0)
return -EINVAL; return -EINVAL;
pid = pidfd_get_pid(upid); pid = pidfd_get_pid(upid, &f_flags);
if (IS_ERR(pid)) if (IS_ERR(pid))
return PTR_ERR(pid); return PTR_ERR(pid);
break; break;
default: default:
return -EINVAL; return -EINVAL;
...@@ -1544,7 +1548,12 @@ static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop, ...@@ -1544,7 +1548,12 @@ static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop,
wo.wo_flags = options; wo.wo_flags = options;
wo.wo_info = infop; wo.wo_info = infop;
wo.wo_rusage = ru; wo.wo_rusage = ru;
if (f_flags & O_NONBLOCK)
wo.wo_flags |= WNOHANG;
ret = do_wait(&wo); ret = do_wait(&wo);
if (!ret && !(options & WNOHANG) && (f_flags & O_NONBLOCK))
ret = -EAGAIN;
put_pid(pid); put_pid(pid);
return ret; return ret;
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <linux/sched/task.h> #include <linux/sched/task.h>
#include <linux/idr.h> #include <linux/idr.h>
#include <net/sock.h> #include <net/sock.h>
#include <uapi/linux/pidfd.h>
struct pid init_struct_pid = { struct pid init_struct_pid = {
.count = REFCOUNT_INIT(1), .count = REFCOUNT_INIT(1),
...@@ -522,7 +523,8 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns) ...@@ -522,7 +523,8 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns)
/** /**
* pidfd_create() - Create a new pid file descriptor. * pidfd_create() - Create a new pid file descriptor.
* *
* @pid: struct pid that the pidfd will reference * @pid: struct pid that the pidfd will reference
* @flags: flags to pass
* *
* This creates a new pid file descriptor with the O_CLOEXEC flag set. * This creates a new pid file descriptor with the O_CLOEXEC flag set.
* *
...@@ -532,12 +534,12 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns) ...@@ -532,12 +534,12 @@ struct pid *find_ge_pid(int nr, struct pid_namespace *ns)
* Return: On success, a cloexec pidfd is returned. * Return: On success, a cloexec pidfd is returned.
* On error, a negative errno number will be returned. * On error, a negative errno number will be returned.
*/ */
static int pidfd_create(struct pid *pid) static int pidfd_create(struct pid *pid, unsigned int flags)
{ {
int fd; int fd;
fd = anon_inode_getfd("[pidfd]", &pidfd_fops, get_pid(pid), fd = anon_inode_getfd("[pidfd]", &pidfd_fops, get_pid(pid),
O_RDWR | O_CLOEXEC); flags | O_RDWR | O_CLOEXEC);
if (fd < 0) if (fd < 0)
put_pid(pid); put_pid(pid);
...@@ -565,7 +567,7 @@ SYSCALL_DEFINE2(pidfd_open, pid_t, pid, unsigned int, flags) ...@@ -565,7 +567,7 @@ SYSCALL_DEFINE2(pidfd_open, pid_t, pid, unsigned int, flags)
int fd; int fd;
struct pid *p; struct pid *p;
if (flags) if (flags & ~PIDFD_NONBLOCK)
return -EINVAL; return -EINVAL;
if (pid <= 0) if (pid <= 0)
...@@ -576,7 +578,7 @@ SYSCALL_DEFINE2(pidfd_open, pid_t, pid, unsigned int, flags) ...@@ -576,7 +578,7 @@ SYSCALL_DEFINE2(pidfd_open, pid_t, pid, unsigned int, flags)
return -ESRCH; return -ESRCH;
if (pid_has_task(p, PIDTYPE_TGID)) if (pid_has_task(p, PIDTYPE_TGID))
fd = pidfd_create(p); fd = pidfd_create(p, flags);
else else
fd = -EINVAL; fd = -EINVAL;
......
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
#define __NR_pidfd_getfd -1 #define __NR_pidfd_getfd -1
#endif #endif
#ifndef PIDFD_NONBLOCK
#define PIDFD_NONBLOCK O_NONBLOCK
#endif
/* /*
* The kernel reserves 300 pids via RESERVED_PIDS in kernel/pid.c * The kernel reserves 300 pids via RESERVED_PIDS in kernel/pid.c
* That means, when it wraps around any pid < 300 will be skipped. * That means, when it wraps around any pid < 300 will be skipped.
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment