From: Jeff Layton <jlayton@kernel.org>
To: NeilBrown <neilb@suse.de>
Cc: Christian Brauner <brauner@kernel.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Eric Van Hensbergen <ericvh@kernel.org>,
Latchesar Ionkov <lucho@ionkov.net>,
Dominique Martinet <asmadeus@codewreck.org>,
Christian Schoenebeck <linux_oss@crudebyte.com>,
David Howells <dhowells@redhat.com>,
Marc Dionne <marc.dionne@auristor.com>,
Xiubo Li <xiubli@redhat.com>, Ilya Dryomov <idryomov@gmail.com>,
Alexander Aring <aahringo@redhat.com>,
David Teigland <teigland@redhat.com>,
Miklos Szeredi <miklos@szeredi.hu>,
Andreas Gruenbacher <agruenba@redhat.com>,
Trond Myklebust <trond.myklebust@hammerspace.com>,
Anna Schumaker <anna@kernel.org>,
Chuck Lever <chuck.lever@oracle.com>,
Olga Kornievskaia <kolga@netapp.com>,
Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
Jan Kara <jack@suse.cz>, Mark Fasheh <mark@fasheh.com>,
Joel Becker <jlbec@evilplan.org>,
Joseph Qi <joseph.qi@linux.alibaba.com>,
Steve French <sfrench@samba.org>,
Paulo Alcantara <pc@manguebit.com>,
Ronnie Sahlberg <lsahlber@redhat.com>,
Shyam Prasad N <sprasad@microsoft.com>,
Namjae Jeon <linkinjeon@kernel.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>,
Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
linux-kernel@vger.kernel.org, v9fs@lists.linux.dev,
linux-afs@lists.infradead.org, ceph-devel@vger.kernel.org,
gfs2@lists.linux.dev, linux-fsdevel@vger.kernel.org,
linux-nfs@vger.kernel.org, ocfs2-devel@lists.linux.dev,
linux-cifs@vger.kernel.org, samba-technical@lists.samba.org,
linux-trace-kernel@vger.kernel.org
Subject: Re: [PATCH 11/20] filelock: convert the IS_* macros to take file_lock_core
Date: Wed, 17 Jan 2024 07:32:42 -0500 [thread overview]
Message-ID: <7e1026b829cff2e59bc7edfe29faea5572c841ea.camel@kernel.org> (raw)
In-Reply-To: <170544341684.23031.11038222640477022046@noble.neil.brown.name>
On Wed, 2024-01-17 at 09:16 +1100, NeilBrown wrote:
> On Wed, 17 Jan 2024, Jeff Layton wrote:
> > I couldn't get them to work properly as macros, so convert them
> > to static inlines instead (which is probably better for the type safety
> > anyway).
> >
> > Signed-off-by: Jeff Layton <jlayton@kernel.org>
> > ---
> > fs/locks.c | 46 +++++++++++++++++++++++++++++++++-------------
> > 1 file changed, 33 insertions(+), 13 deletions(-)
> >
> > diff --git a/fs/locks.c b/fs/locks.c
> > index 770aaa5809ba..eddf4d767d5d 100644
> > --- a/fs/locks.c
> > +++ b/fs/locks.c
> > @@ -70,10 +70,26 @@
> >
> > #include <linux/uaccess.h>
> >
> > -#define IS_POSIX(fl) (fl->fl_core.fl_flags & FL_POSIX)
> Used 3 times... once as
> if (IS_POSIX(blocker) && !IS_OFDLCK(blocker))
> Can an IS_POSIX lock also be IS_OFDLCK ??
>
Yes. They conflict with one another so they're both considered POSIX
locks.
>
> > -#define IS_FLOCK(fl) (fl->fl_core.fl_flags & FL_FLOCK)
> Used once.
>
> > -#define IS_LEASE(fl) (fl->fl_core.fl_flags & (FL_LEASE|FL_DELEG|FL_LAYOUT))
> Used twice. Either "IS_LEASE" approves things that aren't leases, or
> FL_LEASE is not set on all leases.... Names could be improved.
>
Good point.
> > -#define IS_OFDLCK(fl) (fl->fl_core.fl_flags & FL_OFDLCK)
>
> used 4 times - a clear winner :-)
>
> If it would me, I would simply discard these macros and open-code the
> tests. I don't think IS_FLOCK() is easier to read for someone who knows
> the code, and I think IS_LEASE() is actually harder to read for someone
> who doesn't know the code, as that it does it not really obvious.
>
> But this is just a suggestion, I won't push it.
>
> Thanks,
> NeilBrown
>
>
It's a good suggestion, and I considered doing this when I converted
over the macros to inlines. I may go ahead and make this change for v2.
> > +static inline bool IS_POSIX(struct file_lock_core *flc)
> > +{
> > + return flc->fl_flags & FL_POSIX;
> > +}
> > +
> > +static inline bool IS_FLOCK(struct file_lock_core *flc)
> > +{
> > + return flc->fl_flags & FL_FLOCK;
> > +}
> > +
> > +static inline bool IS_OFDLCK(struct file_lock_core *flc)
> > +{
> > + return flc->fl_flags & FL_OFDLCK;
> > +}
> > +
> > +static inline bool IS_LEASE(struct file_lock_core *flc)
> > +{
> > + return flc->fl_flags & (FL_LEASE|FL_DELEG|FL_LAYOUT);
> > +}
> > +
> > #define IS_REMOTELCK(fl) (fl->fl_core.fl_pid <= 0)
> >
> > static bool lease_breaking(struct file_lock *fl)
> > @@ -761,6 +777,7 @@ static void __locks_insert_block(struct file_lock *blocker,
> > struct file_lock *))
> > {
> > struct file_lock *fl;
> > + struct file_lock_core *bflc;
> > BUG_ON(!list_empty(&waiter->fl_core.fl_blocked_member));
> >
> > new_blocker:
> > @@ -773,7 +790,9 @@ static void __locks_insert_block(struct file_lock *blocker,
> > waiter->fl_core.fl_blocker = blocker;
> > list_add_tail(&waiter->fl_core.fl_blocked_member,
> > &blocker->fl_core.fl_blocked_requests);
> > - if (IS_POSIX(blocker) && !IS_OFDLCK(blocker))
> > +
> > + bflc = &blocker->fl_core;
> > + if (IS_POSIX(bflc) && !IS_OFDLCK(bflc))
> > locks_insert_global_blocked(&waiter->fl_core);
> >
> > /* The requests in waiter->fl_blocked are known to conflict with
> > @@ -998,6 +1017,7 @@ static int posix_locks_deadlock(struct file_lock *caller_fl,
> > struct file_lock *block_fl)
> > {
> > int i = 0;
> > + struct file_lock_core *flc = &caller_fl->fl_core;
> >
> > lockdep_assert_held(&blocked_lock_lock);
> >
> > @@ -1005,7 +1025,7 @@ static int posix_locks_deadlock(struct file_lock *caller_fl,
> > * This deadlock detector can't reasonably detect deadlocks with
> > * FL_OFDLCK locks, since they aren't owned by a process, per-se.
> > */
> > - if (IS_OFDLCK(caller_fl))
> > + if (IS_OFDLCK(flc))
> > return 0;
> >
> > while ((block_fl = what_owner_is_waiting_for(block_fl))) {
> > @@ -2157,7 +2177,7 @@ static pid_t locks_translate_pid(struct file_lock *fl, struct pid_namespace *ns)
> > pid_t vnr;
> > struct pid *pid;
> >
> > - if (IS_OFDLCK(fl))
> > + if (IS_OFDLCK(&fl->fl_core))
> > return -1;
> > if (IS_REMOTELCK(fl))
> > return fl->fl_core.fl_pid;
> > @@ -2721,19 +2741,19 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
> > if (repeat)
> > seq_printf(f, "%*s", repeat - 1 + (int)strlen(pfx), pfx);
> >
> > - if (IS_POSIX(fl)) {
> > + if (IS_POSIX(&fl->fl_core)) {
> > if (fl->fl_core.fl_flags & FL_ACCESS)
> > seq_puts(f, "ACCESS");
> > - else if (IS_OFDLCK(fl))
> > + else if (IS_OFDLCK(&fl->fl_core))
> > seq_puts(f, "OFDLCK");
> > else
> > seq_puts(f, "POSIX ");
> >
> > seq_printf(f, " %s ",
> > (inode == NULL) ? "*NOINODE*" : "ADVISORY ");
> > - } else if (IS_FLOCK(fl)) {
> > + } else if (IS_FLOCK(&fl->fl_core)) {
> > seq_puts(f, "FLOCK ADVISORY ");
> > - } else if (IS_LEASE(fl)) {
> > + } else if (IS_LEASE(&fl->fl_core)) {
> > if (fl->fl_core.fl_flags & FL_DELEG)
> > seq_puts(f, "DELEG ");
> > else
> > @@ -2748,7 +2768,7 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
> > } else {
> > seq_puts(f, "UNKNOWN UNKNOWN ");
> > }
> > - type = IS_LEASE(fl) ? target_leasetype(fl) : fl->fl_core.fl_type;
> > + type = IS_LEASE(&fl->fl_core) ? target_leasetype(fl) : fl->fl_core.fl_type;
> >
> > seq_printf(f, "%s ", (type == F_WRLCK) ? "WRITE" :
> > (type == F_RDLCK) ? "READ" : "UNLCK");
> > @@ -2760,7 +2780,7 @@ static void lock_get_status(struct seq_file *f, struct file_lock *fl,
> > } else {
> > seq_printf(f, "%d <none>:0 ", fl_pid);
> > }
> > - if (IS_POSIX(fl)) {
> > + if (IS_POSIX(&fl->fl_core)) {
> > if (fl->fl_end == OFFSET_MAX)
> > seq_printf(f, "%Ld EOF\n", fl->fl_start);
> > else
> >
> > --
> > 2.43.0
> >
> >
>
--
Jeff Layton <jlayton@kernel.org>
next prev parent reply other threads:[~2024-01-17 12:32 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-16 19:45 [PATCH 00/20] filelock: split struct file_lock into file_lock and file_lease structs Jeff Layton
2024-01-16 19:45 ` [PATCH 01/20] filelock: split common fields into struct file_lock_core Jeff Layton
2024-01-16 22:07 ` NeilBrown
2024-01-17 12:46 ` Jeff Layton
2024-01-16 19:45 ` [PATCH 02/20] filelock: add coccinelle scripts to move fields to " Jeff Layton
2024-01-16 19:45 ` [PATCH 03/20] filelock: the results of the coccinelle conversion Jeff Layton
2024-01-17 15:10 ` Chuck Lever
2024-01-16 19:46 ` [PATCH 04/20] filelock: fixups after the coccinelle changes Jeff Layton
2024-01-17 15:13 ` Chuck Lever
2024-01-16 19:46 ` [PATCH 05/20] filelock: convert some internal functions to use file_lock_core instead Jeff Layton
2024-01-16 19:46 ` [PATCH 06/20] filelock: convert more internal functions to use file_lock_core Jeff Layton
2024-01-16 19:46 ` [PATCH 07/20] filelock: make posix_same_owner take file_lock_core pointers Jeff Layton
2024-01-16 19:46 ` [PATCH 08/20] filelock: convert posix_owner_key to take file_lock_core arg Jeff Layton
2024-01-16 19:46 ` [PATCH 09/20] filelock: make locks_{insert,delete}_global_locks " Jeff Layton
2024-01-16 19:46 ` [PATCH 10/20] filelock: convert locks_{insert,delete}_global_blocked Jeff Layton
2024-01-16 19:46 ` [PATCH 11/20] filelock: convert the IS_* macros to take file_lock_core Jeff Layton
2024-01-16 22:16 ` NeilBrown
2024-01-17 12:32 ` Jeff Layton [this message]
2024-01-16 19:46 ` [PATCH 12/20] filelock: make __locks_delete_block and __locks_wake_up_blocks " Jeff Layton
2024-01-16 22:23 ` NeilBrown
2024-01-17 12:40 ` Jeff Layton
2024-01-16 19:46 ` [PATCH 13/20] filelock: convert __locks_insert_block, conflict and deadlock checks to use file_lock_core Jeff Layton
2024-01-16 22:32 ` NeilBrown
2024-01-17 12:42 ` Jeff Layton
2024-01-16 19:46 ` [PATCH 14/20] filelock: convert fl_blocker to file_lock_core Jeff Layton
2024-01-16 19:46 ` [PATCH 15/20] filelock: clean up locks_delete_block internals Jeff Layton
2024-01-16 19:46 ` [PATCH 16/20] filelock: reorganize locks_delete_block and __locks_insert_block Jeff Layton
2024-01-16 19:46 ` [PATCH 17/20] filelock: make assign_type helper take a file_lock_core pointer Jeff Layton
2024-01-16 19:46 ` [PATCH 18/20] filelock: convert locks_wake_up_blocks to " Jeff Layton
2024-01-16 19:46 ` [PATCH 19/20] filelock: convert locks_insert_lock_ctx and locks_delete_lock_ctx Jeff Layton
2024-01-16 19:46 ` [PATCH 20/20] filelock: split leases out of struct file_lock Jeff Layton
2024-01-16 22:44 ` NeilBrown
2024-01-17 12:45 ` Jeff Layton
2024-01-17 12:48 ` [PATCH 00/20] filelock: split struct file_lock into file_lock and file_lease structs Christian Brauner
2024-01-17 12:59 ` Jeff Layton
2024-01-17 13:25 ` [PATCH 02/20] filelock: add coccinelle scripts to move fields to struct file_lock_core David Howells
2024-01-17 13:40 ` Jeff Layton
2024-01-17 15:12 ` [PATCH 00/20] filelock: split struct file_lock into file_lock and file_lease structs Chuck Lever
2024-01-17 17:32 ` Jeff Layton
2024-01-17 18:59 ` NeilBrown
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=7e1026b829cff2e59bc7edfe29faea5572c841ea.camel@kernel.org \
--to=jlayton@kernel.org \
--cc=Dai.Ngo@oracle.com \
--cc=aahringo@redhat.com \
--cc=agruenba@redhat.com \
--cc=anna@kernel.org \
--cc=asmadeus@codewreck.org \
--cc=brauner@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=chuck.lever@oracle.com \
--cc=dhowells@redhat.com \
--cc=ericvh@kernel.org \
--cc=gfs2@lists.linux.dev \
--cc=idryomov@gmail.com \
--cc=jack@suse.cz \
--cc=jlbec@evilplan.org \
--cc=joseph.qi@linux.alibaba.com \
--cc=kolga@netapp.com \
--cc=linkinjeon@kernel.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=linux_oss@crudebyte.com \
--cc=lsahlber@redhat.com \
--cc=lucho@ionkov.net \
--cc=marc.dionne@auristor.com \
--cc=mark@fasheh.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=miklos@szeredi.hu \
--cc=neilb@suse.de \
--cc=ocfs2-devel@lists.linux.dev \
--cc=pc@manguebit.com \
--cc=rostedt@goodmis.org \
--cc=samba-technical@lists.samba.org \
--cc=senozhatsky@chromium.org \
--cc=sfrench@samba.org \
--cc=sprasad@microsoft.com \
--cc=teigland@redhat.com \
--cc=tom@talpey.com \
--cc=trond.myklebust@hammerspace.com \
--cc=v9fs@lists.linux.dev \
--cc=viro@zeniv.linux.org.uk \
--cc=xiubli@redhat.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 read-only IMAP folder(s) and NNTP newsgroup(s).