diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2013-03-27 02:02:24 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2013-03-27 02:02:24 +0000 |
| commit | 5fa7e034e0e83d8f2236e12164749a8c0c7f82d3 (patch) | |
| tree | fd138d6d17648e9572f3167d87654c4c1dbbd6c3 /sys/uvm | |
| parent | be20be1289f28de3729145734ccf2dc34844d0ee (diff) | |
combine several atomic_clearbits calls into one. slightly faster on
machines where atomic ops aren't so simple.
ok beck deraadt miod
Diffstat (limited to 'sys/uvm')
| -rw-r--r-- | sys/uvm/uvm_page.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c index be1eb538d4b..29a7fe92186 100644 --- a/sys/uvm/uvm_page.c +++ b/sys/uvm/uvm_page.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_page.c,v 1.122 2013/03/12 21:10:11 deraadt Exp $ */ +/* $OpenBSD: uvm_page.c,v 1.123 2013/03/27 02:02:23 tedu Exp $ */ /* $NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $ */ /* @@ -1053,6 +1053,7 @@ void uvm_pagefree(struct vm_page *pg) { int saved_loan_count = pg->loan_count; + u_int flags_to_clear = 0; #ifdef DEBUG if (pg->uobject == (void *)0xdeadbeef && @@ -1115,7 +1116,7 @@ uvm_pagefree(struct vm_page *pg) if (pg->pg_flags & PQ_ACTIVE) { TAILQ_REMOVE(&uvm.page_active, pg, pageq); - atomic_clearbits_int(&pg->pg_flags, PQ_ACTIVE); + flags_to_clear |= PQ_ACTIVE; uvmexp.active--; } if (pg->pg_flags & PQ_INACTIVE) { @@ -1123,7 +1124,7 @@ uvm_pagefree(struct vm_page *pg) TAILQ_REMOVE(&uvm.page_inactive_swp, pg, pageq); else TAILQ_REMOVE(&uvm.page_inactive_obj, pg, pageq); - atomic_clearbits_int(&pg->pg_flags, PQ_INACTIVE); + flags_to_clear |= PQ_INACTIVE; uvmexp.inactive--; } @@ -1138,15 +1139,16 @@ uvm_pagefree(struct vm_page *pg) if (pg->uanon) { pg->uanon->an_page = NULL; pg->uanon = NULL; - atomic_clearbits_int(&pg->pg_flags, PQ_ANON); + flags_to_clear |= PQ_ANON; } /* * Clean page state bits. */ - atomic_clearbits_int(&pg->pg_flags, PQ_AOBJ); /* XXX: find culprit */ - atomic_clearbits_int(&pg->pg_flags, PQ_ENCRYPT| - PG_ZERO|PG_FAKE|PG_BUSY|PG_RELEASED|PG_CLEAN|PG_CLEANCHK); + flags_to_clear |= PQ_AOBJ; /* XXX: find culprit */ + flags_to_clear |= PQ_ENCRYPT|PG_ZERO|PG_FAKE|PG_BUSY|PG_RELEASED| + PG_CLEAN|PG_CLEANCHK; + atomic_clearbits_int(&pg->pg_flags, flags_to_clear); /* * and put on free queue |