Commit 0acefef5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull thread management updates from Christian Brauner:

 - A pidfd's fdinfo file currently contains the field "Pid:\t<pid>"
   where <pid> is the pid of the process in the pid namespace of the
   procfs instance the fdinfo file for the pidfd was opened in.

   The fdinfo file has now gained a new "NSpid:\t<ns-pid1>[\t<ns-pid2>[...]]"
   field which lists the pids of the process in all child pid namespaces
   provided the pid namespace of the procfs instance it is looked up
   under has an ancestoral relationship with the pid namespace of the
   process. If it does not 0 will be shown and no further pid namespaces
   will be listed. Tests included. (Christian Kellner)

 - If the process the pidfd references has already exited, print -1 for
   the Pid and NSpid fields in the pidfd's fdinfo file. Tests included.
   (me)

 - Add CLONE_CLEAR_SIGHAND. This lets callers clear all signal handler
   that are not SIG_DFL or SIG_IGN at process creation time. This
   originated as a feature request from glibc to improve performance and
   elimate races in their posix_spawn() implementation. Tests included.
   (me)

 - Add support for choosing a specific pid for a process with clone3().
   This is the feature which was part of the thread update for v5.4 but
   after a discussion at LPC in Lisbon we decided to delay it for one
   more cycle in order to make the interface more generic. This has now
   done. It is now possible to choose a specific pid in a whole pid
   namespaces (sub)hierarchy instead of just one pid namespace. In order
   to choose a specific pid the caller must have CAP_SYS_ADMIN in all
   owning user namespaces of the target pid namespaces. Tests included.
   (Adrian Reber)

 - Test improvements and extensions. (Andrei Vagin, me)

* tag 'threads-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
  selftests/clone3: skip if clone3() is ENOSYS
  selftests/clone3: check that all pids are released on error paths
  selftests/clone3: report a correct number of fails
  selftests/clone3: flush stdout and stderr before clone3() and _exit()
  selftests: add tests for clone3() with *set_tid
  fork: extend clone3() to support setting a PID
  selftests: add tests for clone3()
  tests: test CLONE_CLEAR_SIGHAND
  clone3: add CLONE_CLEAR_SIGHAND
  pid: use pid_has_task() in pidfd_open()
  exit: use pid_has_task() in do_wait()
  pid: use pid_has_task() in __change_pid()
  test: verify fdinfo for pidfd of reaped process
  pidfd: check pid has attached task in fdinfo
  pidfd: add tests for NSpid info in fdinfo
  pidfd: add NSpid entries to fdinfo
parents 9c91e6a5 11fde161

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12861,6 +12861,7 @@ S: Maintained 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git

F:	samples/pidfd/

F:	tools/testing/selftests/pidfd/

F:	tools/testing/selftests/clone3/

K:	(?i)pidfd

K:	(?i)clone3

K:	\b(clone_args|kernel_clone_args)\b

include/linux/pid.h

+6 −1
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ static inline struct pid *get_pid(struct pid *pid) 


extern void put_pid(struct pid *pid);

extern struct task_struct *pid_task(struct pid *pid, enum pid_type);

static inline bool pid_has_task(struct pid *pid, enum pid_type type)

{

	return !hlist_empty(&pid->tasks[type]);

}

extern struct task_struct *get_pid_task(struct pid *pid, enum pid_type);



extern struct pid *get_task_pid(struct task_struct *task, enum pid_type type);
@@ -120,7 +124,8 @@ extern struct pid *find_vpid(int nr); 
extern struct pid *find_get_pid(int nr);

extern struct pid *find_ge_pid(int nr, struct pid_namespace *);



extern struct pid *alloc_pid(struct pid_namespace *ns);

extern struct pid *alloc_pid(struct pid_namespace *ns, pid_t *set_tid,

			     size_t set_tid_size);

extern void free_pid(struct pid *pid);

extern void disable_pid_allocation(struct pid_namespace *ns);

include/linux/pid_namespace.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/ns_common.h>

#include <linux/idr.h>



/* MAX_PID_NS_LEVEL is needed for limiting size of 'struct pid' */

#define MAX_PID_NS_LEVEL 32



struct fs_pin;

include/linux/sched/task.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ struct kernel_clone_args { 
	unsigned long stack;

	unsigned long stack_size;

	unsigned long tls;

	pid_t *set_tid;

	/* Number of elements in *set_tid */

	size_t set_tid_size;

};



/*

include/uapi/linux/sched.h

+42 −22
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
#define CLONE_NEWNET		0x40000000	/* New network namespace */

#define CLONE_IO		0x80000000	/* Clone io context */



/* Flags for the clone3() syscall. */

#define CLONE_CLEAR_SIGHAND 0x100000000ULL /* Clear any signal handler and reset to SIG_DFL. */



#ifndef __ASSEMBLY__

/**

 * struct clone_args - arguments for the clone3 syscall
@@ -58,6 +61,20 @@ 
 * @stack_size:   The size of the stack for the child process.

 * @tls:          If CLONE_SETTLS is set, the tls descriptor

 *                is set to tls.

 * @set_tid:      Pointer to an array of type *pid_t. The size

 *                of the array is defined using @set_tid_size.

 *                This array is used to select PIDs/TIDs for

 *                newly created processes. The first element in

 *                this defines the PID in the most nested PID

 *                namespace. Each additional element in the array

 *                defines the PID in the parent PID namespace of

 *                the original PID namespace. If the array has

 *                less entries than the number of currently

 *                nested PID namespaces only the PIDs in the

 *                corresponding namespaces are set.

 * @set_tid_size: This defines the size of the array referenced

 *                in @set_tid. This cannot be larger than the

 *                kernel's limit of nested PID namespaces.

 *

 * The structure is versioned by size and thus extensible.

 * New struct members must go at the end of the struct and
@@ -72,10 +89,13 @@ struct clone_args { 
	__aligned_u64 stack;

	__aligned_u64 stack_size;

	__aligned_u64 tls;

	__aligned_u64 set_tid;

	__aligned_u64 set_tid_size;

};

#endif



#define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */

#define CLONE_ARGS_SIZE_VER1 80 /* sizeof second published struct */



/*

 * Scheduling policies

CRA Git | Maintained and supported by SUSTech CRA and CCSE