openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-25 06:35:46 +00:00
Code Issues Projects Releases Wiki Activity

Revert the rest of commit 1.3.1 and revert commit 1.3.8

Browse Source 
This reverts both of these commits in the current tree.

this will be follwed up with changes to re-add the atomic
operations on uvmexp.paging

ok claudio@, kettenis@, (possibly deraadt@?)
This commit is contained in:
beck
2026-01-22 02:09:37 +00:00
parent 72d111245f
commit ec50cc4777
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sys/uvm/uvm_pdaemon.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: uvm_pdaemon.c,v 1.148 2026/01/06 07:18:48 beck Exp $ */
/* $OpenBSD: uvm_pdaemon.c,v 1.149 2026/01/22 02:09:37 beck Exp $ */
/* $NetBSD: uvm_pdaemon.c,v 1.23 2000/08/20 10:24:14 bjh21 Exp $ */
/*
@@ -244,8 +244,7 @@ uvm_pageout(void *arg)
constraint = no_constraint;
}
/* How many pages do we need to free during this round? */
shortage = uvmexp.freetarg -
(uvmexp.free + uvmexp.paging) + BUFPAGES_DEFICIT;
shortage = uvmexp.freetarg - uvmexp.free + BUFPAGES_DEFICIT;
uvm_unlock_fpageq();
/*
@@ -290,7 +289,8 @@ uvm_pageout(void *arg)
* wake up any waiters.
*/
uvm_lock_fpageq();
if (uvmexp.free > uvmexp.reserve_kernel || uvmexp.paging == 0) {
if (uvmexp.free > uvmexp.reserve_kernel ||
uvmexp.paging == 0) {
wakeup(&uvmexp.free);
}
@@ -326,7 +326,7 @@ uvm_pageout(void *arg)
void
uvm_aiodone_daemon(void *arg)
{
int s, npages;
int s, free;
struct buf *bp, *nbp;
uvm.aiodoned_proc = curproc;
@@ -346,11 +346,11 @@ uvm_aiodone_daemon(void *arg)
mtx_leave(&uvm.aiodoned_lock);
/* process each i/o that's done. */
npages = 0;
KERNEL_LOCK();
free = uvmexp.free;
while (bp != NULL) {
if (bp->b_flags & B_PDAEMON) {
npages += bp->b_bufsize >> PAGE_SHIFT;
uvmexp.paging -= bp->b_bufsize >> PAGE_SHIFT;
}
nbp = TAILQ_NEXT(bp, b_freelist);
s = splbio(); /* b_iodone must by called at splbio */
@@ -361,14 +361,9 @@ uvm_aiodone_daemon(void *arg)
sched_pause(yield);
}
KERNEL_UNLOCK();
uvm_lock_fpageq();
atomic_sub_int(&uvmexp.paging, npages);
if (uvmexp.free <= uvmexp.reserve_kernel ||
!TAILQ_EMPTY(&uvm.pmr_control.allocs))
wakeup(&uvm.pagedaemon);
else
wakeup(&uvmexp.free);
wakeup(free <= uvmexp.reserve_kernel ? &uvm.pagedaemon :
&uvmexp.free);
uvm_unlock_fpageq();
}
}
@@ -844,7 +839,7 @@ uvmpd_scan_inactive(struct uvm_pmalloc *pma, int shortage)
uvm_lock_pageq();
if (result == VM_PAGER_PEND) {
atomic_add_int(&uvmexp.paging, npages);
uvmexp.paging += npages;
uvmexp.pdpending++;
}
}

6
sys/uvm/uvmexp.h
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: uvmexp.h,v 1.20 2025/11/12 12:19:47 mpi Exp $ */
/* $OpenBSD: uvmexp.h,v 1.21 2026/01/22 02:09:37 beck Exp $ */
#ifndef _UVM_UVMEXP_
#define _UVM_UVMEXP_
@@ -61,8 +61,8 @@ struct uvmexp {
int free; /* [F] number of free pages */
int active; /* [L] # of active pages */
int inactive; /* [L] # of pages that we free'd but may want back */
int paging; /* [a] # of pages in the process of being paged out */
int wired; /* [a] number of wired pages */
int paging; /* number of pages in the process of being paged out */
int wired; /* number of wired pages */
int zeropages; /* [F] number of zero'd pages */
int reserve_pagedaemon; /* [I] # of pages reserved for pagedaemon */