Module Name: src
Committed By: riastradh
Date: Sun Feb 7 18:41:25 UTC 2016
Modified Files:
src/sys/uvm/pmap: pmap_pvt.c
Log Message:
Use IPL_NONE for pserialized lock. Assert sleepable. (OOPS.)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/uvm/pmap/pmap_pvt.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/uvm/pmap/pmap_pvt.c
diff -u src/sys/uvm/pmap/pmap_pvt.c:1.2 src/sys/uvm/pmap/pmap_pvt.c:1.3
--- src/sys/uvm/pmap/pmap_pvt.c:1.2 Wed Nov 11 08:22:36 2015
+++ src/sys/uvm/pmap/pmap_pvt.c Sun Feb 7 18:41:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_pvt.c,v 1.2 2015/11/11 08:22:36 skrll Exp $ */
+/* $NetBSD: pmap_pvt.c,v 1.3 2016/02/07 18:41:25 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: pmap_pvt.c,v 1.2 2015/11/11 08:22:36 skrll Exp $");
+__RCSID("$NetBSD: pmap_pvt.c,v 1.3 2016/02/07 18:41:25 riastradh Exp $");
#include <sys/kmem.h>
#include <sys/pserialize.h>
@@ -66,7 +66,7 @@ void
pmap_pv_init(void)
{
- mutex_init(&pv_unmanaged.lock, MUTEX_DEFAULT, IPL_VM);
+ mutex_init(&pv_unmanaged.lock, MUTEX_DEFAULT, IPL_NONE);
pv_unmanaged.psz = pserialize_create();
pv_unmanaged.list = NULL;
}
@@ -80,6 +80,9 @@ pmap_pv_track(paddr_t start, psize_t siz
KASSERT(start == trunc_page(start));
KASSERT(size == trunc_page(size));
+ /* We may sleep for allocation. */
+ ASSERT_SLEEPABLE();
+
npages = size >> PAGE_SHIFT;
pvt = kmem_zalloc(offsetof(struct pv_track, pvt_pages[npages]),
KM_SLEEP);
@@ -102,6 +105,9 @@ pmap_pv_untrack(paddr_t start, psize_t s
KASSERT(start == trunc_page(start));
KASSERT(size == trunc_page(size));
+ /* We may sleep for pserialize_perform. */
+ ASSERT_SLEEPABLE();
+
mutex_enter(&pv_unmanaged.lock);
for (pvtp = &pv_unmanaged.list;
(pvt = *pvtp) != NULL;
