Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add curlwp_bind

Browse Source 
It is necessary for example when we use tun(4). Without it the following
panic occurs:

  panic: kernel diagnostic assertion "(kpreempt_disabled() || cpu_softintr_p() || ISSET(curlwp->l_pflag, LP_BOUND))" failed: file "/usr/src/sys/kern/subr_psref.c", line 291 passive references are CPU-local, but preemption is enabled and the caller is not in a softint or CPU-bound LWP
  Backtrace:
  vpanic()
  ch_voltag_convert_in()
  psref_release()
  pfil_run_arg.isra.0()
  if_initialize()
  if_attach()
  tun_clone_create()
  tunopen()
  cdev_open()
  spec_open()
  VOP_OPEN()
  vn_open()
  do_open()
  do_sys_openat()
  sys_open()
  syscall()
This commit is contained in:
ozaki-r 2017-01-23 02:30:47 +00:00
parent 81bb145d26
commit ab9446efae
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/net/pfil.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pfil.c,v 1.32 2017/01/16 09:28:40 ryo Exp $ */
/* $NetBSD: pfil.c,v 1.33 2017/01/23 02:30:47 ozaki-r Exp $ */
/*
* Copyright (c) 2013 Mindaugas Rasiukevicius <rmind at NetBSD org>
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pfil.c,v 1.32 2017/01/16 09:28:40 ryo Exp $");
__KERNEL_RCSID(0, "$NetBSD: pfil.c,v 1.33 2017/01/23 02:30:47 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -384,7 +384,7 @@ pfil_run_hooks(pfil_head_t *ph, struct mbuf **mp, ifnet_t *ifp, int dir)
pfil_listset_t *phlistset;
pfil_list_t *phlist;
struct psref psref;
int s;
int s, bound;
int ret = 0;
KASSERT(dir == PFIL_IN || dir == PFIL_OUT);
@ -392,6 +392,7 @@ pfil_run_hooks(pfil_head_t *ph, struct mbuf **mp, ifnet_t *ifp, int dir)
return ret;
}
bound = curlwp_bind();
s = pserialize_read_enter();
phlist = phlistset->active;
membar_datadep_consumer();
@ -406,6 +407,7 @@ pfil_run_hooks(pfil_head_t *ph, struct mbuf **mp, ifnet_t *ifp, int dir)
break;
}
psref_release(&psref, &phlist->psref, pfil_psref_class);
curlwp_bindx(bound);
if (mp) {
*mp = m;
@ -418,8 +420,9 @@ pfil_run_arg(pfil_listset_t *phlistset, u_long cmd, void *arg)
{
pfil_list_t *phlist;
struct psref psref;
int s;
int s, bound;
bound = curlwp_bind();
s = pserialize_read_enter();
phlist = phlistset->active;
membar_datadep_consumer();
@ -431,6 +434,7 @@ pfil_run_arg(pfil_listset_t *phlistset, u_long cmd, void *arg)
(*func)(pfh->pfil_arg, cmd, arg);
}
psref_release(&psref, &phlist->psref, pfil_psref_class);
curlwp_bindx(bound);
}
void