diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-17 07:03:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 13:23:02 -0400 |
commit | 831441862956fffa17b9801db37e6ea1650b0f69 (patch) | |
tree | b0334921341f8f1734bdd3243de76d676329d21c /net | |
parent | 787d2214c19bcc9b6ac48af0ce098277a801eded (diff) |
Freezer: make kernel threads nonfreezable by default
Currently, the freezer treats all tasks as freezable, except for the kernel
threads that explicitly set the PF_NOFREEZE flag for themselves. This
approach is problematic, since it requires every kernel thread to either
set PF_NOFREEZE explicitly, or call try_to_freeze(), even if it doesn't
care for the freezing of tasks at all.
It seems better to only require the kernel threads that want to or need to
be frozen to use some freezer-related code and to remove any
freezer-related code from the other (nonfreezable) kernel threads, which is
done in this patch.
The patch causes all kernel threads to be nonfreezable by default (ie. to
have PF_NOFREEZE set by default) and introduces the set_freezable()
function that should be called by the freezable kernel threads in order to
unset PF_NOFREEZE. It also makes all of the currently freezable kernel
threads call set_freezable(), so it shouldn't cause any (intentional)
change of behaviour to appear. Additionally, it updates documentation to
describe the freezing of tasks more accurately.
[akpm@linux-foundation.org: build fixes]
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Gautham R Shenoy <ego@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/bnep/core.c | 2 | ||||
-rw-r--r-- | net/bluetooth/cmtp/core.c | 2 | ||||
-rw-r--r-- | net/bluetooth/hidp/core.c | 2 | ||||
-rw-r--r-- | net/bluetooth/rfcomm/core.c | 2 | ||||
-rw-r--r-- | net/core/pktgen.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 1c8f4a0c5f43..1f78c3e336d8 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <linux/signal.h> | 36 | #include <linux/signal.h> |
37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
38 | #include <linux/wait.h> | 38 | #include <linux/wait.h> |
39 | #include <linux/freezer.h> | ||
39 | #include <linux/errno.h> | 40 | #include <linux/errno.h> |
40 | #include <linux/net.h> | 41 | #include <linux/net.h> |
41 | #include <net/sock.h> | 42 | #include <net/sock.h> |
@@ -474,7 +475,6 @@ static int bnep_session(void *arg) | |||
474 | 475 | ||
475 | daemonize("kbnepd %s", dev->name); | 476 | daemonize("kbnepd %s", dev->name); |
476 | set_user_nice(current, -15); | 477 | set_user_nice(current, -15); |
477 | current->flags |= PF_NOFREEZE; | ||
478 | 478 | ||
479 | init_waitqueue_entry(&wait, current); | 479 | init_waitqueue_entry(&wait, current); |
480 | add_wait_queue(sk->sk_sleep, &wait); | 480 | add_wait_queue(sk->sk_sleep, &wait); |
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c index 66bef1ccee2a..ca60a4517fd3 100644 --- a/net/bluetooth/cmtp/core.c +++ b/net/bluetooth/cmtp/core.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <linux/poll.h> | 30 | #include <linux/poll.h> |
31 | #include <linux/fcntl.h> | 31 | #include <linux/fcntl.h> |
32 | #include <linux/freezer.h> | ||
32 | #include <linux/skbuff.h> | 33 | #include <linux/skbuff.h> |
33 | #include <linux/socket.h> | 34 | #include <linux/socket.h> |
34 | #include <linux/ioctl.h> | 35 | #include <linux/ioctl.h> |
@@ -287,7 +288,6 @@ static int cmtp_session(void *arg) | |||
287 | 288 | ||
288 | daemonize("kcmtpd_ctr_%d", session->num); | 289 | daemonize("kcmtpd_ctr_%d", session->num); |
289 | set_user_nice(current, -15); | 290 | set_user_nice(current, -15); |
290 | current->flags |= PF_NOFREEZE; | ||
291 | 291 | ||
292 | init_waitqueue_entry(&wait, current); | 292 | init_waitqueue_entry(&wait, current); |
293 | add_wait_queue(sk->sk_sleep, &wait); | 293 | add_wait_queue(sk->sk_sleep, &wait); |
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 450eb0244bbf..64d89ca28847 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <linux/poll.h> | 30 | #include <linux/poll.h> |
31 | #include <linux/freezer.h> | ||
31 | #include <linux/fcntl.h> | 32 | #include <linux/fcntl.h> |
32 | #include <linux/skbuff.h> | 33 | #include <linux/skbuff.h> |
33 | #include <linux/socket.h> | 34 | #include <linux/socket.h> |
@@ -547,7 +548,6 @@ static int hidp_session(void *arg) | |||
547 | 548 | ||
548 | daemonize("khidpd_%04x%04x", vendor, product); | 549 | daemonize("khidpd_%04x%04x", vendor, product); |
549 | set_user_nice(current, -15); | 550 | set_user_nice(current, -15); |
550 | current->flags |= PF_NOFREEZE; | ||
551 | 551 | ||
552 | init_waitqueue_entry(&ctrl_wait, current); | 552 | init_waitqueue_entry(&ctrl_wait, current); |
553 | init_waitqueue_entry(&intr_wait, current); | 553 | init_waitqueue_entry(&intr_wait, current); |
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 52e04df323ea..bb7220770f2c 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
34 | #include <linux/signal.h> | 34 | #include <linux/signal.h> |
35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
36 | #include <linux/freezer.h> | ||
36 | #include <linux/wait.h> | 37 | #include <linux/wait.h> |
37 | #include <linux/device.h> | 38 | #include <linux/device.h> |
38 | #include <linux/net.h> | 39 | #include <linux/net.h> |
@@ -1940,7 +1941,6 @@ static int rfcomm_run(void *unused) | |||
1940 | 1941 | ||
1941 | daemonize("krfcommd"); | 1942 | daemonize("krfcommd"); |
1942 | set_user_nice(current, -10); | 1943 | set_user_nice(current, -10); |
1943 | current->flags |= PF_NOFREEZE; | ||
1944 | 1944 | ||
1945 | BT_DBG(""); | 1945 | BT_DBG(""); |
1946 | 1946 | ||
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 75215331b045..bca787fdbc51 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -3465,6 +3465,8 @@ static int pktgen_thread_worker(void *arg) | |||
3465 | 3465 | ||
3466 | set_current_state(TASK_INTERRUPTIBLE); | 3466 | set_current_state(TASK_INTERRUPTIBLE); |
3467 | 3467 | ||
3468 | set_freezable(); | ||
3469 | |||
3468 | while (!kthread_should_stop()) { | 3470 | while (!kthread_should_stop()) { |
3469 | pkt_dev = next_to_run(t); | 3471 | pkt_dev = next_to_run(t); |
3470 | 3472 | ||