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

Revert the previous change for two reasons: (1) If vm_map_find() succeeds

Browse Source 
but vm_map_wire() fails, then a vm object, vm map entries, and kernel_map
free space is leaked and (2) unwiring is handled automatically by
vm_map_remove().

Suggested by:   tegge
This commit is contained in:
Alan Cox 2005-08-28 00:19:54 +00:00
parent 3ae0e7d8ae
commit 4167396552
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=149539
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/kern/link_elf.c
View File

@ -710,15 +710,6 @@ 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;
@ -747,6 +738,16 @@ 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
@ -880,14 +881,6 @@ 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));