--- a/serverboot/default_pager.c 2010-05-19 13:37:53.000000000 +0200 +++ b/serverboot/default_pager.c 2010-05-19 15:27:33.000000000 +0200 @@ -2259,39 +2259,6 @@ mach_port_urefs_t default_pager_max_urefs = 10000; -/* - * Check user reference count on pager_request port. - * Pager must be locked. - * Unlocks and re-locks pager if needs to call kernel. - */ -void pager_port_check_request(ds, pager_request) - default_pager_t ds; - mach_port_t pager_request; -{ - mach_port_delta_t delta; - kern_return_t kr; - - assert(ds->pager_request == pager_request); - - if (++ds->request_refs > default_pager_max_urefs) { - delta = 1 - ds->request_refs; - ds->request_refs = 1; - - dstruct_unlock(ds); - - /* - * Deallocate excess user references. - */ - - kr = mach_port_mod_refs(default_pager_self, pager_request, - MACH_PORT_RIGHT_SEND, delta); - if (kr != KERN_SUCCESS) - panic("%spager_port_check_request",my_name); - - dstruct_lock(ds); - } -} - void default_pager_add(ds, internal) default_pager_t ds; boolean_t internal; @@ -2512,28 +2479,11 @@ pager_port_unlock(ds); /* - * Now we deallocate our various port rights. + * Now we destroy our port rights. */ - kr = mach_port_mod_refs(default_pager_self, pager_request, - MACH_PORT_RIGHT_SEND, -request_refs); - if (kr != KERN_SUCCESS) - panic(here,my_name); - - kr = mach_port_mod_refs(default_pager_self, pager_request, - MACH_PORT_RIGHT_RECEIVE, -1); - if (kr != KERN_SUCCESS) - panic(here,my_name); - - kr = mach_port_mod_refs(default_pager_self, pager_name, - MACH_PORT_RIGHT_SEND, -name_refs); - if (kr != KERN_SUCCESS) - panic(here,my_name); - - kr = mach_port_mod_refs(default_pager_self, pager_name, - MACH_PORT_RIGHT_RECEIVE, -1); - if (kr != KERN_SUCCESS) - panic(here,my_name); + mach_port_destroy(mach_task_self(), pager_request); + mach_port_destroy(mach_task_self(), pager_name); return (KERN_SUCCESS); } @@ -2642,7 +2592,6 @@ ddprintf ("seqnos_memory_object_data_request <%p>: pager_port_lock: <%p>[s:%d,r:%d,w:%d,l:%d], %d\n", &ds, ds, ds->seqno, ds->readers, ds->writers, ds->lock.held, seqno); pager_port_lock(ds, seqno); - pager_port_check_request(ds, reply_to); pager_port_wait_for_writers(ds); pager_port_start_read(ds); @@ -2745,7 +2694,6 @@ ddprintf ("seqnos_memory_object_data_initialize <%p>: pager_port_lock: <%p>[s:%d,r:%d,w:%d,l:%d], %d\n", &ds, ds, ds->seqno, ds->readers, ds->writers, ds->lock.held, seqno); pager_port_lock(ds, seqno); - pager_port_check_request(ds, pager_request); pager_port_start_write(ds); ddprintf ("seqnos_memory_object_data_initialize <%p>: pager_port_unlock: <%p>[s:%d,r:%d,w:%d,l:%d]\n", &ds, ds, ds->seqno, ds->readers, ds->writers, ds->lock.held); @@ -2825,7 +2773,6 @@ &err, ds, ds->seqno, ds->readers, ds->writers, ds->lock.held, seqno); pager_port_lock(ds, seqno); ddprintf ("seqnos_memory_object_data_write <%p>: 5\n", &err); - pager_port_check_request(ds, pager_request); ddprintf ("seqnos_memory_object_data_write <%p>: 6\n", &err); pager_port_start_write(ds); ddprintf ("seqnos_memory_object_data_write <%p>: 7\n", &err); @@ -2893,8 +2840,6 @@ return KERN_FAILURE; } -/* We get this when our memory_object_lock_request has completed - after we truncated an object. */ kern_return_t seqnos_memory_object_lock_completed (memory_object_t pager, mach_port_seqno_t seqno, @@ -2902,30 +2847,8 @@ vm_offset_t offset, vm_size_t length) { - default_pager_t ds; - - ds = pager_port_lookup(pager); - assert(ds != DEFAULT_PAGER_NULL); - - pager_port_lock(ds, seqno); - pager_port_wait_for_readers(ds); - pager_port_wait_for_writers(ds); - - /* Now that any in-core pages have been flushed, we can apply - the limit to prevent any new page-ins. */ - assert (page_aligned (offset)); - ds->dpager.limit = offset; - - default_pager_object_set_size_reply (ds->lock_request, KERN_SUCCESS); - ds->lock_request = MACH_PORT_NULL; - - if (ds->dpager.size > ds->dpager.limit / vm_page_size) - /* Deallocate the old backing store pages and shrink the page map. */ - pager_truncate (&ds->dpager, ds->dpager.limit / vm_page_size); - - pager_port_unlock(ds, seqno); - - return KERN_SUCCESS; + panic("%slock_completed", my_name); + return KERN_FAILURE; } kern_return_t @@ -3725,7 +3648,6 @@ kern_return_t S_default_pager_object_set_size (mach_port_t pager, mach_port_seqno_t seqno, - mach_port_t reply_to, vm_size_t limit) { kern_return_t kr; @@ -3736,7 +3658,6 @@ return KERN_INVALID_ARGUMENT; pager_port_lock(ds, seqno); - pager_port_check_request(ds, reply_to); pager_port_wait_for_readers(ds); pager_port_wait_for_writers(ds); @@ -3747,26 +3668,23 @@ ds->dpager.limit = limit; kr = KERN_SUCCESS; } - else if (ds->lock_request == MACH_PORT_NULL) + else { - /* Tell the kernel to flush from core all the pages being removed. - We will get the memory_object_lock_completed callback when they - have been flushed. We handle that by completing the limit update - and posting the reply to the pending truncation. */ + /* Tell the kernel to flush from core all the pages being removed. */ kr = memory_object_lock_request (ds->pager_request, limit, - ds->dpager.size * vm_page_size - limit, + ds->dpager.limit - limit, MEMORY_OBJECT_RETURN_NONE, TRUE, - VM_PROT_ALL, ds->pager); + VM_PROT_ALL, MACH_PORT_NULL); if (kr != KERN_SUCCESS) panic ("memory_object_lock_request: %d", kr); - ds->lock_request = reply_to; - kr = MIG_NO_REPLY; + ds->dpager.limit = limit; +#if 0 + /* FIXME: Currently, we're unable to free used swap space */ + if (ds->dpager.size > ds->dpager.limit / vm_page_size) + pager_truncate (&ds->dpager, ds->dpager.limit / vm_page_size); +#endif } - else - /* There is already another call in progress. Tough titties. */ - kr = KERN_FAILURE; - pager_port_unlock(ds, seqno); return kr; --- a/hurd/default_pager.defs 2010-05-19 15:40:38.000000000 +0200 +++ b/hurd/default_pager.defs 2010-05-19 15:40:53.000000000 +0200 @@ -91,6 +91,5 @@ will fail. */ routine default_pager_object_set_size( memory_object : mach_port_t; - sreplyport reply_port : mach_port_send_once_t; msgseqno seqno : mach_port_seqno_t; object_size_limit : vm_size_t);