On Wed, 2017-02-22 at 09:10 -0500, Benjamin Coddington wrote:
> On 22 Feb 2017, at 8:20, Jeff Layton wrote:
>
> > On Tue, 2017-02-21 at 10:39 -0500, Benjamin Coddington wrote:
> > > NFS attempts to wait for read and write completion before unlocking
> > > in
> > > order to ensure that the data returned was protected by the lock.
> > > When
> > > this waiting is interrupted by a signal, the unlock may be skipped,
> > > and
> > > messages similar to the following are seen in the kernel ring buffer:
> > >
> > > [20.167876] Leaked locks on dev=0x0:0x2b ino=0x8dd4c3:
> > > [20.168286] POSIX: fl_owner=ffff880078b06940 fl_flags=0x1 fl_type=0x0
> > > fl_pid=20183
> > > [20.168727] POSIX: fl_owner=ffff880078b06680 fl_flags=0x1 fl_type=0x0
> > > fl_pid=20185
> > >
> > > For NFSv3, the missing unlock will cause the server to refuse
> > > conflicting
> > > locks indefinitely. For NFSv4, the leftover lock will be removed by
> > > the
> > > server after the lease timeout.
> > >
> > > This patch fixes this issue by skipping the wait in order to
> > > immediately send
> > > the unlock if the FL_CLOSE flag is set when signaled.
> > >
> > > Signed-off-by: Benjamin Coddington <bcodding@xxxxxxxxxx>
> > > ---
> > > fs/nfs/file.c | 10 +++++-----
> > > 1 file changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/fs/nfs/file.c b/fs/nfs/file.c
> > > index a490f45df4db..df695f52bb9d 100644
> > > --- a/fs/nfs/file.c
> > > +++ b/fs/nfs/file.c
> > > @@ -697,14 +697,14 @@ do_unlk(struct file *filp, int cmd, struct
> > > file_lock *fl, int is_local)
> > > if (!IS_ERR(l_ctx)) {
> > > status = nfs_iocounter_wait(l_ctx);
> > > nfs_put_lock_context(l_ctx);
> > > - if (status < 0)
> > > + /* NOTE: special case
> > > + * If we're signalled while cleaning up locks on process exit, we
> > > + * still need to complete the unlock.
> > > + */
> > > + if (status < 0 && !(fl->fl_flags & FL_CLOSE))
> > > return status;
> >
> >
> > Hmm, I don't know if this is safe...
> >
> > Suppose we have a bunch of buffered writeback going on, and we're
> > sitting here waiting for it so we can do the unlock. The task catches
> > a
> > signal, and then issues the unlock while writeback is still going on.
> > Another client then grabs the lock, and starts doing reads and writes
> > while this one is still writing back.
> >
> > I think the unlock really needs to wait until writeback is done,
> > regardless of whether you catch a signal or not.
>
> The only other way to do this is as you've sugggested many times -- by
> putting the LOCKU on a rpc_wait_queue. But that won't work for NFSv3.
>
IDGI -- why doesn't that (or something similar) not work for v3?
> For NFSv4, the other thing to do might be to look up the lock state and
> set
> NFS_LOCK_LOST, then unlock. That will cause subsequent writes to not
> attempt recovery.
>
No! LOCK_LOST is really for the case where we've lost contact with the
server. We don't want to get kicked into recovery just because of a
SIGKILL.
Ideally, I think what we want is for the effect of every write that
occurred up until the SIGKILL to be visible to other clients after the
SIGKILL. Doing anything else could be problematic for applications.
> How can this be fixed for NFSv3 without voilating the NLM layers?
That, I'm not sure of. Conceptually, I think what we want though is to
wait until writeback is done, and then issue an unlock.
One way might be to embed some new infrastructure in nlm_rqst and
nfs_lock_context that would allow you to idle NLM requests until the
io_count goes to 0.
Maybe have nlmclnt_unlock() put the nlm_rqst on a list in the lock
context if there are still outstanding NFS requests. When the io_count
goes to zero, queue some work that will scrape out the list and kick
off those requests. It'll take some creativity to do that without
turning it into one huge layering violation though.
Alternately, you could idle them in the NFS layer, but that probably
means having to do another allocation, which may be problematic in
situations where you may be dealing with a SIGKILL (e.g. OOM killer).
--
Jeff Layton <jlayton@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
