From b20700966027364e7e2e3cf5ca4613cbb4e2a25b Mon Sep 17 00:00:00 2001 From: Owain Ainsworth Date: Tue, 16 Jun 2009 00:11:30 +0000 Subject: Backout all changes to uvm after pmemrange (which will be backed out separately). a change at or just before the hackathon has either exposed or added a very very nasty memory corruption bug that is giving us hell right now. So in the interest of kernel stability these diffs are being backed out until such a time as that corruption bug has been found and squashed, then the ones that are proven good may slowly return. a quick hitlist of the main commits this backs out: mine: uvm_objwire the lock change in uvm_swap.c using trees for uvm objects instead of the hash removing the pgo_releasepg callback. art@'s: putting pmap_page_protect(VM_PROT_NONE) in uvm_pagedeactivate() since all callers called that just prior anyway. ok beck@, ariane@. prompted by deraadt@. --- sys/uvm/uvm_page.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/uvm/uvm_page.h') diff --git a/sys/uvm/uvm_page.h b/sys/uvm/uvm_page.h index e6d71c95ae9..5896286c871 100644 --- a/sys/uvm/uvm_page.h +++ b/sys/uvm/uvm_page.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_page.h,v 1.36 2009/06/14 03:04:08 deraadt Exp $ */ +/* $OpenBSD: uvm_page.h,v 1.37 2009/06/16 00:11:29 oga Exp $ */ /* $NetBSD: uvm_page.h,v 1.19 2000/12/28 08:24:55 chs Exp $ */ /* @@ -108,7 +108,7 @@ union vm_page_fq { struct { - RB_ENTRY(vm_page) tree; /* hash table links (O)*/ + TAILQ_ENTRY(vm_page) hashq; /* hash table links (O)*/ TAILQ_ENTRY(vm_page) listq; /* pages in same object (O)*/ } queues; @@ -122,6 +122,7 @@ struct vm_page { union vm_page_fq fq; /* free and queue management */ TAILQ_ENTRY(vm_page) pageq; /* queue info for FIFO * queue or free list (P) */ + struct vm_anon *uanon; /* anon (O,P) */ struct uvm_object *uobject; /* object (O,P) */ voff_t offset; /* offset into object (O,P) */ @@ -252,6 +253,7 @@ void uvm_page_own(struct vm_page *, char *); #if !defined(PMAP_STEAL_MEMORY) boolean_t uvm_page_physget(paddr_t *); #endif +void uvm_page_rehash(void); void uvm_pageidlezero(void); void uvm_pageactivate(struct vm_page *); -- cgit v1.2.3