[src/trunk]: src/sys/net/npf PR/54314: Frank Kardel: LOCKDEBUG: Mutex error: ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c141f91650bd
branches:  trunk
changeset: 999849:c141f91650bd
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jun 20 17:08:52 2019 +0000

description:
PR/54314: Frank Kardel: LOCKDEBUG: Mutex error: assert_sleepable,70:
spin lock held when loading NPF

diffstat:

 sys/net/npf/npf_tableset.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r ea56aa8bbc00 -r c141f91650bd sys/net/npf/npf_tableset.c
--- a/sys/net/npf/npf_tableset.c        Thu Jun 20 16:57:25 2019 +0000
+++ b/sys/net/npf/npf_tableset.c        Thu Jun 20 17:08:52 2019 +0000
@@ -39,7 +39,7 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.30 2019/06/12 14:36:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.31 2019/06/20 17:08:52 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -513,7 +513,7 @@
                toalloc = roundup2(allocated + 1, NPF_IFADDR_STEP);
                newsize = toalloc * sizeof(npf_tblent_t *);
 
-               elements = kmem_zalloc(newsize, KM_SLEEP);
+               elements = kmem_zalloc(newsize, KM_NOSLEEP);
                for (unsigned i = 0; i < used; i++) {
                        elements[i] = old_elements[i];
                }