From: Minchan Kim <minchan@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
linux-mm <linux-mm@kvack.org>,
linux-api@vger.kernel.org, oleksandr@redhat.com,
Suren Baghdasaryan <surenb@google.com>,
Tim Murray <timmurray@google.com>,
Daniel Colascione <dancol@google.com>,
Sandeep Patil <sspatil@google.com>,
Sonny Rao <sonnyrao@google.com>,
Brian Geffon <bgeffon@google.com>, Michal Hocko <mhocko@suse.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Shakeel Butt <shakeelb@google.com>,
John Dias <joaodias@google.com>,
Joel Fernandes <joel@joelfernandes.org>,
Jann Horn <jannh@google.com>,
alexander.h.duyck@linux.intel.com, sj38.park@gmail.com,
Minchan Kim <minchan@kernel.org>,
Christoph Hellwig <hch@infradead.org>,
Christian Brauner <christian@brauner.io>
Subject: [PATCH v7 4/7] pid: move pidfd_get_pid function to pid.c
Date: Mon, 2 Mar 2020 11:36:27 -0800 [thread overview]
Message-ID: <20200302193630.68771-5-minchan@kernel.org> (raw)
In-Reply-To: <20200302193630.68771-1-minchan@kernel.org>
process_madvise syscall needs pidfd_get_pid function to translate
pidfd to pid so this patch move the function to kernel/pid.c.
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Christian Brauner <christian@brauner.io>
Reviewed-by: Suren Baghdasaryan <surenb@google.com>
Suggested-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Reviewed-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Signed-off-by: Minchan Kim <minchan@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 998ae7d24450..993f68cb45c2 100644
--- a/include/linux/pid.h
+++ b/include/linux/pid.h
@@ -75,6 +75,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 764960fabfa1..8cad838c26d6 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1471,23 +1471,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 0f4ecb57214c..360ba480a2a9 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -496,6 +496,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.25.0.265.gbab2e86ba0-goog
next prev parent reply other threads:[~2020-03-02 19:36 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-02 19:36 [PATCH v7 0/7] introduce memory hinting API for external process Minchan Kim
2020-03-02 19:36 ` [PATCH v7 1/7] mm: pass task and mm to do_madvise Minchan Kim
2020-03-05 15:48 ` Vlastimil Babka
2020-05-08 18:21 ` Minchan Kim
2020-03-02 19:36 ` [PATCH v7 2/7] mm: introduce external memory hinting API Minchan Kim
2020-03-03 10:33 ` kbuild test robot
2020-03-03 14:57 ` Minchan Kim
2020-03-05 18:15 ` Vlastimil Babka
2020-03-10 22:20 ` Minchan Kim
2020-03-11 0:36 ` Minchan Kim
2020-03-12 12:40 ` Vlastimil Babka
2020-03-12 20:23 ` Minchan Kim
2020-05-08 18:33 ` Minchan Kim
2020-03-02 19:36 ` [PATCH v7 3/7] mm: check fatal signal pending of target process Minchan Kim
2020-03-06 10:22 ` Vlastimil Babka
2020-03-10 22:24 ` Minchan Kim
2020-03-02 19:36 ` Minchan Kim [this message]
2020-03-06 10:57 ` [PATCH v7 4/7] pid: move pidfd_get_pid function to pid.c Vlastimil Babka
2020-03-06 11:14 ` Christian Brauner
2020-03-02 19:36 ` [PATCH v7 5/7] mm: support both pid and pidfd for process_madvise Minchan Kim
2020-03-06 11:14 ` Vlastimil Babka
2020-03-11 0:42 ` Minchan Kim
2020-05-08 18:36 ` Minchan Kim
2020-05-08 23:04 ` Andrew Morton
2020-05-09 12:48 ` Christian Brauner
2020-05-09 23:14 ` Minchan Kim
2020-05-12 19:55 ` Suren Baghdasaryan
2020-03-02 19:36 ` [PATCH v7 6/7] mm/madvise: employ mmget_still_valid for write lock Minchan Kim
2020-03-06 12:52 ` Vlastimil Babka
2020-03-06 13:03 ` Oleksandr Natalenko
2020-03-06 16:03 ` Vlastimil Babka
2020-03-09 12:30 ` Oleksandr Natalenko
2020-03-10 22:28 ` Minchan Kim
2020-03-02 19:36 ` [PATCH v7 7/7] mm/madvise: allow KSM hints for remote API Minchan Kim
2020-03-06 13:13 ` Vlastimil Babka
2020-03-06 13:41 ` Oleksandr Natalenko
2020-03-06 16:08 ` Vlastimil Babka
2020-03-09 13:11 ` Oleksandr Natalenko
2020-03-09 15:08 ` Michal Hocko
2020-03-09 15:19 ` Oleksandr Natalenko
2020-03-09 15:42 ` Vlastimil Babka
2020-03-09 16:03 ` Michal Hocko
2020-06-11 2:21 ` Jann Horn
2020-03-02 21:16 ` [PATCH v7 0/7] introduce memory hinting API for external process Andrew Morton
2020-03-02 21:42 ` Minchan Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200302193630.68771-5-minchan@kernel.org \
--to=minchan@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=alexander.h.duyck@linux.intel.com \
--cc=bgeffon@google.com \
--cc=christian@brauner.io \
--cc=dancol@google.com \
--cc=hannes@cmpxchg.org \
--cc=hch@infradead.org \
--cc=jannh@google.com \
--cc=joaodias@google.com \
--cc=joel@joelfernandes.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=oleksandr@redhat.com \
--cc=shakeelb@google.com \
--cc=sj38.park@gmail.com \
--cc=sonnyrao@google.com \
--cc=sspatil@google.com \
--cc=surenb@google.com \
--cc=timmurray@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).