posix_timers: A few expiry caching fixes
cover posix_timers: A few expiry caching fixes
Hi Andrew,
This v2 only updates the changelogs to describe more explicitly the user visible effects as you suggested.
I dropped the 3rd patch for now because it needs more thinking.
Thanks.
Frederic Weisbecker (2):
posix-timers: correctly get dying task time sample in
posix_cpu_timer_schedule()
posix_timers: Fix racy timer delta caching on task exit
kernel/posix-cpu-timers.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-)
Signature · 1 line
1.7.5.4
PATCH 1/2 posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
In order to re-arm a timer after it fired, we take a sample of the current process or thread cputime.
If the task is dying though, we don't arm anything but we cache the remaining timer expiration delta for further reads.
Something similar is performed in posix_cpu_timer_get() but here we forget to take the process wide cputime sample before caching it.
As a result we are storing random stack content, leading every further reads of that timer to return junk values.
Fix this by taking the appropriate sample in the case of process wide timers.
This probably doesn't matter much in practice because, at this stage, the thread is the last one in the group and we reached exit_notify(). This implies that we called exit_itimers() and there should be no more timers to handle for that task.
So this is likely dead code anyway but let's fix the current logic and the warning that came along:
kernel/posix-cpu-timers.c: In function 'posix_cpu_timer_schedule':
kernel/posix-cpu-timers.c:1127: warning: 'now' may be used uninitialized in this function
Then we can start to think further about cleaning up that code.
--- kernel/posix-cpu-timers.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
kernel/posix-cpu-timers.c +1 -0
@@ -1062,6 +1062,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer)* not yet reaped. Take this opportunity to * drop our task ref. */ +cpu_timer_sample_group (timer->it_clock, p, &now);clear_dead_task (timer, now); goto out_unlock; }
Signature · 1 line
1.7.5.4
PATCH 2/2 posix_timers: Fix racy timer delta caching on task exit
In reply to Frederic WeisbeckerWhen a task exits, we perform a caching of the remaining cputime delta before expiring of its timers.
This is done from the following places:
* When the task is reaped. We iterate through its list of posix cpu timers and store the remaining timer delta to the timer struct instead of the absolute value.
(See posix_cpu_timers_exit() / posix_cpu_timers_exit_group() )
* When we call posix_cpu_timer_get() or posix_cpu_timer_schedule(). If the timer's task is considered dying when watched from these places, the same conversion from absolute to relative expiry time is performed. Then the given task's reference is released. (See clear_dead_task() ).
The relevance of this caching is questionable but this is another and deeper debate.
The big issue here is that these two sources of caching don't mix up very well together.
More specifically, the caching can easily be done twice, resulting in a wrong delta as it gets spuriously substracted a second time by the elapsed clock. This can happen in the following scenario:
1) The task exits and gets reaped: we call posix_cpu_timers_exit() and the absolute timer expiry values are converted to a relative delta.
2) timer_gettime() -> posix_cpu_timer_get() is called and relies on clear_dead_task() because tsk->exit_state == EXIT_DEAD. The delta gets substracted again by the elapsed clock and we return a wrong result.
To fix this, just remove the caching done on task reaping time. It doesn't bring much value on its own. The caching done from posix_cpu_timer_get/schedule is enough.
And it would also be hard to get it really right: we could make it put and clear the target task in the timer struct so that readers know if they are dealing with a relative cached of absolute value. But it would be racy. The only safe way to do it would be to lock the itimer->it_lock so that we know nobody reads the cputime expiry value while we modify it and its target task reference. Doing so would involve some funny workarounds to avoid circular lock against the sighand lock. There is just no reason to maintain this.
The user visible effect of this patch can be observed by running the following code: it creates a subthread that launches a posix cputimer which expires after 10 seconds. But then the subthread only busy loops for 2 seconds and exits. The parent reaps the subthread and read the timer value. Its expected value should the be the initial timer's expiration value minus the cputime elapsed in the subthread. Roughly 10 - 2 = 8 seconds:
#include <sys/time.h>
#include <stdio.h>
#include <unistd.h>
#include <time.h>
#include <pthread.h>
static timer_t id;
static struct itimerspec val = { .it_value.tv_sec = 10, }, new;
static void *thread(void *unused)
{
int err;
struct timeval start, end, diff;
timer_create(CLOCK_THREAD_CPUTIME_ID, NULL, &id);
if (err < 0) {
perror("Can't create timer\n");
return NULL;
}
/* Arm 10 sec timer */
err = timer_settime(id, 0, &val, NULL);
if (err < 0) {
perror("Can't set timer\n");
return NULL;
}
/* Exit after 2 seconds of execution */
gettimeofday(&start, NULL);
do {
gettimeofday(&end, NULL);
timersub(&end, &start, &diff);
} while (diff.tv_sec < 2);
return NULL;
}
int main(int argc, char **argv)
{
pthread_t pthread;
int err;
err = pthread_create(&pthread, NULL, thread, NULL);
if (err) {
perror("Can't create thread\n");
return -1;
}
pthread_join(pthread, NULL);
/* Just wait a little bit to make sure the child got reaped */
sleep(1);
err = timer_gettime(id, &new);
if (err)
perror("Can't get timer value\n");
printf("%d %ld\n", new.it_value.tv_sec, new.it_value.tv_nsec);
return 0;
}Before the patch:
$ ./posix_cpu_timers
6 2278074After the patch:
$ ./posix_cpu_timers
8 1158766Before the patch, the elapsed time got two more seconds spuriously accounted.
--- kernel/posix-cpu-timers.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
kernel/posix-cpu-timers.c +11 -11
@@ -387,14 +387,8 @@ static void cleanup_timers_list(struct list_head *head, {struct cpu_timer_list *timer, *next; -list_for_each_entry_safe (timer, next, head, entry) { +list_for_each_entry_safe (timer, next, head, entry)list_del_init (&timer->entry); -if (timer->expires < curr) { - timer->expires =0 ; - }else { - timer->expires -= curr; - } - } }/*
@@ -442,15 +436,21 @@ void posix_cpu_timers_exit_group(struct task_struct *tsk) tsk->se.sum_exec_runtime + sig->sum_sched_runtime); } -static void clear_dead_task (struct k_itimer *timer,unsigned long long now) +static void clear_dead_task (struct k_itimer *itimer,unsigned long long now) { +struct cpu_timer_list *timer = &itimer->it.cpu; +/* * That's all for this thread or process. * We leave our residual in expires to be reported. */ -put_task_struct (timer->it.cpu.task); - timer->it.cpu.task =NULL ; - timer->it.cpu.expires -= now; +put_task_struct (timer->task); + timer->task =NULL ; +if (timer->expires < now) { + timer->expires =0 ; + }else { + timer->expires -= now; + } }static inline int expires_gt (cputime_t expires,cputime_t new_exp)
Signature · 1 line
1.7.5.4