linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nikolay Borisov <kernel@kyup.com>
To: jlayton@poochiereds.net, bfields@fieldses.org
Cc: viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, ebiederm@xmission.com,
	containers@lists.linux-foundation.org,
	Nikolay Borisov <kernel@kyup.com>
Subject: [PATCH v2] locks: Filter /proc/locks output on proc pid ns
Date: Wed,  3 Aug 2016 10:35:10 +0300	[thread overview]
Message-ID: <1470209710-30022-1-git-send-email-kernel@kyup.com> (raw)
In-Reply-To: <1470148943-21835-1-git-send-email-kernel@kyup.com>

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

  parent reply	other threads:[~2016-08-03  7:54 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 ` Nikolay Borisov [this message]
2016-08-03 13:46   ` [PATCH v2] locks: Filter /proc/locks output on proc pid ns 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

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=1470209710-30022-1-git-send-email-kernel@kyup.com \
    --to=kernel@kyup.com \
    --cc=bfields@fieldses.org \
    --cc=containers@lists.linux-foundation.org \
    --cc=ebiederm@xmission.com \
    --cc=jlayton@poochiereds.net \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /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).