Commit 1aa92cd3 authored Oct 17, 2020 by Minchan Kim Committed by Linus Torvalds Oct 18, 2020

pid: move pidfd_get_pid() to pid.c



process_madvise syscall needs pidfd_get_pid function to translate pidfd to
pid so this patch move the function to kernel/pid.c.

Suggested-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Signed-off-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Suren Baghdasaryan <surenb@google.com>
Reviewed-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jann Horn <jannh@google.com>
Cc: Brian Geffon <bgeffon@google.com>
Cc: Daniel Colascione <dancol@google.com>
Cc: Joel Fernandes <joel@joelfernandes.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: John Dias <joaodias@google.com>
Cc: Kirill Tkhai <ktkhai@virtuozzo.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oleksandr Natalenko <oleksandr@redhat.com>
Cc: Sandeep Patil <sspatil@google.com>
Cc: SeongJae Park <sj38.park@gmail.com>
Cc: SeongJae Park <sjpark@amazon.de>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Sonny Rao <sonnyrao@google.com>
Cc: Tim Murray <timmurray@google.com>
Cc: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Florian Weimer <fw@deneb.enyo.de>
Cc: <linux-man@vger.kernel.org>
Link: http://lkml.kernel.org/r/20200302193630.68771-5-minchan@kernel.org
Link: http://lkml.kernel.org/r/20200622192900.22757-3-minchan@kernel.org
Link: https://lkml.kernel.org/r/20200901000633.1920247-3-minchan@kernel.org


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 0726b01e

include/linux/pid.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ extern const struct file_operations pidfd_fops;
		struct file;

		extern struct pid pidfd_pid(const struct file file);
		struct pid pidfd_get_pid(unsigned int fd, unsigned int flags);

		static inline struct pid get_pid(struct pid pid)
		{

kernel/exit.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -1474,25 +1474,6 @@ end:
		return retval;
		}

		static struct pid pidfd_get_pid(unsigned int fd, unsigned int flags)
		{
		struct fd f;
		struct pid *pid;

		f = fdget(fd);
		if (!f.file)
		return ERR_PTR(-EBADF);

		pid = pidfd_pid(f.file);
		if (!IS_ERR(pid)) {
		get_pid(pid);
		*flags = f.file->f_flags;
		}

		fdput(f);
		return pid;
		}

		static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop,
		int options, struct rusage *ru)
		{

kernel/pid.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -520,6 +520,25 @@ struct pid find_ge_pid(int nr, struct pid_namespace ns)
		return idr_get_next(&ns->idr, &nr);
		}

		struct pid pidfd_get_pid(unsigned int fd, unsigned int flags)
		{
		struct fd f;
		struct pid *pid;

		f = fdget(fd);
		if (!f.file)
		return ERR_PTR(-EBADF);

		pid = pidfd_pid(f.file);
		if (!IS_ERR(pid)) {
		get_pid(pid);
		*flags = f.file->f_flags;
		}

		fdput(f);
		return pid;
		}

		/**
		* pidfd_create() - Create a new pid file descriptor.
		*

Admin message