From: Jeff Layton <jlayton@poochiereds.net>
To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Dmitry Vyukov <dvyukov@google.com>,
"J. Bruce Fields" <bfields@fieldses.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
syzkaller <syzkaller@googlegroups.com>,
Kostya Serebryany <kcc@google.com>,
Alexander Potapenko <glider@google.com>,
Sasha Levin <sasha.levin@oracle.com>,
Eric Dumazet <edumazet@google.com>
Subject: [PATCH v2 5/6] locks: prink more detail when there are leaked locks
Date: Fri, 8 Jan 2016 08:50:13 -0500 [thread overview]
Message-ID: <1452261014-1682-6-git-send-email-jeff.layton@primarydata.com> (raw)
In-Reply-To: <1452261014-1682-1-git-send-email-jeff.layton@primarydata.com>
Right now, we just get WARN_ON_ONCE, which is not particularly helpful.
Have it dump some info about the locks and the inode to make it easier
to track down leaked locks in the future.
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
---
fs/locks.c | 33 +++++++++++++++++++++++++++++----
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/fs/locks.c b/fs/locks.c
index ed9ab930d093..ca272eb63c30 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -233,15 +233,40 @@ out:
return ctx;
}
+static void
+locks_dump_ctx_list(struct list_head *list, char *list_type)
+{
+ struct file_lock *fl;
+
+ list_for_each_entry(fl, list, fl_list) {
+ pr_warn("%s: fl_owner=%p fl_flags=0x%x fl_type=0x%x fl_pid=%u\n", list_type, fl->fl_owner, fl->fl_flags, fl->fl_type, fl->fl_pid);
+ }
+}
+
+static void
+locks_check_ctx_lists(struct inode *inode)
+{
+ struct file_lock_context *ctx = inode->i_flctx;
+
+ if (unlikely(!list_empty(&ctx->flc_flock) ||
+ !list_empty(&ctx->flc_posix) ||
+ !list_empty(&ctx->flc_lease))) {
+ pr_warn("Leaked locks on dev=0x%x:0x%x ino=0x%lx:\n",
+ MAJOR(inode->i_sb->s_dev), MINOR(inode->i_sb->s_dev),
+ inode->i_ino);
+ locks_dump_ctx_list(&ctx->flc_flock, "FLOCK");
+ locks_dump_ctx_list(&ctx->flc_posix, "POSIX");
+ locks_dump_ctx_list(&ctx->flc_lease, "LEASE");
+ }
+}
+
void
locks_free_lock_context(struct inode *inode)
{
struct file_lock_context *ctx = inode->i_flctx;
- if (ctx) {
- WARN_ON_ONCE(!list_empty(&ctx->flc_flock));
- WARN_ON_ONCE(!list_empty(&ctx->flc_posix));
- WARN_ON_ONCE(!list_empty(&ctx->flc_lease));
+ if (unlikely(ctx)) {
+ locks_check_ctx_lists(inode);
kmem_cache_free(flctx_cache, ctx);
}
}
--
2.5.0
next prev parent reply other threads:[~2016-01-08 13:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-23 10:37 fs: WARNING in locks_free_lock_context() Dmitry Vyukov
2015-12-23 13:54 ` Jeff Layton
2016-02-03 18:19 ` William Dauchy
2016-02-03 18:26 ` Jeff Layton
2016-02-03 18:28 ` William Dauchy
2016-01-08 2:22 ` [PATCH] locks: fix unlock when fcntl_setlk races with a close Jeff Layton
2016-01-08 12:48 ` Jeff Layton
2016-01-08 16:16 ` J. Bruce Fields
2016-01-08 13:50 ` [PATCH v2 0/6] locks: better debugging and fix for setlk/close race handling Jeff Layton
2016-01-08 13:50 ` [PATCH v2 1/6] locks: fix unlock when fcntl_setlk races with a close Jeff Layton
2016-01-08 15:55 ` J. Bruce Fields
2016-01-08 16:11 ` Jeff Layton
2016-01-08 16:21 ` J. Bruce Fields
2016-01-08 16:22 ` J. Bruce Fields
2016-01-08 16:26 ` J. Bruce Fields
2016-01-08 13:50 ` [PATCH v2 2/6] locks: don't check for race with close when setting OFD lock Jeff Layton
2016-01-08 13:50 ` [PATCH v2 3/6] locks: sprinkle some tracepoints around the file locking code Jeff Layton
2016-01-08 13:50 ` [PATCH v2 4/6] locks: pass inode pointer to locks_free_lock_context Jeff Layton
2016-01-08 13:50 ` Jeff Layton [this message]
2016-01-08 13:50 ` [PATCH v2 6/6] locks: rename __posix_lock_file to posix_lock_inode Jeff Layton
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=1452261014-1682-6-git-send-email-jeff.layton@primarydata.com \
--to=jlayton@poochiereds.net \
--cc=bfields@fieldses.org \
--cc=dvyukov@google.com \
--cc=edumazet@google.com \
--cc=glider@google.com \
--cc=kcc@google.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sasha.levin@oracle.com \
--cc=syzkaller@googlegroups.com \
--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).