Skip to content

Commit

Permalink
nfsd: don't set a FL_LAYOUT lease for flexfiles layouts
Browse files Browse the repository at this point in the history
We currently can hit a deadlock (of sorts) when trying to use flexfiles
layouts with XFS. XFS will call break_layout when something wants to
write to the file. In the case of the (super-simple) flexfiles layout
driver in knfsd, the MDS and DS are the same machine.

The client can get a layout and then issue a v3 write to do its I/O. XFS
will then call xfs_break_layouts, which will cause a CB_LAYOUTRECALL to
be issued to the client. The client however can't return the layout
until the v3 WRITE completes, but XFS won't allow the write to proceed
until the layout is returned.

Christoph says:

    XFS only cares about block-like layouts where the client has direct
    access to the file blocks.  I'd need to look how to propagate the
    flag into break_layout, but in principle we don't need to do any
    recalls on truncate ever for file and flexfile layouts.

If we're never going to recall the layout, then we don't even need to
set the lease at all. Just skip doing so on flexfiles layouts by
adding a new flag to struct nfsd4_layout_ops and skipping the lease
setting and removal when that flag is true.

Cc: Christoph Hellwig <[email protected]>
Signed-off-by: Jeff Layton <[email protected]>
Signed-off-by: J. Bruce Fields <[email protected]>
  • Loading branch information
jtlayton authored and J. Bruce Fields committed Sep 16, 2016
1 parent bf2c4b6 commit 1983a66
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions fs/nfsd/flexfilelayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ nfsd4_ff_proc_getdeviceinfo(struct super_block *sb, struct svc_rqst *rqstp,
const struct nfsd4_layout_ops ff_layout_ops = {
.notify_types =
NOTIFY_DEVICEID4_DELETE | NOTIFY_DEVICEID4_CHANGE,
.disable_recalls = true,
.proc_getdeviceinfo = nfsd4_ff_proc_getdeviceinfo,
.encode_getdeviceinfo = nfsd4_ff_encode_getdeviceinfo,
.proc_layoutget = nfsd4_ff_proc_layoutget,
Expand Down
6 changes: 5 additions & 1 deletion fs/nfsd/nfs4layouts.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ nfsd4_free_layout_stateid(struct nfs4_stid *stid)
list_del_init(&ls->ls_perfile);
spin_unlock(&fp->fi_lock);

vfs_setlease(ls->ls_file, F_UNLCK, NULL, (void **)&ls);
if (!nfsd4_layout_ops[ls->ls_layout_type]->disable_recalls)
vfs_setlease(ls->ls_file, F_UNLCK, NULL, (void **)&ls);
fput(ls->ls_file);

if (ls->ls_recalled)
Expand All @@ -189,6 +190,9 @@ nfsd4_layout_setlease(struct nfs4_layout_stateid *ls)
struct file_lock *fl;
int status;

if (nfsd4_layout_ops[ls->ls_layout_type]->disable_recalls)
return 0;

fl = locks_alloc_lock();
if (!fl)
return -ENOMEM;
Expand Down
1 change: 1 addition & 0 deletions fs/nfsd/pnfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ struct nfsd4_deviceid_map {

struct nfsd4_layout_ops {
u32 notify_types;
bool disable_recalls;

__be32 (*proc_getdeviceinfo)(struct super_block *sb,
struct svc_rqst *rqstp,
Expand Down

0 comments on commit 1983a66

Please sign in to comment.