From: Jeff Layton <jlayton@kernel.org>
To: NeilBrown <neilb@suse.com>
Cc: Bruce Fields <bfields@fieldses.org>,
slawek1211@gmail.com, "open list:NFS, SUNRPC,
AND..." <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH] locks: move checks from locks_free_lock() to locks_release_private()
Date: Wed, 24 Apr 2019 09:47:59 -0400 [thread overview]
Message-ID: <CAOhYWN+wgm9gVPkGW=jh+WUt0T_Nn1zs=BZAKt8y-b50dWM4zw@mail.gmail.com> (raw)
In-Reply-To: <87r29s5fiv.fsf@notabene.neil.brown.name>
On Tue, Apr 23, 2019 at 10:00 PM NeilBrown <neilb@suse.com> wrote:
>
>
> Code that allocates locks using locks_alloc_lock() will free it
> using locks_free_lock(), and will benefit from the BUG_ON()
> consistency checks therein.
>
> However some code (nfsd and lockd) allocate a lock embedded in
> some other data structure, and so free the lock themselves after
> calling locks_release_private(). This path does not benefit from
> the consistency checks.
>
> To help catch future errors, move the BUG_ON() checks to
> locks_release_private() - which locks_free_lock() already calls.
> This ensures that all users for locks will find out if the lock
> isn't detached properly before being free.
>
> Signed-off-by: NeilBrown <neilb@suse.com>
> ---
> fs/locks.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/fs/locks.c b/fs/locks.c
> index 71d0c6c2aac5..456a3782c6ca 100644
> --- a/fs/locks.c
> +++ b/fs/locks.c
> @@ -352,6 +352,12 @@ EXPORT_SYMBOL_GPL(locks_alloc_lock);
>
> void locks_release_private(struct file_lock *fl)
> {
> + BUG_ON(waitqueue_active(&fl->fl_wait));
> + BUG_ON(!list_empty(&fl->fl_list));
> + BUG_ON(!list_empty(&fl->fl_blocked_requests));
> + BUG_ON(!list_empty(&fl->fl_blocked_member));
> + BUG_ON(!hlist_unhashed(&fl->fl_link));
> +
> if (fl->fl_ops) {
> if (fl->fl_ops->fl_release_private)
> fl->fl_ops->fl_release_private(fl);
> @@ -371,12 +377,6 @@ EXPORT_SYMBOL_GPL(locks_release_private);
> /* Free a lock which is not in use. */
> void locks_free_lock(struct file_lock *fl)
> {
> - BUG_ON(waitqueue_active(&fl->fl_wait));
> - BUG_ON(!list_empty(&fl->fl_list));
> - BUG_ON(!list_empty(&fl->fl_blocked_requests));
> - BUG_ON(!list_empty(&fl->fl_blocked_member));
> - BUG_ON(!hlist_unhashed(&fl->fl_link));
> -
> locks_release_private(fl);
> kmem_cache_free(filelock_cache, fl);
> }
> --
> 2.14.0.rc0.dirty
>
Looks good to me. Bruce, would you mind picking this up for the next
merge window? I don't have any other file locking patches queued up
for v5.2, and I hate to send Linus a PR for just this.
Either way:
Reviewed-by: Jeff Layton <jlayton@kernel.org>
next prev parent reply other threads:[~2019-04-24 13:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 16:34 [PATCH v2 0/2] nfsd: ensure we wake file lock waiters before deleting blocked lock Jeff Layton
2019-04-22 16:34 ` [PATCH v2 1/2] nfsd: wake waiters blocked on file_lock before deleting it Jeff Layton
2019-04-22 23:47 ` NeilBrown
2019-04-23 10:57 ` Jeff Layton
2019-04-24 2:00 ` [PATCH] locks: move checks from locks_free_lock() to locks_release_private() NeilBrown
2019-04-24 13:47 ` Jeff Layton [this message]
2019-04-24 13:55 ` Bruce Fields
2019-04-24 13:58 ` [PATCH v2 1/2] nfsd: wake waiters blocked on file_lock before deleting it J. Bruce Fields
2019-04-24 15:29 ` Steve Dickson
2019-04-24 15:47 ` J. Bruce Fields
2019-04-24 19:09 ` Pavel Shilovsky
2019-04-22 16:34 ` [PATCH v2 2/2] nfsd: wake blocked file lock waiters before sending callback Jeff Layton
2019-04-22 19:46 ` J. Bruce Fields
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='CAOhYWN+wgm9gVPkGW=jh+WUt0T_Nn1zs=BZAKt8y-b50dWM4zw@mail.gmail.com' \
--to=jlayton@kernel.org \
--cc=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.com \
--cc=slawek1211@gmail.com \
/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).