--- Gnu-Mach/device/dev_pager.c 2020/09/02 04:45:29 1.1.1.3 +++ Gnu-Mach/device/dev_pager.c 2020/09/02 04:54:17 1.1.1.6 @@ -55,9 +55,8 @@ #include #include #include - -extern vm_offset_t block_io_mmap(); /* dummy routine to allow - mmap for block devices */ +#include +#include /* * The device pager routines are called directly from the message @@ -174,15 +173,15 @@ void dev_pager_hash_init(void) size = sizeof(struct dev_pager_entry); kmem_cache_init(&dev_pager_hash_cache, "dev_pager_entry", size, 0, - NULL, NULL, NULL, 0); + NULL, 0); for (i = 0; i < DEV_PAGER_HASH_COUNT; i++) queue_init(&dev_pager_hashtable[i]); simple_lock_init(&dev_pager_hash_lock); } void dev_pager_hash_insert( - ipc_port_t name_port, - dev_pager_t rec) + const ipc_port_t name_port, + const dev_pager_t rec) { dev_pager_entry_t new_entry; @@ -196,7 +195,7 @@ void dev_pager_hash_insert( simple_unlock(&dev_pager_hash_lock); } -void dev_pager_hash_delete(ipc_port_t name_port) +void dev_pager_hash_delete(const ipc_port_t name_port) { queue_t bucket; dev_pager_entry_t entry; @@ -217,7 +216,7 @@ void dev_pager_hash_delete(ipc_port_t na kmem_cache_free(&dev_pager_hash_cache, (vm_offset_t)entry); } -dev_pager_t dev_pager_hash_lookup(ipc_port_t name_port) +dev_pager_t dev_pager_hash_lookup(const ipc_port_t name_port) { queue_t bucket; dev_pager_entry_t entry; @@ -241,11 +240,11 @@ dev_pager_t dev_pager_hash_lookup(ipc_po } kern_return_t device_pager_setup( - mach_device_t device, - int prot, - vm_offset_t offset, - vm_size_t size, - mach_port_t *pager) + const mach_device_t device, + int prot, + vm_offset_t offset, + vm_size_t size, + mach_port_t *pager) { dev_pager_t d; @@ -318,16 +317,12 @@ void device_pager_release(memory_object_ boolean_t device_pager_debug = FALSE; -boolean_t device_pager_data_request_done(); /* forward */ -boolean_t device_pager_data_write_done(); /* forward */ - - kern_return_t device_pager_data_request( - ipc_port_t pager, - ipc_port_t pager_request, - vm_offset_t offset, - vm_size_t length, - vm_prot_t protection_required) + const ipc_port_t pager, + const ipc_port_t pager_request, + vm_offset_t offset, + vm_size_t length, + vm_prot_t protection_required) { dev_pager_t ds; @@ -335,7 +330,7 @@ kern_return_t device_pager_data_request( printf("(device_pager)data_request: pager=%p, offset=0x%lx, length=0x%x\n", pager, offset, length); - ds = dev_pager_hash_lookup((ipc_port_t)pager); + ds = dev_pager_hash_lookup(pager); if (ds == DEV_PAGER_NULL) panic("(device_pager)data_request: lookup failed"); @@ -344,7 +339,6 @@ kern_return_t device_pager_data_request( if (ds->type == CHAR_PAGER_TYPE) { vm_object_t object; - vm_offset_t device_map_page(void *, vm_offset_t); object = vm_object_lookup(pager_request); if (object == VM_OBJECT_NULL) { @@ -357,50 +351,12 @@ kern_return_t device_pager_data_request( vm_object_page_map(object, offset, length, - device_map_page, (char *)ds); + device_map_page, (void *)ds); 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); @@ -408,140 +364,20 @@ 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, - (unsigned) ior->io_residual); - } - } else { - size_read = ior->io_count - ior->io_residual; - } - - start_alloc = trunc_page((vm_offset_t)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( - ipc_port_t pager, - 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((ipc_port_t)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(ior) - io_req_t ior; -{ - device_write_dealloc(ior); - mach_device_deallocate(ior->io_device); - - return (TRUE); -} - kern_return_t device_pager_copy( - ipc_port_t pager, - ipc_port_t pager_request, + const ipc_port_t pager, + const ipc_port_t pager_request, vm_offset_t offset, vm_size_t length, - ipc_port_t new_pager) + const ipc_port_t new_pager) { panic("(device_pager)copy: called"); } kern_return_t device_pager_supply_completed( - ipc_port_t pager, - ipc_port_t pager_request, + const ipc_port_t pager, + const ipc_port_t pager_request, vm_offset_t offset, vm_size_t length, kern_return_t result, @@ -552,8 +388,8 @@ device_pager_supply_completed( kern_return_t device_pager_data_return( - ipc_port_t pager, - ipc_port_t pager_request, + const ipc_port_t pager, + const ipc_port_t pager_request, vm_offset_t offset, pointer_t addr, vm_size_t data_cnt, @@ -565,7 +401,7 @@ device_pager_data_return( kern_return_t device_pager_change_completed( - ipc_port_t pager, + const ipc_port_t pager, boolean_t may_cache, memory_object_copy_strategy_t copy_strategy) { @@ -590,10 +426,10 @@ vm_offset_t device_map_page( } kern_return_t device_pager_init_pager( - ipc_port_t pager, - ipc_port_t pager_request, - ipc_port_t pager_name, - vm_size_t pager_page_size) + const ipc_port_t pager, + const ipc_port_t pager_request, + const ipc_port_t pager_name, + vm_size_t pager_page_size) { dev_pager_t ds; @@ -625,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); @@ -641,9 +475,9 @@ kern_return_t device_pager_init_pager( } kern_return_t device_pager_terminate( - ipc_port_t pager, - ipc_port_t pager_request, - ipc_port_t pager_name) + const ipc_port_t pager, + const ipc_port_t pager_request, + const ipc_port_t pager_name) { dev_pager_t ds; @@ -683,8 +517,8 @@ kern_return_t device_pager_terminate( } kern_return_t device_pager_data_unlock( - ipc_port_t memory_object, - ipc_port_t memory_control_port, + const ipc_port_t memory_object, + const ipc_port_t memory_control_port, vm_offset_t offset, vm_size_t length, vm_prot_t desired_access) @@ -694,10 +528,10 @@ kern_return_t device_pager_data_unlock( } kern_return_t device_pager_lock_completed( - ipc_port_t memory_object, - ipc_port_t pager_request_port, - vm_offset_t offset, - vm_size_t length) + const ipc_port_t memory_object, + const ipc_port_t pager_request_port, + vm_offset_t offset, + vm_size_t length) { panic("(device_pager)lock_completed: called"); return (KERN_FAILURE); @@ -712,7 +546,7 @@ void device_pager_init(void) */ size = sizeof(struct dev_pager); kmem_cache_init(&dev_pager_cache, "dev_pager", size, 0, - NULL, NULL, NULL, 0); + NULL, 0); /* * Initialize the name port hashing stuff.