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

update the rump copy of uvm_page_unbusy() to match the real version,

Browse Source 
in particular handle PG_PAGEOUT.  fixes a few atf tests.
This commit is contained in:
chs 2020-12-05 19:08:50 +00:00
parent 37d00948af
commit 4650d4123d
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sys/rump/librump/rumpkern/vm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vm.c,v 1.190 2020/06/11 19:20:46 ad Exp $ */
/* $NetBSD: vm.c,v 1.191 2020/12/05 19:08:50 chs Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.190 2020/06/11 19:20:46 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.191 2020/12/05 19:08:50 chs Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@ -673,26 +673,51 @@ void
uvm_page_unbusy(struct vm_page **pgs, int npgs)
{
struct vm_page *pg;
int i;
int i, pageout_done;
KASSERT(npgs > 0);
KASSERT(rw_write_held(pgs[0]->uobject->vmobjlock));
pageout_done = 0;
for (i = 0; i < npgs; i++) {
pg = pgs[i];
if (pg == NULL)
if (pg == NULL || pg == PGO_DONTCARE) {
continue;
}
#if 0
KASSERT(uvm_page_owner_locked_p(pg, true));
#else
/*
* uvm_page_owner_locked_p() is not available in rump,
* and rump doesn't support amaps anyway.
*/
KASSERT(rw_write_held(pg->uobject->vmobjlock));
#endif
KASSERT(pg->flags & PG_BUSY);
if (pg->flags & PG_PAGEOUT) {
pg->flags &= ~PG_PAGEOUT;
pg->flags |= PG_RELEASED;
pageout_done++;
atomic_inc_uint(&uvmexp.pdfreed);
}
if (pg->flags & PG_RELEASED) {
KASSERT(pg->uobject != NULL ||
(pg->uanon != NULL && pg->uanon->an_ref > 0));
pg->flags &= ~PG_RELEASED;
uvm_pagefree(pg);
} else {
KASSERT((pg->flags & PG_FAKE) == 0);
pg->flags &= ~PG_BUSY;
uvm_pagelock(pg);
uvm_pagewakeup(pg);
uvm_pageunlock(pg);
UVM_PAGE_OWN(pg, NULL);
}
}
if (pageout_done != 0) {
uvm_pageout_done(pageout_done);
}
}
void