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

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