[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200901000633.1920247-3-minchan@kernel.org>
Date: Mon, 31 Aug 2020 17:06:32 -0700
From: Minchan Kim <minchan@...nel.org>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
Christian Brauner <christian.brauner@...ntu.com>,
linux-mm <linux-mm@...ck.org>, linux-api@...r.kernel.org,
oleksandr@...hat.com, Suren Baghdasaryan <surenb@...gle.com>,
Tim Murray <timmurray@...gle.com>,
Sandeep Patil <sspatil@...gle.com>,
Sonny Rao <sonnyrao@...gle.com>,
Brian Geffon <bgeffon@...gle.com>,
Michal Hocko <mhocko@...e.com>,
Johannes Weiner <hannes@...xchg.org>,
Shakeel Butt <shakeelb@...gle.com>,
John Dias <joaodias@...gle.com>,
Joel Fernandes <joel@...lfernandes.org>,
Jann Horn <jannh@...gle.com>,
alexander.h.duyck@...ux.intel.com, sj38.park@...il.com,
David Rientjes <rientjes@...gle.com>,
Arjun Roy <arjunroy@...gle.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Minchan Kim <minchan@...nel.org>,
Vlastimil Babka <vbabka@...e.cz>, Jens Axboe <axboe@...nel.dk>,
Daniel Colascione <dancol@...gle.com>,
Kirill Tkhai <ktkhai@...tuozzo.com>,
SeongJae Park <sjpark@...zon.de>, linux-man@...r.kernel.org
Subject: [PATCH v9 2/3] 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.
Link: http://lkml.kernel.org/r/20200302193630.68771-5-minchan@kernel.org
Link: http://lkml.kernel.org/r/20200622192900.22757-3-minchan@kernel.org
Reviewed-by: Suren Baghdasaryan <surenb@...gle.com>
Suggested-by: Alexander Duyck <alexander.h.duyck@...ux.intel.com>
Reviewed-by: Alexander Duyck <alexander.h.duyck@...ux.intel.com>
Acked-by: Christian Brauner <christian.brauner@...ntu.com>
Reviewed-by: Vlastimil Babka <vbabka@...e.cz>
Acked-by: David Rientjes <rientjes@...gle.com>
Signed-off-by: Minchan Kim <minchan@...nel.org>
Cc: Jens Axboe <axboe@...nel.dk>
Cc: Jann Horn <jannh@...gle.com>
Cc: Brian Geffon <bgeffon@...gle.com>
Cc: Daniel Colascione <dancol@...gle.com>
Cc: Joel Fernandes <joel@...lfernandes.org>
Cc: Johannes Weiner <hannes@...xchg.org>
Cc: John Dias <joaodias@...gle.com>
Cc: Kirill Tkhai <ktkhai@...tuozzo.com>
Cc: Michal Hocko <mhocko@...e.com>
Cc: Oleksandr Natalenko <oleksandr@...hat.com>
Cc: Sandeep Patil <sspatil@...gle.com>
Cc: SeongJae Park <sj38.park@...il.com>
Cc: SeongJae Park <sjpark@...zon.de>
Cc: Shakeel Butt <shakeelb@...gle.com>
Cc: Sonny Rao <sonnyrao@...gle.com>
Cc: Tim Murray <timmurray@...gle.com>
Cc: Christian Brauner <christian.brauner@...ntu.com>
Cc: <linux-man@...r.kernel.org>
---
include/linux/pid.h | 1 +
kernel/exit.c | 17 -----------------
kernel/pid.c | 17 +++++++++++++++++
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/include/linux/pid.h b/include/linux/pid.h
index 176d6cf80e7c..86e0e7cb7872 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -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);
static inline struct pid *get_pid(struct pid *pid)
{
diff --git a/kernel/exit.c b/kernel/exit.c
index 733e80f334e7..62912406d74a 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1474,23 +1474,6 @@ static long do_wait(struct wait_opts *wo)
return retval;
}
-static struct pid *pidfd_get_pid(unsigned int fd)
-{
- 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);
-
- fdput(f);
- return pid;
-}
-
static long kernel_waitid(int which, pid_t upid, struct waitid_info *infop,
int options, struct rusage *ru)
{
diff --git a/kernel/pid.c b/kernel/pid.c
index 2b97bedc1d9f..54e153ec6b74 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -519,6 +519,23 @@ 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)
+{
+ 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);
+
+ fdput(f);
+ return pid;
+}
+
/**
* pidfd_create() - Create a new pid file descriptor.
*
--
2.28.0.402.g5ffc5be6b7-goog
Powered by blists - more mailing lists