kthread: update lockd to use kthread
Subsystems (2)
Convert lockd to use kthread rather than kernel_thread, which is deprecated.
Not sure how to test it.
--- fs/lockd/clntlock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/lockd/clntlock.c +5 -2
@@ -14,6 +14,7 @@#include <linux/sunrpc/svc.h> #include <linux/lockd/lockd.h> #include <linux/smp_lock.h> +#include <linux/kthread.h> #define NLMDBG_FACILITY NLMDBG_CLIENT
@@ -181,9 +182,12 @@ nlmclnt_recovery(struct nlm_host *host,return ; host->h_nsmstate = newstate;if (!host->h_reclaiming++) { +struct task_struct * task; +nlm_get_host (host);__module_get (THIS_MODULE ); -if (kernel_thread (reclaimer, host,CLONE_KERNEL ) <0 ) + task =kthread_run (reclaimer, host,"%s-reclaim" , host->h_name); +if (IS_ERR (task))module_put (THIS_MODULE ); } }
@@ -196,7 +200,6 @@ reclaimer(void *ptr)struct file_lock *fl, *next;u32 nsmstate; -daemonize ("%s-reclaim" , host->h_name);allow_signal (SIGKILL );/* This one ensures that our parent doesn't terminate while the
fs/lockd/clntlock.c nlmclnt_recovery(struct nlm_host *host, · line 191
Quoted 10 lines
fs/lockd/clntlock.c +4
-1host->h_nsmstate = newstate;if (!host->h_reclaiming++) { +struct task_struct * task; +nlm_get_host (host);__module_get (THIS_MODULE ); -if (kernel_thread (reclaimer, host,CLONE_KERNEL ) <0 ) + task =kthread_run (reclaimer, host,"%s-reclaim" , host->h_name); +if (IS_ERR (task))module_put (THIS_MODULE );
Folks, this kind of patches is really useless. If I wanted to just replace kernel_thread() with kthread_run() I could do it myself in a day or two.
The whole point of the kthread API is that we now have a coherent set of functions that deal with all aspects of kernel thread handling. And a conversion to that always involves rething the whole way a driver uses kernel threads, and that's a good thing because most users were buggy or at least rather odd.
sunrpc is not an exception to that, the thread handling is very interesting, including things like using signals for various things possibly not waiting for threads to exit.
If you don't feel like poking into all these nasty internal leave the conversation to someone else, preferably a nfs developer.
Hello !
Quoted 5 lines · Christoph Hellwig
Quoted 5 lines
fs/lockd/clntlock.c +2
-0host->h_nsmstate = newstate;if (!host->h_reclaiming++) { +struct task_struct * task; +nlm_get_host (host);
Quoted 8 lines
fs/lockd/clntlock.c nlmclnt_recovery(struct nlm_host *host, · line 191
Quoted 5 lines
fs/lockd/clntlock.c +2
-1__module_get (THIS_MODULE ); -if (kernel_thread (reclaimer, host,CLONE_KERNEL ) <0 ) + task =kthread_run (reclaimer, host,"%s-reclaim" , host->h_name); +if (IS_ERR (task))module_put (THIS_MODULE );Folks, this kind of patches is really useless. If I wanted to just replace
kernel_thread()withkthread_run()I could do it myself in a day or two.
ok ok. The real work that needs to be done is in sunrpc and I'm still *very* far from providing any patches.
This kernel thread is a sub thread of the lockd thread. It's a bit more simple and does not require as much modification. It still depends on the way its parent is killed and it will require some more work when the sunrpc thread are fixed.
Quoted 9 lines
The whole point of the kthread API is that we now have a coherent set of functions that deal with all aspects of kernel thread handling. And a conversion to that always involves rething the whole way a driver uses kernel threads, and that's a good thing because most users were buggy or at least rather odd.
sunrpc is not an exception to that, the thread handling is very interesting, including things like using signals for various things possibly not waiting for threads to exit.
The SIGKILL used to terminate the threads is a challenge ... it propagates to sub threads. Some other stuff that bother me in using the kthread api in sunrpc : nfs_callback_down() uses a wait on a completion with a timeout. This is not possible with the kthread but might not be really useful. dunno.
We might need some enhancements to kthread to make everyone happy or some work around in the model.
Quoted 2 lines
If you don't feel like poking into all these nasty internal leave the conversation to someone else, preferably a nfs developer.
They would certainly do a better job than me. I'm discovering the code.
Thanks,
C.
Quoted 4 lines · Cedric Le Goater
This kernel thread is a sub thread of the lockd thread. It's a bit more simple and does not require as much modification. It still depends on the way its parent is killed and it will require some more work when the sunrpc thread are fixed.
Yes, the whole sunrpc/nfs thread situation is rather difficult.
Quoted 4 lines
The SIGKILL used to terminate the threads is a challenge ... it propagates to sub threads. Some other stuff that bother me in using the kthread api in sunrpc :
nfs_callback_down()uses a wait on a completion with a timeout. This is not possible with the kthread but might not be really useful. dunno.
The usage look buggy to me because we can't guarantee thread exit. But I really don't even understand the requirements for those threads yet, I wish someone could write up a coherent description.