NFSD: Initial implementation of NFSv4 Courteous Server
Subsystems (6)
Dai Ngo
reviewerv25 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
v21:
. merged with 5.18.0-rc3
. Redo based on Bruce's suggestion by breaking the patches into functionality
and also don't remove client record of courtesy client until the client is actually expired.
0001: courteous server framework with support for client with delegation only.
This patch also handles COURTESY and EXPIRABLE reconnect. Conflict is resolved by set the courtesy client to EXPIRABLE, let the laundromat expires the client on next run and return NFS4ERR_DELAY OPEN request.
0002: add support for opens/share reservation to courteous server
Conflict is resolved by set the courtesy client to EXPIRABLE, let the laundromat expires the client on next run and return NFS4ERR_DELAY OPEN request.
0003: mv creation/destroying laundromat workqueue from nfs4_state_start and
and nfs4_state_shutdown_net to init_nfsd and exit_nfsd.
0004: fs/lock: add locks_owner_has_blockers helper
0005: add 2 callbacks to lock_manager_operations for resolving lock conflict
0006: add support for locks to courteous server, making use of 0004 and 0005
Conflict is resolved by set the courtesy client to EXPIRABLE, run the laundromat immediately and wait for it to complete before returning to fs/lock code to recheck the lock list from the beginning.
NOTE: I could not get queue_work/queue_delay_work and flush_workqueue to work as expected, I have to use mod_delayed_work and flush_workqueue to get the laundromat to run immediately.
When we check for blockers in nfs4_anylock_blockers, we do not check for client with delegation conflict. This is because we already hold the client_lock and to check for delegation conflict we need the state_lock and scanning the del_recall_lru list each time. So to avoid this overhead and potential deadlock (not sure about lock of ordering of these locks) we check and set the COURTESY client with delegation being recalled to EXPIRABLE later in nfs4_laundromat.
0007: show state of courtesy client in client info.
v22:
. modify 0001:
. allow EXPIRABLE client to reconnect.
. modify try_to_expire_client to return false if cl_state is
either COURTEY or EXPIRABLE.
. remove try_to_activate_client and set cl_state to ACTIVE in
get_client_locked and renew_client_locked.
. remove unnecessary cl_cs_lock. Synchronization between expiring
client and client reconnect is provided by mark_client_expired_locked and get_client_locked or renew_client_locked
. modify 0003:
. fix 'ld' error with laundry_wq when CONFIG_NFSD is defined
and CONFIG_NFSD_V4 is not defined.
v23:
. rework try_to_expire_client to return true when cl_state in EXPIRABLE
and its callers to work accordingly.
. add missing mod_delay_work in nfsd4_lm_lock_expirable.
. add check for cl_rpc_users before setting client state to COURTESY
in nfs4_get_client_reaplist.
. setting client to COURTESY before nfs4_anylock_blockers to handle
race between the laundromat and thread resolving lock conflict.
. cleanup 2 fs/lock callbacks: lm_lock_expirable to return bool and
lm_expire_lock takes no argument.
v24:
. add new counter, cl_delegs_in_recall, in nfs4_client to maintain
delegation recalls and is checked by nfs4_anylock_blockers.
. remove resolve_lock_conflict_locked and move its logic into the
callers posix_lock_inode and posix_test_lock for clarity.
. rename 'conflict' to 'resolvable' in nfs4_resolve_deny_conflicts_locked.
. fix kernel robot test warning about missing semicolon in nfsd.h
v25:
. drop clearing of dl_recalled in nfsd_change_deleg_cb.
. simplify posix_lock_inode and posix_test_lock. Lock manager code
is expected to provide all required fields in lock_manager_operations for handling lock conflict
. revert client_info_show to show seconds from last renew.
. add 'Reviewed-by: J. Bruce Fields <[email protected]>' to
the patch series.
Dai Ngo
reviewerRFC PATCH v25 1/7 NFSD: add courteous server support for thread with only delegation
This patch provides courteous server support for delegation only. Only expired client with delegation but no conflict and no open or lock state is allowed to be in COURTESY state.
Delegation conflict with COURTESY/EXPIRABLE client is resolved by setting it to EXPIRABLE, queue work for the laundromat and return delay to the caller. Conflict is resolved when the laudromat runs and expires the EXIRABLE client while the NFS client retries the OPEN request. Local thread request that gets conflict is doing the retry in _break_lease.
Client in COURTESY or EXPIRABLE state is allowed to reconnect and continues to have access to its state. Access to the nfs4_client by the reconnecting thread and the laundromat is serialized via the client_lock.
--- fs/nfsd/nfs4state.c | 82 +++++++++++++++++++++++++++++++++++++++++++---------- fs/nfsd/nfsd.h | 1 + fs/nfsd/state.h | 31 ++++++++++++++++++++ 3 files changed, 99 insertions(+), 15 deletions(-)
fs/nfsd/nfs4state.c +67 -15
@@ -125,6 +125,8 @@ static void free_session(struct nfsd4_session *);static const struct nfsd4_callback_ops nfsd4_cb_recall_ops;static const struct nfsd4_callback_ops nfsd4_cb_notify_lock_ops; +static struct workqueue_struct *laundry_wq; +static bool is_session_dead (struct nfsd4_session *ses) {return ses->se_flags &NFS4_SESSION_DEAD ;
@@ -152,6 +154,7 @@ static __be32 get_client_locked(struct nfs4_client *clp)if (is_client_expired (clp))return nfserr_expired;atomic_inc (&clp->cl_rpc_users); + clp->cl_state =NFSD4_ACTIVE ;return nfs_ok; }
@@ -172,6 +175,7 @@ renew_client_locked(struct nfs4_client *clp)list_move_tail (&clp->cl_lru, &nn->client_lru); clp->cl_time =ktime_get_boottime_seconds (); + clp->cl_state =NFSD4_ACTIVE ; }static void put_client_renew_locked (struct nfs4_client *clp)
@@ -1090,6 +1094,7 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_file *fp,get_clnt_odstate (odstate); dp->dl_type =NFS4_OPEN_DELEGATE_READ ; dp->dl_retries =1 ; + dp->dl_recalled = false;nfsd4_init_cb (&dp->dl_recall, dp->dl_stid.sc_client, &nfsd4_cb_recall_ops,NFSPROC4_CLNT_CB_RECALL );get_nfs4_file (fp);
@@ -2004,6 +2009,8 @@ static struct nfs4_client *alloc_client(struct xdr_netobj name)idr_init (&clp->cl_stateids);atomic_set (&clp->cl_rpc_users,0 ); clp->cl_cb_state =NFSD4_CB_UNKNOWN ; + clp->cl_state =NFSD4_ACTIVE ; +atomic_set (&clp->cl_delegs_in_recall,0 );INIT_LIST_HEAD (&clp->cl_idhash);INIT_LIST_HEAD (&clp->cl_openowners);INIT_LIST_HEAD (&clp->cl_delegations);
@@ -4694,9 +4701,18 @@ nfsd_break_deleg_cb(struct file_lock *fl)bool ret = false;struct nfs4_delegation *dp = (struct nfs4_delegation *)fl->fl_owner;struct nfs4_file *fp = dp->dl_stid.sc_file; +struct nfs4_client *clp = dp->dl_stid.sc_client; +struct nfsd_net *nn;trace_nfsd_cb_recall (&dp->dl_stid); + dp->dl_recalled = true; +atomic_inc (&clp->cl_delegs_in_recall); +if (try_to_expire_client (clp)) { + nn =net_generic (clp->net, nfsd_net_id); +mod_delayed_work (laundry_wq, &nn->laundromat_work,0 ); + } +/* * We don't want the locks code to timeout the lease for us; * we'll remove it ourself if a delegation isn't returned
@@ -4739,9 +4755,14 @@ static int nfsd_change_deleg_cb(struct file_lock *onlist, int arg, struct list_head *dispose) { - if (arg & F_UNLCK) + struct nfs4_delegation *dp = (struct nfs4_delegation *)onlist->fl_owner; +struct nfs4_client *clp = dp->dl_stid.sc_client; + +if (arg &F_UNLCK ) { +if (dp->dl_recalled) +atomic_dec (&clp->cl_delegs_in_recall);return lease_modify (onlist, arg, dispose); - else + }else return -EAGAIN ; }
@@ -5605,6 +5626,49 @@ static void nfsd4_ssc_expire_umount(struct nfsd_net *nn) }#endif +/* +* place holder for now, no check for lock blockers yet +*/ +static bool +nfs4_anylock_blockers (struct nfs4_client *clp) +{ +if (atomic_read (&clp->cl_delegs_in_recall) || +client_has_openowners (clp) || + !list_empty (&clp->async_copies)) +return true; +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; + +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 (clp->cl_state ==NFSD4_EXPIRABLE ) + goto exp_client; +if (!state_expired (lt, clp->cl_time)) +break ; +if (!atomic_read (&clp->cl_rpc_users)) + clp->cl_state =NFSD4_COURTESY ; +if (!client_has_state (clp) || +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)) +list_add (&clp->cl_lru, reaplist); + } + } +spin_unlock (&nn->client_lock); +} +static time64_t nfs4_laundromat (struct nfsd_net *nn) {
@@ -5627,7 +5691,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) {
@@ -5637,17 +5700,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);
@@ -5722,7 +5775,6 @@ nfs4_laundromat(struct nfsd_net *nn)return max_t (time64_t, lt.new_timeo,NFSD_LAUNDROMAT_MINTIMEOUT ); } -static struct workqueue_struct *laundry_wq;static void laundromat_main (struct work_struct *); static void
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 +31 -0
@@ -149,6 +149,7 @@ struct nfs4_delegation {/* For recall: */ int dl_retries;struct nfsd4_callback dl_recall; +bool dl_recalled; };#define cb_to_delegation (cb) \
@@ -283,6 +284,28 @@ struct nfsd4_sessionid {#define HEXDIR_LEN 33/* hex version of 16 byte md5 of cl_name plus '\0' */ /* +* State Meaning Where set +* -------------------------------------------------------------------------- +* | NFSD4_ACTIVE | Confirmed, active | Default | +* |------------------- ----------------------------------------------------| +* | NFSD4_COURTESY | Courtesy state. | nfs4_get_client_reaplist | +* | | Lease/lock/share | | +* | | reservation conflict | | +* | | can cause Courtesy | | +* | | client to be expired | | +* |------------------------------------------------------------------------| +* | NFSD4_EXPIRABLE | Courtesy client to be| nfs4_laundromat | +* | | expired by Laundromat| try_to_expire_client | +* | | due to conflict | | +* |------------------------------------------------------------------------| +*/ +enum { +NFSD4_ACTIVE =0 , +NFSD4_COURTESY , +NFSD4_EXPIRABLE , +}; + +/* * struct nfs4_client - one per client. Clientids live here. * * The initial object created by an NFS client using SETCLIENTID (for NFSv4.0)
@@ -385,6 +408,9 @@ 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 */ + +unsigned int cl_state; +atomic_t cl_delegs_in_recall; };/* struct nfs4_client_reset
@@ -702,4 +728,9 @@ 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 try_to_expire_client (struct nfs4_client *clp) +{ +cmpxchg (&clp->cl_state,NFSD4_COURTESY ,NFSD4_EXPIRABLE ); +return clp->cl_state ==NFSD4_EXPIRABLE ; +}#endif /* NFSD4_STATE_H */
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v25 2/7 NFSD: add support for share reservation conflict to courteous server
In reply to Dai NgoThis patch allows expired client with open state to be in COURTESY state. Share/access conflict with COURTESY client is resolved by setting COURTESY client to EXPIRABLE state, schedule laundromat to run and returning nfserr_jukebox to the request client.
--- fs/nfsd/nfs4state.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 8 deletions(-)
fs/nfsd/nfs4state.c +101 -8
@@ -694,6 +694,57 @@ static unsigned int file_hashval(struct svc_fh *fh)static struct hlist_head file_hashtbl[FILE_HASH_SIZE ]; +/* +* 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; +bool resolvable = true; +unsigned char bmap; +struct nfsd_net *nn; +struct nfs4_client *clp; + +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 (try_to_expire_client (clp)) +continue ; + resolvable = false; +break ; + } +if (resolvable) { + clp = stp->st_stid.sc_client; + nn =net_generic (clp->net, nfsd_net_id); +mod_delayed_work (laundry_wq, &nn->laundromat_work,0 ); + } +return resolvable; +} +static void __nfs4_file_get_access (struct nfs4_file *fp,u32 access) {
@@ -4968,7 +5019,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;
@@ -4984,6 +5035,13 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp,*/ status =nfs4_file_check_deny (fp, open->op_share_deny);if (status != nfs_ok) { +if (status != nfserr_share_denied) { +spin_unlock (&fp->fi_lock); + goto out; + } +if (nfs4_resolve_deny_conflicts_locked (fp, new_stp, + stp, open->op_share_deny, false)) + status = nfserr_jukebox;spin_unlock (&fp->fi_lock); goto out; }
@@ -4991,6 +5049,13 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp,/* set access to the file */ status =nfs4_file_get_access (fp, open->op_share_access);if (status != nfs_ok) { +if (status != nfserr_share_denied) { +spin_unlock (&fp->fi_lock); + goto out; + } +if (nfs4_resolve_deny_conflicts_locked (fp, new_stp, + stp, open->op_share_access, true)) + status = nfserr_jukebox;spin_unlock (&fp->fi_lock); goto out; }
@@ -5037,21 +5102,29 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp, }static __be32 -nfs4_upgrade_open (struct svc_rqst *rqstp,struct nfs4_file *fp,struct svc_fh *cur_fh,struct nfs4_ol_stateid *stp,struct nfsd4_open *open) +nfs4_upgrade_open (struct svc_rqst *rqstp,struct nfs4_file *fp, +struct svc_fh *cur_fh,struct nfs4_ol_stateid *stp, +struct nfsd4_open *open) {__be32 status;unsigned 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);if (status == nfs_ok) { -set_deny (open->op_share_deny, stp); - fp->fi_share_deny |= +if (status != nfserr_share_denied) { +set_deny (open->op_share_deny, stp); + fp->fi_share_deny |= (open->op_share_deny &NFS4_SHARE_DENY_BOTH ); + }else { +if (nfs4_resolve_deny_conflicts_locked (fp, false, + stp, open->op_share_deny, false)) + status = nfserr_jukebox; + } }spin_unlock (&fp->fi_lock);
@@ -5392,7 +5465,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);
@@ -5626,6 +5699,26 @@ static void nfsd4_ssc_expire_umount(struct nfsd_net *nn) }#endif +static bool +nfs4_has_any_locks (struct nfs4_client *clp) +{ +int i; +struct nfs4_stateowner *so; + +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 ; +spin_unlock (&clp->cl_lock); +return true; + } + } +spin_unlock (&clp->cl_lock); +return false; +} +/* * place holder for now, no check for lock blockers yet */
@@ -5633,8 +5726,8 @@ static bool nfs4_anylock_blockers(struct nfs4_client *clp) {if (atomic_read (&clp->cl_delegs_in_recall) || -client_has_openowners (clp) || - !list_empty (&clp->async_copies)) + !list_empty (&clp->async_copies) || +nfs4_has_any_locks (clp))return true;return false; }
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v25 3/7 NFSD: move create/destroy of laundry_wq to init_nfsd and exit_nfsd
In reply to Dai NgoThis patch moves create/destroy of laundry_wq from nfs4_state_start and nfs4_state_shutdown_net to init_nfsd and exit_nfsd to prevent the laundromat from being freed while a thread is processing a conflicting lock.
--- fs/nfsd/nfs4state.c | 28 ++++++++++++++++------------ fs/nfsd/nfsctl.c | 4 ++++ fs/nfsd/nfsd.h | 4 ++++ 3 files changed, 24 insertions(+), 12 deletions(-)
fs/nfsd/nfs4state.c +16 -12
@@ -127,6 +127,21 @@ static const struct nfsd4_callback_ops nfsd4_cb_notify_lock_ops;static struct workqueue_struct *laundry_wq; +int nfsd4_create_laundry_wq (void ) +{ +int rc =0 ; + + laundry_wq =alloc_workqueue ("%s" ,WQ_UNBOUND ,0 ,"nfsd4" ); +if (laundry_wq ==NULL ) + rc = -ENOMEM ; +return rc; +} + +void nfsd4_destroy_laundry_wq (void ) +{ +destroy_workqueue (laundry_wq); +} +static bool is_session_dead (struct nfsd4_session *ses) {return ses->se_flags &NFS4_SESSION_DEAD ;
@@ -7747,22 +7762,12 @@ nfs4_state_start(void) {int ret; - laundry_wq =alloc_workqueue ("%s" ,WQ_UNBOUND ,0 ,"nfsd4" ); -if (laundry_wq ==NULL ) { - ret = -ENOMEM ; - goto out; - } ret =nfsd4_create_callback_queue ();if (ret) - goto out_free_laundry; +return ret;set_max_delegations ();return 0 ; - -out_free_laundry: -destroy_workqueue (laundry_wq); -out: -return ret; }void
@@ -7799,7 +7804,6 @@ nfs4_state_shutdown_net(struct net *net)void nfs4_state_shutdown (void ) { -destroy_workqueue (laundry_wq);nfsd4_destroy_callback_queue (); }
fs/nfsd/nfsctl.c +4 -0
@@ -1544,6 +1544,9 @@ static int __init init_nfsd(void) retval =register_cld_notifier ();if (retval) goto out_free_all; + retval =nfsd4_create_laundry_wq (); +if (retval) + goto out_free_all;return 0 ; out_free_all:unregister_pernet_subsys (&nfsd_net_ops);
@@ -1566,6 +1569,7 @@ static int __init init_nfsd(void) static void __exit exit_nfsd(void) { +nfsd4_destroy_laundry_wq ();unregister_cld_notifier ();unregister_pernet_subsys (&nfsd_net_ops);nfsd_drc_slab_free ();
fs/nfsd/nfsd.h +4 -0
@@ -162,6 +162,8 @@ void nfs4_state_shutdown_net(struct net *net);int nfs4_reset_recoverydir (char *recdir);char *nfs4_recoverydir (void );bool nfsd4_spo_must_allow (struct svc_rqst *rqstp); +int nfsd4_create_laundry_wq (void ); +void nfsd4_destroy_laundry_wq (void );#else static inline int nfsd4_init_slabs (void ) {return 0 ; }static inline void nfsd4_free_slabs (void ) { }
@@ -175,6 +177,8 @@ static inline bool nfsd4_spo_must_allow(struct svc_rqst *rqstp) {return false; } +static inline int nfsd4_create_laundry_wq (void ) {return 0 ; }; +static inline void nfsd4_destroy_laundry_wq (void ) {};#endif /*
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v25 4/7 fs/lock: add helper locks_owner_has_blockers to check for blockers
In reply to Dai NgoAdd helper locks_owner_has_blockers to check if there is any blockers for a given lockowner.
--- fs/locks.c | 28 ++++++++++++++++++++++++++++ include/linux/fs.h | 7 +++++++ 2 files changed, 35 insertions(+)
fs/locks.c +28 -0
@@ -300,6 +300,34 @@ void locks_release_private(struct file_lock *fl) }EXPORT_SYMBOL_GPL (locks_release_private); +/** +* locks_owner_has_blockers - Check for blocking lock requests +* @flctx: file lock context +* @owner: lock owner +* +* Return values: +* %true: @owner has at least one blocker +* %false: @owner has no blockers +*/ +bool locks_owner_has_blockers (struct file_lock_context *flctx, +fl_owner_t owner) +{ +struct file_lock *fl; + +spin_lock (&flctx->flc_lock); +list_for_each_entry (fl, &flctx->flc_posix, fl_list) { +if (fl->fl_owner != owner) +continue ; +if (!list_empty (&fl->fl_blocked_requests)) { +spin_unlock (&flctx->flc_lock); +return true; + } + } +spin_unlock (&flctx->flc_lock); +return false; +} +EXPORT_SYMBOL_GPL (locks_owner_has_blockers); +/* Free a lock which is not in use. */ void locks_free_lock (struct file_lock *fl) {
include/linux/fs.h +7 -0
@@ -1174,6 +1174,8 @@ extern void lease_unregister_notifier(struct notifier_block *);struct files_struct ;extern void show_fd_locks (struct seq_file *f,struct file *filp,struct files_struct *files); +extern bool locks_owner_has_blockers (struct file_lock_context *flctx, +fl_owner_t owner);#else /* !CONFIG_FILE_LOCKING */ static inline int fcntl_getlk (struct file *file,unsigned int cmd,struct flock __user *user)
@@ -1309,6 +1311,11 @@ static inline int lease_modify(struct file_lock *fl, int arg,struct files_struct ;static inline void show_fd_locks (struct seq_file *f,struct file *filp,struct files_struct *files) {} +static inline bool locks_owner_has_blockers (struct file_lock_context *flctx, +fl_owner_t owner) +{ +return false; +}#endif /* !CONFIG_FILE_LOCKING */ static inline struct inode *file_inode (const struct file *f)
Signature · 1 line
2.9.5
Re: [PATCH RFC v25 4/7] fs/lock: add helper locks_owner_has_blockers to check for blockers
Quoted 64 lines · Dai Ngo
Add helper
locks_owner_has_blockersto check if there is any blockers for a given lockowner.Reviewed-by J. Bruce Fields <[email protected]>Signed-off-by Dai Ngo <[email protected]>--- fs/locks.c | 28 ++++++++++++++++++++++++++++ include/linux/fs.h | 7 +++++++ 2 files changed, 35 insertions(+)fs/locks.c +28
-0@@ -300,6 +300,34 @@ void locks_release_private(struct file_lock *fl) }EXPORT_SYMBOL_GPL (locks_release_private); +/** +* locks_owner_has_blockers - Check for blocking lock requests +* @flctx: file lock context +* @owner: lock owner +* +* Return values: +* %true: @owner has at least one blocker +* %false: @owner has no blockers +*/ +bool locks_owner_has_blockers (struct file_lock_context *flctx, +fl_owner_t owner) +{ +struct file_lock *fl; + +spin_lock (&flctx->flc_lock); +list_for_each_entry (fl, &flctx->flc_posix, fl_list) { +if (fl->fl_owner != owner) +continue ; +if (!list_empty (&fl->fl_blocked_requests)) { +spin_unlock (&flctx->flc_lock); +return true; + } + } +spin_unlock (&flctx->flc_lock); +return false; +} +EXPORT_SYMBOL_GPL (locks_owner_has_blockers); +/* Free a lock which is not in use. */ void locks_free_lock (struct file_lock *fl) {include/linux/fs.h +2
-0@@ -1174,6 +1174,8 @@ extern void lease_unregister_notifier(struct notifier_block *);struct files_struct ;extern void show_fd_locks (struct seq_file *f,struct file *filp,struct files_struct *files); +extern bool locks_owner_has_blockers (struct file_lock_context *flctx, +fl_owner_t owner);#else /* !CONFIG_FILE_LOCKING */ static inline int fcntl_getlk (struct file *file,unsigned int cmd,struct flock __user *user)@@ -1309,6 +1311,11 @@ static inline int lease_modify(struct file_lock *fl, int arg,struct files_struct ;
include/linux/fs.h static inline int lease_modify(struct file_lock *fl, int arg, · line 1321
Quoted 10 lines
include/linux/fs.h +5
-0static inline void show_fd_locks (struct seq_file *f,struct file *filp,struct files_struct *files) {} +static inline bool locks_owner_has_blockers (struct file_lock_context *flctx, +fl_owner_t owner) +{ +return false; +}#endif /* !CONFIG_FILE_LOCKING */ static inline struct inode *file_inode (const struct file *f)
Dai Ngo
reviewerRFC PATCH v25 5/7 fs/lock: add 2 callbacks to lock_manager_operations to resolve conflict
In reply to Dai NgoAdd 2 new callbacks, lm_lock_expirable and lm_expire_lock, to lock_manager_operations to allow the lock manager to take appropriate action to resolve the lock conflict if possible.
A new field, lm_mod_owner, is also added to lock_manager_operations. The lm_mod_owner is used by the fs/lock code to make sure the lock manager module such as nfsd, is not freed while lock conflict is being resolved.
lm_lock_expirable checks and returns true to indicate that the lock conflict can be resolved else return false. This callback must be called with the flc_lock held so it can not block.
lm_expire_lock is called to resolve the lock conflict if the returned value from lm_lock_expirable is true. This callback is called without the flc_lock held since it's allowed to block. Upon returning from this callback, the lock conflict should be resolved and the caller is expected to restart the conflict check from the beginnning of the list.
Lock manager, such as NFSv4 courteous server, uses this callback to resolve conflict by destroying lock owner, or the NFSv4 courtesy client (client that has expired but allowed to maintains its states) that owns the lock.
--- Documentation/filesystems/locking.rst | 4 ++++ fs/locks.c | 33 ++++++++++++++++++++++++++++++--- include/linux/fs.h | 3 +++ 3 files changed, 37 insertions(+), 3 deletions(-)
Documentation/filesystems/locking.rst +4 -0
@@ -428,6 +428,8 @@ prototypes:: void (*lm_break)(struct file_lock *); /* break_lease callback */ int (*lm_change)(struct file_lock **, int); bool (*lm_breaker_owns_lease)(struct file_lock *); + bool (*lm_lock_expirable)(struct file_lock *); + void (*lm_expire_lock)(void); locking rules:
@@ -439,6 +441,8 @@ lm_grant: no no no lm_break: yes no no lm_change yes no no lm_breaker_owns_lease: yes no no +lm_lock_expirable yes no no +lm_expire_lock no no yes ====================== ============= ================= ========= buffer_head
fs/locks.c +30 -3
@@ -902,6 +902,8 @@ posix_test_lock(struct file *filp, struct file_lock *fl)struct file_lock *cfl;struct file_lock_context *ctx;struct inode *inode =locks_inode (filp); +void *owner; +void (*func)(void ); ctx =smp_load_acquire (&inode->i_flctx);if (!ctx ||list_empty_careful (&ctx->flc_posix)) {
@@ -909,12 +911,23 @@ posix_test_lock(struct file *filp, struct file_lock *fl)return ; } +retry:spin_lock (&ctx->flc_lock);list_for_each_entry (cfl, &ctx->flc_posix, fl_list) { -if (posix_locks_conflict (fl, cfl)) { -locks_copy_conflock (fl, cfl); - goto out; +if (!posix_locks_conflict (fl, cfl)) +continue ; +if (cfl->fl_lmops && cfl->fl_lmops->lm_lock_expirable + && (*cfl->fl_lmops->lm_lock_expirable)(cfl)) { + owner = cfl->fl_lmops->lm_mod_owner; + func = cfl->fl_lmops->lm_expire_lock; +__module_get (owner); +spin_unlock (&ctx->flc_lock); + (*func)(); +module_put (owner); + goto retry; } +locks_copy_conflock (fl, cfl); + goto out; } fl->fl_type =F_UNLCK ; out:
@@ -1088,6 +1101,8 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,int error;bool added = false;LIST_HEAD (dispose); +void *owner; +void (*func)(void ); ctx =locks_get_lock_context (inode, request->fl_type);if (!ctx)
@@ -1106,6 +1121,7 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request, new_fl2 =locks_alloc_lock (); } +retry:percpu_down_read (&file_rwsem);spin_lock (&ctx->flc_lock);/*
@@ -1117,6 +1133,17 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,list_for_each_entry (fl, &ctx->flc_posix, fl_list) {if (!posix_locks_conflict (request, fl))continue ; +if (fl->fl_lmops && fl->fl_lmops->lm_lock_expirable + && (*fl->fl_lmops->lm_lock_expirable)(fl)) { + owner = fl->fl_lmops->lm_mod_owner; + func = fl->fl_lmops->lm_expire_lock; +__module_get (owner); +spin_unlock (&ctx->flc_lock); +percpu_up_read (&file_rwsem); + (*func)(); +module_put (owner); + goto retry; + }if (conflock)locks_copy_conflock (conflock, fl); error = -EAGAIN ;
include/linux/fs.h +3 -0
@@ -1029,6 +1029,7 @@ struct file_lock_operations { };struct lock_manager_operations { +void *lm_mod_owner;fl_owner_t (*lm_get_owner)(fl_owner_t );void (*lm_put_owner)(fl_owner_t );void (*lm_notify)(struct file_lock *);/* unblock callback */
@@ -1037,6 +1038,8 @@ struct lock_manager_operations {int (*lm_change)(struct file_lock *,int ,struct list_head *);void (*lm_setup)(struct file_lock *,void **);bool (*lm_breaker_owns_lease)(struct file_lock *); +bool (*lm_lock_expirable)(struct file_lock *cfl); +void (*lm_expire_lock)(void ); };struct lock_manager {
Signature · 1 line
2.9.5
Re: [PATCH RFC v25 5/7] fs/lock: add 2 callbacks to lock_manager_operations to resolve conflict
Quoted 23 lines · Dai Ngo
Add 2 new callbacks,
lm_lock_expirableandlm_expire_lock, tolock_manager_operationsto allow the lock manager to take appropriate action to resolve the lock conflict if possible.A new field,
lm_mod_owner, is also added tolock_manager_operations. Thelm_mod_owneris used by the fs/lock code to make sure the lock manager module such as nfsd, is not freed while lock conflict is being resolved.
lm_lock_expirablechecks and returns true to indicate that the lock conflict can be resolved else return false. This callback must be called with theflc_lockheld so it can not block.
lm_expire_lockis called to resolve the lock conflict if the returned value fromlm_lock_expirableis true. This callback is called without theflc_lockheld since it's allowed to block. Upon returning from this callback, the lock conflict should be resolved and the caller is expected to restart the conflict check from the beginnning of the list.
Quoted 7 lines
Lock manager, such as NFSv4 courteous server, uses this callback to resolve conflict by destroying lock owner, or the NFSv4 courtesy client (client that has expired but allowed to maintains its states) that owns the lock.
Reviewed-by J. Bruce Fields <[email protected]>Signed-off-by Dai Ngo <[email protected]>
Jeff, May I add your Reviewed-by or Acked-by to 4/7 and 5/7 in this series?
Quoted 127 lines
---
Documentation/filesystems/locking.rst | 4 ++++ fs/locks.c | 33 ++++++++++++++++++++++++++++++--- include/linux/fs.h | 3 +++ 3 files changed, 37 insertions(+), 3 deletions(-)Documentation/filesystems/locking.rst +2
-0@@ -428,6 +428,8 @@ prototypes:: void (*lm_break)(struct file_lock *); /* break_lease callback */ int (*lm_change)(struct file_lock **, int); bool (*lm_breaker_owns_lease)(struct file_lock *); + bool (*lm_lock_expirable)(struct file_lock *); + void (*lm_expire_lock)(void);locking rules:
Documentation/filesystems/locking.rst +0
-0@@ -439,6 +441,8 @@ lm_grant: no no no
lm_break: yes no nolm_changeyes no nolm_breaker_owns_lease: yes no noDocumentation/filesystems/locking.rst +2
-0+lm_lock_expirable yes no no +lm_expire_lock no no yes====================== ============= ================= =========
buffer_headfs/locks.c +16
-3@@ -902,6 +902,8 @@ posix_test_lock(struct file *filp, struct file_lock *fl)struct file_lock *cfl;struct file_lock_context *ctx;struct inode *inode =locks_inode (filp); +void *owner; +void (*func)(void ); ctx =smp_load_acquire (&inode->i_flctx);if (!ctx ||list_empty_careful (&ctx->flc_posix)) {@@ -909,12 +911,23 @@ posix_test_lock(struct file *filp, struct file_lock *fl)return ; } +retry:spin_lock (&ctx->flc_lock);list_for_each_entry (cfl, &ctx->flc_posix, fl_list) { -if (posix_locks_conflict (fl, cfl)) { -locks_copy_conflock (fl, cfl); - goto out; +if (!posix_locks_conflict (fl, cfl)) +continue ; +if (cfl->fl_lmops && cfl->fl_lmops->lm_lock_expirable + && (*cfl->fl_lmops->lm_lock_expirable)(cfl)) { + owner = cfl->fl_lmops->lm_mod_owner; + func = cfl->fl_lmops->lm_expire_lock; +__module_get (owner); +spin_unlock (&ctx->flc_lock); + (*func)(); +module_put (owner); + goto retry; } +locks_copy_conflock (fl, cfl); + goto out; } fl->fl_type =F_UNLCK ;out:
fs/locks.c +14
-0@@ -1088,6 +1101,8 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,int error;bool added = false;LIST_HEAD (dispose); +void *owner; +void (*func)(void ); ctx =locks_get_lock_context (inode, request->fl_type);if (!ctx)@@ -1106,6 +1121,7 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request, new_fl2 =locks_alloc_lock (); } +retry:percpu_down_read (&file_rwsem);spin_lock (&ctx->flc_lock);/* @@ -1117,6 +1133,17 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,list_for_each_entry (fl, &ctx->flc_posix, fl_list) {if (!posix_locks_conflict (request, fl))continue ; +if (fl->fl_lmops && fl->fl_lmops->lm_lock_expirable + && (*fl->fl_lmops->lm_lock_expirable)(fl)) { + owner = fl->fl_lmops->lm_mod_owner; + func = fl->fl_lmops->lm_expire_lock; +__module_get (owner); +spin_unlock (&ctx->flc_lock); +percpu_up_read (&file_rwsem); + (*func)(); +module_put (owner); + goto retry; + }if (conflock)locks_copy_conflock (conflock, fl); error = -EAGAIN ;include/linux/fs.h +3
-0@@ -1029,6 +1029,7 @@ struct file_lock_operations { };struct lock_manager_operations { +void *lm_mod_owner;fl_owner_t (*lm_get_owner)(fl_owner_t );void (*lm_put_owner)(fl_owner_t );void (*lm_notify)(struct file_lock *);/* unblock callback */ @@ -1037,6 +1038,8 @@ struct lock_manager_operations {int (*lm_change)(struct file_lock *,int ,struct list_head *);void (*lm_setup)(struct file_lock *,void **);bool (*lm_breaker_owns_lease)(struct file_lock *); +bool (*lm_lock_expirable)(struct file_lock *cfl); +void (*lm_expire_lock)(void ); };struct lock_manager {Signature · 1 line
2.9.5
--
Chuck Lever
Re: [PATCH RFC v25 5/7] fs/lock: add 2 callbacks to lock_manager_operations to resolve conflict
In reply to Dai NgoQuoted 142 lines · Dai Ngo
Add 2 new callbacks,
lm_lock_expirableandlm_expire_lock, tolock_manager_operationsto allow the lock manager to take appropriate action to resolve the lock conflict if possible.A new field,
lm_mod_owner, is also added tolock_manager_operations. Thelm_mod_owneris used by the fs/lock code to make sure the lock manager module such as nfsd, is not freed while lock conflict is being resolved.
lm_lock_expirablechecks and returns true to indicate that the lock conflict can be resolved else return false. This callback must be called with theflc_lockheld so it can not block.
lm_expire_lockis called to resolve the lock conflict if the returned value fromlm_lock_expirableis true. This callback is called without theflc_lockheld since it's allowed to block. Upon returning from this callback, the lock conflict should be resolved and the caller is expected to restart the conflict check from the beginnning of the list.Lock manager, such as NFSv4 courteous server, uses this callback to resolve conflict by destroying lock owner, or the NFSv4 courtesy client (client that has expired but allowed to maintains its states) that owns the lock.
Reviewed-by J. Bruce Fields <[email protected]>Signed-off-by Dai Ngo <[email protected]>--- Documentation/filesystems/locking.rst | 4 ++++ fs/locks.c | 33 ++++++++++++++++++++++++++++++--- include/linux/fs.h | 3 +++ 3 files changed, 37 insertions(+), 3 deletions(-)Documentation/filesystems/locking.rst +4
-0@@ -428,6 +428,8 @@ prototypes:: void (*lm_break)(struct file_lock *); /* break_lease callback */ int (*lm_change)(struct file_lock **, int); bool (*lm_breaker_owns_lease)(struct file_lock *); + bool (*lm_lock_expirable)(struct file_lock *); + void (*lm_expire_lock)(void); locking rules:@@ -439,6 +441,8 @@ lm_grant: no no no lm_break: yes no no lm_change yes no no lm_breaker_owns_lease: yes no no +lm_lock_expirable yes no no +lm_expire_lock no no yes ====================== ============= ================= ========= buffer_headfs/locks.c +30
-3@@ -902,6 +902,8 @@ posix_test_lock(struct file *filp, struct file_lock *fl)struct file_lock *cfl;struct file_lock_context *ctx;struct inode *inode =locks_inode (filp); +void *owner; +void (*func)(void ); ctx =smp_load_acquire (&inode->i_flctx);if (!ctx ||list_empty_careful (&ctx->flc_posix)) {@@ -909,12 +911,23 @@ posix_test_lock(struct file *filp, struct file_lock *fl)return ; } +retry:spin_lock (&ctx->flc_lock);list_for_each_entry (cfl, &ctx->flc_posix, fl_list) { -if (posix_locks_conflict (fl, cfl)) { -locks_copy_conflock (fl, cfl); - goto out; +if (!posix_locks_conflict (fl, cfl)) +continue ; +if (cfl->fl_lmops && cfl->fl_lmops->lm_lock_expirable + && (*cfl->fl_lmops->lm_lock_expirable)(cfl)) { + owner = cfl->fl_lmops->lm_mod_owner; + func = cfl->fl_lmops->lm_expire_lock; +__module_get (owner); +spin_unlock (&ctx->flc_lock); + (*func)(); +module_put (owner); + goto retry; } +locks_copy_conflock (fl, cfl); + goto out; } fl->fl_type =F_UNLCK ; out:@@ -1088,6 +1101,8 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,int error;bool added = false;LIST_HEAD (dispose); +void *owner; +void (*func)(void ); ctx =locks_get_lock_context (inode, request->fl_type);if (!ctx)@@ -1106,6 +1121,7 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request, new_fl2 =locks_alloc_lock (); } +retry:percpu_down_read (&file_rwsem);spin_lock (&ctx->flc_lock);/* @@ -1117,6 +1133,17 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,list_for_each_entry (fl, &ctx->flc_posix, fl_list) {if (!posix_locks_conflict (request, fl))continue ; +if (fl->fl_lmops && fl->fl_lmops->lm_lock_expirable + && (*fl->fl_lmops->lm_lock_expirable)(fl)) { + owner = fl->fl_lmops->lm_mod_owner; + func = fl->fl_lmops->lm_expire_lock; +__module_get (owner); +spin_unlock (&ctx->flc_lock); +percpu_up_read (&file_rwsem); + (*func)(); +module_put (owner); + goto retry; + }if (conflock)locks_copy_conflock (conflock, fl); error = -EAGAIN ;include/linux/fs.h +1
-0@@ -1029,6 +1029,7 @@ struct file_lock_operations { };struct lock_manager_operations { +void *lm_mod_owner;fl_owner_t (*lm_get_owner)(fl_owner_t );void (*lm_put_owner)(fl_owner_t );void (*lm_notify)(struct file_lock *);/* unblock callback */
include/linux/fs.h struct lock_manager_operations { · line 1045
Quoted 8 lines
include/linux/fs.h +2
-0@@ -1037,6 +1038,8 @@ struct lock_manager_operations {int (*lm_change)(struct file_lock *,int ,struct list_head *);void (*lm_setup)(struct file_lock *,void **);bool (*lm_breaker_owns_lease)(struct file_lock *); +bool (*lm_lock_expirable)(struct file_lock *cfl); +void (*lm_expire_lock)(void ); };struct lock_manager {
Dai Ngo
reviewerRFC PATCH v25 6/7 NFSD: add support for lock conflict to courteous server
In reply to Dai NgoThis patch allows expired client with lock state to be in COURTESY state. Lock conflict with COURTESY client is resolved by the fs/lock code using the lm_lock_expirable and lm_expire_lock callback in the struct lock_manager_operations.
If conflict client is in COURTESY state, set it to EXPIRABLE and schedule the laundromat to run immediately to expire the client. The callback lm_expire_lock waits for the laundromat to flush its work queue before returning to caller.
--- fs/nfsd/nfs4state.c | 70 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 16 deletions(-)
fs/nfsd/nfs4state.c +54 -16
@@ -5714,39 +5714,51 @@ 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_has_any_locks (struct nfs4_client *clp) +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; +if (atomic_read (&clp->cl_delegs_in_recall)) +return true;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 ; -spin_unlock (&clp->cl_lock); -return true; + lo =lockowner (so); +if (nfs4_lockowner_has_blockers (lo)) { +spin_unlock (&clp->cl_lock); +return true; + } } }spin_unlock (&clp->cl_lock);return false; } -/* -* place holder for now, no check for lock blockers yet -*/ -static bool -nfs4_anylock_blockers (struct nfs4_client *clp) -{ -if (atomic_read (&clp->cl_delegs_in_recall) || - !list_empty (&clp->async_copies) || -nfs4_has_any_locks (clp)) -return true; -return false; -} -static void nfs4_get_client_reaplist (struct nfsd_net *nn,struct list_head *reaplist,struct laundry_time *lt)
@@ -6711,6 +6723,29 @@ nfsd4_lm_put_owner(fl_owner_t owner)nfs4_put_stateowner (&lo->lo_owner); } +/* return pointer to struct nfs4_client if client is expirable */ +static bool +nfsd4_lm_lock_expirable (struct file_lock *cfl) +{ +struct nfs4_lockowner *lo = (struct nfs4_lockowner *)cfl->fl_owner; +struct nfs4_client *clp = lo->lo_owner.so_client; +struct nfsd_net *nn; + +if (try_to_expire_client (clp)) { + nn =net_generic (clp->net, nfsd_net_id); +mod_delayed_work (laundry_wq, &nn->laundromat_work,0 ); +return true; + } +return false; +} + +/* schedule laundromat to run immediately and wait for it to complete */ +static void +nfsd4_lm_expire_lock (void ) +{ +flush_workqueue (laundry_wq); +} +static void nfsd4_lm_notify (struct file_lock *fl) {
@@ -6737,9 +6772,12 @@ nfsd4_lm_notify(struct file_lock *fl) }static const struct lock_manager_operations nfsd_posix_mng_ops = { + .lm_mod_owner =THIS_MODULE , .lm_notify = nfsd4_lm_notify, .lm_get_owner = nfsd4_lm_get_owner, .lm_put_owner = nfsd4_lm_put_owner, + .lm_lock_expirable = nfsd4_lm_lock_expirable, + .lm_expire_lock = nfsd4_lm_expire_lock, }; static inline void
Signature · 1 line
2.9.5
Dai Ngo
reviewerRFC PATCH v25 7/7 NFSD: Show state of courtesy client in client info
In reply to Dai NgoUpdate client_info_show to show state of courtesy client and seconds since last renew.
--- fs/nfsd/nfs4state.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/nfsd/nfs4state.c +8 -1
@@ -2481,10 +2481,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_state ==NFSD4_COURTESY ) +seq_puts (m,"status: courtesy\n" ); +else if (clp->cl_state ==NFSD4_EXPIRABLE ) +seq_puts (m,"status: expirable\n" ); +else if (test_bit (NFSD4_CLIENT_CONFIRMED , &clp->cl_flags))seq_puts (m,"status: confirmed\n" );else seq_puts (m,"status: unconfirmed\n" ); +seq_printf (m,"seconds from last renew: %lld\n" , +ktime_get_boottime_seconds () - clp->cl_time);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
Looks good to me.
--b.
Quoted 414 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_clntv21:
. merged with 5.18.0-rc3
. Redo based on Bruce's suggestion by breaking the patches into functionality
and also don't remove client record of courtesy client until the client is actually expired.0001: courteous server framework with support for client with delegation only.
This patch also handles COURTESY and EXPIRABLE reconnect. Conflict is resolved by set the courtesy client to EXPIRABLE, let the laundromat expires the client on next run and returnNFS4ERR_DELAYOPEN request.0002: add support for opens/share reservation to courteous server
Conflict is resolved by set the courtesy client to EXPIRABLE, let the laundromat expires the client on next run and returnNFS4ERR_DELAYOPEN request.0003: mv creation/destroying laundromat workqueue from
nfs4_state_startand
andnfs4_state_shutdown_nettoinit_nfsdandexit_nfsd.0004: fs/lock: add
locks_owner_has_blockershelper0005: add 2 callbacks to
lock_manager_operationsfor resolving lock conflict0006: add support for locks to courteous server, making use of 0004 and 0005
Conflict is resolved by set the courtesy client to EXPIRABLE, run the laundromat immediately and wait for it to complete before returning to fs/lock code to recheck the lock list from the beginning.NOTE: I could not get queue_work/queue_delay_work and
flush_workqueueto work as expected, I have to usemod_delayed_workandflush_workqueueto get the laundromat to run immediately.When we check for blockers in
nfs4_anylock_blockers, we do not check for client with delegation conflict. This is because we already hold theclient_lockand to check for delegation conflict we need thestate_lockand scanning thedel_recall_lrulist each time. So to avoid this overhead and potential deadlock (not sure about lock of ordering of these locks) we check and set the COURTESY client with delegation being recalled to EXPIRABLE later innfs4_laundromat.0007: show state of courtesy client in client info.
v22:
. modify 0001:
. allow EXPIRABLE client to reconnect.
. modifytry_to_expire_clientto return false ifcl_stateis
either COURTEY or EXPIRABLE.
. removetry_to_activate_clientand setcl_stateto ACTIVE in
get_client_lockedandrenew_client_locked.
. remove unnecessarycl_cs_lock. Synchronization between expiring
client and client reconnect is provided bymark_client_expired_lockedandget_client_lockedorrenew_client_locked. modify 0003:
. fix 'ld' error withlaundry_wqwhenCONFIG_NFSDis defined
andCONFIG_NFSD_V4is not defined.v23:
. reworktry_to_expire_clientto return true whencl_statein EXPIRABLE
and its callers to work accordingly.. add missing
mod_delay_workinnfsd4_lm_lock_expirable.. add check for
cl_rpc_usersbefore setting client state to COURTESY
innfs4_get_client_reaplist.. setting client to COURTESY before
nfs4_anylock_blockersto handle
race between the laundromat and thread resolving lock conflict.. cleanup 2 fs/lock callbacks:
lm_lock_expirableto return bool and
lm_expire_locktakes no argument.
v24:
. add new counter,cl_delegs_in_recall, innfs4_clientto maintain
delegation recalls and is checked bynfs4_anylock_blockers.. remove
resolve_lock_conflict_lockedand move its logic into the
callersposix_lock_inodeandposix_test_lockfor clarity.. rename 'conflict' to 'resolvable' in
nfs4_resolve_deny_conflicts_locked.. fix kernel robot test warning about missing semicolon in
nfsd.hv25:
. drop clearing ofdl_recalledinnfsd_change_deleg_cb.. simplify
posix_lock_inodeandposix_test_lock. Lock manager code
is expected to provide all required fields inlock_manager_operationsfor handling lock conflict. revert
client_info_showto show seconds from last renew.. add 'Reviewed-by: J. Bruce Fields <[email protected]>' to
the patch series.
Quoted 1 line · J. Bruce Fields
Looks good to me.
And the only new test failures are due to the new DELAYs on OPEN. Somebody'll need to fix up pynfs. (I'm not volunteering for now.)
--b.
[email protected]
reviewerQuoted 4 lines · J. Bruce Fields
Quoted 1 line · J. Bruce Fields
Looks good to me.
And the only new test failures are due to the new DELAYs on OPEN. Somebody'll need to fix up pynfs. (I'm not volunteering for now.)
I will fix it, since I broke it :-)
-Dai
Quoted 2 lines
--b.
Quoted 8 lines · On Mon, May 02, 2022 at 06:38:03PM -0700, [email protected] wrote:
Quoted 4 lines · J. Bruce Fields
Quoted 1 line · J. Bruce Fields
Looks good to me.
And the only new test failures are due to the new DELAYs on OPEN. Somebody'll need to fix up pynfs. (I'm not volunteering for now.)
I will fix it, since I broke it :-)
By the way, I have three more notes on courtesy server stuff that I wanted to dump into email before I forget them:
1. I do still recommend fixing up those pynfs failures. The ones I see are in RENEW3, LKU10, CLOSE9, CLOSE8, but there may be others.
2. In the lock case, nfsd4_lock() holds an st_mutex while calling vfs_lock_file(), which may end up needing to wait for the laundromat. As I said in review, I don't see a potential deadlock there, so I'm fine with the code going in as is.
But, as a note for possible cleanup, or if this does turn into a problem later: vfs_lock_file could return to nfsd4_lock(), and nfsd4_lock() could easily drop the st_mutex, wait, and retry.
I think the only trick part would be deciding on conventions for the caller to tell vfs_lock_file() that it shouldn't wait in this case (non-nfsd callers will still want to wait), and for vfs_lock_file() to indicate the caller needs to retry. Probably something in fl_flags for the former, and an agreed-on error return for the latter?
3. One other piece of future work would be optimizing the conflicting lock case. A very premature optimization at this point, but I'm just leaving my notes here in case someone's interested:
The loop in posix_lock_inode() is currently O(N^2) in the number of expirable clients holding conflicting locks, because each time we encounter one, we wait and then restart. In practice I doubt that matters--if you have a lot of clients to expire, the time rescanning the list will likely be trivial compared to the time spent waiting for nfsdcld to commit the expiry of each client to stable storage.
*However*, it might be a more significant optimization if we first allowed more parallelism in nfsdcld. And that might also benefit some other cases (e.g., lots of clients reconnecting after a crash). We'd need paralle nfsdcld--no idea what that would involve--and I think it'd also help to update the kernel<->nfsdcld protocol with a separate commit operation, so that nfsd could issue a bunch of client changes and then a single commit to wait for them all.
That done, we could modify the loop in vfs_lock_file() so that, in the case where multiple clients hold conflicting locks, the loop marks them all for expiry in one pass, then waits just once at the end.
--b.
[email protected]
reviewerQuoted 4 lines · J. Bruce Fields
Quoted 3 lines · On Mon, May 02, 2022 at 06:38:03PM -0700, [email protected] wrote:
Quoted 2 lines · J. Bruce Fields
Quoted 1 line · J. Bruce Fields
Looks good to me.
Quoted 8 lines
Quoted 3 lines
Quoted 2 lines
And the only new test failures are due to the new DELAYs on OPEN. Somebody'll need to fix up pynfs. (I'm not volunteering for now.)
I will fix it, since I broke it :-)
By the way, I have three more notes on courtesy server stuff that I wanted to dump into email before I forget them:
1. I do still recommend fixing up those pynfs failures. The ones I see are in RENEW3, LKU10, CLOSE9, CLOSE8, but there may be others.
I had the pynfs fix ready, I just wait for the courteous server patches to go in 5.19 then submit the pynfs fix. Or do you want me to send it out now?
Quoted 36 lines
2. In the lock case,
nfsd4_lock()holds anst_mutexwhile callingvfs_lock_file(), which may end up needing to wait for the laundromat. As I said in review, I don't see a potential deadlock there, so I'm fine with the code going in as is.But, as a note for possible cleanup, or if this does turn into a problem later:
vfs_lock_filecould return tonfsd4_lock(), andnfsd4_lock()could easily drop thest_mutex, wait, and retry.I think the only trick part would be deciding on conventions for the caller to tell
vfs_lock_file()that it shouldn't wait in this case (non-nfsd callers will still want to wait), and forvfs_lock_file()to indicate the caller needs to retry. Probably something infl_flagsfor the former, and an agreed-on error return for the latter?3. One other piece of future work would be optimizing the conflicting lock case. A very premature optimization at this point, but I'm just leaving my notes here in case someone's interested:
The loop in
posix_lock_inode()is currently O(N^2) in the number of expirable clients holding conflicting locks, because each time we encounter one, we wait and then restart. In practice I doubt that matters--if you have a lot of clients to expire, the time rescanning the list will likely be trivial compared to the time spent waiting for nfsdcld to commit the expiry of each client to stable storage.*However*, it might be a more significant optimization if we first allowed more parallelism in nfsdcld. And that might also benefit some other cases (e.g., lots of clients reconnecting after a crash). We'd need paralle nfsdcld--no idea what that would involve--and I think it'd also help to update the kernel<->nfsdcld protocol with a separate commit operation, so that nfsd could issue a bunch of client changes and then a single commit to wait for them all.
Quoted 4 lines
That done, we could modify the loop in
vfs_lock_file()so that, in the case where multiple clients hold conflicting locks, the loop marks them all for expiry in one pass, then waits just once at the end.
Thank you for your notes Bruce, I will keep these in mind.
-Dai
Quoted 2 lines
--b.