From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965515AbcHBOvJ (ORCPT ); Tue, 2 Aug 2016 10:51:09 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:35052 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934933AbcHBOuj (ORCPT ); Tue, 2 Aug 2016 10:50:39 -0400 From: Nikolay Borisov To: jlayton@poochiereds.net, viro@zeniv.linux.org.uk Cc: bfields@fieldses.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, ebiederm@xmission.com, containers@lists.linux-foundation.org, serge.hallyn@canonical.com, Nikolay Borisov Subject: [RFC PATCH] locks: Show only file_locks created in the same pidns as current process Date: Tue, 2 Aug 2016 17:42:23 +0300 Message-Id: <1470148943-21835-1-git-send-email-kernel@kyup.com> X-Mailer: git-send-email 1.7.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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