Module Name: src Committed By: ad Date: Sun Mar 1 21:43:56 UTC 2020
Modified Files: src/sys/uvm: uvm_pglist.c Log Message: uvm_pglistalloc() / uvm_pglistfree() musn't be called from interrupt context. Assert it. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/uvm/uvm_pglist.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/uvm_pglist.c diff -u src/sys/uvm/uvm_pglist.c:1.80 src/sys/uvm/uvm_pglist.c:1.81 --- src/sys/uvm/uvm_pglist.c:1.80 Thu Feb 20 04:54:47 2020 +++ src/sys/uvm/uvm_pglist.c Sun Mar 1 21:43:56 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_pglist.c,v 1.80 2020/02/20 04:54:47 rin Exp $ */ +/* $NetBSD: uvm_pglist.c,v 1.81 2020/03/01 21:43:56 ad Exp $ */ /*- * Copyright (c) 1997, 2019 The NetBSD Foundation, Inc. @@ -35,10 +35,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.80 2020/02/20 04:54:47 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.81 2020/03/01 21:43:56 ad Exp $"); #include <sys/param.h> #include <sys/systm.h> +#include <sys/cpu.h> #include <uvm/uvm.h> #include <uvm/uvm_pdpolicy.h> @@ -514,6 +515,8 @@ uvm_pglistalloc(psize_t size, paddr_t lo { int num, res; + KASSERT(!cpu_intr_p()); + KASSERT(!cpu_softintr_p()); KASSERT((alignment & (alignment - 1)) == 0); KASSERT((boundary & (boundary - 1)) == 0); @@ -562,6 +565,9 @@ uvm_pglistfree(struct pglist *list) struct vm_page *pg; int c, b; + KASSERT(!cpu_intr_p()); + KASSERT(!cpu_softintr_p()); + /* * Lock the free list and free each page. */