mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-10-19 02:29:40 +00:00
Code Issues Releases Activity

Tidy up: Add comments. Eliminate the pointless

Browse Source 
malloc_type_allocated(..., 0) calls that occur when contigmalloc() has
failed.  Eliminate the acquisition and release of the page queues lock
from vm_page_release_contig().  Rename contigmalloc2() to
contigmapping(), reflecting what it does.
This commit is contained in:
Alan Cox 2007-11-25 07:42:34 +00:00
parent c89d1cf588
commit 9c5ce94257
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=173901
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sys/vm/vm_contig.c
View File

@ -96,6 +96,7 @@ vm_contig_launder_page(vm_page_t m)
struct mount *mp;
int vfslocked;
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
object = m->object;
if (!VM_OBJECT_TRYLOCK(object))
return (EAGAIN);
@ -148,8 +149,7 @@ vm_contig_launder(int queue)
vm_page_t m, next;
int error;
for (m = TAILQ_FIRST(&vm_page_queues[queue].pl); m != NULL; m = next) {
next = TAILQ_NEXT(m, pageq);
TAILQ_FOREACH_SAFE(m, &vm_page_queues[queue].pl, pageq, next) {
/* Skip marker pages */
if ((m->flags & PG_MARKER) != 0)
@ -166,35 +166,38 @@ vm_contig_launder(int queue)
return (FALSE);
}
/*
* Frees the given physically contiguous pages.
*
* N.B.: Any pages with PG_ZERO set must, in fact, be zero filled.
*/
static void
vm_page_release_contigl(vm_page_t m, vm_pindex_t count)
vm_page_release_contig(vm_page_t m, vm_pindex_t count)
{
while (count--) {
/* Leave PG_ZERO unchanged. */
vm_page_free_toq(m);
m++;
}
}
static void
vm_page_release_contig(vm_page_t m, vm_pindex_t count)
{
vm_page_lock_queues();
vm_page_release_contigl(m, count);
vm_page_unlock_queues();
}
/*
* Allocates a region from the kernel address map, inserts the
* given physically contiguous pages into the kernel object,
* creates a wired mapping from the region to the pages, and
* returns the region's starting virtual address. If M_ZERO is
* specified through the given flags, then the pages are zeroed
* before they are mapped.
*/
static void *
contigmalloc2(vm_page_t m, vm_pindex_t npages, int flags)
contigmapping(vm_page_t m, vm_pindex_t npages, int flags)
{
vm_object_t object = kernel_object;
vm_map_t map = kernel_map;
vm_offset_t addr, tmp_addr;
vm_pindex_t i;
/*
* Allocate kernel VM, unfree and assign the physical pages to
* it and return kernel VM pointer.
*/
vm_map_lock(map);
if (vm_map_findspace(map, vm_map_min(map), npages << PAGE_SHIFT, &addr)
!= KERN_SUCCESS) {
@ -230,7 +233,7 @@ contigmalloc(
unsigned long alignment,
unsigned long boundary)
{
void * ret;
void *ret;
vm_page_t pages;
unsigned long npgs;
int actl, actmax, inactl, inactmax, tries;
@ -263,11 +266,12 @@ contigmalloc(
}
ret = NULL;
} else {
ret = contigmalloc2(pages, npgs, flags);
ret = contigmapping(pages, npgs, flags);
if (ret == NULL)
vm_page_release_contig(pages, npgs);
else
malloc_type_allocated(type, npgs << PAGE_SHIFT);
}
malloc_type_allocated(type, ret == NULL ? 0 : npgs << PAGE_SHIFT);
return (ret);
}