Module Name: src
Committed By: rin
Date: Fri Nov 1 08:26:18 UTC 2019
Modified Files:
src/sys/uvm: uvm_map.c
Log Message:
PR kern/54395
- Align hint for virtual address at the beginning of uvm_map() if
required. Otherwise, it will be rounded up/down in an unexpected
way by uvm_map_space_avail(), which results in assertion failure.
Fix kernel panic when executing earm binary (8KB pages) on aarch64
(4KB pages), which relies on mmap(2) with MAP_ALIGNED flag.
- Use inline functions/macros consistently.
- Add some more KASSERT's.
For more details, see the PR as well as discussion on port-kern:
http://mail-index.netbsd.org/tech-kern/2019/10/27/msg025629.html
To generate a diff of this commit:
cvs rdiff -u -r1.364 -r1.365 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.364 src/sys/uvm/uvm_map.c:1.365
--- src/sys/uvm/uvm_map.c:1.364 Sat Aug 10 01:06:45 2019
+++ src/sys/uvm/uvm_map.c Fri Nov 1 08:26:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.364 2019/08/10 01:06:45 mrg Exp $ */
+/* $NetBSD: uvm_map.c,v 1.365 2019/11/01 08:26:18 rin 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.364 2019/08/10 01:06:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.365 2019/11/01 08:26:18 rin Exp $");
#include "opt_ddb.h"
#include "opt_pax.h"
@@ -187,6 +187,23 @@ int user_va0_disable = __USER_VA0_DISABL
*/
/*
+ * uvm_map_align_va: round down or up virtual address
+ */
+static __inline void
+uvm_map_align_va(vaddr_t *vap, vsize_t align, int topdown)
+{
+
+ KASSERT(powerof2(align));
+
+ if (align != 0 && (*vap & (align - 1)) != 0) {
+ if (topdown)
+ *vap = rounddown2(*vap, align);
+ else
+ *vap = roundup2(*vap, align);
+ }
+}
+
+/*
* UVM_ET_ISCOMPATIBLE: check some requirements for map entry merging
*/
extern struct vm_map *pager_map;
@@ -1063,6 +1080,7 @@ uvm_map(struct vm_map *map, vaddr_t *sta
int error;
KASSERT((size & PAGE_MASK) == 0);
+ KASSERT((flags & UVM_FLAG_FIXED) == 0 || align == 0);
/*
* for pager_map, allocate the new entry first to avoid sleeping
@@ -1805,13 +1823,9 @@ uvm_map_space_avail(vaddr_t *start, vsiz
*start = ptoa(hint + align); /* adjust to color */
}
}
- } else if (align != 0) {
- if ((*start & (align - 1)) != 0) {
- if (topdown)
- *start &= ~(align - 1);
- else
- *start = roundup(*start, align);
- }
+ } else {
+ KASSERT(powerof2(align));
+ uvm_map_align_va(start, align, topdown);
/*
* XXX Should we PMAP_PREFER() here again?
* eh...i think we're okay
@@ -1861,7 +1875,7 @@ uvm_map_findspace(struct vm_map *map, va
UVMHIST_LOG(maphist, "(map=%#jx, hint=%#jx, len=%ju, flags=%#jx)",
(uintptr_t)map, hint, length, flags);
- KASSERT((flags & UVM_FLAG_COLORMATCH) != 0 || (align & (align - 1)) == 0);
+ KASSERT((flags & UVM_FLAG_COLORMATCH) != 0 || powerof2(align));
KASSERT((flags & UVM_FLAG_COLORMATCH) == 0 || align < uvmexp.ncolors);
KASSERT((flags & UVM_FLAG_FIXED) == 0 || align == 0);
@@ -1888,6 +1902,12 @@ uvm_map_findspace(struct vm_map *map, va
}
/*
+ * hint may not be aligned properly; we need round up or down it
+ * before proceeding further.
+ */
+ uvm_map_align_va(&hint, align, topdown);
+
+ /*
* Look for the first possible address; if there's already
* something at this address, we have to start after it.
*/
