Module Name: src
Committed By: jdolecek
Date: Sun Feb 25 16:44:31 UTC 2018
Modified Files:
src/sys/uvm/pmap: pmap_tlb.c
Log Message:
adjust KASSERT() triggered in PR port-cobalt/53054 to provide more info
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/uvm/pmap/pmap_tlb.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_tlb.c
diff -u src/sys/uvm/pmap/pmap_tlb.c:1.26 src/sys/uvm/pmap/pmap_tlb.c:1.27
--- src/sys/uvm/pmap/pmap_tlb.c:1.26 Wed Feb 21 21:53:54 2018
+++ src/sys/uvm/pmap/pmap_tlb.c Sun Feb 25 16:44:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_tlb.c,v 1.26 2018/02/21 21:53:54 jdolecek Exp $ */
+/* $NetBSD: pmap_tlb.c,v 1.27 2018/02/25 16:44:31 jdolecek Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.26 2018/02/21 21:53:54 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.27 2018/02/25 16:44:31 jdolecek Exp $");
/*
* Manages address spaces in a TLB.
@@ -457,7 +457,11 @@ pmap_tlb_asid_reinitialize(struct pmap_t
const u_int asids_found = tlb_record_asids(
ti->ti_asid_bitmap._b, ti->ti_asid_max);
pmap_tlb_asid_check();
- KASSERT(asids_found == pmap_tlb_asid_count(ti));
+#ifdef DIAGNOSTIC
+ const u_int asids_count = pmap_tlb_asid_count(ti);
+#endif
+ KASSERTMSG(asids_found == asids_count,
+ "found %u != count %u", asids_found, asids_count);
if (__predict_false(asids_found >= ti->ti_asid_max / 2)) {
tlb_invalidate_asids(KERNEL_PID + 1, ti->ti_asid_max);
#else /* MULTIPROCESSOR && !PMAP_TLB_NEED_SHOOTDOWN */
