public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

NFSD: Add nfsd4_copy time-to-live

Browse source 
Keep async copy state alive for a few lease cycles after the copy
completes so that OFFLOAD_STATUS returns something meaningful.

This means that NFSD's client shutdown processing needs to purge
any of this state that happens to be waiting to die.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2024-10-31 09:40:08 -04:00
parent ac0514f4d1
commit aa0ebd21df
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fs/nfsd/nfs4proc.c
View file

@ -1326,8 +1326,10 @@ void nfsd4_async_copy_reaper(struct nfsd_net *nn)
list_for_each_safe(pos, next, &clp->async_copies) { list_for_each_safe(pos, next, &clp->async_copies) {
copy = list_entry(pos, struct nfsd4_copy, copies); copy = list_entry(pos, struct nfsd4_copy, copies);
if (test_bit(NFSD4_COPY_F_OFFLOAD_DONE, &copy->cp_flags)) { if (test_bit(NFSD4_COPY_F_OFFLOAD_DONE, &copy->cp_flags)) {
list_del_init(&copy->copies); if (--copy->cp_ttl) {
list_add(&copy->copies, &reaplist); list_del_init(&copy->copies);
list_add(&copy->copies, &reaplist);
}
} }
} }
spin_unlock(&clp->async_lock); spin_unlock(&clp->async_lock);
@ -1921,6 +1923,7 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
async_copy->cp_nn = nn; async_copy->cp_nn = nn;
INIT_LIST_HEAD(&async_copy->copies); INIT_LIST_HEAD(&async_copy->copies);
refcount_set(&async_copy->refcount, 1); refcount_set(&async_copy->refcount, 1);
async_copy->cp_ttl = NFSD_COPY_INITIAL_TTL;
/* Arbitrary cap on number of pending async copy operations */ /* Arbitrary cap on number of pending async copy operations */
if (atomic_inc_return(&nn->pending_async_copies) > if (atomic_inc_return(&nn->pending_async_copies) >
(int)rqstp->rq_pool->sp_nrthreads) (int)rqstp->rq_pool->sp_nrthreads)

15
fs/nfsd/state.h
View file

@ -137,6 +137,21 @@ struct nfs4_cpntf_state {
time64_t cpntf_time; /* last time stateid used */ time64_t cpntf_time; /* last time stateid used */
}; };
/*
* RFC 7862 Section 4.8 states:
*
* | A copy offload stateid will be valid until either (A) the client
* | or server restarts or (B) the client returns the resource by
* | issuing an OFFLOAD_CANCEL operation or the client replies to a
* | CB_OFFLOAD operation.
*
* Because a client might not reply to a CB_OFFLOAD, or a reply
* might get lost due to connection loss, NFSD purges async copy
* state after a short period to prevent it from accumulating
* over time.
*/
#define NFSD_COPY_INITIAL_TTL 10
struct nfs4_cb_fattr { struct nfs4_cb_fattr {
struct nfsd4_callback ncf_getattr; struct nfsd4_callback ncf_getattr;
u32 ncf_cb_status; u32 ncf_cb_status;

1
fs/nfsd/xdr4.h
View file

@ -715,6 +715,7 @@ struct nfsd4_copy {
struct list_head copies; struct list_head copies;
struct task_struct *copy_task; struct task_struct *copy_task;
refcount_t refcount; refcount_t refcount;
unsigned int cp_ttl;
struct nfsd4_ssc_umount_item *ss_nsui; struct nfsd4_ssc_umount_item *ss_nsui;
struct nfs_fh c_fh; struct nfs_fh c_fh;