Skip to contentSkip to conversation

2.6.12: itimer_real timers don't survive execve() any more

DISCUSSION Gerd Knorr 4 participants 10 messages Aug 4, 2005 – Aug 6, 2005

lore
Share & tools
lore

Gerd Knorr

author
#0 lore raw

Hi,

Somewhere between 2.6.11 and 2.6.12 the regression in $subject was added to the linux kernel. Testcase below.

Ideas on that anyone?

Gerd

==============================[ test_exec_alarm.c ]============================== #include <sys/time.h>
#include <unistd.h>
#include <string.h>

int main(int argc, char ** argv)

{
    struct itimerval value;
    int retval;
    static char hosted_executable[256];
    char * hosted_executable_args[2];

    /* Set the alarm timer. */
    value.it_interval.tv_sec = 0;
    value.it_interval.tv_usec = 0;
    value.it_value.tv_sec = 200;
    value.it_value.tv_usec = 0;
    retval = setitimer(ITIMER_REAL, &value, NULL);
    if (retval != 0) {
        perror("setitimer()");
        return 1;
    }

    /* Prepare the file name of the hosted executable. */
    strcpy(hosted_executable, "./test_getitimer");

    /* Prepare the command line arguments. */
    hosted_executable_args[0] = hosted_executable;
    hosted_executable_args[1] = NULL;

    /* Execute the hosted executable which should inherit the timer. */
    retval = execvp(hosted_executable, hosted_executable_args);

    /* If we get here, the execvp() call failed. */
    perror("execvp()");
    return 1;
}

==============================[ test_getitimer.c ]============================== #include <sys/time.h>
#include <stdio.h>

int main(int argc, char ** argv)

{
    struct itimerval value;
    int retval;

    retval = getitimer(ITIMER_REAL, &value);
    if (retval != 0) {
        perror("getitimer()");
        return 1;
    }

    printf("alarm timer value: %u sec, %u msec\n", value.it_value.tv_sec, value.it_value.tv_usec);
    return 0;
}
#1 lore raw
Quoted 4 lines · Gerd Knorr

Hi,

Somewhere between 2.6.11 and 2.6.12 the regression in $subject was added to the linux kernel. Testcase below.

Yep. The itimer changes got a bit carried away. Here is a fix.

Signature · 2 lines
George Anzinger   [email protected]
HRT (High-res-timers):  http://sourceforge.net/projects/high-res-timers/

Source: MontaVista Software, Inc. George Anzinger <[email protected]>
Type: Defect Fix
Description:

The changes to itimer of late (after 2.6.11) cause itimers not to survive the exec* calls. Standard says they should.

 exit.c         |    1 +
 posix-timers.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
kernel/exit.c +1 -0
Index: linux-2.6.13-rc/kernel/exit.c
===================================================================
@@ -794,6 +794,7 @@ fastcall NORET_TYPE void do_exit(long co
 	}
 
 	tsk->flags |= PF_EXITING;
+	del_timer_sync(&tsk->signal->real_timer);
 
 	/*
 	 * Make sure we don't try to process any timer firings
kernel/posix-timers.c +2 -2
Index: linux-2.6.13-rc/kernel/posix-timers.c
===================================================================
@@ -1183,10 +1183,10 @@ void exit_itimers(struct signal_struct *
 	struct k_itimer *tmr;
 
 	while (!list_empty(&sig->posix_timers)) {
-		tmr = list_entry(sig->posix_timers.next, struct k_itimer, list);
+		tmr = list_entry(sig->posix_timers.next,
+				 struct k_itimer, list);
 		itimer_delete(tmr);
 	}
-	del_timer_sync(&sig->real_timer);
 }
 
 /*
#2 lore raw

That's wrong. It has to be done only by the last thread in the group to go. Just revert Ingo's change.

Thanks,
Roland

#9 lore raw
In reply to George Anzinger
Quoted 32 lines · George Anzinger

Source: MontaVista Software, Inc. George Anzinger <[email protected]>
Type: Defect Fix
Description:

(quoted diff) +0 -0
 	The changes to itimer of late (after 2.6.11) cause itimers not
 	to survive the exec* calls.  Standard says they should.  
 exit.c         |    1 +
 posix-timers.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

Index: linux-2.6.13-rc/kernel/exit.c
===================================================================

kernel/exit.c +1 -0
@@ -794,6 +794,7 @@ fastcall NORET_TYPE void do_exit(long co
 	}
 
 	tsk->flags |= PF_EXITING;
+	del_timer_sync(&tsk->signal->real_timer);
 
 	/*
 	 * Make sure we don't try to process any timer firings

Index: linux-2.6.13-rc/kernel/posix-timers.c
===================================================================

kernel/posix-timers.c void exit_itimers(struct signal_struct * · line 1190

Quoted 10 lines
kernel/posix-timers.c +2 -2
@@ -1183,10 +1183,10 @@ void exit_itimers(struct signal_struct *
 	struct k_itimer *tmr;
 
 	while (!list_empty(&sig->posix_timers)) {
-		tmr = list_entry(sig->posix_timers.next, struct k_itimer, list);
+		tmr = list_entry(sig->posix_timers.next,
+				 struct k_itimer, list);
 		itimer_delete(tmr);
 	}
-	del_timer_sync(&sig->real_timer);
 }

Yup, that's the one, thanks George.

Obvious though it is, I'll hold off on forwarding this Linuswards until Gerd has had a chance to test it. Or did you run Gerd's test app?

#3 lore raw
In reply to Roland McGrath
Quoted 4 lines · Roland McGrath

That's wrong. It has to be done only by the last thread in the group to go. Just revert Ingo's change.

OK..

kernel/exit.c renamed from kernel/exit.c~revert-timer-exit-cleanup +3 -1
@@ -829,8 +829,10 @@ fastcall NORET_TYPE void do_exit(long co
 	acct_update_integrals(tsk);
 	update_mem_hiwater(tsk);
 	group_dead = atomic_dec_and_test(&tsk->signal->live);
-	if (group_dead)
+	if (group_dead) {
+ 		del_timer_sync(&tsk->signal->real_timer);
 		acct_process(code);
+	}
 	exit_mm(tsk);
 
 	exit_sem(tsk);
kernel/posix-timers.c renamed from kernel/posix-timers.c~revert-timer-exit-cleanup +0 -1
diff -puN kernel/posix-timers.c~revert-timer-exit-cleanup kernel/posix-timers.c
@@ -1166,7 +1166,6 @@ void exit_itimers(struct signal_struct *
 		tmr = list_entry(sig->posix_timers.next, struct k_itimer, list);
 		itimer_delete(tmr);
 	}
-	del_timer_sync(&sig->real_timer);
 }
 
 /*

_

#4 lore raw
Quoted 5 lines · Andrew Morton
Quoted 3 lines · Roland McGrath

That's wrong. It has to be done only by the last thread in the group to go. Just revert Ingo's change.

Hm... I was looking at 2.6.10 to figure it out. This looks more correct.

Quoted 37 lines

OK..

kernel/exit.c renamed from kernel/exit.c~revert-timer-exit-cleanup +3 -1
@@ -829,8 +829,10 @@ fastcall NORET_TYPE void do_exit(long co
 	acct_update_integrals(tsk);
 	update_mem_hiwater(tsk);
 	group_dead = atomic_dec_and_test(&tsk->signal->live);
-	if (group_dead)
+	if (group_dead) {
+ 		del_timer_sync(&tsk->signal->real_timer);
 		acct_process(code);
+	}
 	exit_mm(tsk);
 
 	exit_sem(tsk);

diff -puN kernel/posix-timers.c~revert-timer-exit-cleanup kernel/posix-timers.c

kernel/posix-timers.c renamed from kernel/posix-timers.c~revert-timer-exit-cleanup +0 -1
@@ -1166,7 +1166,6 @@ void exit_itimers(struct signal_struct *
 		tmr = list_entry(sig->posix_timers.next, struct k_itimer, list);
 		itimer_delete(tmr);
 	}
-	del_timer_sync(&sig->real_timer);
 }
 
 /*

_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 2 lines
George Anzinger   [email protected]
HRT (High-res-timers):  http://sourceforge.net/projects/high-res-timers/
author
#5 lore raw
In reply to Andrew Morton
Quoted 17 lines · Andrew Morton
Quoted 4 lines · Roland McGrath

That's wrong. It has to be done only by the last thread in the group to go. Just revert Ingo's change.

OK..

+++ 25-akpm/kernel/exit.c Thu Aug 4 15:01:06 2005

kernel/exit.c renamed from kernel/exit.c~revert-timer-exit-cleanup +4 -1
@@ -829,8 +829,10 @@ fastcall NORET_TYPE void do_exit(long co
-	if (group_dead)
+	if (group_dead) {
+ 		del_timer_sync(&tsk->signal->real_timer);
 		acct_process(code);
+	}
+++ 25-akpm/kernel/posix-timers.c	Thu Aug  4 15:01:06 2005

kernel/exit.c void exit_itimers(struct signal_struct * · line 1166

Quoted 1 line
kernel/exit.c renamed from kernel/exit.c~revert-timer-exit-cleanup +0 -1
@@ -1166,7 +1166,6 @@ void exit_itimers(struct signal_struct *
-	del_timer_sync(&sig->real_timer);

That one fixes it for me.

Gerd

Signature · 1 line
panic("it works"); /* avoid being flooded with debug messages */
#6 lore raw
Quoted 10 lines · Gerd Knorr
Quoted 8 lines · Andrew Morton
Quoted 3 lines · Roland McGrath

That's wrong. It has to be done only by the last thread in the group to go. Just revert Ingo's change.

OK..

Quoted 13 lines

kernel/exit.c void exit_itimers(struct signal_struct * · line 1166

Quoted 10 lines

+++ 25-akpm/kernel/exit.c Thu Aug 4 15:01:06 2005

kernel/exit.c renamed from kernel/exit.c~revert-timer-exit-cleanup +4 -2
@@ -829,8 +829,10 @@ fastcall NORET_TYPE void do_exit(long co
-	if (group_dead)
+	if (group_dead) {
+ 		del_timer_sync(&tsk->signal->real_timer);
 		acct_process(code);
+	}
+++ 25-akpm/kernel/posix-timers.c	Thu Aug  4 15:01:06 2005
@@ -1166,7 +1166,6 @@ void exit_itimers(struct signal_struct *
-	del_timer_sync(&sig->real_timer);

That one fixes it for me.

There are other concerns. Let me see if I understand this. A thread (other than the leader) can exec and we then need to change the real_timer to wake the new task which will NOT be using the same task struct.

My looking at the code shows that the thread leader can exit and then stays around as a zombi until the last thread in the group exits. If an alarm comes during this wait I suspect it will wake this zombi and cause problems. So, don't we need to also change real_timer's task when the exiting task is the real_timer wake up task, assigning it to some other member of the group? Note, I don't say just if it is the group leader...

Then when we finally release the signal structure, we can "del" the timer.

Did I miss something here?

Quoted 1 line
Signature · 2 lines
George Anzinger   [email protected]
HRT (High-res-timers):  http://sourceforge.net/projects/high-res-timers/
#7 lore raw
Quoted 4 lines

There are other concerns. Let me see if I understand this. A thread (other than the leader) can exec and we then need to change the real_timer to wake the new task which will NOT be using the same task struct.

That's correct. de_thread will turn the thread calling exec into the new leader and kill off all the other threads, including the old leader. The exec'ing thread's existing task_struct is reassigned to the PID of the original leader.

Quoted 2 lines

My looking at the code shows that the thread leader can exit and then stays around as a zombi until the last thread in the group exits.

That is correct.

Quoted 2 lines

If an alarm comes during this wait I suspect it will wake this zombi and cause problems.

You are mistaken. The signal code handles process signals sent when the leader is a zombie. The group leader sticks around with the PID that matches the TGID, until there are no live threads with its TGID. That is how process-wide kill can still work.

Thanks,
Roland

#8 lore raw
Quoted 15 lines · Roland McGrath
Quoted 1 line

There are other concerns. Let me see if I understand this. A thread (other than the leader) can exec and we then need to change the real_timer to wake the new task which will NOT be using the same task struct.

That's correct. de_thread will turn the thread calling exec into the new leader and kill off all the other threads, including the old leader. The exec'ing thread's existing task_struct is reassigned to the PID of the original leader.

Quoted 1 line

My looking at the code shows that the thread leader can exit and then stays around as a zombi until the last thread in the group exits.

That is correct.

Quoted 8 lines
Quoted 2 lines

If an alarm comes during this wait I suspect it will wake this zombi and cause problems.

You are mistaken. The signal code handles process signals sent when the leader is a zombie. The group leader sticks around with the PID that matches the TGID, until there are no live threads with its TGID. That is how process-wide kill can still work.

Yes, I see, traced through the signal delivery. So Linus' patch as well as the regression of Ingo's will fix all of this. Right?

Signature · 2 lines
George Anzinger   [email protected]
HRT (High-res-timers):  http://sourceforge.net/projects/high-res-timers/