NFSD: Initial implementation of NFSv4 Courteous Server
Subsystems (2)
Dai Ngo
reviewerv20 cover NFSD: Initial implementation of NFSv4 Courteous Server
Hi Chuck, Bruce
This series of patches implement the NFSv4 Courteous Server.
A server which does not immediately expunge the state on lease expiration is known as a Courteous Server. A Courteous Server continues to recognize previously generated state tokens as valid until conflict arises between the expired state and the requests from another client, or the server reboots.
v2:
. add new callback, lm_expire_lock, to lock_manager_operations to
allow the lock manager to take appropriate action with conflict lock.
. handle conflicts of NFSv4 locks with NFSv3/NLM and local locks.
. expire courtesy client after 24hr if client has not reconnected.
. do not allow expired client to become courtesy client if there are
waiters for client's locks.
. modify client_info_show to show courtesy client and seconds from
last renew.
. fix a problem with NFSv4.1 server where the it keeps returning
SEQ4_STATUS_CB_PATH_DOWN in the successful SEQUENCE reply, after the courtesy client reconnects, causing the client to keep sending BCTS requests to server.
v3:
. modified posix_test_lock to check and resolve conflict locks
to handle NLM TEST and NFSv4 LOCKT requests.
. separate out fix for back channel stuck in SEQ4_STATUS_CB_PATH_DOWN.
v4:
. rework nfsd_check_courtesy to avoid dead lock of fl_lock and client_lock
by asking the laudromat thread to destroy the courtesy client.
. handle NFSv4 share reservation conflicts with courtesy client. This
includes conflicts between access mode and deny mode and vice versa.
. drop the patch for back channel stuck in SEQ4_STATUS_CB_PATH_DOWN.
v5:
. fix recursive locking of file_rwsem from posix_lock_file.
. retest with LOCKDEP enabled.
v6:
. merge witn 5.15-rc7
. fix a bug in nfs4_check_deny_bmap that did not check for matched
nfs4_file before checking for access/deny conflict. This bug causes pynfs OPEN18 to fail since the server taking too long to release lots of un-conflict clients' state.
. enhance share reservation conflict handler to handle case where
a large number of conflict courtesy clients need to be expired. The 1st 100 clients are expired synchronously and the rest are expired in the background by the laundromat and NFS4ERR_DELAY is returned to the NFS client. This is needed to prevent the NFS client from timing out waiting got the reply.
v7:
. Fix race condition in posix_test_lock and posix_lock_inode after
dropping spinlock.
. Enhance nfsd4_fl_expire_lock to work with with new lm_expire_lock
callback
. Always resolve share reservation conflicts asynchrously.
. Fix bug in nfs4_laundromat where spinlock is not used when
scanning cl_ownerstr_hashtbl.
. Fix bug in nfs4_laundromat where idr_get_next was called
with incorrect 'id'.
. Merge nfs4_destroy_courtesy_client into nfsd4_fl_expire_lock.
v8:
. Fix warning in nfsd4_fl_expire_lock reported by test robot.
v9:
. Simplify lm_expire_lock API by (1) remove the 'testonly' flag
and (2) specifying return value as true/false to indicate whether conflict was succesfully resolved.
. Rework nfsd4_fl_expire_lock to mark client with
NFSD4_DESTROY_COURTESY_CLIENT then tell the laundromat to expire the client in the background.
. Add a spinlock in nfs4_client to synchronize access to the
NFSD4_COURTESY_CLIENT and NFSD4_DESTROY_COURTESY_CLIENT flag to handle race conditions when resolving lock and share reservation conflict.
. Courtesy client that was marked as NFSD4_DESTROY_COURTESY_CLIENT
are now consisdered 'dead', waiting for the laundromat to expire it. This client is no longer allowed to use its states if it reconnects before the laundromat finishes expiring the client.
For v4.1 client, the detection is done in the processing of the SEQUENCE op and returns NFS4ERR_BAD_SESSION to force the client to re-establish new clientid and session.
For v4.0 client, the detection is done in the processing of the RENEW and state-related ops and return NFS4ERR_EXPIRE to force the client to re-establish new clientid.
v10:
Resolve deadlock in v9 by avoiding getting cl_client and cl_cs_lock together. The laundromat needs to determine whether the expired client has any state and also has no blockers on its locks. Both of these conditions are allowed to change after the laundromat transits an expired client to courtesy client. When this happens, the laundromat will detect it on the next run and and expire the courtesy client.
Remove client persistent record before marking it as COURTESY_CLIENT and add client persistent record before clearing the COURTESY_CLIENT flag to allow the courtesy client to transist to normal client to continue to use its state.
Lock/delegation/share reversation conflict with courtesy client is resolved by marking the courtesy client as DESTROY_COURTESY_CLIENT, effectively disable it, then allow the current request to proceed immediately.
Courtesy client marked as DESTROY_COURTESY_CLIENT is not allowed to reconnect to reuse itsstate. It is expired by the laundromat asynchronously in the background.
Move processing of expired clients from nfs4_laudromat to a separate function, nfs4_get_client_reaplist, that creates the reaplist and also to process courtesy clients.
Update Documentation/filesystems/locking.rst to include new lm_lock_conflict call.
Modify leases_conflict to call lm_breaker_owns_lease only if there is real conflict. This is to allow the lock manager to resolve the delegation conflict if possible.
v11:
Add comment for lm_lock_conflict callback.
Replace static const courtesy_client_expiry with macro.
Remove courtesy_clnt argument from find_in_sessionid_hashtbl. Callers use nfs4_client->cl_cs_client boolean to determined if it's the courtesy client and take appropriate actions.
Rename NFSD4_COURTESY_CLIENT and NFSD4_DESTROY_COURTESY_CLIENT with NFSD4_CLIENT_COURTESY and NFSD4_CLIENT_DESTROY_COURTESY.
v12:
Remove unnecessary comment in nfs4_get_client_reaplist.
Replace nfs4_client->cl_cs_client boolean with
NFSD4_CLIENT_COURTESY_CLNT flag.
Remove courtesy_clnt argument from find_client_in_id_table and find_clp_in_name_tree. Callers use NFSD4_CLIENT_COURTESY_CLNT to determined if it's the courtesy client and take appropriate actions.
v13:
Merge with 5.17-rc3.
Cleanup Documentation/filesystems/locking.rst: replace i_lock with flc_lock, update API's that use flc_lock.
Rename lm_lock_conflict to lm_lock_expired().
Remove comment of lm_lock_expired API in lock_manager_operations. Same information is in patch description.
Update commit messages of 4/4.
Add some comment for NFSD4_CLIENT_COURTESY_CLNT.
Add nfsd4_discard_courtesy_clnt() to eliminate duplicate code of discarding courtesy client; setting NFSD4_DESTROY_COURTESY_CLIENT.
v14:
. merge with Chuck's public for-next branch.
. remove courtesy_client_expiry, use client's last renew time.
. simplify comment of nfs4_check_access_deny_bmap.
. add comment about race condition in nfs4_get_client_reaplist.
. add list_del when walking cslist in nfs4_get_client_reaplist.
. remove duplicate INIT_LIST_HEAD(&reaplist) from nfs4_laundromat
. Modify find_confirmed_client and find_confirmed_client_by_name
to detect courtesy client and destroy it.
. refactor lookup_clientid to use find_client_in_id_table
directly instead of find_confirmed_client.
. refactor nfsd4_setclientid to call find_clp_in_name_tree
directly instead of find_confirmed_client_by_name.
. remove comment of NFSD4_CLIENT_COURTESY.
. replace NFSD4_CLIENT_DESTROY_COURTESY with NFSD4_CLIENT_EXPIRED.
. replace NFSD4_CLIENT_COURTESY_CLNT with NFSD4_CLIENT_RECONNECTED.
v15:
. add helper locks_has_blockers_locked in fs.h to check for
lock blockers
. rename nfs4_conflict_clients to nfs4_resolve_deny_conflicts_locked
. update nfs4_upgrade_open() to handle courtesy clients.
. add helper nfs4_check_and_expire_courtesy_client and
nfs4_is_courtesy_client_expired to deduplicate some code.
. update nfs4_anylock_blocker:
. replace list_for_each_entry_safe with list_for_each_entry . break nfs4_anylock_blocker into 2 smaller functions.
. update nfs4_get_client_reaplist:
. remove unnecessary commets
. acquire cl_cs_lock before setting NFSD4_CLIENT_COURTESY flag
. update client_info_show to show 'time since last renew: 00:00:38'
instead of 'seconds from last renew: 38'.
v16:
. update client_info_show to display 'status' as
'confirmed/unconfirmed/courtesy'
. replace helper locks_has_blockers_locked in fs.h in v15 with new
locks_owner_has_blockers call in fs/locks.c
. update nfs4_lockowner_has_blockers to use locks_owner_has_blockers
. move nfs4_check_and_expire_courtesy_client from 5/11 to 4/11
. remove unnecessary check for NULL clp in find_in_sessionid_hashtb
. fix typo in commit messages
v17:
. replace flags used for courtesy client with enum courtesy_client_state
. add state table in nfsd/state.h
. make nfsd4_expire_courtesy_clnt, nfsd4_discard_courtesy_clnt and
nfsd4_courtesy_clnt_expired as static inline.
. update nfsd_breaker_owns_lease to use dl->dl_stid.sc_client directly
. fix kernel test robot warning when CONFIG_FILE_LOCKING not defined.
v18:
. modify 0005-NFSD-Update-nfs4_get_vfs_file-to-handle-courtesy-cli.patch to:
. remove nfs4_check_access_deny_bmap, fold this functionality
into nfs4_resolve_deny_conflicts_locked by making use of bmap_to_share_mode.
. move nfs4_resolve_deny_conflicts_locked into nfs4_file_get_access
and nfs4_file_check_deny.
v19:
. modify 0002-NFSD-Add-courtesy-client-state-macro-and-spinlock-to.patch to
. add NFSD4_CLIENT_ACTIVE
. redo Courtesy client state table
. modify 0007-NFSD-Update-find_in_sessionid_hashtbl-to-handle-cour.patch and
0008-NFSD-Update-find_client_in_id_table-to-handle-courte.patch to:
. set cl_cs_client_stare to NFSD4_CLIENT_ACTIVE when reactive
courtesy client
v20:
. modify 0006-NFSD-Update-find_clp_in_name_tree-to-handle-courtesy.patch to:
. add nfsd4_discard_reconnect_clnt
. replace call to nfsd4_discard_courtesy_clnt with
nfsd4_discard_reconnect_clnt
. modify 0007-NFSD-Update-find_in_sessionid_hashtbl-to-handle-cour.patch to:
. replace call to nfsd4_discard_courtesy_clnt with
nfsd4_discard_reconnect_clnt
. modify 0008-NFSD-Update-find_client_in_id_table-to-handle-courte.patch
. replace call to nfsd4_discard_courtesy_clnt with
nfsd4_discard_reconnect_clnt
Dai Ngo
reviewerRFC PATCH v20 1/10 NFSD: Add courtesy client state, macro and spinlock to support courteous server
Update nfs4_client to add:
. cl_cs_client_state: courtesy client state
. cl_cs_lock: spinlock to synchronize access to cl_cs_client_state . cl_cs_list: list used by laundromat to process courtesy clients
Modify alloc_client to initialize these fields.
--- fs/nfsd/nfs4state.c | 2 ++ fs/nfsd/nfsd.h | 1 + fs/nfsd/state.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+)
fs/nfsd/nfs4state.c +2 -0
@@ -2009,12 +2009,14 @@ static struct nfs4_client *alloc_client(struct xdr_netobj name)INIT_LIST_HEAD (&clp->cl_delegations);INIT_LIST_HEAD (&clp->cl_lru);INIT_LIST_HEAD (&clp->cl_revoked); +INIT_LIST_HEAD (&clp->cl_cs_list);#ifdef CONFIG_NFSD_PNFS INIT_LIST_HEAD (&clp->cl_lo_states);#endif INIT_LIST_HEAD (&clp->async_copies);spin_lock_init (&clp->async_lock);spin_lock_init (&clp->cl_lock); +spin_lock_init (&clp->cl_cs_lock);rpc_init_wait_queue (&clp->cl_cb_waitq,"Backchannel slot table" );return clp; err_no_hashtbl:
fs/nfsd/nfsd.h +1 -0
@@ -336,6 +336,7 @@ void nfsd_lockd_shutdown(void);#define COMPOUND_ERR_SLACK_SPACE 16/* OP_SETATTR */ #define NFSD_LAUNDROMAT_MINTIMEOUT 1/* seconds */ +#define NFSD_COURTESY_CLIENT_TIMEOUT (24 * 60 * 60)/* seconds */ /* * The following attributes are currently not supported by the NFSv4 server:
fs/nfsd/state.h +33 -0
@@ -283,6 +283,35 @@ struct nfsd4_sessionid {#define HEXDIR_LEN 33/* hex version of 16 byte md5 of cl_name plus '\0' */ /* +* State Meaning Where set +* -------------------------------------------------------------------------- +* | CLIENT_ACTIVE | Confirmed, active | Default | +* |------------------- ----------------------------------------------------| +* | CLIENT_COURTESY | Courtesy state. | nfs4_get_client_reaplist | +* | | Lease/lock/share | | +* | | reservation conflict | | +* | | can cause Courtesy | | +* | | client to be expired | | +* |------------------------------------------------------------------------| +* | CLIENT_EXPIRED | Courtesy client to be| nfs4_laundromat | +* | | expired by Laundromat| nfsd4_lm_lock_expired | +* | | due to conflict | nfsd4_discard_courtesy_clnt | +* | | | nfsd4_expire_courtesy_clnt | +* |------------------------------------------------------------------------| +* | CLIENT_RECONNECT | Courtesy client | nfsd4_courtesy_clnt_expired | +* | | reconnected, | | +* | | becoming active | | +* -------------------------------------------------------------------------- +*/ + +enum courtesy_client_state { +NFSD4_CLIENT_ACTIVE =0 , +NFSD4_CLIENT_COURTESY , +NFSD4_CLIENT_EXPIRED , +NFSD4_CLIENT_RECONNECTED , +}; + +/* * struct nfs4_client - one per client. Clientids live here. * * The initial object created by an NFS client using SETCLIENTID (for NFSv4.0)
@@ -385,6 +414,10 @@ struct nfs4_client {struct list_head async_copies;/* list of async copies */ spinlock_t async_lock;/* lock for async copies */ atomic_t cl_cb_inflight;/* Outstanding callbacks */ + +enum courtesy_client_state cl_cs_client_state; +spinlock_t cl_cs_lock; +struct list_head cl_cs_list; };/* struct nfs4_client_reset
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v20 2/10 NFSD: Add lm_lock_expired call out
In reply to Dai NgoAdd callout function nfsd4_lm_lock_expired for lm_lock_expired. If lock request has conflict with courtesy client then expire the courtesy client and return no conflict to caller.
--- fs/nfsd/nfs4state.c | 22 ++++++++++++++++++++++ fs/nfsd/state.h | 14 ++++++++++++++ 2 files changed, 36 insertions(+)
fs/nfsd/nfs4state.c +22 -0
@@ -6578,10 +6578,32 @@ nfsd4_lm_notify(struct file_lock *fl) } } +/** +* nfsd4_lm_lock_expired - check if lock conflict can be resolved. +* +* @fl: pointer to file_lock with a potential conflict +* Return values: +* %false: real conflict, lock conflict can not be resolved. +* %true: no conflict, lock conflict was resolved. +* +* Note that this function is called while the flc_lock is held. +*/ +static bool +nfsd4_lm_lock_expired (struct file_lock *fl) +{ +struct nfs4_lockowner *lo; + +if (!fl) +return false; + lo = (struct nfs4_lockowner *)fl->fl_owner; +return nfsd4_expire_courtesy_clnt (lo->lo_owner.so_client); +} +static const struct lock_manager_operations nfsd_posix_mng_ops = { .lm_notify = nfsd4_lm_notify, .lm_get_owner = nfsd4_lm_get_owner, .lm_put_owner = nfsd4_lm_put_owner, + .lm_lock_expired = nfsd4_lm_lock_expired, }; static inline void
fs/nfsd/state.h +14 -0
@@ -735,4 +735,18 @@ extern void nfsd4_client_record_remove(struct nfs4_client *clp);extern int nfsd4_client_record_check (struct nfs4_client *clp);extern void nfsd4_record_grace_done (struct nfsd_net *nn); +static inline bool +nfsd4_expire_courtesy_clnt (struct nfs4_client *clp) +{ +bool rc = false; + +spin_lock (&clp->cl_cs_lock); +if (clp->cl_cs_client_state ==NFSD4_CLIENT_COURTESY ) + clp->cl_cs_client_state =NFSD4_CLIENT_EXPIRED ; +if (clp->cl_cs_client_state ==NFSD4_CLIENT_EXPIRED ) + rc = true; +spin_unlock (&clp->cl_cs_lock); +return rc; +} +#endif /* NFSD4_STATE_H */
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v20 3/10 NFSD: Update nfsd_breaker_owns_lease() to handle courtesy client
In reply to Dai NgoUpdate nfsd_breaker_owns_lease() to handle delegation conflict with courtesy client by calling nfsd4_expire_courtesy_clnt.
--- fs/nfsd/nfs4state.c | 3 +++ 1 file changed, 3 insertions(+)
fs/nfsd/nfs4state.c +3 -0
@@ -4727,6 +4727,9 @@ static bool nfsd_breaker_owns_lease(struct file_lock *fl)struct svc_rqst *rqst;struct nfs4_client *clp; +if (nfsd4_expire_courtesy_clnt (dl->dl_stid.sc_client)) +return true; +if (!i_am_nfsd ())return false; rqst =kthread_data (current);
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v20 4/10 NFSD: Update nfs4_get_vfs_file() to handle courtesy client
In reply to Dai NgoUpdate nfs4_get_vfs_file and nfs4_upgrade_open to handle share reservation conflict with courtesy client.
Update nfs4_get_vfs_file and nfs4_upgrade_open to handle share reservation conflict with courtesy client.
When we have deny/access conflict we walk the fi_stateids of the file in question, looking for open stateid and check the deny/access of that stateid against the one from the open request. If there is a conflict then we check if the client that owns that stateid is a courtesy client. If it is then we set the client state to CLIENT_EXPIRED and allow the open request to continue. We have to scan all the stateid's of the file since the conflict can be caused by multiple open stateid's.
Client with CLIENT_EXPIRED is expired by the laundromat.
--- fs/nfsd/nfs4state.c | 85 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 72 insertions(+), 13 deletions(-)
fs/nfsd/nfs4state.c +72 -13
@@ -701,9 +701,56 @@ __nfs4_file_get_access(struct nfs4_file *fp, u32 access)atomic_inc (&fp->fi_access[O_RDONLY ]); } +/* +* Check if courtesy clients have conflicting access and resolve it if possible +* +* access: is op_share_access if share_access is true. +* Check if access mode, op_share_access, would conflict with +* the current deny mode of the file 'fp'. +* access: is op_share_deny if share_access is false. +* Check if the deny mode, op_share_deny, would conflict with +* current access of the file 'fp'. +* stp: skip checking this entry. +* new_stp: normal open, not open upgrade. +* +* Function returns: +* false - access/deny mode conflict with normal client. +* true - no conflict or conflict with courtesy client(s) is resolved. +*/ +static bool +nfs4_resolve_deny_conflicts_locked (struct nfs4_file *fp,bool new_stp, +struct nfs4_ol_stateid *stp,u32 access,bool share_access) +{ +struct nfs4_ol_stateid *st; +struct nfs4_client *clp; +bool conflict = true; +unsigned char bmap; + +lockdep_assert_held (&fp->fi_lock); +list_for_each_entry (st, &fp->fi_stateids, st_perfile) { +/* ignore lock stateid */ +if (st->st_openstp) +continue ; +if (st == stp && new_stp) +continue ; +/* check file access against deny mode or vice versa */ + bmap = share_access ? st->st_deny_bmap : st->st_access_bmap; +if (!(access &bmap_to_share_mode (bmap))) +continue ; + clp = st->st_stid.sc_client; +if (nfsd4_expire_courtesy_clnt (clp)) +continue ; + conflict = false; +break ; + } +return conflict; +} +static __be32 -nfs4_file_get_access (struct nfs4_file *fp,u32 access) +nfs4_file_get_access (struct nfs4_file *fp,u32 access, +struct nfs4_ol_stateid *stp,bool new_stp) { +lockdep_assert_held (&fp->fi_lock);/* Does this access mode make sense? */
@@ -711,15 +758,21 @@ nfs4_file_get_access(struct nfs4_file *fp, u32 access)return nfserr_inval;/* Does it conflict with a deny mode already set? */ -if ((access & fp->fi_share_deny) !=0 ) -return nfserr_share_denied; +if ((access & fp->fi_share_deny) !=0 ) { +if (!nfs4_resolve_deny_conflicts_locked (fp, new_stp, + stp, access, true)) +return nfserr_share_denied; + }__nfs4_file_get_access (fp, access);return nfs_ok; } -static __be32 nfs4_file_check_deny (struct nfs4_file *fp,u32 deny) +static __be32 nfs4_file_check_deny (struct nfs4_file *fp,u32 deny, +struct nfs4_ol_stateid *stp,bool new_stp) { +__be32 rc = nfs_ok; +/* Common case is that there is no deny mode. */ if (deny) {/* Does this deny mode make sense? */
@@ -728,13 +781,19 @@ static __be32 nfs4_file_check_deny(struct nfs4_file *fp, u32 deny)if ((deny &NFS4_SHARE_DENY_READ ) &&atomic_read (&fp->fi_access[O_RDONLY ])) -return nfserr_share_denied; + rc = nfserr_share_denied;if ((deny &NFS4_SHARE_DENY_WRITE ) &&atomic_read (&fp->fi_access[O_WRONLY ])) -return nfserr_share_denied; + rc = nfserr_share_denied; + +if (rc == nfserr_share_denied) { +if (nfs4_resolve_deny_conflicts_locked (fp, new_stp, + stp, deny, false)) + rc = nfs_ok; + } } -return nfs_ok; +return rc; }static void __nfs4_file_put_access (struct nfs4_file *fp,int oflag)
@@ -4952,7 +5011,7 @@ nfsd4_truncate(struct svc_rqst *rqstp, struct svc_fh *fh,static __be32 nfs4_get_vfs_file (struct svc_rqst *rqstp,struct nfs4_file *fp,struct svc_fh *cur_fh,struct nfs4_ol_stateid *stp, -struct nfsd4_open *open) +struct nfsd4_open *open,bool new_stp) {struct nfsd_file *nf =NULL ;__be32 status;
@@ -4966,14 +5025,14 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp,* Are we trying to set a deny mode that would conflict with * current access? */ - status =nfs4_file_check_deny (fp, open->op_share_deny); + status =nfs4_file_check_deny (fp, open->op_share_deny, stp, new_stp);if (status != nfs_ok) {spin_unlock (&fp->fi_lock); goto out; }/* set access to the file */ - status =nfs4_file_get_access (fp, open->op_share_access); + status =nfs4_file_get_access (fp, open->op_share_access, stp, new_stp);if (status != nfs_ok) {spin_unlock (&fp->fi_lock); goto out;
@@ -5027,11 +5086,11 @@ nfs4_upgrade_open(struct svc_rqst *rqstp, struct nfs4_file *fp, struct svc_fh *cunsigned char old_deny_bmap = stp->st_deny_bmap;if (!test_access (open->op_share_access, stp)) -return nfs4_get_vfs_file (rqstp, fp, cur_fh, stp, open); +return nfs4_get_vfs_file (rqstp, fp, cur_fh, stp, open, false);/* test and set deny mode */ spin_lock (&fp->fi_lock); - status =nfs4_file_check_deny (fp, open->op_share_deny); + status =nfs4_file_check_deny (fp, open->op_share_deny, stp, false);if (status == nfs_ok) {set_deny (open->op_share_deny, stp); fp->fi_share_deny |=
@@ -5376,7 +5435,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf goto out; } }else { - status =nfs4_get_vfs_file (rqstp, fp, current_fh, stp, open); + status =nfs4_get_vfs_file (rqstp, fp, current_fh, stp, open, true);if (status) { stp->st_stid.sc_type =NFS4_CLOSED_STID ;release_open_stateid (stp);
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v20 5/10 NFSD: Update find_clp_in_name_tree() to handle courtesy client
In reply to Dai NgoUpdate find_clp_in_name_tree to check and expire courtesy client.
Update find_confirmed_client_by_name to discard the courtesy client by setting CLIENT_EXPIRED.
Update nfsd4_setclientid to expire client with CLIENT_EXPIRED state to prevent multiple confirmed clients with the same name on the conf_name_tree.
--- fs/nfsd/nfs4state.c | 25 ++++++++++++++++++++++--- fs/nfsd/state.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-)
fs/nfsd/nfs4state.c +22 -3
@@ -2893,8 +2893,11 @@ find_clp_in_name_tree(struct xdr_netobj *name, struct rb_root *root) node = node->rb_left; else if (cmp < 0) node = node->rb_right; - else + else { +if (nfsd4_courtesy_clnt_expired (clp)) +return NULL ;return clp; + } }return NULL ; }
@@ -2973,8 +2976,13 @@ static bool clp_used_exchangeid(struct nfs4_client *clp)static struct nfs4_client *find_confirmed_client_by_name (struct xdr_netobj *name,struct nfsd_net *nn) { +struct nfs4_client *clp; +lockdep_assert_held (&nn->client_lock); -return find_clp_in_name_tree (name, &nn->conf_name_tree); + clp =find_clp_in_name_tree (name, &nn->conf_name_tree); +if (clp &&nfsd4_discard_reconnect_clnt (clp)) + clp =NULL ; +return clp; } static struct nfs4_client *
@@ -4091,12 +4099,19 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,struct nfs4_client *unconf =NULL ;__be32 status;struct nfsd_net *nn =net_generic (SVC_NET (rqstp), nfsd_net_id); +struct nfs4_client *cclient =NULL ; new =create_client (clname, rqstp, &clverifier);if (new ==NULL )return nfserr_jukebox;spin_lock (&nn->client_lock); - conf =find_confirmed_client_by_name (&clname, nn); +/* find confirmed client by name */ + conf =find_clp_in_name_tree (&clname, &nn->conf_name_tree); +if (conf && conf->cl_cs_client_state ==NFSD4_CLIENT_RECONNECTED ) { + cclient = conf; + conf =NULL ; + } +if (conf &&client_has_state (conf)) { status = nfserr_clid_inuse;if (clp_used_exchangeid (conf))
@@ -4127,7 +4142,11 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, new =NULL ; status = nfs_ok; out: +if (cclient) +unhash_client_locked (cclient);spin_unlock (&nn->client_lock); +if (cclient) +expire_client (cclient);if (new)free_client (new);if (unconf) {
fs/nfsd/state.h +28 -0
@@ -735,6 +735,7 @@ extern void nfsd4_client_record_remove(struct nfs4_client *clp);extern int nfsd4_client_record_check (struct nfs4_client *clp);extern void nfsd4_record_grace_done (struct nfsd_net *nn); +/* courteous server */ static inline bool nfsd4_expire_courtesy_clnt (struct nfs4_client *clp) {
@@ -749,4 +750,31 @@ nfsd4_expire_courtesy_clnt(struct nfs4_client *clp) return rc; } +static inline bool +nfsd4_discard_reconnect_clnt (struct nfs4_client *clp) +{ +bool ret = false; + +spin_lock (&clp->cl_cs_lock); +if (clp->cl_cs_client_state ==NFSD4_CLIENT_RECONNECTED ) { + clp->cl_cs_client_state =NFSD4_CLIENT_EXPIRED ; + ret = true; + } +spin_unlock (&clp->cl_cs_lock); +return ret; +} + +static inline bool +nfsd4_courtesy_clnt_expired (struct nfs4_client *clp) +{ +bool rc = false; + +spin_lock (&clp->cl_cs_lock); +if (clp->cl_cs_client_state ==NFSD4_CLIENT_EXPIRED ) + rc = true; +if (clp->cl_cs_client_state ==NFSD4_CLIENT_COURTESY ) + clp->cl_cs_client_state =NFSD4_CLIENT_RECONNECTED ; +spin_unlock (&clp->cl_cs_lock); +return rc; +}#endif /* NFSD4_STATE_H */
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v20 6/10 NFSD: Update find_in_sessionid_hashtbl() to handle courtesy client
In reply to Dai NgoUpdate find_in_sessionid_hashtbl to:
. skip client with CLIENT_EXPIRED state; discarded courtesy client. . if courtesy client was found then set CLIENT_RECONNECTED so caller
can take appropriate action.
Update nfsd4_sequence and nfsd4_bind_conn_to_session to create client record for courtesy client with CLIENT_RECONNECTED state.
Update nfsd4_destroy_session to discard courtesy client with CLIENT_RECONNECTED state.
--- fs/nfsd/nfs4state.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-)
fs/nfsd/nfs4state.c +37 -2
@@ -701,6 +701,22 @@ __nfs4_file_get_access(struct nfs4_file *fp, u32 access)atomic_inc (&fp->fi_access[O_RDONLY ]); } +static void +nfsd4_reactivate_courtesy_client (struct nfs4_client *clp,__be32 status) +{ +spin_lock (&clp->cl_cs_lock); +if (clp->cl_cs_client_state ==NFSD4_CLIENT_RECONNECTED ) { +if (status == nfs_ok) { + clp->cl_cs_client_state =NFSD4_CLIENT_ACTIVE ; +spin_unlock (&clp->cl_cs_lock); +nfsd4_client_record_create (clp); +return ; + } + clp->cl_cs_client_state =NFSD4_CLIENT_EXPIRED ; + } +spin_unlock (&clp->cl_cs_lock); +} +/* * Check if courtesy clients have conflicting access and resolve it if possible *
@@ -1994,13 +2010,21 @@ find_in_sessionid_hashtbl(struct nfs4_sessionid *sessionid, struct net *net, {struct nfsd4_session *session;__be32 status = nfserr_badsession; +struct nfs4_client *clp; session =__find_in_sessionid_hashtbl (sessionid, net);if (!session) goto out; + clp = session->se_client; +if (nfsd4_courtesy_clnt_expired (clp)) { + session =NULL ; + goto out; + } status =nfsd4_get_session_locked (session); -if (status) +if (status) { session =NULL ; +nfsd4_discard_reconnect_clnt (clp); + } out: *ret = status;return session;
@@ -3700,6 +3724,7 @@ __be32 nfsd4_bind_conn_to_session(struct svc_rqst *rqstp,struct nfsd4_session *session;struct net *net =SVC_NET (rqstp);struct nfsd_net *nn =net_generic (net, nfsd_net_id); +struct nfs4_client *clp;if (!nfsd4_last_compound_op (rqstp))return nfserr_not_only_op;
@@ -3732,6 +3757,8 @@ __be32 nfsd4_bind_conn_to_session(struct svc_rqst *rqstp,nfsd4_init_conn (rqstp, conn, session); status = nfs_ok; out: + clp = session->se_client; +nfsd4_reactivate_courtesy_client (clp, status);nfsd4_put_session (session); out_no_session:return status;
@@ -3754,6 +3781,7 @@ nfsd4_destroy_session(struct svc_rqst *r, struct nfsd4_compound_state *cstate,int ref_held_by_me =0 ;struct net *net =SVC_NET (r);struct nfsd_net *nn =net_generic (net, nfsd_net_id); +struct nfs4_client *clp; status = nfserr_not_only_op;if (nfsd4_compound_in_session (cstate, sessionid)) {
@@ -3766,6 +3794,11 @@ nfsd4_destroy_session(struct svc_rqst *r, struct nfsd4_compound_state *cstate, ses =find_in_sessionid_hashtbl (sessionid, net, &status);if (!ses) goto out_client_lock; + clp = ses->se_client; +if (nfsd4_discard_reconnect_clnt (clp)) { + status = nfserr_badsession; + goto out_put_session; + } status = nfserr_wrong_cred;if (!nfsd4_mach_creds_match (ses->se_client, r)) goto out_put_session;
@@ -3870,7 +3903,7 @@ nfsd4_sequence(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,struct nfsd4_compoundres *resp = rqstp->rq_resp;struct xdr_stream *xdr = resp->xdr;struct nfsd4_session *session; -struct nfs4_client *clp; +struct nfs4_client *clp =NULL ;struct nfsd4_slot *slot;struct nfsd4_conn *conn;__be32 status;
@@ -3980,6 +4013,8 @@ nfsd4_sequence(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,if (conn)free_conn (conn);spin_unlock (&nn->client_lock); +if (clp) +nfsd4_reactivate_courtesy_client (clp, status);return status; out_put_session:nfsd4_put_session_locked (session);
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v20 7/10 NFSD: Update find_client_in_id_table() to handle courtesy client
In reply to Dai NgoUpdate find_client_in_id_table to:
. skip client with CLIENT_EXPIRED; discarded courtesy client . if courtesy client was found then set CLIENT_RECONNECTED
state so caller can take appropriate action.
Update find_confirmed_client to discard courtesy client. Update lookup_clientid to call find_client_in_id_table directly. Update set_client to create client record for courtesy client. Update find_cpntf_state to discard courtesy client.
--- fs/nfsd/nfs4state.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
fs/nfsd/nfs4state.c +16 -3
@@ -2967,6 +2967,8 @@ find_client_in_id_table(struct list_head *tbl, clientid_t *clid, bool sessions)if (same_clid (&clp->cl_clientid, clid)) {if ((bool )clp->cl_minorversion != sessions)return NULL ; +if (nfsd4_courtesy_clnt_expired (clp)) +continue ;renew_client_locked (clp);return clp; }
@@ -2978,9 +2980,13 @@ static struct nfs4_client * find_confirmed_client(clientid_t *clid, bool sessions, struct nfsd_net *nn) {struct list_head *tbl = nn->conf_id_hashtbl; +struct nfs4_client *clp;lockdep_assert_held (&nn->client_lock); -return find_client_in_id_table (tbl, clid, sessions); + clp =find_client_in_id_table (tbl, clid, sessions); +if (clp &&nfsd4_discard_reconnect_clnt (clp)) + clp =NULL ; +return clp; } static struct nfs4_client *
@@ -4884,9 +4890,10 @@ static struct nfs4_client *lookup_clientid(clientid_t *clid, bool sessions, struct nfsd_net *nn) {struct nfs4_client *found; +struct list_head *tbl = nn->conf_id_hashtbl;spin_lock (&nn->client_lock); - found =find_confirmed_client (clid, sessions, nn); + found =find_client_in_id_table (tbl, clid, sessions);if (found)atomic_inc (&found->cl_rpc_users);spin_unlock (&nn->client_lock);
@@ -4911,6 +4918,7 @@ static __be32 set_client(clientid_t *clid, cstate->clp =lookup_clientid (clid, false, nn);if (!cstate->clp)return nfserr_expired; +nfsd4_reactivate_courtesy_client (cstate->clp, nfs_ok);return nfs_ok; }
@@ -6147,7 +6155,12 @@ static __be32 find_cpntf_state(struct nfsd_net *nn, stateid_t *st, found =lookup_clientid (&cps->cp_p_clid, true, nn);if (!found) goto out; - +if (nfsd4_discard_reconnect_clnt (found)) { +if (atomic_dec_and_lock (&found->cl_rpc_users, + &nn->client_lock)) +spin_unlock (&nn->client_lock); + goto out; + } *stid =find_stateid_by_type (found, &cps->cp_p_stateid,NFS4_DELEG_STID |NFS4_OPEN_STID |NFS4_LOCK_STID );if (*stid)
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v20 8/10 NFSD: Refactor nfsd4_laundromat()
In reply to Dai NgoExtract a bit of logic that is about to be expanded to handle courtesy clients.
--- fs/nfsd/nfs4state.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-)
fs/nfsd/nfs4state.c +21 -12
@@ -5731,6 +5731,26 @@ static void nfsd4_ssc_expire_umount(struct nfsd_net *nn) }#endif +static void +nfs4_get_client_reaplist (struct nfsd_net *nn,struct list_head *reaplist, +struct laundry_time *lt) +{ +struct list_head *pos, *next; +struct nfs4_client *clp; + +INIT_LIST_HEAD (reaplist); +spin_lock (&nn->client_lock); +list_for_each_safe (pos, next, &nn->client_lru) { + clp = list_entry(pos, struct nfs4_client, cl_lru); +if (!state_expired (lt, clp->cl_time)) +break ; +if (mark_client_expired_locked (clp)) +continue ; +list_add (&clp->cl_lru, reaplist); + } +spin_unlock (&nn->client_lock); +} +static time64_t nfs4_laundromat (struct nfsd_net *nn) {
@@ -5753,7 +5773,6 @@ nfs4_laundromat(struct nfsd_net *nn) goto out; }nfsd4_end_grace (nn); -INIT_LIST_HEAD (&reaplist);spin_lock (&nn->s2s_cp_lock);idr_for_each_entry (&nn->s2s_cp_stateids, cps_t, i) {
@@ -5763,17 +5782,7 @@ nfs4_laundromat(struct nfsd_net *nn)_free_cpntf_state_locked (nn, cps); }spin_unlock (&nn->s2s_cp_lock); - -spin_lock (&nn->client_lock); -list_for_each_safe (pos, next, &nn->client_lru) { - clp = list_entry(pos, struct nfs4_client, cl_lru); -if (!state_expired (<, clp->cl_time)) -break ; -if (mark_client_expired_locked (clp)) -continue ; -list_add (&clp->cl_lru, &reaplist); - } -spin_unlock (&nn->client_lock); +nfs4_get_client_reaplist (nn, &reaplist, <);list_for_each_safe (pos, next, &reaplist) { clp = list_entry(pos, struct nfs4_client, cl_lru);trace_nfsd_clid_purged (&clp->cl_clientid);
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v20 9/10 NFSD: Update laundromat to handle courtesy client
In reply to Dai NgoAdd nfs4_anylock_blocker and nfs4_lockowner_has_blockers to check if an expired client has any lock blockers
Update nfs4_get_client_reaplist to:
. add courtesy client in CLIENT_EXPIRED state to reaplist. . detect if expired client still has state and no blockers then
transit it to courtesy client by setting CLIENT_COURTESY state and removing the client record.
--- fs/nfsd/nfs4state.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-)
fs/nfsd/nfs4state.c +91 -2
@@ -5731,24 +5731,106 @@ static void nfsd4_ssc_expire_umount(struct nfsd_net *nn) }#endif +/* Check if any lock belonging to this lockowner has any blockers */ +static bool +nfs4_lockowner_has_blockers (struct nfs4_lockowner *lo) +{ +struct file_lock_context *ctx; +struct nfs4_ol_stateid *stp; +struct nfs4_file *nf; + +list_for_each_entry (stp, &lo->lo_owner.so_stateids, st_perstateowner) { + nf = stp->st_stid.sc_file; + ctx = nf->fi_inode->i_flctx; +if (!ctx) +continue ; +if (locks_owner_has_blockers (ctx, lo)) +return true; + } +return false; +} + +static bool +nfs4_anylock_blockers (struct nfs4_client *clp) +{ +int i; +struct nfs4_stateowner *so; +struct nfs4_lockowner *lo; + +spin_lock (&clp->cl_lock); +for (i =0 ; i <OWNER_HASH_SIZE ; i++) { +list_for_each_entry (so, &clp->cl_ownerstr_hashtbl[i], + so_strhash) { +if (so->so_is_open_owner) +continue ; + lo =lockowner (so); +if (nfs4_lockowner_has_blockers (lo)) { +spin_unlock (&clp->cl_lock); +return true; + } + } + } +spin_unlock (&clp->cl_lock); +return false; +} +static void nfs4_get_client_reaplist (struct nfsd_net *nn,struct list_head *reaplist,struct laundry_time *lt) {struct list_head *pos, *next;struct nfs4_client *clp; +bool cour; +struct list_head cslist;INIT_LIST_HEAD (reaplist); +INIT_LIST_HEAD (&cslist);spin_lock (&nn->client_lock);list_for_each_safe (pos, next, &nn->client_lru) { clp = list_entry(pos, struct nfs4_client, cl_lru);if (!state_expired (lt, clp->cl_time))break ; -if (mark_client_expired_locked (clp)) + +if (!client_has_state (clp)) + goto exp_client; + +if (clp->cl_cs_client_state ==NFSD4_CLIENT_EXPIRED ) + goto exp_client; + cour = (clp->cl_cs_client_state ==NFSD4_CLIENT_COURTESY ); +if (cour &&ktime_get_boottime_seconds () >= + (clp->cl_time +NFSD_COURTESY_CLIENT_TIMEOUT )) + goto exp_client; +if (nfs4_anylock_blockers (clp)) { +exp_client: +if (mark_client_expired_locked (clp)) +continue ; +list_add (&clp->cl_lru, reaplist);continue ; -list_add (&clp->cl_lru, reaplist); + } +if (!cour) { +spin_lock (&clp->cl_cs_lock); + clp->cl_cs_client_state =NFSD4_CLIENT_COURTESY ; +spin_unlock (&clp->cl_cs_lock); +list_add (&clp->cl_cs_list, &cslist); + } }spin_unlock (&nn->client_lock); + +while (!list_empty (&cslist)) { + clp = list_first_entry(&cslist, struct nfs4_client, cl_cs_list); +list_del_init (&clp->cl_cs_list); +spin_lock (&clp->cl_cs_lock); +/* +* Client might have re-connected. Make sure it's +* still in courtesy state before removing its record. +*/ +if (clp->cl_cs_client_state !=NFSD4_CLIENT_COURTESY ) { +spin_unlock (&clp->cl_cs_lock); +continue ; + } +spin_unlock (&clp->cl_cs_lock); +nfsd4_client_record_remove (clp); + } } static time64_t
@@ -5794,6 +5876,13 @@ nfs4_laundromat(struct nfsd_net *nn) dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru);if (!state_expired (<, dp->dl_time))break ; +spin_lock (&clp->cl_cs_lock); +if (clp->cl_cs_client_state ==NFSD4_CLIENT_COURTESY ) { + clp->cl_cs_client_state =NFSD4_CLIENT_EXPIRED ; +spin_unlock (&clp->cl_cs_lock); +continue ; + } +spin_unlock (&clp->cl_cs_lock);WARN_ON (!unhash_delegation_locked (dp));list_add (&dp->dl_recall_lru, &reaplist); }
Signature · 1 line
2.9.5
Re: [PATCH RFC v20 09/10] NFSD: Update laundromat to handle courtesy client
Quoted 42 lines · Dai Ngo
static void
nfs4_get_client_reaplist(structnfsd_net*nn, structlist_head*reaplist,fs/nfsd/nfs4state.c +25
-2struct laundry_time *lt) {struct list_head *pos, *next;struct nfs4_client *clp; +bool cour; +struct list_head cslist;INIT_LIST_HEAD (reaplist); +INIT_LIST_HEAD (&cslist);spin_lock (&nn->client_lock);list_for_each_safe (pos, next, &nn->client_lru) { clp = list_entry(pos, struct nfs4_client, cl_lru);if (!state_expired (lt, clp->cl_time))break ; -if (mark_client_expired_locked (clp)) + +if (!client_has_state (clp)) + goto exp_client; + +if (clp->cl_cs_client_state ==NFSD4_CLIENT_EXPIRED ) + goto exp_client; + cour = (clp->cl_cs_client_state ==NFSD4_CLIENT_COURTESY ); +if (cour &&ktime_get_boottime_seconds () >= + (clp->cl_time +NFSD_COURTESY_CLIENT_TIMEOUT )) + goto exp_client; +if (nfs4_anylock_blockers (clp)) { +exp_client: +if (mark_client_expired_locked (clp)) +continue ; +list_add (&clp->cl_lru, reaplist);continue ; -list_add (&clp->cl_lru, reaplist); + } +if (!cour) { +spin_lock (&clp->cl_cs_lock); + clp->cl_cs_client_state =NFSD4_CLIENT_COURTESY ; +spin_unlock (&clp->cl_cs_lock); +list_add (&clp->cl_cs_list, &cslist); + } }
fs/nfsd/nfs4state.c static void nfsd4_ssc_expire_umount(struct nfsd_net *nn) · line 5826
Quoted 10 lines
fs/nfsd/nfs4state.c +9
-0spin_unlock (&nn->client_lock); + +while (!list_empty (&cslist)) { + clp = list_first_entry(&cslist, struct nfs4_client, cl_cs_list); +list_del_init (&clp->cl_cs_list); +spin_lock (&clp->cl_cs_lock); +/* +* Client might have re-connected. Make sure it's +* still in courtesy state before removing its record. +*/
Good to be careful, but, then....
fs/nfsd/nfs4state.c static void nfsd4_ssc_expire_umount(struct nfsd_net *nn) · line 5831
Quoted 5 lines
fs/nfsd/nfs4state.c +5
-0+if (clp->cl_cs_client_state !=NFSD4_CLIENT_COURTESY ) { +spin_unlock (&clp->cl_cs_lock); +continue ; + } +spin_unlock (&clp->cl_cs_lock);
.... I'm not seeing what prevents a client from reconnecting right here, after we drop cl_cs_lock but before we call nfsd4_client_record_remove().
fs/nfsd/nfs4state.c nfs4_laundromat(struct nfsd_net *nn) · line 5882
Quoted 13 lines
fs/nfsd/nfs4state.c +6
-0+nfsd4_client_record_remove (clp); + } } static time64_t@@ -5794,6 +5876,13 @@ nfs4_laundromat(struct nfsd_net *nn) dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru);if (!state_expired (<, dp->dl_time))break ; +spin_lock (&clp->cl_cs_lock); +if (clp->cl_cs_client_state ==NFSD4_CLIENT_COURTESY ) { + clp->cl_cs_client_state =NFSD4_CLIENT_EXPIRED ; +spin_unlock (&clp->cl_cs_lock);
In an earlier patch you set the client to EXPIRED as soon as we got a lease break, so isn't this unnecessary?
I guess there could be a case like:
1. lease break comes in
2. client fails to renew, transitions to courtesy
3. delegation callback times out
though it'd seem better to catch that at step 2 if we can.
--b.
Quoted 8 lines
fs/nfsd/nfs4state.c +3
-0+continue ; + } +spin_unlock (&clp->cl_cs_lock);WARN_ON (!unhash_delegation_locked (dp));list_add (&dp->dl_recall_lru, &reaplist); }Signature · 1 line
2.9.5
[email protected]
reviewerRe: [PATCH RFC v20 09/10] NFSD: Update laundromat to handle courtesy client
Quoted 55 lines · J. Bruce Fields
Quoted 42 lines · Dai Ngo
static void
nfs4_get_client_reaplist(structnfsd_net*nn, structlist_head*reaplist,
structlaundry_time*lt)
{
structlist_head*pos, *next;
structnfs4_client*clp;fs/nfsd/nfs4state.c +25
-2+bool cour; +struct list_head cslist;INIT_LIST_HEAD (reaplist); +INIT_LIST_HEAD (&cslist);spin_lock (&nn->client_lock);list_for_each_safe (pos, next, &nn->client_lru) { clp = list_entry(pos, struct nfs4_client, cl_lru);if (!state_expired (lt, clp->cl_time))break ; -if (mark_client_expired_locked (clp)) + +if (!client_has_state (clp)) + goto exp_client; + +if (clp->cl_cs_client_state ==NFSD4_CLIENT_EXPIRED ) + goto exp_client; + cour = (clp->cl_cs_client_state ==NFSD4_CLIENT_COURTESY ); +if (cour &&ktime_get_boottime_seconds () >= + (clp->cl_time +NFSD_COURTESY_CLIENT_TIMEOUT )) + goto exp_client; +if (nfs4_anylock_blockers (clp)) { +exp_client: +if (mark_client_expired_locked (clp)) +continue ; +list_add (&clp->cl_lru, reaplist);continue ; -list_add (&clp->cl_lru, reaplist); + } +if (!cour) { +spin_lock (&clp->cl_cs_lock); + clp->cl_cs_client_state =NFSD4_CLIENT_COURTESY ; +spin_unlock (&clp->cl_cs_lock); +list_add (&clp->cl_cs_list, &cslist); + } }fs/nfsd/nfs4state.c static void nfsd4_ssc_expire_umount(struct nfsd_net *nn) · line 5826
Quoted 10 lines
fs/nfsd/nfs4state.c +9
-0spin_unlock (&nn->client_lock); + +while (!list_empty (&cslist)) { + clp = list_first_entry(&cslist, struct nfs4_client, cl_cs_list); +list_del_init (&clp->cl_cs_list); +spin_lock (&clp->cl_cs_lock); +/* +* Client might have re-connected. Make sure it's +* still in courtesy state before removing its record. +*/ Good to be careful, but, then....
Quoted 8 lines
fs/nfsd/nfs4state.c static void nfsd4_ssc_expire_umount(struct nfsd_net *nn) · line 5831
Quoted 5 lines
fs/nfsd/nfs4state.c +5
-0+if (clp->cl_cs_client_state !=NFSD4_CLIENT_COURTESY ) { +spin_unlock (&clp->cl_cs_lock); +continue ; + } +spin_unlock (&clp->cl_cs_lock);.... I'm not seeing what prevents a client from reconnecting right here, after we drop
cl_cs_lockbut before we callnfsd4_client_record_remove().
Thanks Bruce for pointing this out. I will fix it with a wait lock in the next patch. This seems heavy but I have not been able to fix it without the wait lock. This is should be a rare condition so it would not cause much overhead.
Quoted 5 lines
Quoted 5 lines
fs/nfsd/nfs4state.c +2
-0+nfsd4_client_record_remove (clp); + } }
Quoted 11 lines
fs/nfsd/nfs4state.c nfs4_laundromat(struct nfsd_net *nn) · line 5882
Quoted 9 lines
static
time64_tfs/nfsd/nfs4state.c +4
-0@@ -5794,6 +5876,13 @@ nfs4_laundromat(struct nfsd_net *nn) dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru);if (!state_expired (<, dp->dl_time))break ; +spin_lock (&clp->cl_cs_lock); +if (clp->cl_cs_client_state ==NFSD4_CLIENT_COURTESY ) { + clp->cl_cs_client_state =NFSD4_CLIENT_EXPIRED ; +spin_unlock (&clp->cl_cs_lock);In an earlier patch you set the client to EXPIRED as soon as we got a lease break,
I don't understand, we only set EXPIRED when we want to expire the courtesy client.
Quoted 1 line
so isn't this unnecessary?
When the client is checked to see if it it can be in COURTESY_CLIENT state, we did not check if there is any delegation recall callback is pending, we only check for lock blockers) so that is why we check it here and expire it.
Maybe I did not give the right answer since I'm not clear of the question yet.
Quoted 8 lines
I guess there could be a case like:
1. lease break comes in
2. client fails to renew, transitions to courtesy
3. delegation callback times outthough it'd seem better to catch that at step 2 if we can.
I will wait for the above issue to be resolved first to better understand your concern here.
Thanks,
-Dai
Quoted 10 lines
--b.
Quoted 8 lines
fs/nfsd/nfs4state.c +3
-0+continue ; + } +spin_unlock (&clp->cl_cs_lock);WARN_ON (!unhash_delegation_locked (dp));list_add (&dp->dl_recall_lru, &reaplist); }Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v20 10/10 NFSD: Show state of courtesy client in client info
In reply to Dai NgoUpdate client_info_show to show state of courtesy client and time since last renew.
--- fs/nfsd/nfs4state.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/nfsd/nfs4state.c +10 -2
@@ -2485,7 +2485,8 @@ static int client_info_show(struct seq_file *m, void *v) {struct inode *inode = m->private;struct nfs4_client *clp; -u64 clid; +u64 clid, hrs; +u32 mins, secs; clp =get_nfsdfs_clp (inode);if (!clp)
@@ -2493,10 +2494,17 @@ static int client_info_show(struct seq_file *m, void *v)memcpy (&clid, &clp->cl_clientid,sizeof (clid));seq_printf (m,"clientid: 0x%llx\n" , clid);seq_printf (m,"address: \"%pISpc\"\n" , (struct sockaddr *)&clp->cl_addr); -if (test_bit (NFSD4_CLIENT_CONFIRMED , &clp->cl_flags)) + +if (clp->cl_cs_client_state ==NFSD4_CLIENT_COURTESY ) +seq_puts (m,"status: courtesy\n" ); +else if (clp->cl_cs_client_state ==NFSD4_CLIENT_CONFIRMED )seq_puts (m,"status: confirmed\n" );else seq_puts (m,"status: unconfirmed\n" ); + hrs =div_u64_rem (ktime_get_boottime_seconds () - clp->cl_time, +3600 , &secs); + mins =div_u64_rem ((u64 )secs,60 , &secs); +seq_printf (m,"time since last renew: %llu:%02u:%02u\n" , hrs, mins, secs);seq_printf (m,"name: " );seq_quote_mem (m, clp->cl_name.data, clp->cl_name.len);seq_printf (m,"\nminor version: %d\n" , clp->cl_minorversion);
Signature · 1 line
2.9.5
I've got a process complaint here. Not a big deal, but I think we can fix it and do a little better:
So, I appreciate that a big patch got split up. But we're not getting all of the advantages of that, because what most of the patches do is add new functions that don't actually have callers yet, or code that's effectively dead until one of the last patches that actually tells the laundromat to start transitioning clients to the courtesy state.
That means when reviewing these, I often have to look forward through the patches to understand how the new code that's being added works.
Sometimes that's the best you can do. But I think we can order these so that most of the patches actually make testable changes. That means that if we introduce a bug, a bisect will land on the actual patch that introduced the bug instead of a later patch that activated that code. It also makes the patches easier to read in isolation.
I'll try to write up a suggestion.
--b.
Quoted 316 lines · Dai Ngo
Hi Chuck, Bruce
This series of patches implement the NFSv4 Courteous Server.
A server which does not immediately expunge the state on lease expiration is known as a Courteous Server. A Courteous Server continues to recognize previously generated state tokens as valid until conflict arises between the expired state and the requests from another client, or the server reboots.
v2:
. add new callback,
lm_expire_lock, tolock_manager_operationsto
allow the lock manager to take appropriate action with conflict lock.. handle conflicts of NFSv4 locks with NFSv3/NLM and local locks.
. expire courtesy client after 24hr if client has not reconnected.
. do not allow expired client to become courtesy client if there are
waiters for client's locks.. modify
client_info_showto show courtesy client and seconds from
last renew.. fix a problem with NFSv4.1 server where the it keeps returning
SEQ4_STATUS_CB_PATH_DOWNin the successful SEQUENCE reply, after the courtesy client reconnects, causing the client to keep sending BCTS requests to server.v3:
. modified
posix_test_lockto check and resolve conflict locks
to handle NLM TEST and NFSv4 LOCKT requests.. separate out fix for back channel stuck in
SEQ4_STATUS_CB_PATH_DOWN.v4:
. rework
nfsd_check_courtesyto avoid dead lock offl_lockandclient_lock
by asking the laudromat thread to destroy the courtesy client.. handle NFSv4 share reservation conflicts with courtesy client. This
includes conflicts between access mode and deny mode and vice versa.. drop the patch for back channel stuck in
SEQ4_STATUS_CB_PATH_DOWN.v5:
. fix recursive locking of
file_rwsemfromposix_lock_file.. retest with LOCKDEP enabled.
v6:
. merge witn 5.15-rc7
. fix a bug in
nfs4_check_deny_bmapthat did not check for matched
nfs4_filebefore checking for access/deny conflict. This bug causes pynfs OPEN18 to fail since the server taking too long to release lots of un-conflict clients' state.. enhance share reservation conflict handler to handle case where
a large number of conflict courtesy clients need to be expired. The 1st 100 clients are expired synchronously and the rest are expired in the background by the laundromat andNFS4ERR_DELAYis returned to the NFS client. This is needed to prevent the NFS client from timing out waiting got the reply.v7:
. Fix race condition in
posix_test_lockandposix_lock_inodeafter
dropping spinlock.. Enhance
nfsd4_fl_expire_lockto work with with newlm_expire_lock
callback. Always resolve share reservation conflicts asynchrously.
. Fix bug in
nfs4_laundromatwhere spinlock is not used when
scanningcl_ownerstr_hashtbl.. Fix bug in
nfs4_laundromatwhereidr_get_nextwas called
with incorrect 'id'.. Merge
nfs4_destroy_courtesy_clientintonfsd4_fl_expire_lock.v8:
. Fix warning in
nfsd4_fl_expire_lockreported by test robot.v9:
. Simplify
lm_expire_lockAPI by (1) remove the 'testonly' flag
and (2) specifying return value as true/false to indicate whether conflict was succesfully resolved.. Rework
nfsd4_fl_expire_lockto mark client with
NFSD4_DESTROY_COURTESY_CLIENTthen tell the laundromat to expire the client in the background.. Add a spinlock in
nfs4_clientto synchronize access to the
NFSD4_COURTESY_CLIENTandNFSD4_DESTROY_COURTESY_CLIENTflag to handle race conditions when resolving lock and share reservation conflict.. Courtesy client that was marked as
NFSD4_DESTROY_COURTESY_CLIENT
are now consisdered 'dead', waiting for the laundromat to expire it. This client is no longer allowed to use its states if it reconnects before the laundromat finishes expiring the client.For v4.1 client, the detection is done in the processing of the SEQUENCE op and returns
NFS4ERR_BAD_SESSIONto force the client to re-establish new clientid and session.
For v4.0 client, the detection is done in the processing of the RENEW and state-related ops and returnNFS4ERR_EXPIREto force the client to re-establish new clientid.v10:
Resolve deadlock in v9 by avoiding getting
cl_clientandcl_cs_locktogether. The laundromat needs to determine whether the expired client has any state and also has no blockers on its locks. Both of these conditions are allowed to change after the laundromat transits an expired client to courtesy client. When this happens, the laundromat will detect it on the next run and and expire the courtesy client.Remove client persistent record before marking it as
COURTESY_CLIENTand add client persistent record before clearing theCOURTESY_CLIENTflag to allow the courtesy client to transist to normal client to continue to use its state.Lock/delegation/share reversation conflict with courtesy client is resolved by marking the courtesy client as
DESTROY_COURTESY_CLIENT, effectively disable it, then allow the current request to proceed immediately.Courtesy client marked as
DESTROY_COURTESY_CLIENTis not allowed to reconnect to reuse itsstate. It is expired by the laundromat asynchronously in the background.Move processing of expired clients from
nfs4_laudromatto a separate function,nfs4_get_client_reaplist, that creates the reaplist and also to process courtesy clients.Update
Documentation/filesystems/locking.rstto include newlm_lock_conflictcall.Modify
leases_conflictto calllm_breaker_owns_leaseonly if there is real conflict. This is to allow the lock manager to resolve the delegation conflict if possible.v11:
Add comment for
lm_lock_conflictcallback.Replace static const
courtesy_client_expirywith macro.Remove
courtesy_clntargument fromfind_in_sessionid_hashtbl. Callers usenfs4_client->cl_cs_clientboolean to determined if it's the courtesy client and take appropriate actions.Rename
NFSD4_COURTESY_CLIENTandNFSD4_DESTROY_COURTESY_CLIENTwithNFSD4_CLIENT_COURTESYandNFSD4_CLIENT_DESTROY_COURTESY.v12:
Remove unnecessary comment in
nfs4_get_client_reaplist.Replace
nfs4_client->cl_cs_clientboolean with
NFSD4_CLIENT_COURTESY_CLNTflag.Remove
courtesy_clntargument fromfind_client_in_id_tableandfind_clp_in_name_tree. Callers useNFSD4_CLIENT_COURTESY_CLNTto determined if it's the courtesy client and take appropriate actions.v13:
Merge with 5.17-rc3.
Cleanup
Documentation/filesystems/locking.rst: replacei_lockwithflc_lock, update API's that useflc_lock.Rename
lm_lock_conflicttolm_lock_expired().Remove comment of
lm_lock_expiredAPI inlock_manager_operations. Same information is in patch description.Update commit messages of 4/4.
Add some comment for
NFSD4_CLIENT_COURTESY_CLNT.Add
nfsd4_discard_courtesy_clnt()to eliminate duplicate code of discarding courtesy client; settingNFSD4_DESTROY_COURTESY_CLIENT.v14:
. merge with Chuck's public for-next branch.
. remove
courtesy_client_expiry, use client's last renew time.. simplify comment of
nfs4_check_access_deny_bmap.. add comment about race condition in
nfs4_get_client_reaplist.. add
list_delwhen walking cslist innfs4_get_client_reaplist.. remove duplicate
INIT_LIST_HEAD(&reaplist)fromnfs4_laundromat. Modify
find_confirmed_clientandfind_confirmed_client_by_name
to detect courtesy client and destroy it.. refactor
lookup_clientidto usefind_client_in_id_table
directly instead offind_confirmed_client.. refactor
nfsd4_setclientidto callfind_clp_in_name_tree
directly instead offind_confirmed_client_by_name.. remove comment of
NFSD4_CLIENT_COURTESY.. replace
NFSD4_CLIENT_DESTROY_COURTESYwithNFSD4_CLIENT_EXPIRED.. replace
NFSD4_CLIENT_COURTESY_CLNTwithNFSD4_CLIENT_RECONNECTED.v15:
. add helper
locks_has_blockers_lockedinfs.hto check for
lock blockers. rename
nfs4_conflict_clientstonfs4_resolve_deny_conflicts_locked. update
nfs4_upgrade_open()to handle courtesy clients.. add helper
nfs4_check_and_expire_courtesy_clientand
nfs4_is_courtesy_client_expiredto deduplicate some code.. update
nfs4_anylock_blocker:
. replacelist_for_each_entry_safewithlist_for_each_entry. breaknfs4_anylock_blockerinto 2 smaller functions.. update
nfs4_get_client_reaplist:
. remove unnecessary commets
. acquirecl_cs_lockbefore settingNFSD4_CLIENT_COURTESYflag. update
client_info_showto show 'time since last renew: 00:00:38'
instead of 'seconds from last renew: 38'.v16:
. update
client_info_showto display 'status' as
'confirmed/unconfirmed/courtesy'. replace helper
locks_has_blockers_lockedinfs.hin v15 with new
locks_owner_has_blockerscall infs/locks.c. update
nfs4_lockowner_has_blockersto uselocks_owner_has_blockers. move
nfs4_check_and_expire_courtesy_clientfrom 5/11 to 4/11. remove unnecessary check for NULL clp in
find_in_sessionid_hashtb. fix typo in commit messages
v17:
. replace flags used for courtesy client with enum
courtesy_client_state. add state table in
nfsd/state.h. make
nfsd4_expire_courtesy_clnt,nfsd4_discard_courtesy_clntand
nfsd4_courtesy_clnt_expiredas static inline.. update
nfsd_breaker_owns_leaseto usedl->dl_stid.sc_clientdirectly. fix kernel test robot warning when
CONFIG_FILE_LOCKINGnot defined.v18:
. modify 0005-NFSD-Update-nfs4_get_vfs_file-to-handle-courtesy-cli.patch to:
. remove
nfs4_check_access_deny_bmap, fold this functionality
intonfs4_resolve_deny_conflicts_lockedby making use ofbmap_to_share_mode.. move
nfs4_resolve_deny_conflicts_lockedintonfs4_file_get_access
andnfs4_file_check_deny.v19:
. modify 0002-NFSD-Add-courtesy-client-state-macro-and-spinlock-to.patch to
. add
NFSD4_CLIENT_ACTIVE. redo Courtesy client state table
. modify 0007-NFSD-Update-find_in_sessionid_hashtbl-to-handle-cour.patch and
0008-NFSD-Update-find_client_in_id_table-to-handle-courte.patch to:. set
cl_cs_client_staretoNFSD4_CLIENT_ACTIVEwhen reactive
courtesy clientv20:
. modify 0006-NFSD-Update-find_clp_in_name_tree-to-handle-courtesy.patch to:
. addnfsd4_discard_reconnect_clnt
. replace call tonfsd4_discard_courtesy_clntwith
nfsd4_discard_reconnect_clnt. modify 0007-NFSD-Update-find_in_sessionid_hashtbl-to-handle-cour.patch to:
. replace call tonfsd4_discard_courtesy_clntwith
nfsd4_discard_reconnect_clnt. modify 0008-NFSD-Update-find_client_in_id_table-to-handle-courte.patch
. replace call tonfsd4_discard_courtesy_clntwith
nfsd4_discard_reconnect_clnt
[email protected]
reviewerQuoted 12 lines · J. Bruce Fields
I've got a process complaint here. Not a big deal, but I think we can fix it and do a little better:
So, I appreciate that a big patch got split up. But we're not getting all of the advantages of that, because what most of the patches do is add new functions that don't actually have callers yet, or code that's effectively dead until one of the last patches that actually tells the laundromat to start transitioning clients to the courtesy state.
That means when reviewing these, I often have to look forward through the patches to understand how the new code that's being added works.
Quoted 7 lines
Sometimes that's the best you can do. But I think we can order these so that most of the patches actually make testable changes. That means that if we introduce a bug, a bisect will land on the actual patch that introduced the bug instead of a later patch that activated that code. It also makes the patches easier to read in isolation.
I'll try to write up a suggestion.
Thank you Bruce, I'm looking forward to your suggestion.
-Dai
Quoted 320 lines
--b.
Quoted 316 lines · Dai Ngo
Hi Chuck, Bruce
This series of patches implement the NFSv4 Courteous Server.
A server which does not immediately expunge the state on lease expiration is known as a Courteous Server. A Courteous Server continues to recognize previously generated state tokens as valid until conflict arises between the expired state and the requests from another client, or the server reboots.
v2:
. add new callback,
lm_expire_lock, tolock_manager_operationsto
allow the lock manager to take appropriate action with conflict lock.. handle conflicts of NFSv4 locks with NFSv3/NLM and local locks.
. expire courtesy client after 24hr if client has not reconnected.
. do not allow expired client to become courtesy client if there are
waiters for client's locks.. modify
client_info_showto show courtesy client and seconds from
last renew.. fix a problem with NFSv4.1 server where the it keeps returning
SEQ4_STATUS_CB_PATH_DOWNin the successful SEQUENCE reply, after the courtesy client reconnects, causing the client to keep sending BCTS requests to server.v3:
. modified
posix_test_lockto check and resolve conflict locks
to handle NLM TEST and NFSv4 LOCKT requests.. separate out fix for back channel stuck in
SEQ4_STATUS_CB_PATH_DOWN.v4:
. rework
nfsd_check_courtesyto avoid dead lock offl_lockandclient_lock
by asking the laudromat thread to destroy the courtesy client.. handle NFSv4 share reservation conflicts with courtesy client. This
includes conflicts between access mode and deny mode and vice versa.. drop the patch for back channel stuck in
SEQ4_STATUS_CB_PATH_DOWN.v5:
. fix recursive locking of
file_rwsemfromposix_lock_file.. retest with LOCKDEP enabled.
v6:
. merge witn 5.15-rc7
. fix a bug in
nfs4_check_deny_bmapthat did not check for matched
nfs4_filebefore checking for access/deny conflict. This bug causes pynfs OPEN18 to fail since the server taking too long to release lots of un-conflict clients' state.. enhance share reservation conflict handler to handle case where
a large number of conflict courtesy clients need to be expired. The 1st 100 clients are expired synchronously and the rest are expired in the background by the laundromat andNFS4ERR_DELAYis returned to the NFS client. This is needed to prevent the NFS client from timing out waiting got the reply.v7:
. Fix race condition in
posix_test_lockandposix_lock_inodeafter
dropping spinlock.. Enhance
nfsd4_fl_expire_lockto work with with newlm_expire_lock
callback. Always resolve share reservation conflicts asynchrously.
. Fix bug in
nfs4_laundromatwhere spinlock is not used when
scanningcl_ownerstr_hashtbl.. Fix bug in
nfs4_laundromatwhereidr_get_nextwas called
with incorrect 'id'.. Merge
nfs4_destroy_courtesy_clientintonfsd4_fl_expire_lock.v8:
. Fix warning in
nfsd4_fl_expire_lockreported by test robot.v9:
. Simplify
lm_expire_lockAPI by (1) remove the 'testonly' flag
and (2) specifying return value as true/false to indicate whether conflict was succesfully resolved.. Rework
nfsd4_fl_expire_lockto mark client with
NFSD4_DESTROY_COURTESY_CLIENTthen tell the laundromat to expire the client in the background.. Add a spinlock in
nfs4_clientto synchronize access to the
NFSD4_COURTESY_CLIENTandNFSD4_DESTROY_COURTESY_CLIENTflag to handle race conditions when resolving lock and share reservation conflict.. Courtesy client that was marked as
NFSD4_DESTROY_COURTESY_CLIENT
are now consisdered 'dead', waiting for the laundromat to expire it. This client is no longer allowed to use its states if it reconnects before the laundromat finishes expiring the client.For v4.1 client, the detection is done in the processing of the SEQUENCE op and returns
NFS4ERR_BAD_SESSIONto force the client to re-establish new clientid and session.
For v4.0 client, the detection is done in the processing of the RENEW and state-related ops and returnNFS4ERR_EXPIREto force the client to re-establish new clientid.v10:
Resolve deadlock in v9 by avoiding getting
cl_clientandcl_cs_locktogether. The laundromat needs to determine whether the expired client has any state and also has no blockers on its locks. Both of these conditions are allowed to change after the laundromat transits an expired client to courtesy client. When this happens, the laundromat will detect it on the next run and and expire the courtesy client.Remove client persistent record before marking it as
COURTESY_CLIENTand add client persistent record before clearing theCOURTESY_CLIENTflag to allow the courtesy client to transist to normal client to continue to use its state.Lock/delegation/share reversation conflict with courtesy client is resolved by marking the courtesy client as
DESTROY_COURTESY_CLIENT, effectively disable it, then allow the current request to proceed immediately.Courtesy client marked as
DESTROY_COURTESY_CLIENTis not allowed to reconnect to reuse itsstate. It is expired by the laundromat asynchronously in the background.Move processing of expired clients from
nfs4_laudromatto a separate function,nfs4_get_client_reaplist, that creates the reaplist and also to process courtesy clients.Update
Documentation/filesystems/locking.rstto include newlm_lock_conflictcall.Modify
leases_conflictto calllm_breaker_owns_leaseonly if there is real conflict. This is to allow the lock manager to resolve the delegation conflict if possible.v11:
Add comment for
lm_lock_conflictcallback.Replace static const
courtesy_client_expirywith macro.Remove
courtesy_clntargument fromfind_in_sessionid_hashtbl. Callers usenfs4_client->cl_cs_clientboolean to determined if it's the courtesy client and take appropriate actions.Rename
NFSD4_COURTESY_CLIENTandNFSD4_DESTROY_COURTESY_CLIENTwithNFSD4_CLIENT_COURTESYandNFSD4_CLIENT_DESTROY_COURTESY.v12:
Remove unnecessary comment in
nfs4_get_client_reaplist.Replace
nfs4_client->cl_cs_clientboolean with
NFSD4_CLIENT_COURTESY_CLNTflag.Remove
courtesy_clntargument fromfind_client_in_id_tableandfind_clp_in_name_tree. Callers useNFSD4_CLIENT_COURTESY_CLNTto determined if it's the courtesy client and take appropriate actions.v13:
Merge with 5.17-rc3.
Cleanup
Documentation/filesystems/locking.rst: replacei_lockwithflc_lock, update API's that useflc_lock.Rename
lm_lock_conflicttolm_lock_expired().Remove comment of
lm_lock_expiredAPI inlock_manager_operations. Same information is in patch description.Update commit messages of 4/4.
Add some comment for
NFSD4_CLIENT_COURTESY_CLNT.Add
nfsd4_discard_courtesy_clnt()to eliminate duplicate code of discarding courtesy client; settingNFSD4_DESTROY_COURTESY_CLIENT.v14:
. merge with Chuck's public for-next branch.
. remove
courtesy_client_expiry, use client's last renew time.. simplify comment of
nfs4_check_access_deny_bmap.. add comment about race condition in
nfs4_get_client_reaplist.. add
list_delwhen walking cslist innfs4_get_client_reaplist.. remove duplicate
INIT_LIST_HEAD(&reaplist)fromnfs4_laundromat. Modify
find_confirmed_clientandfind_confirmed_client_by_name
to detect courtesy client and destroy it.. refactor
lookup_clientidto usefind_client_in_id_table
directly instead offind_confirmed_client.. refactor
nfsd4_setclientidto callfind_clp_in_name_tree
directly instead offind_confirmed_client_by_name.. remove comment of
NFSD4_CLIENT_COURTESY.. replace
NFSD4_CLIENT_DESTROY_COURTESYwithNFSD4_CLIENT_EXPIRED.. replace
NFSD4_CLIENT_COURTESY_CLNTwithNFSD4_CLIENT_RECONNECTED.v15:
. add helper
locks_has_blockers_lockedinfs.hto check for
lock blockers. rename
nfs4_conflict_clientstonfs4_resolve_deny_conflicts_locked. update
nfs4_upgrade_open()to handle courtesy clients.. add helper
nfs4_check_and_expire_courtesy_clientand
nfs4_is_courtesy_client_expiredto deduplicate some code.. update
nfs4_anylock_blocker:
. replacelist_for_each_entry_safewithlist_for_each_entry. breaknfs4_anylock_blockerinto 2 smaller functions.. update
nfs4_get_client_reaplist:
. remove unnecessary commets
. acquirecl_cs_lockbefore settingNFSD4_CLIENT_COURTESYflag. update
client_info_showto show 'time since last renew: 00:00:38'
instead of 'seconds from last renew: 38'.v16:
. update
client_info_showto display 'status' as
'confirmed/unconfirmed/courtesy'. replace helper
locks_has_blockers_lockedinfs.hin v15 with new
locks_owner_has_blockerscall infs/locks.c. update
nfs4_lockowner_has_blockersto uselocks_owner_has_blockers. move
nfs4_check_and_expire_courtesy_clientfrom 5/11 to 4/11. remove unnecessary check for NULL clp in
find_in_sessionid_hashtb. fix typo in commit messages
v17:
. replace flags used for courtesy client with enum
courtesy_client_state. add state table in
nfsd/state.h. make
nfsd4_expire_courtesy_clnt,nfsd4_discard_courtesy_clntand
nfsd4_courtesy_clnt_expiredas static inline.. update
nfsd_breaker_owns_leaseto usedl->dl_stid.sc_clientdirectly. fix kernel test robot warning when
CONFIG_FILE_LOCKINGnot defined.v18:
. modify 0005-NFSD-Update-nfs4_get_vfs_file-to-handle-courtesy-cli.patch to:
. remove
nfs4_check_access_deny_bmap, fold this functionality
intonfs4_resolve_deny_conflicts_lockedby making use ofbmap_to_share_mode.. move
nfs4_resolve_deny_conflicts_lockedintonfs4_file_get_access
andnfs4_file_check_deny.v19:
. modify 0002-NFSD-Add-courtesy-client-state-macro-and-spinlock-to.patch to
. add
NFSD4_CLIENT_ACTIVE. redo Courtesy client state table
. modify 0007-NFSD-Update-find_in_sessionid_hashtbl-to-handle-cour.patch and
0008-NFSD-Update-find_client_in_id_table-to-handle-courte.patch to:. set
cl_cs_client_staretoNFSD4_CLIENT_ACTIVEwhen reactive
courtesy clientv20:
. modify 0006-NFSD-Update-find_clp_in_name_tree-to-handle-courtesy.patch to:
. addnfsd4_discard_reconnect_clnt
. replace call tonfsd4_discard_courtesy_clntwith
nfsd4_discard_reconnect_clnt. modify 0007-NFSD-Update-find_in_sessionid_hashtbl-to-handle-cour.patch to:
. replace call tonfsd4_discard_courtesy_clntwith
nfsd4_discard_reconnect_clnt. modify 0008-NFSD-Update-find_client_in_id_table-to-handle-courte.patch
. replace call tonfsd4_discard_courtesy_clntwith
nfsd4_discard_reconnect_clnt