3.3 nfsd fixes
Subsystems (3)
The following are miscellaneous fixes I'm planning to queue up for 3.3.
--b.
PATCH 1/4 nfsd4: fix spurious 4.1 post-reboot failures
From: "J. Bruce Fields" <[email protected]>
In the NFSv4.1 case, this could cause a spurious "NFSD: failed to write recovery record (err -17); please check that /var/lib/nfs/v4recovery exists and is writable.
--- fs/nfsd/nfs4recover.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
fs/nfsd/nfs4recover.c +8 -1
@@ -144,8 +144,15 @@ nfsd4_create_clid_dir(struct nfs4_client *clp) status =PTR_ERR (dentry); goto out_unlock; } - status = -EEXIST ;if (dentry->d_inode) +/* +* In the 4.1 case, where we're called from +* reclaim_complete(), records from the previous reboot +* may still be left, so this is OK. +* +* In the 4.0 case, we should never get here; but we may +* as well be forgiving and just succeed silently. +*/ goto out_put; status =mnt_want_write (rec_file->f_path.mnt);if (status)
Signature · 1 line
1.7.5.4
PATCH 2/4 nfsd4: be forgiving in the absence of the recovery directory
In reply to J. Bruce FieldsFrom: "J. Bruce Fields" <[email protected]>
If the recovery directory doesn't exist, then behavior after a reboot will be suboptimal. But it's unnecessarily harsh to then prevent the nfsv4 server from working at all. Instead just print a warning (already done in nfsd4_init_recdir()) and soldier on.
--- fs/nfsd/nfs4recover.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
fs/nfsd/nfs4recover.c +3 -2
@@ -127,10 +127,11 @@ nfsd4_create_clid_dir(struct nfs4_client *clp)dprintk ("NFSD: nfsd4_create_clid_dir for \"%s\"\n" , dname); -if (!rec_file || clp->cl_firststate) +if (clp->cl_firststate)return 0 ; - clp->cl_firststate =1 ; +if (!rec_file) +return -ENOENT ; status =nfs4_save_creds (&original_cred);if (status <0 )return status;
Signature · 1 line
1.7.5.4
PATCH 3/4 svcrpc: fix double-free on shutdown of nfsd after changing pool mode
In reply to J. Bruce FieldsFrom: "J. Bruce Fields" <[email protected]>
The pool_to and to_pool fields of the global svc_pool_map are freed on shutdown, but are initialized in nfsd startup only in the SVC_POOL_PERCPU and SVC_POOL_PERNODE cases.
They *are* initialized to zero on kernel startup. So as long as you use only SVC_POOL_GLOBAL (the default), this will never be a problem.
You're also OK if you only ever use SVC_POOL_PERCPU or SVC_POOL_PERNODE.
However, the following sequence events leads to a double-free:
1. set SVC_POOL_PERCPU or SVC_POOL_PERNODE
2. start nfsd: both fields are initialized.
3. shutdown nfsd: both fields are freed.
4. set SVC_POOL_GLOBAL
5. start nfsd: the fields are left untouched.
6. shutdown nfsd: now we try to free them again.
Step 4 is actually unnecessary, since (for some bizarre reason), nfsd automatically resets the pool mode to SVC_POOL_GLOBAL on shutdown.
--- net/sunrpc/svc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
net/sunrpc/svc.c +3 -0
@@ -167,6 +167,7 @@ svc_pool_map_alloc_arrays(struct svc_pool_map *m, unsigned int maxpools) fail_free:kfree (m->to_pool); + m->to_pool =NULL ; fail:return -ENOMEM ; }
@@ -287,7 +288,9 @@ svc_pool_map_put(void)if (!--m->count) { m->mode =SVC_POOL_DEFAULT ;kfree (m->to_pool); + m->to_pool =NULL ;kfree (m->pool_to); + m->pool_to =NULL ; m->npools =0 ; }
Signature · 1 line
1.7.5.4
Re: [PATCH 3/4] svcrpc: fix double-free on shutdown of nfsd after changing pool mode
Quoted 20 lines · J. Bruce Fields
From: "J. Bruce Fields" <[email protected]>
The
pool_toandto_poolfields of the globalsvc_pool_mapare freed on shutdown, but are initialized in nfsd startup only in theSVC_POOL_PERCPUandSVC_POOL_PERNODEcases.They *are* initialized to zero on kernel startup. So as long as you use only
SVC_POOL_GLOBAL(the default), this will never be a problem.You're also OK if you only ever use
SVC_POOL_PERCPUorSVC_POOL_PERNODE.However, the following sequence events leads to a double-free:
1. set
SVC_POOL_PERCPUorSVC_POOL_PERNODE
2. start nfsd: both fields are initialized.
3. shutdown nfsd: both fields are freed.
4. setSVC_POOL_GLOBAL
5. start nfsd: the fields are left untouched.
6. shutdown nfsd: now we try to free them again.
Quoted 4 lines
Step 4 is actually unnecessary, since (for some bizarre reason), nfsd automatically resets the pool mode to
SVC_POOL_GLOBALon shutdown.Signed-off-by J. Bruce Fields <[email protected]>
Oops, also adding a stable cc for this.
--b.
Quoted 33 lines
--- net/sunrpc/svc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)net/sunrpc/svc.c +3
-0@@ -167,6 +167,7 @@ svc_pool_map_alloc_arrays(struct svc_pool_map *m, unsigned int maxpools) fail_free:kfree (m->to_pool); + m->to_pool =NULL ; fail:return -ENOMEM ; }@@ -287,7 +288,9 @@ svc_pool_map_put(void)if (!--m->count) { m->mode =SVC_POOL_DEFAULT ;kfree (m->to_pool); + m->to_pool =NULL ;kfree (m->pool_to); + m->pool_to =NULL ; m->npools =0 ; }Signature · 6 lines
1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 4/4 svcrpc: don't revert to SVC_POOL_DEFAULT on nfsd shutdown
In reply to J. Bruce FieldsFrom: "J. Bruce Fields" <[email protected]>
This was unexpected behavior (at least for me)--why would you want configuration settings automatically lost on nfsd restart?
In practice this won't affect distributions, which likely set everything on every startup. But I'd expect the behavior to be less confusing to someone manually restarting nfsd for testing.
--- net/sunrpc/svc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
net/sunrpc/svc.c +0 -1
@@ -286,7 +286,6 @@ svc_pool_map_put(void)mutex_lock (&svc_pool_map_mutex);if (!--m->count) { - m->mode =SVC_POOL_DEFAULT ;kfree (m->to_pool); m->to_pool =NULL ;kfree (m->pool_to);
Signature · 1 line
1.7.5.4