linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
@ 2016-08-02 14:42 Nikolay Borisov
  2016-08-02 14:45 ` Nikolay Borisov
                   ` (3 more replies)
  0 siblings, 4 replies; 22+ messages in thread
From: Nikolay Borisov @ 2016-08-02 14:42 UTC (permalink / raw)
  To: jlayton, viro
  Cc: bfields, linux-kernel, linux-fsdevel, ebiederm, containers,
	serge.hallyn, Nikolay Borisov

Currently when /proc/locks is read it will show all the file locks
which are currently created on the machine. On containers, hosted
on busy servers this means that doing lsof can be very slow. I
observed up to 5 seconds stalls reading 50k locks, while the container
itself had only a small number of relevant entries. Fix it by
filtering the locks listed by the pidns of the current process
and the process which created the lock.

Signed-off-by: Nikolay Borisov <kernel@kyup.com>
---
 fs/locks.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fs/locks.c b/fs/locks.c
index 6333263b7bc8..53e96df4c583 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2615,9 +2615,17 @@ static int locks_show(struct seq_file *f, void *v)
 {
 	struct locks_iterator *iter = f->private;
 	struct file_lock *fl, *bfl;
+	struct pid_namespace *pid_ns = task_active_pid_ns(current);
+
 
 	fl = hlist_entry(v, struct file_lock, fl_link);
 
+	pr_info ("Current pid_ns: %p init_pid_ns: %p, fl->fl_nspid: %p nspidof:%p\n", pid_ns, &init_pid_ns,
+		 fl->fl_nspid, ns_of_pid(fl->fl_nspid));
+	if ((pid_ns != &init_pid_ns) && fl->fl_nspid &&
+		(pid_ns != ns_of_pid(fl->fl_nspid)))
+		    return 0;
+
 	lock_get_status(f, fl, iter->li_pos, "");
 
 	list_for_each_entry(bfl, &fl->fl_block, fl_block)
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 14:42 [RFC PATCH] locks: Show only file_locks created in the same pidns as current process Nikolay Borisov
@ 2016-08-02 14:45 ` Nikolay Borisov
  2016-08-02 15:05 ` J. Bruce Fields
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 22+ messages in thread
From: Nikolay Borisov @ 2016-08-02 14:45 UTC (permalink / raw)
  To: jlayton, viro
  Cc: serge.hallyn, containers, linux-kernel, bfields, ebiederm, linux-fsdevel



On 08/02/2016 05:42 PM, Nikolay Borisov wrote:
> Currently when /proc/locks is read it will show all the file locks
> which are currently created on the machine. On containers, hosted
> on busy servers this means that doing lsof can be very slow. I
> observed up to 5 seconds stalls reading 50k locks, while the container
> itself had only a small number of relevant entries. Fix it by
> filtering the locks listed by the pidns of the current process
> and the process which created the lock.
> 
> Signed-off-by: Nikolay Borisov <kernel@kyup.com>
> ---
>  fs/locks.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/fs/locks.c b/fs/locks.c
> index 6333263b7bc8..53e96df4c583 100644
> --- a/fs/locks.c
> +++ b/fs/locks.c
> @@ -2615,9 +2615,17 @@ static int locks_show(struct seq_file *f, void *v)
>  {
>  	struct locks_iterator *iter = f->private;
>  	struct file_lock *fl, *bfl;
> +	struct pid_namespace *pid_ns = task_active_pid_ns(current);
> +
>  
>  	fl = hlist_entry(v, struct file_lock, fl_link);
>  
> +	pr_info ("Current pid_ns: %p init_pid_ns: %p, fl->fl_nspid: %p nspidof:%p\n", pid_ns, &init_pid_ns,
> +		 fl->fl_nspid, ns_of_pid(fl->fl_nspid));

Obviously I don't intend on including that in the final submission.

> +	if ((pid_ns != &init_pid_ns) && fl->fl_nspid &&
> +		(pid_ns != ns_of_pid(fl->fl_nspid)))
> +		    return 0;
> +
>  	lock_get_status(f, fl, iter->li_pos, "");
>  
>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)
> 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 14:42 [RFC PATCH] locks: Show only file_locks created in the same pidns as current process Nikolay Borisov
  2016-08-02 14:45 ` Nikolay Borisov
@ 2016-08-02 15:05 ` J. Bruce Fields
  2016-08-02 15:20   ` Nikolay Borisov
  2016-08-02 16:00 ` Eric W. Biederman
  2016-08-03  7:35 ` [PATCH v2] locks: Filter /proc/locks output on proc pid ns Nikolay Borisov
  3 siblings, 1 reply; 22+ messages in thread
From: J. Bruce Fields @ 2016-08-02 15:05 UTC (permalink / raw)
  To: Nikolay Borisov
  Cc: jlayton, viro, linux-kernel, linux-fsdevel, ebiederm, containers,
	serge.hallyn

On Tue, Aug 02, 2016 at 05:42:23PM +0300, Nikolay Borisov wrote:
> Currently when /proc/locks is read it will show all the file locks
> which are currently created on the machine. On containers, hosted
> on busy servers this means that doing lsof can be very slow. I
> observed up to 5 seconds stalls reading 50k locks,

Do you mean just that the reading process itself was blocked, or that
others were getting stuck on blocked_lock_lock?

(And what process was actually reading /proc/locks, out of curiosity?)

> while the container
> itself had only a small number of relevant entries. Fix it by
> filtering the locks listed by the pidns of the current process
> and the process which created the lock.

Thanks, that's interesting.  So you show a lock if it was created by
someone in the current pid namespace.  With a special exception for the
init namespace so that 

If a filesystem is shared between containers that means you won't
necessarily be able to figure out from within a container which lock is
conflicting with your lock.  (I don't know if that's really a problem.
I'm unfortunately short on evidence aobut what people actually use
/proc/locks for....)

--b.

> 
> Signed-off-by: Nikolay Borisov <kernel@kyup.com>
> ---
>  fs/locks.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/fs/locks.c b/fs/locks.c
> index 6333263b7bc8..53e96df4c583 100644
> --- a/fs/locks.c
> +++ b/fs/locks.c
> @@ -2615,9 +2615,17 @@ static int locks_show(struct seq_file *f, void *v)
>  {
>  	struct locks_iterator *iter = f->private;
>  	struct file_lock *fl, *bfl;
> +	struct pid_namespace *pid_ns = task_active_pid_ns(current);
> +
>  
>  	fl = hlist_entry(v, struct file_lock, fl_link);
>  
> +	pr_info ("Current pid_ns: %p init_pid_ns: %p, fl->fl_nspid: %p nspidof:%p\n", pid_ns, &init_pid_ns,
> +		 fl->fl_nspid, ns_of_pid(fl->fl_nspid));
> +	if ((pid_ns != &init_pid_ns) && fl->fl_nspid &&
> +		(pid_ns != ns_of_pid(fl->fl_nspid)))
> +		    return 0;
> +
>  	lock_get_status(f, fl, iter->li_pos, "");
>  
>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)
> -- 
> 2.5.0

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 15:05 ` J. Bruce Fields
@ 2016-08-02 15:20   ` Nikolay Borisov
  2016-08-02 15:43     ` J. Bruce Fields
  0 siblings, 1 reply; 22+ messages in thread
From: Nikolay Borisov @ 2016-08-02 15:20 UTC (permalink / raw)
  To: J. Bruce Fields
  Cc: jlayton, viro, linux-kernel, linux-fsdevel, ebiederm, containers,
	serge.hallyn



On 08/02/2016 06:05 PM, J. Bruce Fields wrote:
> On Tue, Aug 02, 2016 at 05:42:23PM +0300, Nikolay Borisov wrote:
>> Currently when /proc/locks is read it will show all the file locks
>> which are currently created on the machine. On containers, hosted
>> on busy servers this means that doing lsof can be very slow. I
>> observed up to 5 seconds stalls reading 50k locks,
> 
> Do you mean just that the reading process itself was blocked, or that
> others were getting stuck on blocked_lock_lock?

I mean the listing process. Here is a simplified example from cat: 

cat-15084 [010] 3394000.190341: funcgraph_entry:      # 6156.641 us |  vfs_read();
cat-15084 [010] 3394000.196568: funcgraph_entry:      # 6096.618 us |  vfs_read();
cat-15084 [010] 3394000.202743: funcgraph_entry:      # 6060.097 us |  vfs_read();
cat-15084 [010] 3394000.208937: funcgraph_entry:      # 6111.374 us |  vfs_read();


> 
> (And what process was actually reading /proc/locks, out of curiosity?)

lsof in my case

> 
>> while the container
>> itself had only a small number of relevant entries. Fix it by
>> filtering the locks listed by the pidns of the current process
>> and the process which created the lock.
> 
> Thanks, that's interesting.  So you show a lock if it was created by
> someone in the current pid namespace.  With a special exception for the
> init namespace so that 

I admit this is a rather naive approach. Something else I was pondering was 
checking whether the user_ns of the lock's creator pidns is the same as the 
reader's user_ns. That should potentially solve your concerns re. 
shared filesystems, no? Or whether the reader's userns is an ancestor 
of the user'ns of the creator's pidns? Maybe Eric can elaborate whether 
this would make sense?

> 
> If a filesystem is shared between containers that means you won't
> necessarily be able to figure out from within a container which lock is
> conflicting with your lock.  (I don't know if that's really a problem.
> I'm unfortunately short on evidence aobut what people actually use
> /proc/locks for....)
> 
> --b.
> 
>>
>> Signed-off-by: Nikolay Borisov <kernel@kyup.com>
>> ---
>>  fs/locks.c | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/fs/locks.c b/fs/locks.c
>> index 6333263b7bc8..53e96df4c583 100644
>> --- a/fs/locks.c
>> +++ b/fs/locks.c
>> @@ -2615,9 +2615,17 @@ static int locks_show(struct seq_file *f, void *v)
>>  {
>>  	struct locks_iterator *iter = f->private;
>>  	struct file_lock *fl, *bfl;
>> +	struct pid_namespace *pid_ns = task_active_pid_ns(current);
>> +
>>  
>>  	fl = hlist_entry(v, struct file_lock, fl_link);
>>  
>> +	pr_info ("Current pid_ns: %p init_pid_ns: %p, fl->fl_nspid: %p nspidof:%p\n", pid_ns, &init_pid_ns,
>> +		 fl->fl_nspid, ns_of_pid(fl->fl_nspid));
>> +	if ((pid_ns != &init_pid_ns) && fl->fl_nspid &&
>> +		(pid_ns != ns_of_pid(fl->fl_nspid)))
>> +		    return 0;
>> +
>>  	lock_get_status(f, fl, iter->li_pos, "");
>>  
>>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)
>> -- 
>> 2.5.0

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 15:20   ` Nikolay Borisov
@ 2016-08-02 15:43     ` J. Bruce Fields
  0 siblings, 0 replies; 22+ messages in thread
From: J. Bruce Fields @ 2016-08-02 15:43 UTC (permalink / raw)
  To: Nikolay Borisov
  Cc: jlayton, viro, linux-kernel, linux-fsdevel, ebiederm, containers,
	serge.hallyn

On Tue, Aug 02, 2016 at 06:20:32PM +0300, Nikolay Borisov wrote:
> On 08/02/2016 06:05 PM, J. Bruce Fields wrote:
> > (And what process was actually reading /proc/locks, out of curiosity?)
> 
> lsof in my case

Oh, thanks, and you said that at the start, and I overlooked
it--apologies.

> >> while the container
> >> itself had only a small number of relevant entries. Fix it by
> >> filtering the locks listed by the pidns of the current process
> >> and the process which created the lock.
> > 
> > Thanks, that's interesting.  So you show a lock if it was created by
> > someone in the current pid namespace.  With a special exception for the
> > init namespace so that 
> 
> I admit this is a rather naive approach. Something else I was pondering was 
> checking whether the user_ns of the lock's creator pidns is the same as the 
> reader's user_ns. That should potentially solve your concerns re. 
> shared filesystems, no? Or whether the reader's userns is an ancestor 
> of the user'ns of the creator's pidns? Maybe Eric can elaborate whether 
> this would make sense?

If I could just imagine myself king of the world for a moment--I wish I
could have an interface that took a path or a filehandle and gave back a
list of locks on the associated filesystem.  Then if lsof wanted a
global list, it would go through /proc/mounts and request the list of
locks for each filesystem.

For /proc/locks it might be nice if we could restrict to locks on
filesystem that are somehow visible to the current process, but I don't
know if there's a simple way to do that.

--b.

> 
> > 
> > If a filesystem is shared between containers that means you won't
> > necessarily be able to figure out from within a container which lock is
> > conflicting with your lock.  (I don't know if that's really a problem.
> > I'm unfortunately short on evidence aobut what people actually use
> > /proc/locks for....)
> > 
> > --b.
> > 
> >>
> >> Signed-off-by: Nikolay Borisov <kernel@kyup.com>
> >> ---
> >>  fs/locks.c | 8 ++++++++
> >>  1 file changed, 8 insertions(+)
> >>
> >> diff --git a/fs/locks.c b/fs/locks.c
> >> index 6333263b7bc8..53e96df4c583 100644
> >> --- a/fs/locks.c
> >> +++ b/fs/locks.c
> >> @@ -2615,9 +2615,17 @@ static int locks_show(struct seq_file *f, void *v)
> >>  {
> >>  	struct locks_iterator *iter = f->private;
> >>  	struct file_lock *fl, *bfl;
> >> +	struct pid_namespace *pid_ns = task_active_pid_ns(current);
> >> +
> >>  
> >>  	fl = hlist_entry(v, struct file_lock, fl_link);
> >>  
> >> +	pr_info ("Current pid_ns: %p init_pid_ns: %p, fl->fl_nspid: %p nspidof:%p\n", pid_ns, &init_pid_ns,
> >> +		 fl->fl_nspid, ns_of_pid(fl->fl_nspid));
> >> +	if ((pid_ns != &init_pid_ns) && fl->fl_nspid &&
> >> +		(pid_ns != ns_of_pid(fl->fl_nspid)))
> >> +		    return 0;
> >> +
> >>  	lock_get_status(f, fl, iter->li_pos, "");
> >>  
> >>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)
> >> -- 
> >> 2.5.0

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 14:42 [RFC PATCH] locks: Show only file_locks created in the same pidns as current process Nikolay Borisov
  2016-08-02 14:45 ` Nikolay Borisov
  2016-08-02 15:05 ` J. Bruce Fields
@ 2016-08-02 16:00 ` Eric W. Biederman
  2016-08-02 17:40   ` J. Bruce Fields
  2016-08-03  7:35 ` [PATCH v2] locks: Filter /proc/locks output on proc pid ns Nikolay Borisov
  3 siblings, 1 reply; 22+ messages in thread
From: Eric W. Biederman @ 2016-08-02 16:00 UTC (permalink / raw)
  To: Nikolay Borisov
  Cc: jlayton, viro, bfields, linux-kernel, linux-fsdevel, containers,
	serge.hallyn

Nikolay Borisov <kernel@kyup.com> writes:

> Currently when /proc/locks is read it will show all the file locks
> which are currently created on the machine. On containers, hosted
> on busy servers this means that doing lsof can be very slow. I
> observed up to 5 seconds stalls reading 50k locks, while the container
> itself had only a small number of relevant entries. Fix it by
> filtering the locks listed by the pidns of the current process
> and the process which created the lock.

The locks always confuse me so I am not 100% connecting locks
to a pid namespace is appropriate.

That said if you are going to filter by pid namespace please use the pid
namespace of proc, not the pid namespace of the process reading the
file.

Different contents of files depending on who opens them is generally to
be discouraged.

Eric

> Signed-off-by: Nikolay Borisov <kernel@kyup.com>
> ---
>  fs/locks.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/fs/locks.c b/fs/locks.c
> index 6333263b7bc8..53e96df4c583 100644
> --- a/fs/locks.c
> +++ b/fs/locks.c
> @@ -2615,9 +2615,17 @@ static int locks_show(struct seq_file *f, void *v)
>  {
>  	struct locks_iterator *iter = f->private;
>  	struct file_lock *fl, *bfl;
> +	struct pid_namespace *pid_ns = task_active_pid_ns(current);
> +
>  
>  	fl = hlist_entry(v, struct file_lock, fl_link);
>  
> +	pr_info ("Current pid_ns: %p init_pid_ns: %p, fl->fl_nspid: %p nspidof:%p\n", pid_ns, &init_pid_ns,
> +		 fl->fl_nspid, ns_of_pid(fl->fl_nspid));
> +	if ((pid_ns != &init_pid_ns) && fl->fl_nspid &&
> +		(pid_ns != ns_of_pid(fl->fl_nspid)))
> +		    return 0;
> +
>  	lock_get_status(f, fl, iter->li_pos, "");
>  
>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 16:00 ` Eric W. Biederman
@ 2016-08-02 17:40   ` J. Bruce Fields
  2016-08-02 19:09     ` Eric W. Biederman
  0 siblings, 1 reply; 22+ messages in thread
From: J. Bruce Fields @ 2016-08-02 17:40 UTC (permalink / raw)
  To: Eric W. Biederman
  Cc: Nikolay Borisov, jlayton, viro, linux-kernel, linux-fsdevel,
	containers, serge.hallyn

On Tue, Aug 02, 2016 at 11:00:39AM -0500, Eric W. Biederman wrote:
> Nikolay Borisov <kernel@kyup.com> writes:
> 
> > Currently when /proc/locks is read it will show all the file locks
> > which are currently created on the machine. On containers, hosted
> > on busy servers this means that doing lsof can be very slow. I
> > observed up to 5 seconds stalls reading 50k locks, while the container
> > itself had only a small number of relevant entries. Fix it by
> > filtering the locks listed by the pidns of the current process
> > and the process which created the lock.
> 
> The locks always confuse me so I am not 100% connecting locks
> to a pid namespace is appropriate.
> 
> That said if you are going to filter by pid namespace please use the pid
> namespace of proc, not the pid namespace of the process reading the
> file.

Oh, that makes sense, thanks.

What does /proc/mounts use, out of curiosity?  The mount namespace that
/proc was originally mounted in?

--b.

> 
> Different contents of files depending on who opens them is generally to
> be discouraged.
> 
> Eric
> 
> > Signed-off-by: Nikolay Borisov <kernel@kyup.com>
> > ---
> >  fs/locks.c | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> >
> > diff --git a/fs/locks.c b/fs/locks.c
> > index 6333263b7bc8..53e96df4c583 100644
> > --- a/fs/locks.c
> > +++ b/fs/locks.c
> > @@ -2615,9 +2615,17 @@ static int locks_show(struct seq_file *f, void *v)
> >  {
> >  	struct locks_iterator *iter = f->private;
> >  	struct file_lock *fl, *bfl;
> > +	struct pid_namespace *pid_ns = task_active_pid_ns(current);
> > +
> >  
> >  	fl = hlist_entry(v, struct file_lock, fl_link);
> >  
> > +	pr_info ("Current pid_ns: %p init_pid_ns: %p, fl->fl_nspid: %p nspidof:%p\n", pid_ns, &init_pid_ns,
> > +		 fl->fl_nspid, ns_of_pid(fl->fl_nspid));
> > +	if ((pid_ns != &init_pid_ns) && fl->fl_nspid &&
> > +		(pid_ns != ns_of_pid(fl->fl_nspid)))
> > +		    return 0;
> > +
> >  	lock_get_status(f, fl, iter->li_pos, "");
> >  
> >  	list_for_each_entry(bfl, &fl->fl_block, fl_block)

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 17:40   ` J. Bruce Fields
@ 2016-08-02 19:09     ` Eric W. Biederman
  2016-08-02 19:44       ` J. Bruce Fields
  0 siblings, 1 reply; 22+ messages in thread
From: Eric W. Biederman @ 2016-08-02 19:09 UTC (permalink / raw)
  To: J. Bruce Fields
  Cc: Nikolay Borisov, jlayton, viro, linux-kernel, linux-fsdevel,
	containers, serge.hallyn

"J. Bruce Fields" <bfields@fieldses.org> writes:

> On Tue, Aug 02, 2016 at 11:00:39AM -0500, Eric W. Biederman wrote:
>> Nikolay Borisov <kernel@kyup.com> writes:
>> 
>> > Currently when /proc/locks is read it will show all the file locks
>> > which are currently created on the machine. On containers, hosted
>> > on busy servers this means that doing lsof can be very slow. I
>> > observed up to 5 seconds stalls reading 50k locks, while the container
>> > itself had only a small number of relevant entries. Fix it by
>> > filtering the locks listed by the pidns of the current process
>> > and the process which created the lock.
>> 
>> The locks always confuse me so I am not 100% connecting locks
>> to a pid namespace is appropriate.
>> 
>> That said if you are going to filter by pid namespace please use the pid
>> namespace of proc, not the pid namespace of the process reading the
>> file.
>
> Oh, that makes sense, thanks.
>
> What does /proc/mounts use, out of curiosity?  The mount namespace that
> /proc was originally mounted in?

/proc/mounts -> /proc/self/mounts

/proc/[pid]/mounts lists mounts from the mount namespace of the
appropriate process.

That is another way to go but it is a tread carefully thing as changing
things that way it is easy to surprise apparmor or selinux rules and be
surprised you broke someones userspace in a way that prevents booting.
Although I suspect /proc/locks isn't too bad.

Eric

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 19:09     ` Eric W. Biederman
@ 2016-08-02 19:44       ` J. Bruce Fields
  2016-08-02 20:01         ` Jeff Layton
  0 siblings, 1 reply; 22+ messages in thread
From: J. Bruce Fields @ 2016-08-02 19:44 UTC (permalink / raw)
  To: Eric W. Biederman
  Cc: Nikolay Borisov, jlayton, viro, linux-kernel, linux-fsdevel,
	containers, serge.hallyn

On Tue, Aug 02, 2016 at 02:09:22PM -0500, Eric W. Biederman wrote:
> "J. Bruce Fields" <bfields@fieldses.org> writes:
> 
> > On Tue, Aug 02, 2016 at 11:00:39AM -0500, Eric W. Biederman wrote:
> >> Nikolay Borisov <kernel@kyup.com> writes:
> >> 
> >> > Currently when /proc/locks is read it will show all the file locks
> >> > which are currently created on the machine. On containers, hosted
> >> > on busy servers this means that doing lsof can be very slow. I
> >> > observed up to 5 seconds stalls reading 50k locks, while the container
> >> > itself had only a small number of relevant entries. Fix it by
> >> > filtering the locks listed by the pidns of the current process
> >> > and the process which created the lock.
> >> 
> >> The locks always confuse me so I am not 100% connecting locks
> >> to a pid namespace is appropriate.
> >> 
> >> That said if you are going to filter by pid namespace please use the pid
> >> namespace of proc, not the pid namespace of the process reading the
> >> file.
> >
> > Oh, that makes sense, thanks.
> >
> > What does /proc/mounts use, out of curiosity?  The mount namespace that
> > /proc was originally mounted in?
> 
> /proc/mounts -> /proc/self/mounts

D'oh, I knew that.

> /proc/[pid]/mounts lists mounts from the mount namespace of the
> appropriate process.
> 
> That is another way to go but it is a tread carefully thing as changing
> things that way it is easy to surprise apparmor or selinux rules and be
> surprised you broke someones userspace in a way that prevents booting.
> Although I suspect /proc/locks isn't too bad.

OK, thanks.

/proc/[pid]/locks might be confusing.  I'd expect it to be "all the
locks owned by this task", rather than "all the locks owned by pid's in
the same pid namespace", or whatever criterion we choose.

Uh, I'm still trying to think of the Obviously Right solution here, and
it's not coming.

--b.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 19:44       ` J. Bruce Fields
@ 2016-08-02 20:01         ` Jeff Layton
  2016-08-02 20:11           ` Nikolay Borisov
  2016-08-02 20:34           ` J. Bruce Fields
  0 siblings, 2 replies; 22+ messages in thread
From: Jeff Layton @ 2016-08-02 20:01 UTC (permalink / raw)
  To: J. Bruce Fields, Eric W. Biederman
  Cc: Nikolay Borisov, viro, linux-kernel, linux-fsdevel, containers,
	serge.hallyn

On Tue, 2016-08-02 at 15:44 -0400, J. Bruce Fields wrote:
> On Tue, Aug 02, 2016 at 02:09:22PM -0500, Eric W. Biederman wrote:
> > 
> > > > "J. Bruce Fields" <bfields@fieldses.org> writes:
> > 
> > > 
> > > On Tue, Aug 02, 2016 at 11:00:39AM -0500, Eric W. Biederman wrote:
> > > > 
> > > > > > > > Nikolay Borisov <kernel@kyup.com> writes:
> > > > 
> > > > > 
> > > > > Currently when /proc/locks is read it will show all the file locks
> > > > > which are currently created on the machine. On containers, hosted
> > > > > on busy servers this means that doing lsof can be very slow. I
> > > > > observed up to 5 seconds stalls reading 50k locks, while the container
> > > > > itself had only a small number of relevant entries. Fix it by
> > > > > filtering the locks listed by the pidns of the current process
> > > > > and the process which created the lock.
> > > > 
> > > > The locks always confuse me so I am not 100% connecting locks
> > > > to a pid namespace is appropriate.
> > > > 
> > > > That said if you are going to filter by pid namespace please use the pid
> > > > namespace of proc, not the pid namespace of the process reading the
> > > > file.
> > > 
> > > Oh, that makes sense, thanks.
> > > 
> > > What does /proc/mounts use, out of curiosity?  The mount namespace that
> > > /proc was originally mounted in?
> > 
> > /proc/mounts -> /proc/self/mounts
> 
> D'oh, I knew that.
> 
> > 
> > /proc/[pid]/mounts lists mounts from the mount namespace of the
> > appropriate process.
> > 
> > That is another way to go but it is a tread carefully thing as changing
> > things that way it is easy to surprise apparmor or selinux rules and be
> > surprised you broke someones userspace in a way that prevents booting.
> > Although I suspect /proc/locks isn't too bad.
> 
> OK, thanks.
> 
> /proc/[pid]/locks might be confusing.  I'd expect it to be "all the
> locks owned by this task", rather than "all the locks owned by pid's in
> the same pid namespace", or whatever criterion we choose.
> 
> Uh, I'm still trying to think of the Obviously Right solution here, and
> it's not coming.
> 
> --b.


I'm a little leery of changing how this works. It has always been
maintained as a legacy interface, so do we run the risk of breaking
something if we turn it into a per-namespace thing? This also doesn't
solve the problem of slow traversal in the init_pid_ns -- only in a
container.

I also can't help but feel that /proc/locks is just showing its age. It
was fine in the late 90's, but its limitations are just becoming more
apparent as things get more complex. It was never designed for
performance as you end up thrashing several spinlocks when reading it.

Maybe it's time to think about presenting this info in another way? A
global view of all locks on the system is interesting but maybe it
would be better to present it more granularly somehow?

I guess I should go look at what lsof actually does with this info...

-- 
Jeff Layton <jlayton@poochiereds.net>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 20:01         ` Jeff Layton
@ 2016-08-02 20:11           ` Nikolay Borisov
  2016-08-02 20:34           ` J. Bruce Fields
  1 sibling, 0 replies; 22+ messages in thread
From: Nikolay Borisov @ 2016-08-02 20:11 UTC (permalink / raw)
  To: Jeff Layton
  Cc: J. Bruce Fields, Eric W. Biederman, Nikolay Borisov,
	Alexander Viro, LKML, linux-fsdevel, Linux Containers,
	Serge Hallyn

On Tue, Aug 2, 2016 at 11:01 PM, Jeff Layton <jlayton@poochiereds.net> wrote:
> On Tue, 2016-08-02 at 15:44 -0400, J. Bruce Fields wrote:
>> On Tue, Aug 02, 2016 at 02:09:22PM -0500, Eric W. Biederman wrote:
>> >
>> > > > "J. Bruce Fields" <bfields@fieldses.org> writes:
>> >
>> > >
>> > > On Tue, Aug 02, 2016 at 11:00:39AM -0500, Eric W. Biederman wrote:
>> > > >
>> > > > > > > > Nikolay Borisov <kernel@kyup.com> writes:
>> > > >
>> > > > >
>> > > > > Currently when /proc/locks is read it will show all the file locks
>> > > > > which are currently created on the machine. On containers, hosted
>> > > > > on busy servers this means that doing lsof can be very slow. I
>> > > > > observed up to 5 seconds stalls reading 50k locks, while the container
>> > > > > itself had only a small number of relevant entries. Fix it by
>> > > > > filtering the locks listed by the pidns of the current process
>> > > > > and the process which created the lock.
>> > > >
>> > > > The locks always confuse me so I am not 100% connecting locks
>> > > > to a pid namespace is appropriate.
>> > > >
>> > > > That said if you are going to filter by pid namespace please use the pid
>> > > > namespace of proc, not the pid namespace of the process reading the
>> > > > file.
>> > >
>> > > Oh, that makes sense, thanks.
>> > >
>> > > What does /proc/mounts use, out of curiosity?  The mount namespace that
>> > > /proc was originally mounted in?
>> >
>> > /proc/mounts -> /proc/self/mounts
>>
>> D'oh, I knew that.
>>
>> >
>> > /proc/[pid]/mounts lists mounts from the mount namespace of the
>> > appropriate process.
>> >
>> > That is another way to go but it is a tread carefully thing as changing
>> > things that way it is easy to surprise apparmor or selinux rules and be
>> > surprised you broke someones userspace in a way that prevents booting.
>> > Although I suspect /proc/locks isn't too bad.
>>
>> OK, thanks.
>>
>> /proc/[pid]/locks might be confusing.  I'd expect it to be "all the
>> locks owned by this task", rather than "all the locks owned by pid's in
>> the same pid namespace", or whatever criterion we choose.
>>
>> Uh, I'm still trying to think of the Obviously Right solution here, and
>> it's not coming.
>>
>> --b.
>
>
> I'm a little leery of changing how this works. It has always been
> maintained as a legacy interface, so do we run the risk of breaking
> something if we turn it into a per-namespace thing? This also doesn't
> solve the problem of slow traversal in the init_pid_ns -- only in a
> container.
>
> I also can't help but feel that /proc/locks is just showing its age. It
> was fine in the late 90's, but its limitations are just becoming more
> apparent as things get more complex. It was never designed for
> performance as you end up thrashing several spinlocks when reading it.

I believe it's also used by CRIU, though in this case you'd be doing
that from the init ns so I guess it's not that big of a problem there.

>
> Maybe it's time to think about presenting this info in another way? A
> global view of all locks on the system is interesting but maybe it
> would be better to present it more granularly somehow?
>
> I guess I should go look at what lsof actually does with this info...
>
> --
> Jeff Layton <jlayton@poochiereds.net>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process
  2016-08-02 20:01         ` Jeff Layton
  2016-08-02 20:11           ` Nikolay Borisov
@ 2016-08-02 20:34           ` J. Bruce Fields
  1 sibling, 0 replies; 22+ messages in thread
From: J. Bruce Fields @ 2016-08-02 20:34 UTC (permalink / raw)
  To: Jeff Layton
  Cc: Eric W. Biederman, Nikolay Borisov, viro, linux-kernel,
	linux-fsdevel, containers, serge.hallyn

On Tue, Aug 02, 2016 at 04:01:22PM -0400, Jeff Layton wrote:
> On Tue, 2016-08-02 at 15:44 -0400, J. Bruce Fields wrote:
> > On Tue, Aug 02, 2016 at 02:09:22PM -0500, Eric W. Biederman wrote:
> > > 
> > > > > "J. Bruce Fields" <bfields@fieldses.org> writes:
> > > 
> > > > 
> > > > On Tue, Aug 02, 2016 at 11:00:39AM -0500, Eric W. Biederman wrote:
> > > > > 
> > > > > > > > > Nikolay Borisov <kernel@kyup.com> writes:
> > > > > 
> > > > > > 
> > > > > > Currently when /proc/locks is read it will show all the file locks
> > > > > > which are currently created on the machine. On containers, hosted
> > > > > > on busy servers this means that doing lsof can be very slow. I
> > > > > > observed up to 5 seconds stalls reading 50k locks, while the container
> > > > > > itself had only a small number of relevant entries. Fix it by
> > > > > > filtering the locks listed by the pidns of the current process
> > > > > > and the process which created the lock.
> > > > > 
> > > > > The locks always confuse me so I am not 100% connecting locks
> > > > > to a pid namespace is appropriate.
> > > > > 
> > > > > That said if you are going to filter by pid namespace please use the pid
> > > > > namespace of proc, not the pid namespace of the process reading the
> > > > > file.
> > > > 
> > > > Oh, that makes sense, thanks.
> > > > 
> > > > What does /proc/mounts use, out of curiosity?  The mount namespace that
> > > > /proc was originally mounted in?
> > > 
> > > /proc/mounts -> /proc/self/mounts
> > 
> > D'oh, I knew that.
> > 
> > > 
> > > /proc/[pid]/mounts lists mounts from the mount namespace of the
> > > appropriate process.
> > > 
> > > That is another way to go but it is a tread carefully thing as changing
> > > things that way it is easy to surprise apparmor or selinux rules and be
> > > surprised you broke someones userspace in a way that prevents booting.
> > > Although I suspect /proc/locks isn't too bad.
> > 
> > OK, thanks.
> > 
> > /proc/[pid]/locks might be confusing.  I'd expect it to be "all the
> > locks owned by this task", rather than "all the locks owned by pid's in
> > the same pid namespace", or whatever criterion we choose.
> > 
> > Uh, I'm still trying to think of the Obviously Right solution here, and
> > it's not coming.
> > 
> > --b.
> 
> 
> I'm a little leery of changing how this works. It has always been
> maintained as a legacy interface, so do we run the risk of breaking
> something if we turn it into a per-namespace thing?

The namespace work is all about making interfaces per-namespace.  I
guess it works as long as it contributes to the illusion that each
container is its own machine.

Thinking about it, I might be sold on the per-pidns approach (with
Eric's modification to use the pidns of /proc not the reader).

My complaint about not being able to see conflicting locks would apply
just as well to conflicts from nfs locks held by other clients.  A disk
filesystem shared across multiple containers is a little like an nfs
filesystem shared between nfs clients.

That'd solve this immediate problem without requiring an lsof upgrade as
well.

> This also doesn't
> solve the problem of slow traversal in the init_pid_ns -- only in a
> container.
> 
> I also can't help but feel that /proc/locks is just showing its age. It
> was fine in the late 90's, but its limitations are just becoming more
> apparent as things get more complex. It was never designed for
> performance as you end up thrashing several spinlocks when reading it.
> 
> Maybe it's time to think about presenting this info in another way? A
> global view of all locks on the system is interesting but maybe it
> would be better to present it more granularly somehow?

But, yes, that might be a good idea.

--b.

> 
> I guess I should go look at what lsof actually does with this info...
> 
> -- 
> Jeff Layton <jlayton@poochiereds.net>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v2] locks: Filter /proc/locks output on proc pid ns
  2016-08-02 14:42 [RFC PATCH] locks: Show only file_locks created in the same pidns as current process Nikolay Borisov
                   ` (2 preceding siblings ...)
  2016-08-02 16:00 ` Eric W. Biederman
@ 2016-08-03  7:35 ` Nikolay Borisov
  2016-08-03 13:46   ` Jeff Layton
  3 siblings, 1 reply; 22+ messages in thread
From: Nikolay Borisov @ 2016-08-03  7:35 UTC (permalink / raw)
  To: jlayton, bfields
  Cc: viro, linux-kernel, linux-fsdevel, ebiederm, containers, Nikolay Borisov

On busy container servers reading /proc/locks shows all the locks
created by all clients. This can cause large latency spikes. In my
case I observed lsof taking up to 5-10 seconds while processing around
50k locks. Fix this by limiting the locks shown only to those created
in the same pidns as the one the proc was mounted in. When reading
/proc/locks from the init_pid_ns show everything.

Signed-off-by: Nikolay Borisov <kernel@kyup.com>
---
 fs/locks.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fs/locks.c b/fs/locks.c
index ee1b15f6fc13..751673d7f7fc 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2648,9 +2648,15 @@ static int locks_show(struct seq_file *f, void *v)
 {
 	struct locks_iterator *iter = f->private;
 	struct file_lock *fl, *bfl;
+	struct pid_namespace *proc_pidns = file_inode(f->file)->i_sb->s_fs_info;
+	struct pid_namespace *current_pidns = task_active_pid_ns(current);
 
 	fl = hlist_entry(v, struct file_lock, fl_link);
 
+	if ((current_pidns != &init_pid_ns) && fl->fl_nspid
+	    && (proc_pidns != ns_of_pid(fl->fl_nspid)))
+		return 0;
+
 	lock_get_status(f, fl, iter->li_pos, "");
 
 	list_for_each_entry(bfl, &fl->fl_block, fl_block)
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH v2] locks: Filter /proc/locks output on proc pid ns
  2016-08-03  7:35 ` [PATCH v2] locks: Filter /proc/locks output on proc pid ns Nikolay Borisov
@ 2016-08-03 13:46   ` Jeff Layton
  2016-08-03 14:17     ` Nikolay Borisov
  0 siblings, 1 reply; 22+ messages in thread
From: Jeff Layton @ 2016-08-03 13:46 UTC (permalink / raw)
  To: Nikolay Borisov, bfields
  Cc: viro, linux-kernel, linux-fsdevel, ebiederm, containers

On Wed, 2016-08-03 at 10:35 +0300, Nikolay Borisov wrote:
> On busy container servers reading /proc/locks shows all the locks
> created by all clients. This can cause large latency spikes. In my
> case I observed lsof taking up to 5-10 seconds while processing around
> 50k locks. Fix this by limiting the locks shown only to those created
> in the same pidns as the one the proc was mounted in. When reading
> /proc/locks from the init_pid_ns show everything.
> 
> > Signed-off-by: Nikolay Borisov <kernel@kyup.com>
> ---
>  fs/locks.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/fs/locks.c b/fs/locks.c
> index ee1b15f6fc13..751673d7f7fc 100644
> --- a/fs/locks.c
> +++ b/fs/locks.c
> @@ -2648,9 +2648,15 @@ static int locks_show(struct seq_file *f, void *v)
>  {
> >  	struct locks_iterator *iter = f->private;
> >  	struct file_lock *fl, *bfl;
> > +	struct pid_namespace *proc_pidns = file_inode(f->file)->i_sb->s_fs_info;
> > +	struct pid_namespace *current_pidns = task_active_pid_ns(current);
>  
> >  	fl = hlist_entry(v, struct file_lock, fl_link);
>  
> > > +	if ((current_pidns != &init_pid_ns) && fl->fl_nspid

Ok, so when you read from a process that's in the init_pid_ns
namespace, then you'll get the whole pile of locks, even when reading
this from a filesystem that was mounted in a different pid_ns?

That seems odd to me if so. Any reason not to just uniformly use the
proc_pidns here?

> > > +	    && (proc_pidns != ns_of_pid(fl->fl_nspid)))
> > +		return 0;
> +
> >  	lock_get_status(f, fl, iter->li_pos, "");
>  
> >  	list_for_each_entry(bfl, &fl->fl_block, fl_block)

-- 
Jeff Layton <jlayton@poochiereds.net>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v2] locks: Filter /proc/locks output on proc pid ns
  2016-08-03 13:46   ` Jeff Layton
@ 2016-08-03 14:17     ` Nikolay Borisov
  2016-08-03 14:28       ` J. Bruce Fields
  2016-08-03 14:54       ` Pavel Emelyanov
  0 siblings, 2 replies; 22+ messages in thread
From: Nikolay Borisov @ 2016-08-03 14:17 UTC (permalink / raw)
  To: Jeff Layton, bfields
  Cc: viro, linux-kernel, linux-fsdevel, ebiederm, containers,
	Andrey Vagin, xemul



On 08/03/2016 04:46 PM, Jeff Layton wrote:
> On Wed, 2016-08-03 at 10:35 +0300, Nikolay Borisov wrote:
>> On busy container servers reading /proc/locks shows all the locks
>> created by all clients. This can cause large latency spikes. In my
>> case I observed lsof taking up to 5-10 seconds while processing around
>> 50k locks. Fix this by limiting the locks shown only to those created
>> in the same pidns as the one the proc was mounted in. When reading
>> /proc/locks from the init_pid_ns show everything.
>>
>>> Signed-off-by: Nikolay Borisov <kernel@kyup.com>
>> ---
>>  fs/locks.c | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/fs/locks.c b/fs/locks.c
>> index ee1b15f6fc13..751673d7f7fc 100644
>> --- a/fs/locks.c
>> +++ b/fs/locks.c
>> @@ -2648,9 +2648,15 @@ static int locks_show(struct seq_file *f, void *v)
>>  {
>>>  	struct locks_iterator *iter = f->private;
>>>  	struct file_lock *fl, *bfl;
>>> +	struct pid_namespace *proc_pidns = file_inode(f->file)->i_sb->s_fs_info;
>>> +	struct pid_namespace *current_pidns = task_active_pid_ns(current);
>>  
>>>  	fl = hlist_entry(v, struct file_lock, fl_link);
>>  
>>>> +	if ((current_pidns != &init_pid_ns) && fl->fl_nspid
> 
> Ok, so when you read from a process that's in the init_pid_ns
> namespace, then you'll get the whole pile of locks, even when reading
> this from a filesystem that was mounted in a different pid_ns?
> 
> That seems odd to me if so. Any reason not to just uniformly use the
> proc_pidns here?

[CCing some people from openvz/CRIU]

My train of thought was "we should have means which would be the one
universal truth about everything and this would be a process in the
init_pid_ns". I don't have strong preference as long as I'm not breaking
userspace. As I said before - I think the CRIU guys might be using that
interface.

> 
>>>> +	    && (proc_pidns != ns_of_pid(fl->fl_nspid)))
>>> +		return 0;
>> +
>>>  	lock_get_status(f, fl, iter->li_pos, "");
>>  
>>>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)
> 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v2] locks: Filter /proc/locks output on proc pid ns
  2016-08-03 14:17     ` Nikolay Borisov
@ 2016-08-03 14:28       ` J. Bruce Fields
  2016-08-03 14:33         ` Nikolay Borisov
  2016-08-03 14:54       ` Pavel Emelyanov
  1 sibling, 1 reply; 22+ messages in thread
From: J. Bruce Fields @ 2016-08-03 14:28 UTC (permalink / raw)
  To: Nikolay Borisov
  Cc: Jeff Layton, viro, linux-kernel, linux-fsdevel, ebiederm,
	containers, Andrey Vagin, xemul

On Wed, Aug 03, 2016 at 05:17:09PM +0300, Nikolay Borisov wrote:
> 
> 
> On 08/03/2016 04:46 PM, Jeff Layton wrote:
> > On Wed, 2016-08-03 at 10:35 +0300, Nikolay Borisov wrote:
> >> On busy container servers reading /proc/locks shows all the locks
> >> created by all clients. This can cause large latency spikes. In my
> >> case I observed lsof taking up to 5-10 seconds while processing around
> >> 50k locks. Fix this by limiting the locks shown only to those created
> >> in the same pidns as the one the proc was mounted in. When reading
> >> /proc/locks from the init_pid_ns show everything.
> >>
> >>> Signed-off-by: Nikolay Borisov <kernel@kyup.com>
> >> ---
> >>  fs/locks.c | 6 ++++++
> >>  1 file changed, 6 insertions(+)
> >>
> >> diff --git a/fs/locks.c b/fs/locks.c
> >> index ee1b15f6fc13..751673d7f7fc 100644
> >> --- a/fs/locks.c
> >> +++ b/fs/locks.c
> >> @@ -2648,9 +2648,15 @@ static int locks_show(struct seq_file *f, void *v)
> >>  {
> >>>  	struct locks_iterator *iter = f->private;
> >>>  	struct file_lock *fl, *bfl;
> >>> +	struct pid_namespace *proc_pidns = file_inode(f->file)->i_sb->s_fs_info;
> >>> +	struct pid_namespace *current_pidns = task_active_pid_ns(current);
> >>  
> >>>  	fl = hlist_entry(v, struct file_lock, fl_link);
> >>  
> >>>> +	if ((current_pidns != &init_pid_ns) && fl->fl_nspid
> > 
> > Ok, so when you read from a process that's in the init_pid_ns
> > namespace, then you'll get the whole pile of locks, even when reading
> > this from a filesystem that was mounted in a different pid_ns?
> > 
> > That seems odd to me if so. Any reason not to just uniformly use the
> > proc_pidns here?
> 
> [CCing some people from openvz/CRIU]
> 
> My train of thought was "we should have means which would be the one
> universal truth about everything and this would be a process in the
> init_pid_ns".

OK, but why not make that means be "mount proc from the init_pid_ns and
read /proc/locks there".  So just replace current_pidns with proc_pidns
in the above.  I think that's all Jeff was suggesting.

--b.

> I don't have strong preference as long as I'm not breaking
> userspace. As I said before - I think the CRIU guys might be using that
> interface.
> 
> > 
> >>>> +	    && (proc_pidns != ns_of_pid(fl->fl_nspid)))
> >>> +		return 0;
> >> +
> >>>  	lock_get_status(f, fl, iter->li_pos, "");
> >>  
> >>>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)
> > 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v2] locks: Filter /proc/locks output on proc pid ns
  2016-08-03 14:28       ` J. Bruce Fields
@ 2016-08-03 14:33         ` Nikolay Borisov
  0 siblings, 0 replies; 22+ messages in thread
From: Nikolay Borisov @ 2016-08-03 14:33 UTC (permalink / raw)
  To: J. Bruce Fields
  Cc: Jeff Layton, viro, linux-kernel, linux-fsdevel, ebiederm,
	containers, Andrey Vagin, xemul



On 08/03/2016 05:28 PM, J. Bruce Fields wrote:
> On Wed, Aug 03, 2016 at 05:17:09PM +0300, Nikolay Borisov wrote:
>>
>>
>> On 08/03/2016 04:46 PM, Jeff Layton wrote:
>>> On Wed, 2016-08-03 at 10:35 +0300, Nikolay Borisov wrote:
>>>> On busy container servers reading /proc/locks shows all the locks
>>>> created by all clients. This can cause large latency spikes. In my
>>>> case I observed lsof taking up to 5-10 seconds while processing around
>>>> 50k locks. Fix this by limiting the locks shown only to those created
>>>> in the same pidns as the one the proc was mounted in. When reading
>>>> /proc/locks from the init_pid_ns show everything.
>>>>
>>>>> Signed-off-by: Nikolay Borisov <kernel@kyup.com>
>>>> ---
>>>>  fs/locks.c | 6 ++++++
>>>>  1 file changed, 6 insertions(+)
>>>>
>>>> diff --git a/fs/locks.c b/fs/locks.c
>>>> index ee1b15f6fc13..751673d7f7fc 100644
>>>> --- a/fs/locks.c
>>>> +++ b/fs/locks.c
>>>> @@ -2648,9 +2648,15 @@ static int locks_show(struct seq_file *f, void *v)
>>>>  {
>>>>>  	struct locks_iterator *iter = f->private;
>>>>>  	struct file_lock *fl, *bfl;
>>>>> +	struct pid_namespace *proc_pidns = file_inode(f->file)->i_sb->s_fs_info;
>>>>> +	struct pid_namespace *current_pidns = task_active_pid_ns(current);
>>>>  
>>>>>  	fl = hlist_entry(v, struct file_lock, fl_link);
>>>>  
>>>>>> +	if ((current_pidns != &init_pid_ns) && fl->fl_nspid
>>>
>>> Ok, so when you read from a process that's in the init_pid_ns
>>> namespace, then you'll get the whole pile of locks, even when reading
>>> this from a filesystem that was mounted in a different pid_ns?
>>>
>>> That seems odd to me if so. Any reason not to just uniformly use the
>>> proc_pidns here?
>>
>> [CCing some people from openvz/CRIU]
>>
>> My train of thought was "we should have means which would be the one
>> universal truth about everything and this would be a process in the
>> init_pid_ns".
> 
> OK, but why not make that means be "mount proc from the init_pid_ns and
> read /proc/locks there".  So just replace current_pidns with proc_pidns
> in the above.  I think that's all Jeff was suggesting.

Oh, you are right. Silly me, yes, I'm happy with this and I will send a
patch.


> 
> --b.
> 
>> I don't have strong preference as long as I'm not breaking
>> userspace. As I said before - I think the CRIU guys might be using that
>> interface.
>>
>>>
>>>>>> +	    && (proc_pidns != ns_of_pid(fl->fl_nspid)))
>>>>> +		return 0;
>>>> +
>>>>>  	lock_get_status(f, fl, iter->li_pos, "");
>>>>  
>>>>>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)
>>>

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v2] locks: Filter /proc/locks output on proc pid ns
  2016-08-03 14:17     ` Nikolay Borisov
  2016-08-03 14:28       ` J. Bruce Fields
@ 2016-08-03 14:54       ` Pavel Emelyanov
  2016-08-03 15:00         ` Nikolay Borisov
  1 sibling, 1 reply; 22+ messages in thread
From: Pavel Emelyanov @ 2016-08-03 14:54 UTC (permalink / raw)
  To: Nikolay Borisov, Jeff Layton, bfields
  Cc: viro, linux-kernel, linux-fsdevel, ebiederm, containers, Andrey Vagin

On 08/03/2016 05:17 PM, Nikolay Borisov wrote:
> 
> 
> On 08/03/2016 04:46 PM, Jeff Layton wrote:
>> On Wed, 2016-08-03 at 10:35 +0300, Nikolay Borisov wrote:
>>> On busy container servers reading /proc/locks shows all the locks
>>> created by all clients. This can cause large latency spikes. In my
>>> case I observed lsof taking up to 5-10 seconds while processing around
>>> 50k locks. Fix this by limiting the locks shown only to those created
>>> in the same pidns as the one the proc was mounted in. When reading
>>> /proc/locks from the init_pid_ns show everything.
>>>
>>>> Signed-off-by: Nikolay Borisov <kernel@kyup.com>
>>> ---
>>>  fs/locks.c | 6 ++++++
>>>  1 file changed, 6 insertions(+)
>>>
>>> diff --git a/fs/locks.c b/fs/locks.c
>>> index ee1b15f6fc13..751673d7f7fc 100644
>>> --- a/fs/locks.c
>>> +++ b/fs/locks.c
>>> @@ -2648,9 +2648,15 @@ static int locks_show(struct seq_file *f, void *v)
>>>  {
>>>>  	struct locks_iterator *iter = f->private;
>>>>  	struct file_lock *fl, *bfl;
>>>> +	struct pid_namespace *proc_pidns = file_inode(f->file)->i_sb->s_fs_info;
>>>> +	struct pid_namespace *current_pidns = task_active_pid_ns(current);
>>>  
>>>>  	fl = hlist_entry(v, struct file_lock, fl_link);
>>>  
>>>>> +	if ((current_pidns != &init_pid_ns) && fl->fl_nspid
>>
>> Ok, so when you read from a process that's in the init_pid_ns
>> namespace, then you'll get the whole pile of locks, even when reading
>> this from a filesystem that was mounted in a different pid_ns?
>>
>> That seems odd to me if so. Any reason not to just uniformly use the
>> proc_pidns here?
> 
> [CCing some people from openvz/CRIU]

Thanks :)

> My train of thought was "we should have means which would be the one
> universal truth about everything and this would be a process in the
> init_pid_ns". I don't have strong preference as long as I'm not breaking
> userspace. As I said before - I think the CRIU guys might be using that
> interface.

This particular change won't break us mostly because we've switched to
reading the /proc/pid/fdinfo/n files for locks.

-- Pavel

>>
>>>>> +	    && (proc_pidns != ns_of_pid(fl->fl_nspid)))
>>>> +		return 0;
>>> +
>>>>  	lock_get_status(f, fl, iter->li_pos, "");
>>>  
>>>>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)
>>
> .
> 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v2] locks: Filter /proc/locks output on proc pid ns
  2016-08-03 14:54       ` Pavel Emelyanov
@ 2016-08-03 15:00         ` Nikolay Borisov
  2016-08-03 15:06           ` J. Bruce Fields
  0 siblings, 1 reply; 22+ messages in thread
From: Nikolay Borisov @ 2016-08-03 15:00 UTC (permalink / raw)
  To: Pavel Emelyanov, Nikolay Borisov, Jeff Layton, bfields
  Cc: Andrey Vagin, containers, linux-kernel, ebiederm, linux-fsdevel, viro



On 08/03/2016 05:54 PM, Pavel Emelyanov wrote:
> On 08/03/2016 05:17 PM, Nikolay Borisov wrote:
>>
>>
[SNIP]
>>
>> [CCing some people from openvz/CRIU]
> 
> Thanks :)
> 
>> My train of thought was "we should have means which would be the one
>> universal truth about everything and this would be a process in the
>> init_pid_ns". I don't have strong preference as long as I'm not breaking
>> userspace. As I said before - I think the CRIU guys might be using that
>> interface.
> 
> This particular change won't break us mostly because we've switched to
> reading the /proc/pid/fdinfo/n files for locks.

[thinking out loud here]

I've never actually looked into those files but now that I have it seems
to make sense to also switch 'lsof' to actually reading the locks from
the available pids directories rather than relying on the global
/proc/locks interface. Oh well :)

[/thinking out loud here]

> 
> -- Pavel
> 
>>>
>>>>>> +	    && (proc_pidns != ns_of_pid(fl->fl_nspid)))
>>>>> +		return 0;
>>>> +
>>>>>  	lock_get_status(f, fl, iter->li_pos, "");
>>>>  
>>>>>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)
>>>
>> .
>>
> 
> _______________________________________________
> Containers mailing list
> Containers@lists.linux-foundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/containers
> 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v2] locks: Filter /proc/locks output on proc pid ns
  2016-08-03 15:00         ` Nikolay Borisov
@ 2016-08-03 15:06           ` J. Bruce Fields
  2016-08-03 15:10             ` Nikolay Borisov
  0 siblings, 1 reply; 22+ messages in thread
From: J. Bruce Fields @ 2016-08-03 15:06 UTC (permalink / raw)
  To: Nikolay Borisov
  Cc: Pavel Emelyanov, Jeff Layton, Andrey Vagin, containers,
	linux-kernel, ebiederm, linux-fsdevel, viro

On Wed, Aug 03, 2016 at 06:00:18PM +0300, Nikolay Borisov wrote:
> 
> 
> On 08/03/2016 05:54 PM, Pavel Emelyanov wrote:
> > On 08/03/2016 05:17 PM, Nikolay Borisov wrote:
> >>
> >>
> [SNIP]
> >>
> >> [CCing some people from openvz/CRIU]
> > 
> > Thanks :)
> > 
> >> My train of thought was "we should have means which would be the one
> >> universal truth about everything and this would be a process in the
> >> init_pid_ns". I don't have strong preference as long as I'm not breaking
> >> userspace. As I said before - I think the CRIU guys might be using that
> >> interface.
> > 
> > This particular change won't break us mostly because we've switched to
> > reading the /proc/pid/fdinfo/n files for locks.
> 
> [thinking out loud here]
> 
> I've never actually looked into those files but now that I have it seems
> to make sense to also switch 'lsof' to actually reading the locks from
> the available pids directories rather than relying on the global
> /proc/locks interface. Oh well :)

Digging around...  Oh, I see, there's an optional 'lock:..' line in
/proc/[pid]/fdinfo/[pid] file, is that what you're looking at?  I'd
forgotten.  Yeah, maybe that would make more sense long term.

--b.

> 
> [/thinking out loud here]
> 
> > 
> > -- Pavel
> > 
> >>>
> >>>>>> +	    && (proc_pidns != ns_of_pid(fl->fl_nspid)))
> >>>>> +		return 0;
> >>>> +
> >>>>>  	lock_get_status(f, fl, iter->li_pos, "");
> >>>>  
> >>>>>  	list_for_each_entry(bfl, &fl->fl_block, fl_block)
> >>>
> >> .
> >>
> > 
> > _______________________________________________
> > Containers mailing list
> > Containers@lists.linux-foundation.org
> > https://lists.linuxfoundation.org/mailman/listinfo/containers
> > 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v2] locks: Filter /proc/locks output on proc pid ns
  2016-08-03 15:06           ` J. Bruce Fields
@ 2016-08-03 15:10             ` Nikolay Borisov
  2016-08-03 17:35               ` Eric W. Biederman
  0 siblings, 1 reply; 22+ messages in thread
From: Nikolay Borisov @ 2016-08-03 15:10 UTC (permalink / raw)
  To: J. Bruce Fields
  Cc: Pavel Emelyanov, Jeff Layton, Andrey Vagin, containers,
	linux-kernel, ebiederm, linux-fsdevel, viro



On 08/03/2016 06:06 PM, J. Bruce Fields wrote:
> Digging around...  Oh, I see, there's an optional 'lock:..' line in
> /proc/[pid]/fdinfo/[pid] file, is that what you're looking at?  I'd
> forgotten.  Yeah, maybe that would make more sense long term.

Yep, that's the one but this requires the userspace to be updated to use
that interface. In the meantime we could do away with some maintenance
of the existing /proc/locks :)

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v2] locks: Filter /proc/locks output on proc pid ns
  2016-08-03 15:10             ` Nikolay Borisov
@ 2016-08-03 17:35               ` Eric W. Biederman
  0 siblings, 0 replies; 22+ messages in thread
From: Eric W. Biederman @ 2016-08-03 17:35 UTC (permalink / raw)
  To: Nikolay Borisov
  Cc: J. Bruce Fields, Pavel Emelyanov, Jeff Layton, Andrey Vagin,
	containers, linux-kernel, linux-fsdevel, viro

Nikolay Borisov <kernel@kyup.com> writes:

> On 08/03/2016 06:06 PM, J. Bruce Fields wrote:
>> Digging around...  Oh, I see, there's an optional 'lock:..' line in
>> /proc/[pid]/fdinfo/[pid] file, is that what you're looking at?  I'd
>> forgotten.  Yeah, maybe that would make more sense long term.
>
> Yep, that's the one but this requires the userspace to be updated to use
> that interface. In the meantime we could do away with some maintenance
> of the existing /proc/locks :)

I am tempted to say let's not change /proc/locks at all, but if locks
really are in a pid namespace than I do think it makes sense to filter
them in /proc just so there is not excessive visiblity outside of the
pid namespace.

Excessive visibility is a problem on it's own.

Eric

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2016-08-03 22:32 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-02 14:42 [RFC PATCH] locks: Show only file_locks created in the same pidns as current process Nikolay Borisov
2016-08-02 14:45 ` Nikolay Borisov
2016-08-02 15:05 ` J. Bruce Fields
2016-08-02 15:20   ` Nikolay Borisov
2016-08-02 15:43     ` J. Bruce Fields
2016-08-02 16:00 ` Eric W. Biederman
2016-08-02 17:40   ` J. Bruce Fields
2016-08-02 19:09     ` Eric W. Biederman
2016-08-02 19:44       ` J. Bruce Fields
2016-08-02 20:01         ` Jeff Layton
2016-08-02 20:11           ` Nikolay Borisov
2016-08-02 20:34           ` J. Bruce Fields
2016-08-03  7:35 ` [PATCH v2] locks: Filter /proc/locks output on proc pid ns Nikolay Borisov
2016-08-03 13:46   ` Jeff Layton
2016-08-03 14:17     ` Nikolay Borisov
2016-08-03 14:28       ` J. Bruce Fields
2016-08-03 14:33         ` Nikolay Borisov
2016-08-03 14:54       ` Pavel Emelyanov
2016-08-03 15:00         ` Nikolay Borisov
2016-08-03 15:06           ` J. Bruce Fields
2016-08-03 15:10             ` Nikolay Borisov
2016-08-03 17:35               ` Eric W. Biederman

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).