From 8d327ced8c2e539a0e845f522f56a84f6474f5ca Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Sun, 2 Oct 2016 00:37:43 +0200 Subject: Remove deprecated external memory management interface. * NEWS: Update. * device/dev_pager.c (device_pager_data_request): Prune unused branch. (device_pager_data_request_done): Remove function. (device_pager_data_write): Likewise. (device_pager_data_write_done): Likewise. (device_pager_copy): Use 'memory_object_ready'. * device/dev_pager.h (device_pager_data_write_done): Remove prototype. * device/device_pager.srv (memory_object_data_write): Remove macro. * doc/mach.texi: Update documentation. * include/mach/mach.defs (memory_object_data_provided): Drop RPC. (memory_object_set_attributes): Likewise. * include/mach/memory_object.defs: Update comments. (memory_object_data_write): Drop RPC. * include/mach/memory_object_default.defs: Update comments. * include/mach_debug/vm_info.h (VOI_STATE_USE_OLD_PAGEOUT): Drop macro. * vm/memory_object.c (memory_object_data_provided): Remove function. (memory_object_data_error): Simplify. (memory_object_set_attributes_common): Make static, remove unused parameters, simplify. (memory_object_change_attributes): Update callsite. (memory_object_set_attributes): Remove function. (memory_object_ready): Update callsite. * vm/vm_debug.c (mach_vm_object_info): Adapt to the changes. * vm/vm_object.c (vm_object_bootstrap): Likewise. * vm/vm_object.h (struct vm_object): Drop flag 'use_old_pageout'. * vm/vm_pageout.c: Update comments. (vm_pageout_page): Simplify. --- device/dev_pager.c | 171 ++--------------------------------------------------- 1 file changed, 6 insertions(+), 165 deletions(-) (limited to 'device/dev_pager.c') diff --git a/device/dev_pager.c b/device/dev_pager.c index 40331706..7130229b 100644 --- a/device/dev_pager.c +++ b/device/dev_pager.c @@ -356,45 +356,7 @@ kern_return_t device_pager_data_request( vm_object_deallocate(object); } else { - io_req_t ior; - mach_device_t device; - io_return_t result; - panic("(device_pager)data_request: dev pager"); - - device = ds->device; - mach_device_reference(device); - dev_pager_deallocate(ds); - - /* - * Package the read for the device driver. - */ - io_req_alloc(ior, 0); - - ior->io_device = device; - ior->io_unit = device->dev_number; - ior->io_op = IO_READ | IO_CALL; - ior->io_mode = 0; - ior->io_recnum = offset / device->bsize; - ior->io_data = 0; /* driver must allocate */ - ior->io_count = length; - ior->io_alloc_size = 0; /* no data allocated yet */ - ior->io_residual = 0; - ior->io_error = 0; - ior->io_done = device_pager_data_request_done; - ior->io_reply_port = pager_request; - ior->io_reply_port_type = MACH_MSG_TYPE_PORT_SEND; - - result = (*device->dev_ops->d_read)(device->dev_number, ior); - if (result == D_IO_QUEUED) - return (KERN_SUCCESS); - - /* - * Return by queuing IOR for io_done thread, to reply in - * correct environment (kernel). - */ - ior->io_error = result; - iodone(ior); } dev_pager_deallocate(ds); @@ -402,125 +364,6 @@ kern_return_t device_pager_data_request( return (KERN_SUCCESS); } -/* - * Always called by io_done thread. - */ -boolean_t device_pager_data_request_done(io_req_t ior) -{ - vm_offset_t start_alloc, end_alloc; - vm_size_t size_read; - - if (ior->io_error == D_SUCCESS) { - size_read = ior->io_count; - if (ior->io_residual) { - if (device_pager_debug) - printf("(device_pager)data_request_done: r: 0x%lx\n", ior->io_residual); - memset((&ior->io_data[ior->io_count - ior->io_residual]), 0, - (size_t) ior->io_residual); - } - } else { - size_read = ior->io_count - ior->io_residual; - } - - start_alloc = trunc_page(ior->io_data); - end_alloc = start_alloc + round_page(ior->io_alloc_size); - - if (ior->io_error == D_SUCCESS) { - vm_map_copy_t copy; - kern_return_t kr; - - kr = vm_map_copyin(kernel_map, (vm_offset_t)ior->io_data, - size_read, TRUE, ©); - if (kr != KERN_SUCCESS) - panic("device_pager_data_request_done"); - - (void) r_memory_object_data_provided( - ior->io_reply_port, - ior->io_recnum * ior->io_device->bsize, - (vm_offset_t)copy, - size_read, - VM_PROT_NONE); - } - else { - (void) r_memory_object_data_error( - ior->io_reply_port, - ior->io_recnum * ior->io_device->bsize, - (vm_size_t)ior->io_count, - ior->io_error); - } - - (void)vm_deallocate(kernel_map, - start_alloc, - end_alloc - start_alloc); - mach_device_deallocate(ior->io_device); - return (TRUE); -} - -kern_return_t device_pager_data_write( - const ipc_port_t pager, - const ipc_port_t pager_request, - vm_offset_t offset, - pointer_t addr, - vm_size_t data_count) -{ - dev_pager_t ds; - mach_device_t device; - io_req_t ior; - kern_return_t result; - - panic("(device_pager)data_write: called"); - - ds = dev_pager_hash_lookup(pager); - if (ds == DEV_PAGER_NULL) - panic("(device_pager)data_write: lookup failed"); - - if (ds->pager_request != pager_request) - panic("(device_pager)data_write: bad pager_request"); - - if (ds->type == CHAR_PAGER_TYPE) - panic("(device_pager)data_write: char pager"); - - device = ds->device; - mach_device_reference(device); - dev_pager_deallocate(ds); - - /* - * Package the write request for the device driver. - */ - io_req_alloc(ior, data_count); - - ior->io_device = device; - ior->io_unit = device->dev_number; - ior->io_op = IO_WRITE | IO_CALL; - ior->io_mode = 0; - ior->io_recnum = offset / device->bsize; - ior->io_data = (io_buf_ptr_t)addr; - ior->io_count = data_count; - ior->io_alloc_size = data_count; /* amount to deallocate */ - ior->io_residual = 0; - ior->io_error = 0; - ior->io_done = device_pager_data_write_done; - ior->io_reply_port = IP_NULL; - - result = (*device->dev_ops->d_write)(device->dev_number, ior); - - if (result != D_IO_QUEUED) { - device_write_dealloc(ior); - io_req_free((vm_offset_t)ior); - mach_device_deallocate(device); - } - - return (KERN_SUCCESS); -} - -boolean_t device_pager_data_write_done(io_req_t ior) -{ - device_write_dealloc(ior); - mach_device_deallocate(ior->io_device); - - return (TRUE); -} - kern_return_t device_pager_copy( const ipc_port_t pager, const ipc_port_t pager_request, @@ -618,15 +461,13 @@ kern_return_t device_pager_init_pager( /* * Reply that the object is ready */ - (void) r_memory_object_set_attributes(pager_request, - TRUE, /* ready */ - FALSE, /* do not cache */ - MEMORY_OBJECT_COPY_NONE); + (void) r_memory_object_ready(pager_request, + FALSE, /* do not cache */ + MEMORY_OBJECT_COPY_NONE); } else { - (void) r_memory_object_set_attributes(pager_request, - TRUE, /* ready */ - TRUE, /* cache */ - MEMORY_OBJECT_COPY_DELAY); + (void) r_memory_object_ready(pager_request, + TRUE, /* cache */ + MEMORY_OBJECT_COPY_DELAY); } dev_pager_deallocate(ds); -- cgit v1.2.3