Module Name: src
Committed By: christos
Date: Thu Jun 20 17:08:52 UTC 2019
Modified Files:
src/sys/net/npf: npf_tableset.c
Log Message:
PR/54314: Frank Kardel: LOCKDEBUG: Mutex error: assert_sleepable,70:
spin lock held when loading NPF
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/net/npf/npf_tableset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_tableset.c
diff -u src/sys/net/npf/npf_tableset.c:1.30 src/sys/net/npf/npf_tableset.c:1.31
--- src/sys/net/npf/npf_tableset.c:1.30 Wed Jun 12 10:36:32 2019
+++ src/sys/net/npf/npf_tableset.c Thu Jun 20 13:08:52 2019
@@ -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 @@ table_ifaddr_insert(npf_table_t *t, cons
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];
}
