mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-09 01:50:35 +00:00
MFC: r205092
Tidy up callout for select(2) and read timeout. - Add a missing callout_drain(9) before the descriptor deallocation.[1] - Prefer callout_init_mtx(9) over callout_init(9) and let the callout subsystem handle the mutex for callout function. PR: kern/144453 Submitted by: Alexander Sack (asack at niksun dot com)[1]
This commit is contained in:
parent
e651ff978b
commit
1288863fa2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/stable/8/; revision=205463
|
@ -611,6 +611,7 @@ bpf_dtor(void *data)
|
|||
mac_bpfdesc_destroy(d);
|
||||
#endif /* MAC */
|
||||
knlist_destroy(&d->bd_sel.si_note);
|
||||
callout_drain(&d->bd_callout);
|
||||
bpf_freed(d);
|
||||
free(d, M_BPF);
|
||||
}
|
||||
|
@ -648,7 +649,7 @@ bpfopen(struct cdev *dev, int flags, int fmt, struct thread *td)
|
|||
mac_bpfdesc_create(td->td_ucred, d);
|
||||
#endif
|
||||
mtx_init(&d->bd_mtx, devtoname(dev), "bpf cdev lock", MTX_DEF);
|
||||
callout_init(&d->bd_callout, CALLOUT_MPSAFE);
|
||||
callout_init_mtx(&d->bd_callout, &d->bd_mtx, 0);
|
||||
knlist_init_mtx(&d->bd_sel.si_note, &d->bd_mtx);
|
||||
|
||||
return (0);
|
||||
|
@ -804,13 +805,15 @@ bpf_timed_out(void *arg)
|
|||
{
|
||||
struct bpf_d *d = (struct bpf_d *)arg;
|
||||
|
||||
BPFD_LOCK(d);
|
||||
BPFD_LOCK_ASSERT(d);
|
||||
|
||||
if (callout_pending(&d->bd_callout) || !callout_active(&d->bd_callout))
|
||||
return;
|
||||
if (d->bd_state == BPF_WAITING) {
|
||||
d->bd_state = BPF_TIMED_OUT;
|
||||
if (d->bd_slen != 0)
|
||||
bpf_wakeup(d);
|
||||
}
|
||||
BPFD_UNLOCK(d);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
Loading…
Reference in a new issue