NFSv4: Don't trigger uneccessary scans for return-on-close delegations

[ Upstream commit 47acca884f714f41d95dc654f802845544554784 ]

The amount of looping through the list of delegations is occasionally
leading to soft lockups. Avoid at least some loops by not requiring the
NFSv4 state manager to scan for delegations that are marked for
return-on-close. Instead, either mark them for immediate return (if
possible) or else leave it up to nfs4_inode_return_delegation_on_close()
to return them once the file is closed by the application.

Fixes: b757144fd77c ("NFSv4: Be less aggressive about returning delegations for open files")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 4bf2526a3a1892dadf173c3453faaebf0f84c7d5..55cfa1c4e0a65d138c8f3fed20a15571746da387 100644 (file)
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -570,17 +570,6 @@ static bool nfs_delegation_need_return(struct nfs_delegation *delegation)
 
        if (test_and_clear_bit(NFS_DELEGATION_RETURN, &delegation->flags))
                ret = true;
-       else if (test_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags)) {
-               struct inode *inode;
-
-               spin_lock(&delegation->lock);
-               inode = delegation->inode;
-               if (inode && list_empty(&NFS_I(inode)->open_files))
-                       ret = true;
-               spin_unlock(&delegation->lock);
-       }
-       if (ret)
-               clear_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags);
        if (test_bit(NFS_DELEGATION_RETURNING, &delegation->flags) ||
            test_bit(NFS_DELEGATION_RETURN_DELAYED, &delegation->flags) ||
            test_bit(NFS_DELEGATION_REVOKED, &delegation->flags))
@@ -821,11 +810,25 @@ int nfs4_inode_make_writeable(struct inode *inode)
        return nfs4_inode_return_delegation(inode);
 }
 
-static void nfs_mark_return_if_closed_delegation(struct nfs_server *server,
-               struct nfs_delegation *delegation)
+static void
+nfs_mark_return_if_closed_delegation(struct nfs_server *server,
+                                    struct nfs_delegation *delegation)
 {
-       set_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags);
-       set_bit(NFS4CLNT_DELEGRETURN, &server->nfs_client->cl_state);
+       struct inode *inode;
+
+       if (test_bit(NFS_DELEGATION_RETURN, &delegation->flags) ||
+           test_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags))
+               return;
+       spin_lock(&delegation->lock);
+       inode = delegation->inode;
+       if (!inode)
+               goto out;
+       if (list_empty(&NFS_I(inode)->open_files))
+               nfs_mark_return_delegation(server, delegation);
+       else
+               set_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags);
+out:
+       spin_unlock(&delegation->lock);
 }
 
 static bool nfs_server_mark_return_all_delegations(struct nfs_server *server)