2021-09-13 14:58:20

by Frederic Weisbecker

[permalink] [raw]
Subject: [PATCH] posix-cpu-timers: Fix spuriously armed 0-value itimer

Resetting/stopping an itimer eventually leads to it being reprogrammed
with an actual "0" value. As a result the itimer expires on the next
tick, triggering an unexpected signal.

To fix this, make sure that
struct signal_struct::it[CPUCLOCK_PROF/VIRT]::expires is set to 0 when
setitimer() passes a 0 it_value, indicating that the timer must stop.

Reported-by: Victor Stinner <[email protected]>
Fixes: 406dd42bd1ba ("posix-cpu-timers: Force next expiration recalc after itimer reset")
Signed-off-by: Frederic Weisbecker <[email protected]>
Cc: Peter Zijlstra (Intel) <[email protected]>
---
kernel/time/posix-cpu-timers.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index ee736861b18f..643d412ac623 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1404,7 +1404,8 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid,
}
}

- *newval += now;
+ if (*newval)
+ *newval += now;
}

/*
--
2.25.1


Subject: [tip: timers/urgent] posix-cpu-timers: Prevent spuriously armed 0-value itimer

The following commit has been merged into the timers/urgent branch of tip:

Commit-ID: 8cd9da85d2bd87ce889043e7b1735723dd10eb89
Gitweb: https://git.kernel.org/tip/8cd9da85d2bd87ce889043e7b1735723dd10eb89
Author: Frederic Weisbecker <[email protected]>
AuthorDate: Mon, 13 Sep 2021 16:53:32 +02:00
Committer: Thomas Gleixner <[email protected]>
CommitterDate: Thu, 23 Sep 2021 11:53:51 +02:00

posix-cpu-timers: Prevent spuriously armed 0-value itimer

Resetting/stopping an itimer eventually leads to it being reprogrammed
with an actual "0" value. As a result the itimer expires on the next
tick, triggering an unexpected signal.

To fix this, make sure that
struct signal_struct::it[CPUCLOCK_PROF/VIRT]::expires is set to 0 when
setitimer() passes a 0 it_value, indicating that the timer must stop.

Fixes: 406dd42bd1ba ("posix-cpu-timers: Force next expiration recalc after itimer reset")
Reported-by: Victor Stinner <[email protected]>
Reported-by: Chris Hixon <[email protected]>
Signed-off-by: Frederic Weisbecker <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
kernel/time/posix-cpu-timers.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index ee73686..643d412 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1404,7 +1404,8 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid,
}
}

- *newval += now;
+ if (*newval)
+ *newval += now;
}

/*

2021-09-26 13:00:19

by Stafford Horne

[permalink] [raw]
Subject: Re: [PATCH] posix-cpu-timers: Fix spuriously armed 0-value itimer

Hello,

Ccing libc-alpha,

On Mon, Sep 13, 2021 at 04:53:32PM +0200, Frederic Weisbecker wrote:
> Resetting/stopping an itimer eventually leads to it being reprogrammed
> with an actual "0" value. As a result the itimer expires on the next
> tick, triggering an unexpected signal.

Thanks for this I just tracked down the same issue.

I just wanted to give an FYI in case anyone else notices this.

This was causing gprof (gcc -pg) to fail. I noticed this when running the glibc
test suite, tests: gmon/tst-gmon-static, gmon/tst-gmon

Gprof uses ITIMER_PROF, as per:

- https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/posix/profil.c;h=fbf1184df1ccc6e1d2098f92c7d87fc28f5a8f09;hb=HEAD

I was seeing the extra SIGPROF signal after profil de-registered the timer and
signal handler. The spurious signal causes all profiled programs to be killed
and collect no gprof data.

-Stafford

> To fix this, make sure that
> struct signal_struct::it[CPUCLOCK_PROF/VIRT]::expires is set to 0 when
> setitimer() passes a 0 it_value, indicating that the timer must stop.
>
> Reported-by: Victor Stinner <[email protected]>
> Fixes: 406dd42bd1ba ("posix-cpu-timers: Force next expiration recalc after itimer reset")
> Signed-off-by: Frederic Weisbecker <[email protected]>
> Cc: Peter Zijlstra (Intel) <[email protected]>
> ---
> kernel/time/posix-cpu-timers.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
> index ee736861b18f..643d412ac623 100644
> --- a/kernel/time/posix-cpu-timers.c
> +++ b/kernel/time/posix-cpu-timers.c
> @@ -1404,7 +1404,8 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid,
> }
> }
>
> - *newval += now;
> + if (*newval)
> + *newval += now;
> }
>
> /*
> --
> 2.25.1
>