diff options
author | Christoph Lameter <christoph@lameter.com> | 2005-06-25 02:13:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:10:13 -0400 |
commit | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (patch) | |
tree | d1e7c1e2e8902072042aefc3a7976b271cf76021 /arch | |
parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) |
[PATCH] Cleanup patch for process freezing
1. Establish a simple API for process freezing defined in linux/include/sched.h:
frozen(process) Check for frozen process
freezing(process) Check if a process is being frozen
freeze(process) Tell a process to freeze (go to refrigerator)
thaw_process(process) Restart process
frozen_process(process) Process is frozen now
2. Remove all references to PF_FREEZE and PF_FROZEN from all
kernel sources except sched.h
3. Fix numerous locations where try_to_freeze is manually done by a driver
4. Remove the argument that is no longer necessary from two function calls.
5. Some whitespace cleanup
6. Clear potential race in refrigerator (provides an open window of PF_FREEZE
cleared before setting PF_FROZEN, recalc_sigpending does not check
PF_FROZEN).
This patch does not address the problem of freeze_processes() violating the rule
that a task may only modify its own flags by setting PF_FREEZE. This is not clean
in an SMP environment. freeze(process) is therefore not SMP safe!
Signed-off-by: Christoph Lameter <christoph@lameter.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/frv/kernel/signal.c | 4 | ||||
-rw-r--r-- | arch/h8300/kernel/signal.c | 4 | ||||
-rw-r--r-- | arch/i386/kernel/io_apic.c | 2 | ||||
-rw-r--r-- | arch/i386/kernel/signal.c | 4 | ||||
-rw-r--r-- | arch/m32r/kernel/signal.c | 4 | ||||
-rw-r--r-- | arch/ppc/kernel/signal.c | 3 | ||||
-rw-r--r-- | arch/x86_64/kernel/signal.c | 2 |
7 files changed, 7 insertions, 16 deletions
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index d8d8f3d4304d..36a2dffc8ebd 100644 --- a/arch/frv/kernel/signal.c +++ b/arch/frv/kernel/signal.c | |||
@@ -536,10 +536,8 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
536 | if (!user_mode(regs)) | 536 | if (!user_mode(regs)) |
537 | return 1; | 537 | return 1; |
538 | 538 | ||
539 | if (current->flags & PF_FREEZE) { | 539 | if (try_to_freeze()) |
540 | refrigerator(0); | ||
541 | goto no_signal; | 540 | goto no_signal; |
542 | } | ||
543 | 541 | ||
544 | if (!oldset) | 542 | if (!oldset) |
545 | oldset = ¤t->blocked; | 543 | oldset = ¤t->blocked; |
diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c index a4799d633ef4..5aab87eae1f9 100644 --- a/arch/h8300/kernel/signal.c +++ b/arch/h8300/kernel/signal.c | |||
@@ -517,10 +517,8 @@ asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
517 | if ((regs->ccr & 0x10)) | 517 | if ((regs->ccr & 0x10)) |
518 | return 1; | 518 | return 1; |
519 | 519 | ||
520 | if (current->flags & PF_FREEZE) { | 520 | if (try_to_freeze()) |
521 | refrigerator(0); | ||
522 | goto no_signal; | 521 | goto no_signal; |
523 | } | ||
524 | 522 | ||
525 | current->thread.esp0 = (unsigned long) regs; | 523 | current->thread.esp0 = (unsigned long) regs; |
526 | 524 | ||
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 08540bc4ba3e..2451a3a99440 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c | |||
@@ -573,7 +573,7 @@ static int balanced_irq(void *unused) | |||
573 | for ( ; ; ) { | 573 | for ( ; ; ) { |
574 | set_current_state(TASK_INTERRUPTIBLE); | 574 | set_current_state(TASK_INTERRUPTIBLE); |
575 | time_remaining = schedule_timeout(time_remaining); | 575 | time_remaining = schedule_timeout(time_remaining); |
576 | try_to_freeze(PF_FREEZE); | 576 | try_to_freeze(); |
577 | if (time_after(jiffies, | 577 | if (time_after(jiffies, |
578 | prev_balance_time+balanced_irq_interval)) { | 578 | prev_balance_time+balanced_irq_interval)) { |
579 | do_irq_balance(); | 579 | do_irq_balance(); |
diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c index b9b8f4e20fad..ac5b1e975c5c 100644 --- a/arch/i386/kernel/signal.c +++ b/arch/i386/kernel/signal.c | |||
@@ -608,10 +608,8 @@ int fastcall do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
608 | if (!user_mode(regs)) | 608 | if (!user_mode(regs)) |
609 | return 1; | 609 | return 1; |
610 | 610 | ||
611 | if (current->flags & PF_FREEZE) { | 611 | if (try_to_freeze) |
612 | refrigerator(0); | ||
613 | goto no_signal; | 612 | goto no_signal; |
614 | } | ||
615 | 613 | ||
616 | if (!oldset) | 614 | if (!oldset) |
617 | oldset = ¤t->blocked; | 615 | oldset = ¤t->blocked; |
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 50311eb07a24..5aef7e406ef5 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c | |||
@@ -371,10 +371,8 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
371 | if (!user_mode(regs)) | 371 | if (!user_mode(regs)) |
372 | return 1; | 372 | return 1; |
373 | 373 | ||
374 | if (current->flags & PF_FREEZE) { | 374 | if (try_to_freeze()) |
375 | refrigerator(0); | ||
376 | goto no_signal; | 375 | goto no_signal; |
377 | } | ||
378 | 376 | ||
379 | if (!oldset) | 377 | if (!oldset) |
380 | oldset = ¤t->blocked; | 378 | oldset = ¤t->blocked; |
diff --git a/arch/ppc/kernel/signal.c b/arch/ppc/kernel/signal.c index 7c8437da09d5..8aaeb6f4e750 100644 --- a/arch/ppc/kernel/signal.c +++ b/arch/ppc/kernel/signal.c | |||
@@ -705,8 +705,7 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs) | |||
705 | unsigned long frame, newsp; | 705 | unsigned long frame, newsp; |
706 | int signr, ret; | 706 | int signr, ret; |
707 | 707 | ||
708 | if (current->flags & PF_FREEZE) { | 708 | if (try_to_freeze()) { |
709 | refrigerator(PF_FREEZE); | ||
710 | signr = 0; | 709 | signr = 0; |
711 | if (!signal_pending(current)) | 710 | if (!signal_pending(current)) |
712 | goto no_signal; | 711 | goto no_signal; |
diff --git a/arch/x86_64/kernel/signal.c b/arch/x86_64/kernel/signal.c index 98b7ba95d581..98590a989f3d 100644 --- a/arch/x86_64/kernel/signal.c +++ b/arch/x86_64/kernel/signal.c | |||
@@ -425,7 +425,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
425 | if (!user_mode(regs)) | 425 | if (!user_mode(regs)) |
426 | return 1; | 426 | return 1; |
427 | 427 | ||
428 | if (try_to_freeze(0)) | 428 | if (try_to_freeze()) |
429 | goto no_signal; | 429 | goto no_signal; |
430 | 430 | ||
431 | if (!oldset) | 431 | if (!oldset) |