Skip to content

L
linux
Commit 8383e460 authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

NFSv4: Use RCU to protect delegations 

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 13437e12
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 55 deletions
fs/nfs/delegation.c
View file @ 8383e460
...@@ -27,6 +27,13 @@ static void nfs_free_delegation(struct nfs_delegation *delegation) ...@@ -27,6 +27,13 @@ static void nfs_free_delegation(struct nfs_delegation *delegation)
kfree(delegation); kfree(delegation);
} }
static void nfs_free_delegation_callback(struct rcu_head *head)
{
struct nfs_delegation *delegation = container_of(head, struct nfs_delegation, rcu);
nfs_free_delegation(delegation);
}
static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_state *state) static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_state *state)
{ {
struct inode *inode = state->inode; struct inode *inode = state->inode;
...@@ -133,10 +140,10 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct ...@@ -133,10 +140,10 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct
delegation->inode = inode; delegation->inode = inode;
spin_lock(&clp->cl_lock); spin_lock(&clp->cl_lock);
if (nfsi->delegation == NULL) { if (rcu_dereference(nfsi->delegation) == NULL) {
list_add(&delegation->super_list, &clp->cl_delegations); list_add_rcu(&delegation->super_list, &clp->cl_delegations);
nfsi->delegation = delegation;
nfsi->delegation_state = delegation->type; nfsi->delegation_state = delegation->type;
rcu_assign_pointer(nfsi->delegation, delegation);
delegation = NULL; delegation = NULL;
} else { } else {
if (memcmp(&delegation->stateid, &nfsi->delegation->stateid, if (memcmp(&delegation->stateid, &nfsi->delegation->stateid,
...@@ -157,7 +164,7 @@ static int nfs_do_return_delegation(struct inode *inode, struct nfs_delegation * ...@@ -157,7 +164,7 @@ static int nfs_do_return_delegation(struct inode *inode, struct nfs_delegation *
int res = 0; int res = 0;
res = nfs4_proc_delegreturn(inode, delegation->cred, &delegation->stateid); res = nfs4_proc_delegreturn(inode, delegation->cred, &delegation->stateid);
nfs_free_delegation(delegation); call_rcu(&delegation->rcu, nfs_free_delegation_callback);
return res; return res;
} }
...@@ -191,16 +198,16 @@ static int __nfs_inode_return_delegation(struct inode *inode, struct nfs_delegat ...@@ -191,16 +198,16 @@ static int __nfs_inode_return_delegation(struct inode *inode, struct nfs_delegat
static struct nfs_delegation *nfs_detach_delegation_locked(struct nfs_inode *nfsi, const nfs4_stateid *stateid) static struct nfs_delegation *nfs_detach_delegation_locked(struct nfs_inode *nfsi, const nfs4_stateid *stateid)
{ {
struct nfs_delegation *delegation = nfsi->delegation; struct nfs_delegation *delegation = rcu_dereference(nfsi->delegation);
if (delegation == NULL) if (delegation == NULL)
goto nomatch; goto nomatch;
if (stateid != NULL && memcmp(delegation->stateid.data, stateid->data, if (stateid != NULL && memcmp(delegation->stateid.data, stateid->data,
sizeof(delegation->stateid.data)) != 0) sizeof(delegation->stateid.data)) != 0)
goto nomatch; goto nomatch;
list_del_init(&delegation->super_list); list_del_rcu(&delegation->super_list);
nfsi->delegation = NULL;
nfsi->delegation_state = 0; nfsi->delegation_state = 0;
rcu_assign_pointer(nfsi->delegation, NULL);
return delegation; return delegation;
nomatch: nomatch:
return NULL; return NULL;
...@@ -213,7 +220,7 @@ int nfs_inode_return_delegation(struct inode *inode) ...@@ -213,7 +220,7 @@ int nfs_inode_return_delegation(struct inode *inode)
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
int err = 0; int err = 0;
if (nfsi->delegation_state != 0) { if (rcu_dereference(nfsi->delegation) != NULL) {
spin_lock(&clp->cl_lock); spin_lock(&clp->cl_lock);
delegation = nfs_detach_delegation_locked(nfsi, NULL); delegation = nfs_detach_delegation_locked(nfsi, NULL);
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
...@@ -235,20 +242,23 @@ void nfs_return_all_delegations(struct super_block *sb) ...@@ -235,20 +242,23 @@ void nfs_return_all_delegations(struct super_block *sb)
if (clp == NULL) if (clp == NULL)
return; return;
restart: restart:
spin_lock(&clp->cl_lock); rcu_read_lock();
list_for_each_entry(delegation, &clp->cl_delegations, super_list) { list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) {
if (delegation->inode->i_sb != sb) if (delegation->inode->i_sb != sb)
continue; continue;
inode = igrab(delegation->inode); inode = igrab(delegation->inode);
if (inode == NULL) if (inode == NULL)
continue; continue;
nfs_detach_delegation_locked(NFS_I(inode), NULL); spin_lock(&clp->cl_lock);
delegation = nfs_detach_delegation_locked(NFS_I(inode), NULL);
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
__nfs_inode_return_delegation(inode, delegation); rcu_read_unlock();
if (delegation != NULL)
__nfs_inode_return_delegation(inode, delegation);
iput(inode); iput(inode);
goto restart; goto restart;
} }
spin_unlock(&clp->cl_lock); rcu_read_unlock();
} }
static int nfs_do_expire_all_delegations(void *ptr) static int nfs_do_expire_all_delegations(void *ptr)
...@@ -259,23 +269,26 @@ static int nfs_do_expire_all_delegations(void *ptr) ...@@ -259,23 +269,26 @@ static int nfs_do_expire_all_delegations(void *ptr)
allow_signal(SIGKILL); allow_signal(SIGKILL);
restart: restart:
spin_lock(&clp->cl_lock);
if (test_bit(NFS4CLNT_STATE_RECOVER, &clp->cl_state) != 0) if (test_bit(NFS4CLNT_STATE_RECOVER, &clp->cl_state) != 0)
goto out; goto out;
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) == 0) if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) == 0)
goto out; goto out;
list_for_each_entry(delegation, &clp->cl_delegations, super_list) { rcu_read_lock();
list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) {
inode = igrab(delegation->inode); inode = igrab(delegation->inode);
if (inode == NULL) if (inode == NULL)
continue; continue;
nfs_detach_delegation_locked(NFS_I(inode), NULL); spin_lock(&clp->cl_lock);
delegation = nfs_detach_delegation_locked(NFS_I(inode), NULL);
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
__nfs_inode_return_delegation(inode, delegation); rcu_read_unlock();
if (delegation)
__nfs_inode_return_delegation(inode, delegation);
iput(inode); iput(inode);
goto restart; goto restart;
} }
rcu_read_unlock();
out: out:
spin_unlock(&clp->cl_lock);
nfs_put_client(clp); nfs_put_client(clp);
module_put_and_exit(0); module_put_and_exit(0);
} }
...@@ -306,18 +319,21 @@ void nfs_handle_cb_pathdown(struct nfs_client *clp) ...@@ -306,18 +319,21 @@ void nfs_handle_cb_pathdown(struct nfs_client *clp)
if (clp == NULL) if (clp == NULL)
return; return;
restart: restart:
spin_lock(&clp->cl_lock); rcu_read_lock();
list_for_each_entry(delegation, &clp->cl_delegations, super_list) { list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) {
inode = igrab(delegation->inode); inode = igrab(delegation->inode);
if (inode == NULL) if (inode == NULL)
continue; continue;
nfs_detach_delegation_locked(NFS_I(inode), NULL); spin_lock(&clp->cl_lock);
delegation = nfs_detach_delegation_locked(NFS_I(inode), NULL);
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
__nfs_inode_return_delegation(inode, delegation); rcu_read_unlock();
if (delegation != NULL)
__nfs_inode_return_delegation(inode, delegation);
iput(inode); iput(inode);
goto restart; goto restart;
} }
spin_unlock(&clp->cl_lock); rcu_read_unlock();
} }
struct recall_threadargs { struct recall_threadargs {
...@@ -391,14 +407,14 @@ struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs ...@@ -391,14 +407,14 @@ struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs
{ {
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
struct inode *res = NULL; struct inode *res = NULL;
spin_lock(&clp->cl_lock); rcu_read_lock();
list_for_each_entry(delegation, &clp->cl_delegations, super_list) { list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) {
if (nfs_compare_fh(fhandle, &NFS_I(delegation->inode)->fh) == 0) { if (nfs_compare_fh(fhandle, &NFS_I(delegation->inode)->fh) == 0) {
res = igrab(delegation->inode); res = igrab(delegation->inode);
break; break;
} }
} }
spin_unlock(&clp->cl_lock); rcu_read_unlock();
return res; return res;
} }
...@@ -408,10 +424,10 @@ struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs ...@@ -408,10 +424,10 @@ struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs
void nfs_delegation_mark_reclaim(struct nfs_client *clp) void nfs_delegation_mark_reclaim(struct nfs_client *clp)
{ {
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
spin_lock(&clp->cl_lock); rcu_read_lock();
list_for_each_entry(delegation, &clp->cl_delegations, super_list) list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list)
delegation->flags |= NFS_DELEGATION_NEED_RECLAIM; delegation->flags |= NFS_DELEGATION_NEED_RECLAIM;
spin_unlock(&clp->cl_lock); rcu_read_unlock();
} }
/* /*
...@@ -419,39 +435,35 @@ void nfs_delegation_mark_reclaim(struct nfs_client *clp) ...@@ -419,39 +435,35 @@ void nfs_delegation_mark_reclaim(struct nfs_client *clp)
*/ */
void nfs_delegation_reap_unclaimed(struct nfs_client *clp) void nfs_delegation_reap_unclaimed(struct nfs_client *clp)
{ {
struct nfs_delegation *delegation, *n; struct nfs_delegation *delegation;
LIST_HEAD(head); restart:
spin_lock(&clp->cl_lock); rcu_read_lock();
list_for_each_entry_safe(delegation, n, &clp->cl_delegations, super_list) { list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) {
if ((delegation->flags & NFS_DELEGATION_NEED_RECLAIM) == 0) if ((delegation->flags & NFS_DELEGATION_NEED_RECLAIM) == 0)
continue; continue;
list_move(&delegation->super_list, &head); spin_lock(&clp->cl_lock);
NFS_I(delegation->inode)->delegation = NULL; delegation = nfs_detach_delegation_locked(NFS_I(delegation->inode), NULL);
NFS_I(delegation->inode)->delegation_state = 0; spin_unlock(&clp->cl_lock);
} rcu_read_unlock();
spin_unlock(&clp->cl_lock); if (delegation != NULL)
while(!list_empty(&head)) { call_rcu(&delegation->rcu, nfs_free_delegation_callback);
delegation = list_entry(head.next, struct nfs_delegation, super_list); goto restart;
list_del(&delegation->super_list);
nfs_free_delegation(delegation);
} }
rcu_read_unlock();
} }
int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode) int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode)
{ {
struct nfs_client *clp = NFS_SERVER(inode)->nfs_client;
struct nfs_inode *nfsi = NFS_I(inode); struct nfs_inode *nfsi = NFS_I(inode);
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
int res = 0; int ret = 0;
if (nfsi->delegation_state == 0) rcu_read_lock();
return 0; delegation = rcu_dereference(nfsi->delegation);
spin_lock(&clp->cl_lock);
delegation = nfsi->delegation;
if (delegation != NULL) { if (delegation != NULL) {
memcpy(dst->data, delegation->stateid.data, sizeof(dst->data)); memcpy(dst->data, delegation->stateid.data, sizeof(dst->data));
res = 1; ret = 1;
} }
spin_unlock(&clp->cl_lock); rcu_read_unlock();
return res; return ret;
} }
fs/nfs/delegation.h
View file @ 8383e460
...@@ -22,6 +22,7 @@ struct nfs_delegation { ...@@ -22,6 +22,7 @@ struct nfs_delegation {
long flags; long flags;
loff_t maxsize; loff_t maxsize;
__u64 change_attr; __u64 change_attr;
struct rcu_head rcu;
}; };
int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res); int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct nfs_openres *res);
...@@ -45,11 +46,16 @@ int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode); ...@@ -45,11 +46,16 @@ int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode);
static inline int nfs_have_delegation(struct inode *inode, int flags) static inline int nfs_have_delegation(struct inode *inode, int flags)
{ {
struct nfs_delegation *delegation;
int ret = 0;
flags &= FMODE_READ|FMODE_WRITE; flags &= FMODE_READ|FMODE_WRITE;
smp_rmb(); rcu_read_lock();
if ((NFS_I(inode)->delegation_state & flags) == flags) delegation = rcu_dereference(NFS_I(inode)->delegation);
return 1; if (delegation != NULL && (delegation->type & flags) == flags)
return 0; ret = 1;
rcu_read_unlock();
return ret;
} }
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7