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

o Remove GIANT_REQUIRED from vm_map_madvise(). Instead, acquire and

Browse Source 
release Giant around vm_map_madvise()'s call to pmap_object_init_pt().
 o Replace GIANT_REQUIRED in vm_object_madvise() with the acquisition
   and release of Giant.
 o Remove the acquisition and release of Giant from madvise().
This commit is contained in:
Alan Cox 2002-05-18 07:48:06 +00:00
parent 2582d4d13f
commit 094f6d2694
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=96839
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/vm/vm_map.c
View File

@ -1268,8 +1268,6 @@ vm_map_madvise(
vm_map_entry_t current, entry;
int modify_map = 0;
GIANT_REQUIRED;
/*
* Some madvise calls directly modify the vm_map_entry, in which case
* we need to use an exclusive lock on the map and we need to perform
@ -1390,6 +1388,7 @@ vm_map_madvise(
vm_object_madvise(current->object.vm_object,
pindex, count, behav);
if (behav == MADV_WILLNEED) {
mtx_lock(&Giant);
pmap_object_init_pt(
map->pmap,
useStart,
@ -1398,6 +1397,7 @@ vm_map_madvise(
(count << PAGE_SHIFT),
MAP_PREFAULT_MADVISE
);
mtx_unlock(&Giant);
}
}
vm_map_unlock_read(map);

9
sys/vm/vm_mmap.c
View File

@ -743,7 +743,6 @@ madvise(td, uap)
struct madvise_args *uap;
{
vm_offset_t start, end;
int ret;
/*
* Check for illegal behavior
@ -771,10 +770,10 @@ madvise(td, uap)
start = trunc_page((vm_offset_t) uap->addr);
end = round_page((vm_offset_t) uap->addr + uap->len);
mtx_lock(&Giant);
ret = vm_map_madvise(&td->td_proc->p_vmspace->vm_map, start, end, uap->behav);
mtx_unlock(&Giant);
return (ret ? EINVAL : 0);
if (vm_map_madvise(&td->td_proc->p_vmspace->vm_map, start, end,
uap->behav))
return (EINVAL);
return (0);
}
#ifndef _SYS_SYSPROTO_H_

4
sys/vm/vm_object.c
View File

@ -1002,10 +1002,11 @@ vm_object_madvise(vm_object_t object, vm_pindex_t pindex, int count, int advise)
vm_object_t tobject;
vm_page_t m;
GIANT_REQUIRED;
if (object == NULL)
return;
mtx_lock(&Giant);
end = pindex + count;
/*
@ -1093,6 +1094,7 @@ vm_object_madvise(vm_object_t object, vm_pindex_t pindex, int count, int advise)
swap_pager_freespace(tobject, tpindex, 1);
}
}
mtx_unlock(&Giant);
}
/*