nfs41 Fix session reset deadlocks Version 2
Subsystems (2)
cover nfs41 Fix session reset deadlocks Version 2
Fix session reset deadlocks Version 2.
These patches apply to tronds nfs-2.6 bugfix
branch (2.6.32-rc6 on top of these two already posted patches:
nfs41-fix-multiple-free-slot-calls.patch nfs41-fix-race-on-session-reset.patch
Fix two problems reported by Trond:
0001-nfs41-remove-nfs4_recover_session.patch
Responded to comments and moved INIT_COMPLETION() call. 0002-nfs41-fix-state-manager-deadlock-in-session-reset.patch
Testing:
CONFIG_NFS_V4_1
v41 mount: Connectathon tests passed. PyNFS testclient.py SESSIONRESET tests and the new INJECT_ERROR_CTHON test where NFS4ERR_BADSESSION was returned every 50th SEQUENCE operation durring a Connectathon basic test run. This passed with the session being reset 390 times from a variety of client compounds (READ/WRITE/COMMIT/OPEN/CLOSE/ to name a few).
v4 mount: Connectathon tests passed.
no CONFIG_NFS_V4_1
v4 mount: Connectathon tests passed.
-->Andy
PATCH 1/2 nfs41: remove nfs4_recover_session
From: Andy Adamson <[email protected]>
nfs4_recover_session can put rpciod to sleep. Just use nfs4_schedule_recovery.
--- fs/nfs/nfs4proc.c | 26 +++----------------------- 1 files changed, 3 insertions(+), 23 deletions(-)
fs/nfs/nfs4proc.c +3 -23
@@ -427,24 +427,6 @@ out:return ret_id; } -static int nfs4_recover_session (struct nfs4_session *session) -{ -struct nfs_client *clp = session->clp; -unsigned int loop; -int ret; - -for (loop =NFS4_MAX_LOOP_ON_RECOVER ; loop !=0 ; loop--) { - ret =nfs4_wait_clnt_recover (clp); -if (ret !=0 ) -break ; -if (!test_bit (NFS4CLNT_SESSION_SETUP , &clp->cl_state)) -break ; -nfs4_schedule_state_manager (clp); - ret = -EIO ; - } -return ret; -} - static int nfs41_setup_sequence(struct nfs4_session *session, struct nfs4_sequence_args *args, struct nfs4_sequence_res *res,
@@ -453,7 +435,6 @@ static int nfs41_setup_sequence(struct nfs4_session *session, {struct nfs4_slot *slot;struct nfs4_slot_table *tbl; -int status =0 ;u8 slotid;dprintk ("--> %s\n" , __func__);
@@ -476,11 +457,10 @@ static int nfs41_setup_sequence(struct nfs4_session *session,/* The slot table is empty; start the reset thread */ dprintk ("%s Session Reset\n" , __func__); +rpc_sleep_on (&tbl->slot_tbl_waitq, task,NULL ); +nfs4_schedule_state_manager (session->clp);spin_unlock (&tbl->slot_tbl_lock); - status =nfs4_recover_session (session); -if (status) -return status; -spin_lock (&tbl->slot_tbl_lock); +return -EAGAIN ; } slotid =nfs4_find_slot (tbl, task);
Signature · 1 line
1.6.0.6
PATCH 2/2 nfs41: fix state manager deadlock in session reset
From: Andy Adamson <[email protected]>
If the session is reset during state recovery, the state manager thread can sleep on the slot_tbl_waitq causing a deadlock.
Add a completion framework to the session. Have the state manager thread set a new session state (NFS4CLNT_SESSION_DRAINING) and wait for the session slot table to drain.
Signal the state manager thread in nfs41_sequence_free_slot when the NFS4CLNT_SESSION_DRAINING bit is set and the session is drained.
--- fs/nfs/nfs4_fs.h | 1 + fs/nfs/nfs4proc.c | 25 ++++++++++++++++--------- fs/nfs/nfs4state.c | 15 +++++++++++++++ include/linux/nfs_fs_sb.h | 1 + 4 files changed, 33 insertions(+), 9 deletions(-)
fs/nfs/nfs4_fs.h +1 -0
@@ -45,6 +45,7 @@ enum nfs4_client_state {NFS4CLNT_RECLAIM_NOGRACE ,NFS4CLNT_DELEGRETURN ,NFS4CLNT_SESSION_SETUP , + NFS4CLNT_SESSION_DRAINING, };/*
fs/nfs/nfs4proc.c +16 -9
@@ -355,6 +355,16 @@ void nfs41_sequence_free_slot(const struct nfs_client *clp, }nfs4_free_slot (tbl, res->sr_slotid); res->sr_slotid =NFS4_MAX_SLOT_TABLE ; + +/* Signal state manager thread if session is drained */ +if (test_bit (NFS4CLNT_SESSION_DRAINING , &clp->cl_state)) { +spin_lock (&tbl->slot_tbl_lock); +if (tbl->highest_used_slotid ==-1 ) { +dprintk ("%s COMPLETE: Session Drained\n" , __func__); +complete (&clp->cl_session->complete); + } +spin_unlock (&tbl->slot_tbl_lock); + } } static void nfs41_sequence_done(struct nfs_client *clp,
@@ -448,15 +458,11 @@ static int nfs41_setup_sequence(struct nfs4_session *session,spin_lock (&tbl->slot_tbl_lock);if (test_bit (NFS4CLNT_SESSION_SETUP , &session->clp->cl_state)) { -if (tbl->highest_used_slotid !=-1 ) { -rpc_sleep_on (&tbl->slot_tbl_waitq, task,NULL ); -spin_unlock (&tbl->slot_tbl_lock); -dprintk ("<-- %s: Session reset: draining\n" , __func__); -return -EAGAIN ; - } - -/* The slot table is empty; start the reset thread */ -dprintk ("%s Session Reset\n" , __func__); +/* +* The state manager will wait until the slot table is empty. +* Schedule the reset thread +*/ +dprintk ("%s Schedule Session Reset\n" , __func__);rpc_sleep_on (&tbl->slot_tbl_waitq, task,NULL );nfs4_schedule_state_manager (session->clp);spin_unlock (&tbl->slot_tbl_lock);
@@ -4583,6 +4589,7 @@ struct nfs4_session *nfs4_alloc_session(struct nfs_client *clp)* nfs_client struct */ clp->cl_cons_state =NFS_CS_SESSION_INITING ; +init_completion (&session->complete); tbl = &session->fc_slot_table;spin_lock_init (&tbl->slot_tbl_lock);
fs/nfs/nfs4state.c +15 -0
@@ -1162,8 +1162,23 @@ static void nfs4_session_recovery_handle_error(struct nfs_client *clp, int err)static int nfs4_reset_session (struct nfs_client *clp) { +struct nfs4_session *ses = clp->cl_session; +struct nfs4_slot_table *tbl = &ses->fc_slot_table;int status; +INIT_COMPLETION (ses->complete); +spin_lock (&tbl->slot_tbl_lock); +if (tbl->highest_used_slotid !=-1 ) { +set_bit (NFS4CLNT_SESSION_DRAINING , &clp->cl_state); +spin_unlock (&tbl->slot_tbl_lock); + status =wait_for_completion_interruptible (&ses->complete); +clear_bit (NFS4CLNT_SESSION_DRAINING , &clp->cl_state); +if (status)/* -ERESTARTSYS */ + goto out; + }else { +spin_unlock (&tbl->slot_tbl_lock); + } + status =nfs4_proc_destroy_session (clp->cl_session);if (status && status != -NFS4ERR_BADSESSION && status != -NFS4ERR_DEADSESSION ) {
include/linux/nfs_fs_sb.h +1 -0
@@ -209,6 +209,7 @@ struct nfs4_session {unsigned long session_state;u32 hash_alg;u32 ssv_len; +struct completion complete;/* The fore and back channel */ struct nfs4_channel_attrs fc_attrs;
Signature · 1 line
1.6.0.6