diff options
Diffstat (limited to 'vm/vm_debug.c')
| -rw-r--r-- | vm/vm_debug.c | 99 |
1 files changed, 74 insertions, 25 deletions
diff --git a/vm/vm_debug.c b/vm/vm_debug.c index 2dff2296..b0dace80 100644 --- a/vm/vm_debug.c +++ b/vm/vm_debug.c @@ -46,8 +46,10 @@ #include <vm/vm_map.h> #include <vm/vm_kern.h> #include <vm/vm_object.h> +#include <kern/mach_debug.server.h> #include <kern/task.h> #include <kern/host.h> +#include <kern/printf.h> #include <ipc/ipc_port.h> @@ -64,7 +66,7 @@ * or IP_NULL if the object or its name port is null. */ -ipc_port_t +static ipc_port_t vm_object_real_name(vm_object_t object) { ipc_port_t port = IP_NULL; @@ -263,7 +265,7 @@ mach_vm_object_info( VPI_STATE_PRIVATE|VPI_STATE_ABSENT) /* - * Routine: mach_vm_object_pages [kernel call] + * Routine: mach_vm_object_pages/mach_vm_object_pages_phys/ [kernel call] * Purpose: * Retrieve information about the pages in a VM object. * Conditions: @@ -274,15 +276,16 @@ mach_vm_object_info( * KERN_RESOURCE_SHORTAGE Couldn't allocate memory. */ -kern_return_t -mach_vm_object_pages( +static kern_return_t +_mach_vm_object_pages( vm_object_t object, - vm_page_info_array_t *pagesp, - natural_t *countp) + void* *pagesp, + natural_t *countp, + int phys) { vm_size_t size; vm_offset_t addr; - vm_page_info_t *pages; + void *pages; unsigned int potential, actual, count; vm_page_t p; kern_return_t kr; @@ -305,28 +308,52 @@ mach_vm_object_pages( if (pages != *pagesp) kmem_free(ipc_kernel_map, addr, size); - size = round_page(actual * sizeof *pages); + if (phys) + size = round_page(actual * sizeof(vm_page_phys_info_t)); + else + size = round_page(actual * sizeof(vm_page_info_t)); kr = kmem_alloc(ipc_kernel_map, &addr, size); if (kr != KERN_SUCCESS) return kr; - pages = (vm_page_info_t *) addr; - potential = size/sizeof *pages; + pages = (void *) addr; + if (phys) + potential = size / sizeof(vm_page_phys_info_t); + else + potential = size / sizeof(vm_page_info_t); } /* object is locked, we have enough wired memory */ count = 0; queue_iterate(&object->memq, p, vm_page_t, listq) { - vm_page_info_t *info = &pages[count++]; + vm_page_info_t *info = NULL; + vm_page_phys_info_t *info_phys = NULL; + + if (phys) + info_phys = pages + count * sizeof(*info_phys); + else + info = pages + count * sizeof(*info); + count++; + vm_page_info_state_t state = 0; - info->vpi_offset = p->offset; - if (p->phys_addr != (typeof(info->vpi_phys_addr)) p->phys_addr) - printf("warning: physical address overflow in mach_vm_object_pages!!"); - info->vpi_phys_addr = p->phys_addr; - info->vpi_wire_count = p->wire_count; - info->vpi_page_lock = p->page_lock; - info->vpi_unlock_request = p->unlock_request; + if (phys) { + info_phys->vpi_offset = p->offset; + if (p->phys_addr != (typeof(info_phys->vpi_phys_addr)) p->phys_addr) + printf("warning: physical address overflow in mach_vm_object_pages!!\n"); + info_phys->vpi_phys_addr = p->phys_addr; + info_phys->vpi_wire_count = p->wire_count; + info_phys->vpi_page_lock = p->page_lock; + info_phys->vpi_unlock_request = p->unlock_request; + } else { + info->vpi_offset = p->offset; + if (p->phys_addr != (typeof(info->vpi_phys_addr)) p->phys_addr) + printf("warning: physical address overflow in mach_vm_object_pages!!\n"); + info->vpi_phys_addr = p->phys_addr; + info->vpi_wire_count = p->wire_count; + info->vpi_page_lock = p->page_lock; + info->vpi_unlock_request = p->unlock_request; + } if (p->busy) state |= VPI_STATE_BUSY; @@ -374,7 +401,10 @@ mach_vm_object_pages( } vm_page_unlock_queues(); - info->vpi_state = state; + if (phys) + info_phys->vpi_state = state; + else + info->vpi_state = state; } if (object->resident_page_count != count) @@ -395,7 +425,10 @@ mach_vm_object_pages( /* kmem_alloc doesn't zero memory */ - size_used = actual * sizeof *pages; + if (phys) + size_used = actual * sizeof(vm_page_phys_info_t); + else + size_used = actual * sizeof(vm_page_info_t); rsize_used = round_page(size_used); if (rsize_used != size) @@ -410,13 +443,31 @@ mach_vm_object_pages( TRUE, ©); assert(kr == KERN_SUCCESS); - *pagesp = (vm_page_info_t *) copy; + *pagesp = (void *) copy; *countp = actual; } return KERN_SUCCESS; } +kern_return_t +mach_vm_object_pages( + vm_object_t object, + vm_page_info_array_t *pagesp, + natural_t *countp) +{ + return _mach_vm_object_pages(object, (void**) pagesp, countp, 0); +} + +kern_return_t +mach_vm_object_pages_phys( + vm_object_t object, + vm_page_phys_info_array_t *pagesp, + natural_t *countp) +{ + return _mach_vm_object_pages(object, (void**) pagesp, countp, 1); +} + #endif /* MACH_VM_DEBUG */ /* @@ -432,10 +483,8 @@ mach_vm_object_pages( */ kern_return_t -host_virtual_physical_table_info(host, infop, countp) - const host_t host; - hash_info_bucket_array_t *infop; - natural_t *countp; +host_virtual_physical_table_info(const host_t host, + hash_info_bucket_array_t *infop, natural_t *countp) { vm_offset_t addr; vm_size_t size = 0;/* '=0' to quiet gcc warnings */ |