Module Name: src
Committed By: riastradh
Date: Sat Sep 24 11:05:47 UTC 2022
Modified Files:
src/sys/arch/x86/x86: pmap.c
Log Message:
x86/pmap: Convert conditional to assertion.
pmap_kernel should never have va < VM_MAXUSER_ADDRESS entered.
To generate a diff of this commit:
cvs rdiff -u -r1.422 -r1.423 src/sys/arch/x86/x86/pmap.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/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.422 src/sys/arch/x86/x86/pmap.c:1.423
--- src/sys/arch/x86/x86/pmap.c:1.422 Sat Sep 24 11:05:18 2022
+++ src/sys/arch/x86/x86/pmap.c Sat Sep 24 11:05:47 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.422 2022/09/24 11:05:18 riastradh Exp $ */
+/* $NetBSD: pmap.c,v 1.423 2022/09/24 11:05:47 riastradh Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017, 2019, 2020 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.422 2022/09/24 11:05:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.423 2022/09/24 11:05:47 riastradh Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -5001,9 +5001,13 @@ pmap_enter_ma(struct pmap *pmap, vaddr_t
npte |= pmap_pat_flags(flags);
if (wired)
npte |= PTE_WIRED;
- if (va < VM_MAXUSER_ADDRESS &&
- (pmap == pmap_kernel() || pmap_is_user(pmap)))
- npte |= PTE_U;
+ if (va < VM_MAXUSER_ADDRESS) {
+ KASSERTMSG(pmap != pmap_kernel(),
+ "entering user va %#"PRIxVADDR" into kernel pmap",
+ va);
+ if (pmap_is_user(pmap))
+ npte |= PTE_U;
+ }
if (pmap == pmap_kernel())
npte |= pmap_pg_g;
