Remove the mtx_sleep() from the kqueue f_event filter.
The filter is called from the network hot path and must not sleep. The filter runs with the descriptor lock held and does not manipulates the buffers, so it is not necessary sleep when the hold buffer is in use. Just ignore the hold buffer contents when it is being copied to user space (when hold buffer in use is set). This fix the "Sleeping thread owns a non-sleepable lock" panic when the userland thread is too busy reading the packets from bpf(4). PR: 200323 MFC after: 2 weeks Sponsored by: Rubicon Communications (Netgate)
This commit is contained in:
parent
fc6ab77011
commit
9224217213
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=286260
@ -2035,10 +2035,10 @@ filt_bpfread(struct knote *kn, long hint)
|
||||
ready = bpf_ready(d);
|
||||
if (ready) {
|
||||
kn->kn_data = d->bd_slen;
|
||||
while (d->bd_hbuf_in_use)
|
||||
mtx_sleep(&d->bd_hbuf_in_use, &d->bd_lock,
|
||||
PRINET, "bd_hbuf", 0);
|
||||
if (d->bd_hbuf)
|
||||
/*
|
||||
* Ignore the hold buffer if it is being copied to user space.
|
||||
*/
|
||||
if (!d->bd_hbuf_in_use && d->bd_hbuf)
|
||||
kn->kn_data += d->bd_hlen;
|
||||
} else if (d->bd_rtout > 0 && d->bd_state == BPF_IDLE) {
|
||||
callout_reset(&d->bd_callout, d->bd_rtout,
|
||||
|
Loading…
Reference in New Issue
Block a user