[PATCH] posix_cpu_timers_exit_group: do not use thread_group_cputimer()

[PATCH] posix_cpu_timers_exit_group: do not use thread_group_cputimer()

[Stanislaw Gruszka]

When the process exits we don't have to run new cputimer nor use running one
(as it not accounts when tsk->exit_state != 0) to get process CPU times.
As there is only one thread we can just use CPU times fields form task
and signal structs.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
 kernel/posix-cpu-timers.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index bece7c0..e33a21c 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -521,11 +521,12 @@ void posix_cpu_timers_exit(struct task_struct *tsk)
 }
 void posix_cpu_timers_exit_group(struct task_struct *tsk)
 {
-	struct task_cputime cputime;
+	struct signal_struct *const sig = tsk->signal;
 
-	thread_group_cputimer(tsk, &cputime);
 	cleanup_timers(tsk->signal->cpu_timers,
-		       cputime.utime, cputime.stime, cputime.sum_exec_runtime);
+		       cputime_add(tsk->utime, sig->utime),
+		       cputime_add(tsk->stime, sig->stime),
+		       tsk->se.sum_exec_runtime + sig->sum_sched_runtime);
 }
 
 static void clear_dead_task(struct k_itimer *timer, union cpu_time_count now)
-- 
1.5.5.6

Re: [PATCH] posix_cpu_timers_exit_group: do not use thread_group_cputimer()

[Oleg Nesterov]

On 06/17, Stanislaw Gruszka wrote:
>
> When the process exits we don't have to run new cputimer nor use running one
> (as it not accounts when tsk->exit_state != 0) to get process CPU times.
> As there is only one thread we can just use CPU times fields form task
> and signal structs.
>
> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
> ---
>  kernel/posix-cpu-timers.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
> index bece7c0..e33a21c 100644
> --- a/kernel/posix-cpu-timers.c
> +++ b/kernel/posix-cpu-timers.c
> @@ -521,11 +521,12 @@ void posix_cpu_timers_exit(struct task_struct *tsk)
>  }
>  void posix_cpu_timers_exit_group(struct task_struct *tsk)
>  {
> -	struct task_cputime cputime;
> +	struct signal_struct *const sig = tsk->signal;
>
> -	thread_group_cputimer(tsk, &cputime);
>  	cleanup_timers(tsk->signal->cpu_timers,
> -		       cputime.utime, cputime.stime, cputime.sum_exec_runtime);
> +		       cputime_add(tsk->utime, sig->utime),
> +		       cputime_add(tsk->stime, sig->stime),
> +		       tsk->se.sum_exec_runtime + sig->sum_sched_runtime);
>  }

I think this is correct.

Oleg.