From: Andrey Vagin <avagin@openvz.org>
To: Konstantin Khorenko <khorenko@virtuozzo.com>
Cc: Kirill Gorkunov <kgorkunov@virtuozzo.com>,
Benjamin Coddington <bcodding@redhat.com>,
Jeff Layton <jlayton@kernel.org>,
"J. Bruce Fields" <bfields@fieldses.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Vasily Averin <vvs@virtuozzo.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] fs/lock: skip lock owner pid translation in case we are in init_pid_ns
Date: Mon, 11 Jun 2018 21:35:24 -0700 [thread overview]
Message-ID: <20180612043524.GA8843@outlook.office365.com> (raw)
In-Reply-To: <20180608142712.32460-2-khorenko@virtuozzo.com>
On Fri, Jun 08, 2018 at 05:27:11PM +0300, Konstantin Khorenko wrote:
> If the flock owner process is dead and its pid has been already freed,
> pid translation won't work, but we still want to show flock owner pid
> number when expecting /proc/$PID/fdinfo/$FD in init pidns.
>
> Reproducer:
> process A process A1 process A2
> fork()--------->
> exit() open()
> flock()
> fork()--------->
> exit() sleep()
>
> Before the patch:
> ================
> (root@vz7)/: cat /proc/${PID_A2}/fdinfo/3
> pos: 4
> flags: 02100002
> mnt_id: 257
> lock: (root@vz7)/:
>
> After the patch:
> ===============
> (root@vz7)/:cat /proc/${PID_A2}/fdinfo/3
> pos: 4
> flags: 02100002
> mnt_id: 295
> lock: 1: FLOCK ADVISORY WRITE ${PID_A1} b6:f8a61:529946 0 EOF
>
Acked-by: Andrey Vagin <avagin@openvz.org>
> Fixes: 9d5b86ac13c5 ("fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks")
> Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
> ---
> fs/locks.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/fs/locks.c b/fs/locks.c
> index 05e211be8684..bfee5b7f2862 100644
> --- a/fs/locks.c
> +++ b/fs/locks.c
> @@ -2072,6 +2072,13 @@ static pid_t locks_translate_pid(struct file_lock *fl, struct pid_namespace *ns)
> return -1;
> if (IS_REMOTELCK(fl))
> return fl->fl_pid;
> + /*
> + * If the flock owner process is dead and its pid has been already
> + * freed, the translation below won't work, but we still want to show
> + * flock owner pid number in init pidns.
> + */
> + if (ns == &init_pid_ns)
> + return (pid_t)fl->fl_pid;
>
> rcu_read_lock();
> pid = find_pid_ns(fl->fl_pid, &init_pid_ns);
> --
> 2.15.1
>
next prev parent reply other threads:[~2018-06-12 4:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-08 14:27 [PATCH 0/2] fs/lock: show locks info owned by dead/invisible processes Konstantin Khorenko
2018-06-08 14:27 ` [PATCH 1/2] fs/lock: skip lock owner pid translation in case we are in init_pid_ns Konstantin Khorenko
2018-06-12 4:35 ` Andrey Vagin [this message]
2018-06-08 14:27 ` [PATCH 2/2] fs/lock: show locks taken by processes from another pidns Konstantin Khorenko
2018-06-12 4:53 ` Andrey Vagin
2018-06-14 11:00 ` Jeff Layton
2018-06-19 20:25 ` Andrey Vagin
2018-06-08 16:02 ` [PATCH 0/2] fs/lock: show locks info owned by dead/invisible processes Cyrill Gorcunov
2018-06-14 10:41 ` Jeff Layton
2018-06-14 11:13 ` Benjamin Coddington
2018-08-09 7:16 ` Murphy Zhou
2018-08-09 8:20 ` Konstantin Khorenko
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=20180612043524.GA8843@outlook.office365.com \
--to=avagin@openvz.org \
--cc=bcodding@redhat.com \
--cc=bfields@fieldses.org \
--cc=jlayton@kernel.org \
--cc=kgorkunov@virtuozzo.com \
--cc=khorenko@virtuozzo.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=vvs@virtuozzo.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).