d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalize the VM wiring done with SPARSE_MAPPING: check for errors, and

Browse Source 
unmap when done.  For whatever reason, SPARSE_MAPPING is not even a
config option, so this is dead code.
This commit is contained in:
Brian Feldman 2004-08-09 18:46:13 +00:00
parent 732d95288a
commit 83dd6b37e1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=133397
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/kern/link_elf.c
View File

@ -710,6 +710,15 @@ link_elf_load_file(linker_class_t cls, const char* filename,
(vm_offset_t *) &ef->address,
mapsize, 1,
VM_PROT_ALL, VM_PROT_ALL, 0);
#ifdef SPARSE_MAPPING
/*
* Wire down the pages
*/
if (error == 0)
error = vm_map_wire(kernel_map, (vm_offset_t) ef->address,
(vm_offset_t) ef->address + mapsize,
VM_MAP_WIRE_SYSTEM|VM_MAP_WIRE_NOHOLES);
#endif
if (error) {
vm_object_deallocate(ef->object);
ef->object = 0;
@ -738,16 +747,6 @@ link_elf_load_file(linker_class_t cls, const char* filename,
}
bzero(segbase + segs[i]->p_filesz,
segs[i]->p_memsz - segs[i]->p_filesz);
#ifdef SPARSE_MAPPING
/*
* Wire down the pages
*/
vm_map_wire(kernel_map,
(vm_offset_t) segbase,
(vm_offset_t) segbase + segs[i]->p_memsz,
VM_MAP_WIRE_SYSTEM|VM_MAP_WIRE_NOHOLES);
#endif
}
#ifdef GPROF
@ -881,6 +880,14 @@ link_elf_unload_file(linker_file_t file)
#ifdef SPARSE_MAPPING
if (ef->object) {
/*
* Unwire the pages
*/
vm_map_unwire(kernel_map,
(vm_offset_t) ef->address,
(vm_offset_t) ef->address
+ (ef->object->size << PAGE_SHIFT),
VM_MAP_WIRE_SYSTEM|VM_MAP_WIRE_NOHOLES);
vm_map_remove(kernel_map, (vm_offset_t) ef->address,
(vm_offset_t) ef->address
+ (ef->object->size << PAGE_SHIFT));