On Tue, 8 Jan 2008 17:46:33 +1100
Neil Brown <neilb@xxxxxxx> wrote:
The comments about patch 5/6 seem sane. I'll plan to incorporate them
in the respin...
On Saturday January 5, jlayton@xxxxxxxxxx wrote:
@@ -357,7 +375,18 @@ lockd_down(void)Why not "atomic_dec_and_test" ??
goto out;
}
warned = 0;
- kthread_stop(nlmsvc_task);
+ if (atomic_sub_return(1, &nlmsvc_ref) != 0)
+ printk(KERN_WARNING "lockd_down: lockd is waiting
for "
+ "outstanding requests to complete before
exiting.\n");
Temporary amnesia? :-) I'll change that, atomic_dec_and_test will be
clearer.
+The previous patch removes a kill_proc(... SIGKILL), this one adds it
+ /*
+ * Sending a signal is necessary here. If we get to this
point and
+ * nlm_blocked isn't empty then lockd may be held hostage
by clients
+ * that are still blocking. Sending the signal makes sure
that lockd
+ * invalidates all of its locks so that it's just waiting
on RPC
+ * callbacks to complete
+ */
+ kill_proc(nlmsvc_task->pid, SIGKILL, 1);
back.
That makes me wonder if the intermediate state is 'correct'.
But I also wonder what "correct" means.
Do we want all locks to be dropped when the last nfsd thread dies?
The answer is presumably either "yes" or "no".
If "yes", then we don't have that because if there are any NFS mounts
active, lockd will not be killed.
If "no", then we don't want this kill_proc here.
The comment in lockd() which currently reads:
/*
* The main request loop. We don't terminate until the last
* NFS mount or NFS daemon has gone away, and we've been sent
a
* signal, or else another process has taken over our job.
*/
suggests that someone once thought that lockd could hang around after
all nfsd threads and nfs mounts had gone, but I don't think it does.
We really should think this through and get it right, because if lockd
ever drops it's locks, then we really need to make sure sm_notify gets
run. So it needs to be a well defined event.
Thoughts?
This is the part I've been struggling with the most -- defining what
proper behavior should be when lockd is restarted. As you point out,
restarting lockd without doing a sm_notify could be bad news for data
integrity.
Then again, we'd like someone to be able to shut down the NFS "service"
and be able to unmount underlying filesystems without jumping through
special hoops....
Overall, I think I'd vote "yes". We need to drop locks when the last
nfsd goes down. If userspace brings down nfsd, then it's userspace's
responsibility to make sure that a sm_notify is sent when nfsd and lockd
are restarted.
As a side note, I'm not thrilled with this design that mixes signals
and kthreads, but didn't see another way to do this. I'm open to
suggestions if anyone has them...
Also, it is sad that the inc/dec of nlmsvc_ref is called in somewhat
non-obvious ways.
e.g.
+ if (!nlmsvc_users && error)and
+ atomic_dec(&nlmsvc_ref);
+ if (list_empty(&nlm_blocked))where if we moved the atomic_inc a little bit later next to the
+ atomic_inc(&nlmsvc_ref);
+
if (list_empty(&block->b_list)) {
kref_get(&block->b_count);
} else {
"list_add_tail" (which seems to make more sense) it would actually be
wrong... But I think that code is correct as it is - just non-obvious.
The nlmsvc_ref logic is pretty convoluted, unfortunately. I'll plan to
add some comments to clarify what I'm doing there.
Thanks for the review, Neil. I'll see if I can get a new patchset done
in the next few days.
Cheers,