d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop arming realtime posix process timers on suspend or terminate

Browse Source 
Reported and reviewed by:	markj
Tested by:	markj, pho
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
Differential revision:	https://reviews.freebsd.org/D29106
This commit is contained in:
Konstantin Belousov 2021-03-11 10:16:51 +02:00
parent dc47fdf131
commit 4d27d8d2f3
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sys/kern/kern_time.c
View File

@ -895,6 +895,8 @@ void
itimer_proc_continue(struct proc *p)
{
struct timeval ctv;
struct itimer *it;
int id;
PROC_LOCK_ASSERT(p, MA_OWNED);
@ -906,6 +908,23 @@ itimer_proc_continue(struct proc *p)
else
realitexpire_reset_callout(p, NULL);
}
if (p->p_itimers != NULL) {
for (id = 3; id < TIMER_MAX; id++) {
it = p->p_itimers->its_timers[id];
if (it == NULL)
continue;
if ((it->it_flags & ITF_PSTOPPED) != 0) {
ITIMER_LOCK(it);
if ((it->it_flags & ITF_PSTOPPED) != 0) {
it->it_flags &= ~ITF_PSTOPPED;
if ((it->it_flags & ITF_DELETING) == 0)
realtimer_expire(it);
}
ITIMER_UNLOCK(it);
}
}
}
}
/*
@ -1651,6 +1670,7 @@ realtimer_expire(void *arg)
struct timespec cts, ts;
struct timeval tv;
struct itimer *it;
struct proc *p;
uint64_t interval, now, overruns, value;
it = (struct itimer *)arg;
@ -1689,10 +1709,15 @@ realtimer_expire(void *arg)
timespecclear(&it->it_time.it_value);
}
if (timespecisset(&it->it_time.it_value)) {
timespecsub(&it->it_time.it_value, &cts, &ts);
TIMESPEC_TO_TIMEVAL(&tv, &ts);
callout_reset(&it->it_callout, tvtohz(&tv),
realtimer_expire, it);
p = it->it_proc;
if (P_SHOULDSTOP(p) || P_KILLED(p)) {
it->it_flags |= ITF_PSTOPPED;
} else {
timespecsub(&it->it_time.it_value, &cts, &ts);
TIMESPEC_TO_TIMEVAL(&tv, &ts);
callout_reset(&it->it_callout, tvtohz(&tv),
realtimer_expire, it);
}
}
itimer_enter(it);
ITIMER_UNLOCK(it);
@ -1700,11 +1725,16 @@ realtimer_expire(void *arg)
ITIMER_LOCK(it);
itimer_leave(it);
} else if (timespecisset(&it->it_time.it_value)) {
ts = it->it_time.it_value;
timespecsub(&ts, &cts, &ts);
TIMESPEC_TO_TIMEVAL(&tv, &ts);
callout_reset(&it->it_callout, tvtohz(&tv), realtimer_expire,
it);
p = it->it_proc;
if (P_SHOULDSTOP(p) || P_KILLED(p)) {
it->it_flags |= ITF_PSTOPPED;
} else {
ts = it->it_time.it_value;
timespecsub(&ts, &cts, &ts);
TIMESPEC_TO_TIMEVAL(&tv, &ts);
callout_reset(&it->it_callout, tvtohz(&tv),
realtimer_expire, it);
}
}
}

1
sys/sys/timers.h
View File

@ -82,6 +82,7 @@ struct itimer {
#define ITF_DELETING 0x01
#define ITF_WANTED 0x02
#define ITF_PSTOPPED 0x04
#define ITCF_ONWORKLIST 0x01