Module Name: src
Committed By: riastradh
Date: Fri Aug 16 11:28:01 UTC 2024
Modified Files:
src/sys/uvm: uvm_map.c
Log Message:
uvm_map(9): Make KASSERTMSG unconditional for findspace invariants.
PR kern/51254: uvm assertion "!topdown || hint <= orig_hint" failed
To generate a diff of this commit:
cvs rdiff -u -r1.425 -r1.426 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.425 src/sys/uvm/uvm_map.c:1.426
--- src/sys/uvm/uvm_map.c:1.425 Thu Aug 15 11:33:21 2024
+++ src/sys/uvm/uvm_map.c Fri Aug 16 11:28:01 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.425 2024/08/15 11:33:21 riastradh Exp $ */
+/* $NetBSD: uvm_map.c,v 1.426 2024/08/16 11:28:01 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.425 2024/08/15 11:33:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.426 2024/08/16 11:28:01 riastradh Exp $");
#include "opt_ddb.h"
#include "opt_pax.h"
@@ -1846,19 +1846,7 @@ uvm_findspace_invariants(struct vm_map *
topdown ? hint <= orig_hint
: hint >= orig_hint;
-#if !(defined(__sh3__) && defined(DIAGNOSTIC)) /* XXXRO: kern/51254 */
-#define UVM_FINDSPACE_KASSERTMSG KASSERTMSG
-
-#else /* sh3 && DIAGNOSTIC */
-/* like KASSERTMSG but make it not fatal */
-#define UVM_FINDSPACE_KASSERTMSG(e, msg, ...) \
- (__predict_true((e)) ? (void)0 : \
- printf(__KASSERTSTR msg "\n", \
- "weak diagnostic ", #e, \
- __FILE__, __LINE__, ## __VA_ARGS__))
-#endif
-
- UVM_FINDSPACE_KASSERTMSG(hint_location_ok,
+ 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=[%" PRIxVADDR ",%" PRIxVADDR ")"
