Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

signal: Allow POSIX timer signals to be dropped

Browse Source 
In case that a timer was reprogrammed or deleted an already pending signal
is obsolete. Right now such signals are kept around and eventually
delivered. While POSIX is blury about this:

 - "The effect of disarming or resetting a timer with pending expiration
    notifications is unspecified."

 - "The disposition of pending signals for the deleted timer is
    unspecified."

it is reasonable in both cases to expect that pending signals are discarded
as they have no meaning anymore.

Prepare the signal code to allow dropping posix timer signals.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/all/20241001083835.494416923@linutronix.de
This commit is contained in:
Thomas Gleixner 2024-10-01 10:42:04 +02:00
parent 4febce44cf
commit c775ea28d4
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/posix-timers.h
View File

@ -100,8 +100,9 @@ static inline void posix_cputimers_rt_watchdog(struct posix_cputimers *pct,
{
pct->bases[CPUCLOCK_SCHED].nextevt = runtime;
}
void posixtimer_rearm_itimer(struct task_struct *p);
void posixtimer_rearm(struct kernel_siginfo *info);
bool posixtimer_deliver_signal(struct kernel_siginfo *info);
/* Init task static initializer */
#define INIT_CPU_TIMERBASE(b) { \
@ -125,7 +126,7 @@ static inline void posix_cputimers_init(struct posix_cputimers *pct) { }
static inline void posix_cputimers_group_init(struct posix_cputimers *pct,
u64 cpu_limit) { }
static inline void posixtimer_rearm_itimer(struct task_struct *p) { }
static inline void posixtimer_rearm(struct kernel_siginfo *info) { }
static inline bool posixtimer_deliver_signal(struct kernel_siginfo *info) { return false; }
#endif
#ifdef CONFIG_POSIX_CPU_TIMERS_TASK_WORK

7
kernel/signal.c
View File

@ -594,6 +594,7 @@ int dequeue_signal(sigset_t *mask, kernel_siginfo_t *info, enum pid_type *type)
lockdep_assert_held(&tsk->sighand->siglock);
again:
*type = PIDTYPE_PID;
signr = __dequeue_signal(&tsk->pending, mask, info, &resched_timer);
if (!signr) {
@ -625,9 +626,9 @@ int dequeue_signal(sigset_t *mask, kernel_siginfo_t *info, enum pid_type *type)
current->jobctl |= JOBCTL_STOP_DEQUEUED;
}
if (IS_ENABLED(CONFIG_POSIX_TIMERS)) {
if (unlikely(resched_timer))
posixtimer_rearm(info);
if (IS_ENABLED(CONFIG_POSIX_TIMERS) && unlikely(resched_timer)) {
if (!posixtimer_deliver_signal(info))
goto again;
}
return signr;

3
kernel/time/posix-timers.c
View File

@ -254,7 +254,7 @@ static void common_hrtimer_rearm(struct k_itimer *timr)
* info::si_sys_private is not zero, which indicates that the timer has to
* be rearmed. Restart the timer and update info::si_overrun.
*/
void posixtimer_rearm(struct kernel_siginfo *info)
bool posixtimer_deliver_signal(struct kernel_siginfo *info)
{
struct k_itimer *timr;
unsigned long flags;
@ -286,6 +286,7 @@ void posixtimer_rearm(struct kernel_siginfo *info)
/* Don't expose the si_sys_private value to userspace */
info->si_sys_private = 0;
return true;
}
int posix_timer_queue_signal(struct k_itimer *timr)