Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR kern/54395

Browse Source 
- 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
This commit is contained in:
rin 2019-11-01 08:26:18 +00:00
parent 93a28c822d
commit dc365f90f5
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/uvm/uvm_map.c
View File

@ -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"
@ -186,6 +186,23 @@ int user_va0_disable = __USER_VA0_DISABLE_DEFAULT;
* macros
*/
/*
* 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
*/
@ -1063,6 +1080,7 @@ uvm_map(struct vm_map *map, vaddr_t *startp /* IN/OUT */, vsize_t size,
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, vsize_t length, voff_t uoffset,
*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, vaddr_t hint, vsize_t length,
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);
@ -1887,6 +1901,12 @@ uvm_map_findspace(struct vm_map *map, vaddr_t hint, vsize_t length,
return (NULL);
}
/*
* 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.