pidfd: clone: allow CLONE_THREAD | CLONE_PIDFD together
Subsystems (4)
PATCH 1/1 pidfd: clone: allow CLONE_THREAD | CLONE_PIDFD together
copy_process() just needs to pass PIDFD_THREAD to __pidfd_prepare() if clone_flags & CLONE_THREAD.
We can also add another CLONE_ flag (or perhaps reuse CLONE_DETACHED) to enforce PIDFD_THREAD without CLONE_THREAD.
Originally-from: Tycho Andersen <[email protected]>
--- kernel/fork.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/fork.c +4 -3
@@ -2311,9 +2311,8 @@ __latent_entropy struct task_struct *copy_process(/* * - CLONE_DETACHED is blocked so that we can potentially * reuse it later for CLONE_PIDFD. -* - CLONE_THREAD is blocked until someone really needs it. */ -if (clone_flags & (CLONE_DETACHED |CLONE_THREAD )) +if (clone_flags &CLONE_DETACHED )return ERR_PTR (-EINVAL ); }
@@ -2536,8 +2535,10 @@ __latent_entropy struct task_struct *copy_process(* if the fd table isn't shared). */ if (clone_flags &CLONE_PIDFD ) { +int flags = (clone_flags &CLONE_THREAD ) ?PIDFD_THREAD :0 ; +/* Note that no task has been attached to @pid yet. */ - retval =__pidfd_prepare (pid,0 , &pidfile); + retval =__pidfd_prepare (pid, flags, &pidfile);if (retval <0 ) goto bad_fork_free_pid; pidfd = retval;
Signature · 1 line
2.25.1.362.g51ebf55
Christian Brauner
AppliedQuoted 8 lines · Oleg Nesterov
copy_process()just needs to passPIDFD_THREADto__pidfd_prepare()ifclone_flags&CLONE_THREAD.We can also add another
CLONE_flag (or perhaps reuseCLONE_DETACHED) to enforcePIDFD_THREADwithoutCLONE_THREAD.[...]
Applied to the vfs.pidfd branch of the vfs/vfs.git tree. Patches in the vfs.pidfd branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs.pidfd
[1/1] pidfd: clone: allow CLONE_THREAD | CLONE_PIDFD together
https://git.kernel.org/vfs/vfs/c/572a94c5290e
Quoted 7 lines · Oleg Nesterov
copy_process()just needs to passPIDFD_THREADto__pidfd_prepare()ifclone_flags&CLONE_THREAD.We can also add another
CLONE_flag (or perhaps reuseCLONE_DETACHED) to enforcePIDFD_THREADwithoutCLONE_THREAD.Originally-from: Tycho Andersen <[email protected]>
Goes without saying I suppose, but,
as well.
Tycho