aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2005-10-24 06:34:03 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-24 11:12:35 -0400
commit3de463c7d9d58f8cf3395268230cb20a4c15bffa (patch)
tree20ba1584eefb7ed75f6f8536f40e55966294cf4f
parent108150ea78003044e41150c75259447b2c0953b6 (diff)
[PATCH] posix-timers: remove false BUG_ON() from run_posix_cpu_timers()
do_exit() clears ->it_##clock##_expires, but nothing prevents another cpu to attach the timer to exiting process after that. After exit_notify() does 'write_unlock_irq(&tasklist_lock)' and before do_exit() calls 'schedule() local timer interrupt can find tsk->exit_state != 0. If that state was EXIT_DEAD (or another cpu does sys_wait4) interrupted task has ->signal == NULL. At this moment exiting task has no pending cpu timers, they were cleaned up in __exit_signal()->posix_cpu_timers_exit{,_group}(), so we can just return from irq. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--kernel/exit.c8
-rw-r--r--kernel/posix-cpu-timers.c36
2 files changed, 18 insertions, 26 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 3b25b182d2be..4897977a1f4b 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -825,14 +825,6 @@ fastcall NORET_TYPE void do_exit(long code)
825 825
826 tsk->flags |= PF_EXITING; 826 tsk->flags |= PF_EXITING;
827 827
828 /*
829 * Make sure we don't try to process any timer firings
830 * while we are already exiting.
831 */
832 tsk->it_virt_expires = cputime_zero;
833 tsk->it_prof_expires = cputime_zero;
834 tsk->it_sched_expires = 0;
835
836 if (unlikely(in_atomic())) 828 if (unlikely(in_atomic()))
837 printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n", 829 printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
838 current->comm, current->pid, 830 current->comm, current->pid,
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 30ab39a27736..ccb04683bf18 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -1285,30 +1285,30 @@ void run_posix_cpu_timers(struct task_struct *tsk)
1285 1285
1286#undef UNEXPIRED 1286#undef UNEXPIRED
1287 1287
1288 BUG_ON(tsk->exit_state);
1289
1290 /* 1288 /*
1291 * Double-check with locks held. 1289 * Double-check with locks held.
1292 */ 1290 */
1293 read_lock(&tasklist_lock); 1291 read_lock(&tasklist_lock);
1294 spin_lock(&tsk->sighand->siglock); 1292 if (likely(tsk->signal != NULL)) {
1293 spin_lock(&tsk->sighand->siglock);
1295 1294
1296 /* 1295 /*
1297 * Here we take off tsk->cpu_timers[N] and tsk->signal->cpu_timers[N] 1296 * Here we take off tsk->cpu_timers[N] and tsk->signal->cpu_timers[N]
1298 * all the timers that are firing, and put them on the firing list. 1297 * all the timers that are firing, and put them on the firing list.
1299 */ 1298 */
1300 check_thread_timers(tsk, &firing); 1299 check_thread_timers(tsk, &firing);
1301 check_process_timers(tsk, &firing); 1300 check_process_timers(tsk, &firing);
1302 1301
1303 /* 1302 /*
1304 * We must release these locks before taking any timer's lock. 1303 * We must release these locks before taking any timer's lock.
1305 * There is a potential race with timer deletion here, as the 1304 * There is a potential race with timer deletion here, as the
1306 * siglock now protects our private firing list. We have set 1305 * siglock now protects our private firing list. We have set
1307 * the firing flag in each timer, so that a deletion attempt 1306 * the firing flag in each timer, so that a deletion attempt
1308 * that gets the timer lock before we do will give it up and 1307 * that gets the timer lock before we do will give it up and
1309 * spin until we've taken care of that timer below. 1308 * spin until we've taken care of that timer below.
1310 */ 1309 */
1311 spin_unlock(&tsk->sighand->siglock); 1310 spin_unlock(&tsk->sighand->siglock);
1311 }
1312 read_unlock(&tasklist_lock); 1312 read_unlock(&tasklist_lock);
1313 1313
1314 /* 1314 /*