d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If we find we have a superpage in pmap_enter_quick_locked return without

Browse Source 
trying to add a new level 3 page.

Obtained from:	ABT Systems Ltd
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Andrew Turner 2016-08-23 16:12:25 +00:00
parent bf140447ba
commit f17394c340
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=304687
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arm64/arm64/pmap.c
View File

@ -2696,7 +2696,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
{ {
struct spglist free; struct spglist free;
pd_entry_t *pde; pd_entry_t *pde;
pt_entry_t *l3; pt_entry_t *l2, *l3;
vm_paddr_t pa; vm_paddr_t pa;
int lvl; int lvl;
@ -2731,6 +2731,12 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
* attempt to allocate a page table page. If this * attempt to allocate a page table page. If this
* attempt fails, we don't retry. Instead, we give up. * attempt fails, we don't retry. Instead, we give up.
*/ */
if (lvl == 1) {
l2 = pmap_l1_to_l2(pde, va);
if ((pmap_load(l2) & ATTR_DESCR_MASK) ==
L2_BLOCK)
return (NULL);
}
if (lvl == 2 && pmap_load(pde) != 0) { if (lvl == 2 && pmap_load(pde) != 0) {
mpte = mpte =
PHYS_TO_VM_PAGE(pmap_load(pde) & ~ATTR_MASK); PHYS_TO_VM_PAGE(pmap_load(pde) & ~ATTR_MASK);