Unverified Commit ddf53155 authored by Christian Brauner's avatar Christian Brauner
Browse files

selftests/pidfd: expand common pidfd header 

Move more infrastructure to the pidfd header.

Link: https://lore.kernel.org/r/20250305-work-pidfs-kill_on_last_close-v3-9-c8c3d8361705@kernel.org


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 18938f71

tools/testing/selftests/pidfd/pidfd.h

+78 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <stdlib.h>

#include <string.h>

#include <syscall.h>

#include <sys/ioctl.h>

#include <sys/types.h>

#include <sys/wait.h>
@@ -66,6 +67,83 @@ 
#define PIDFD_SELF_PROCESS	PIDFD_SELF_THREAD_GROUP

#endif



#ifndef PIDFS_IOCTL_MAGIC

#define PIDFS_IOCTL_MAGIC 0xFF

#endif



#ifndef PIDFD_GET_CGROUP_NAMESPACE

#define PIDFD_GET_CGROUP_NAMESPACE            _IO(PIDFS_IOCTL_MAGIC, 1)

#endif



#ifndef PIDFD_GET_IPC_NAMESPACE

#define PIDFD_GET_IPC_NAMESPACE               _IO(PIDFS_IOCTL_MAGIC, 2)

#endif



#ifndef PIDFD_GET_MNT_NAMESPACE

#define PIDFD_GET_MNT_NAMESPACE               _IO(PIDFS_IOCTL_MAGIC, 3)

#endif



#ifndef PIDFD_GET_NET_NAMESPACE

#define PIDFD_GET_NET_NAMESPACE               _IO(PIDFS_IOCTL_MAGIC, 4)

#endif



#ifndef PIDFD_GET_PID_NAMESPACE

#define PIDFD_GET_PID_NAMESPACE               _IO(PIDFS_IOCTL_MAGIC, 5)

#endif



#ifndef PIDFD_GET_PID_FOR_CHILDREN_NAMESPACE

#define PIDFD_GET_PID_FOR_CHILDREN_NAMESPACE  _IO(PIDFS_IOCTL_MAGIC, 6)

#endif



#ifndef PIDFD_GET_TIME_NAMESPACE

#define PIDFD_GET_TIME_NAMESPACE              _IO(PIDFS_IOCTL_MAGIC, 7)

#endif



#ifndef PIDFD_GET_TIME_FOR_CHILDREN_NAMESPACE

#define PIDFD_GET_TIME_FOR_CHILDREN_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 8)

#endif



#ifndef PIDFD_GET_USER_NAMESPACE

#define PIDFD_GET_USER_NAMESPACE              _IO(PIDFS_IOCTL_MAGIC, 9)

#endif



#ifndef PIDFD_GET_UTS_NAMESPACE

#define PIDFD_GET_UTS_NAMESPACE               _IO(PIDFS_IOCTL_MAGIC, 10)

#endif



#ifndef PIDFD_GET_INFO

#define PIDFD_GET_INFO			      _IOWR(PIDFS_IOCTL_MAGIC, 11, struct pidfd_info)

#endif



#ifndef PIDFD_INFO_PID

#define PIDFD_INFO_PID			(1UL << 0) /* Always returned, even if not requested */

#endif



#ifndef PIDFD_INFO_CREDS

#define PIDFD_INFO_CREDS		(1UL << 1) /* Always returned, even if not requested */

#endif



#ifndef PIDFD_INFO_CGROUPID

#define PIDFD_INFO_CGROUPID		(1UL << 2) /* Always returned if available, even if not requested */

#endif



struct pidfd_info {

	__u64 mask;

	__u64 cgroupid;

	__u32 pid;

	__u32 tgid;

	__u32 ppid;

	__u32 ruid;

	__u32 rgid;

	__u32 euid;

	__u32 egid;

	__u32 suid;

	__u32 sgid;

	__u32 fsuid;

	__u32 fsgid;

	__u32 spare0[1];

};



/*

 * The kernel reserves 300 pids via RESERVED_PIDS in kernel/pid.c

 * That means, when it wraps around any pid < 300 will be skipped.

tools/testing/selftests/pidfd/pidfd_open_test.c

+0 −26
Original line number Diff line number Diff line
@@ -22,32 +22,6 @@ 
#include "pidfd.h"

#include "../kselftest.h"



#ifndef PIDFS_IOCTL_MAGIC

#define PIDFS_IOCTL_MAGIC 0xFF

#endif



#ifndef PIDFD_GET_INFO

#define PIDFD_GET_INFO _IOWR(PIDFS_IOCTL_MAGIC, 11, struct pidfd_info)

#define PIDFD_INFO_CGROUPID		(1UL << 0)



struct pidfd_info {

	__u64 mask;

	__u64 cgroupid;

	__u32 pid;

	__u32 tgid;

	__u32 ppid;

	__u32 ruid;

	__u32 rgid;

	__u32 euid;

	__u32 egid;

	__u32 suid;

	__u32 sgid;

	__u32 fsuid;

	__u32 fsgid;

	__u32 spare0[1];

};

#endif



static int safe_int(const char *numstr, int *converted)

{

	char *err = NULL;

tools/testing/selftests/pidfd/pidfd_setns_test.c

+0 −45
Original line number Diff line number Diff line
@@ -16,55 +16,10 @@ 
#include <unistd.h>

#include <sys/socket.h>

#include <sys/stat.h>

#include <sys/ioctl.h>



#include "pidfd.h"

#include "../kselftest_harness.h"



#ifndef PIDFS_IOCTL_MAGIC

#define PIDFS_IOCTL_MAGIC 0xFF

#endif



#ifndef PIDFD_GET_CGROUP_NAMESPACE

#define PIDFD_GET_CGROUP_NAMESPACE            _IO(PIDFS_IOCTL_MAGIC, 1)

#endif



#ifndef PIDFD_GET_IPC_NAMESPACE

#define PIDFD_GET_IPC_NAMESPACE               _IO(PIDFS_IOCTL_MAGIC, 2)

#endif



#ifndef PIDFD_GET_MNT_NAMESPACE

#define PIDFD_GET_MNT_NAMESPACE               _IO(PIDFS_IOCTL_MAGIC, 3)

#endif



#ifndef PIDFD_GET_NET_NAMESPACE

#define PIDFD_GET_NET_NAMESPACE               _IO(PIDFS_IOCTL_MAGIC, 4)

#endif



#ifndef PIDFD_GET_PID_NAMESPACE

#define PIDFD_GET_PID_NAMESPACE               _IO(PIDFS_IOCTL_MAGIC, 5)

#endif



#ifndef PIDFD_GET_PID_FOR_CHILDREN_NAMESPACE

#define PIDFD_GET_PID_FOR_CHILDREN_NAMESPACE  _IO(PIDFS_IOCTL_MAGIC, 6)

#endif



#ifndef PIDFD_GET_TIME_NAMESPACE

#define PIDFD_GET_TIME_NAMESPACE              _IO(PIDFS_IOCTL_MAGIC, 7)

#endif



#ifndef PIDFD_GET_TIME_FOR_CHILDREN_NAMESPACE

#define PIDFD_GET_TIME_FOR_CHILDREN_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 8)

#endif



#ifndef PIDFD_GET_USER_NAMESPACE

#define PIDFD_GET_USER_NAMESPACE              _IO(PIDFS_IOCTL_MAGIC, 9)

#endif



#ifndef PIDFD_GET_UTS_NAMESPACE

#define PIDFD_GET_UTS_NAMESPACE               _IO(PIDFS_IOCTL_MAGIC, 10)

#endif



enum {

	PIDFD_NS_USER,

	PIDFD_NS_MNT,