Module Name: src
Committed By: riastradh
Date: Wed Aug 14 00:42:02 UTC 2024
Modified Files:
src/sys/uvm: uvm_map.c
Log Message:
uvm_map(9): Show the entry in findspace invariants.
No functional change intended in the non-crash3 case.
PR kern/51254: uvm assertion "!topdown || hint <= orig_hint" failed
To generate a diff of this commit:
cvs rdiff -u -r1.419 -r1.420 src/sys/uvm/uvm_map.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_map.c
diff -u src/sys/uvm/uvm_map.c:1.419 src/sys/uvm/uvm_map.c:1.420
--- src/sys/uvm/uvm_map.c:1.419 Wed Aug 14 00:41:46 2024
+++ src/sys/uvm/uvm_map.c Wed Aug 14 00:42:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.419 2024/08/14 00:41:46 riastradh Exp $ */
+/* $NetBSD: uvm_map.c,v 1.420 2024/08/14 00:42:02 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.419 2024/08/14 00:41:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.420 2024/08/14 00:42:02 riastradh Exp $");
#include "opt_ddb.h"
#include "opt_pax.h"
@@ -1861,11 +1861,13 @@ uvm_findspace_invariants(struct vm_map *
UVM_FINDSPACE_KASSERTMSG(hint_location_ok,
"%s map=%p hint=%#" PRIxVADDR " %s orig_hint=%#" PRIxVADDR
" length=%#" PRIxVSIZE " uobj=%p uoffset=%#llx align=%" PRIxVSIZE
- " flags=%#x entry=%p (uvm_map_findspace line %d)",
+ " flags=%#x entry@%p=[%" PRIxVADDR ",%" PRIxVADDR ")"
+ " (uvm_map_findspace line %d)",
topdown ? "topdown" : "bottomup",
map, hint, topdown ? ">" : "<", orig_hint,
length, uobj, (unsigned long long)uoffset, align,
- flags, entry, line);
+ flags, entry, entry ? entry->start : 0, entry ? entry->end : 0,
+ line);
}
/*
