--- sys/kern/kern_event.c.orig +++ sys/kern/kern_event.c @@ -801,7 +801,8 @@ sbintime_t to; /* precalculated timer period, 0 for abs */ }; -#define KQ_TIMER_CB_ENQUEUED 0x01 +#define KQ_TIMER_CB_ENQUEUED 0x01 /* in queue of stopped timers */ +#define KQ_TIMER_CB_DETACHING 0x02 /* detach started, don't requeue */ static void kqtimer_sched_callout(struct kq_timer_cb_data *kc) @@ -869,7 +870,8 @@ if (!proc_locked) PROC_LOCK(p); if (P_SHOULDSTOP(p) || P_KILLED(p)) { - if ((kc->flags & KQ_TIMER_CB_ENQUEUED) == 0) { + if ((kc->flags & (KQ_TIMER_CB_ENQUEUED | + KQ_TIMER_CB_DETACHING)) == 0) { /* * Insert into head so that * kqtimer_proc_continue() does not @@ -976,7 +978,8 @@ kn->kn_ptr.p_v = kc = malloc(sizeof(*kc), M_KQUEUE, M_WAITOK); kc->kn = kn; kc->p = p; - kc->flags = kc_src->flags & ~KQ_TIMER_CB_ENQUEUED; + kc->flags = kc_src->flags & + ~(KQ_TIMER_CB_ENQUEUED | KQ_TIMER_CB_DETACHING); kc->next = kc_src->next; kc->to = kc_src->to; kc->cpuid = PCPU_GET(cpuid); @@ -1006,24 +1009,16 @@ { struct kq_timer_cb_data *kc; unsigned int old __unused; - bool pending; kc = kn->kn_ptr.p_v; - do { - callout_drain(&kc->c); - - /* - * kqtimer_proc_continue() might have rescheduled this callout. - * Double-check, using the process mutex as an interlock. - */ - PROC_LOCK(kc->p); - if ((kc->flags & KQ_TIMER_CB_ENQUEUED) != 0) { - kc->flags &= ~KQ_TIMER_CB_ENQUEUED; - TAILQ_REMOVE(&kc->p->p_kqtim_stop, kc, link); - } - pending = callout_pending(&kc->c); - PROC_UNLOCK(kc->p); - } while (pending); + PROC_LOCK(kc->p); + kc->flags |= KQ_TIMER_CB_DETACHING; + if ((kc->flags & KQ_TIMER_CB_ENQUEUED) != 0) { + kc->flags &= ~KQ_TIMER_CB_ENQUEUED; + TAILQ_REMOVE(&kc->p->p_kqtim_stop, kc, link); + } + PROC_UNLOCK(kc->p); + callout_drain(&kc->c); free(kc, M_KQUEUE); old = atomic_fetchadd_int(&kq_ncallouts, -1); KASSERT(old > 0, ("Number of callouts cannot become negative")); @@ -3143,15 +3138,26 @@ KQ_UNLOCK(kq1); } +enum klist_which { + KLIST_FD, + KLIST_HASH, +}; + +static struct klist * +kqueue_list(struct kqueue *kq, enum klist_which which, int i) +{ + return (which == KLIST_FD ? &kq->kq_knlist[i] : &kq->kq_knhash[i]); +} + static void -kqueue_fork_copy_list(struct klist *knlist, struct knote *marker, +kqueue_fork_copy_list(enum klist_which which, int i, struct knote *marker, struct kqueue *kq, struct kqueue *kq1, struct proc *p1, struct filedesc *fdp) { struct knote *kn; KQ_OWNED(kq); - kn = SLIST_FIRST(knlist); + kn = SLIST_FIRST(kqueue_list(kq, which, i)); while (kn != NULL) { MPASS(kn->kn_kq == kq); if ((kn->kn_status & (KN_DETACHED | KN_MARKER)) != 0 || @@ -3167,7 +3173,7 @@ kn_leave_flux(kn); kn = SLIST_NEXT(marker, kn_link); /* XXXKIB switch kn_link to LIST? */ - SLIST_REMOVE(knlist, marker, knote, kn_link); + SLIST_REMOVE(kqueue_list(kq, which, i), marker, knote, kn_link); } } @@ -3191,13 +3197,12 @@ KQ_LOCK(kq); for (i = 0; i < kq->kq_knlistsize; i++) { - kqueue_fork_copy_list(&kq->kq_knlist[i], marker, kq, kq1, - p1, fdp); + kqueue_fork_copy_list(KLIST_FD, i, marker, kq, kq1, p1, fdp); } if (kq->kq_knhashmask != 0) { for (i = 0; i <= kq->kq_knhashmask; i++) { - kqueue_fork_copy_list(&kq->kq_knhash[i], marker, kq, - kq1, p1, fdp); + kqueue_fork_copy_list(KLIST_HASH, i, marker, kq, kq1, + p1, fdp); } } kqueue_release(kq, 1);