Skip to content

Commit

Permalink
mm: vmalloc failure flush fix
Browse files Browse the repository at this point in the history
An initial vmalloc failure should start off a synchronous flush of lazy
areas, in case someone is in progress flushing them already, which could
cause us to return an allocation failure even if there is plenty of KVA
free.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Nick Piggin authored and Linus Torvalds committed Nov 20, 2008
1 parent f011c2d commit 496850e
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions mm/vmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,14 +521,25 @@ static void __purge_vmap_area_lazy(unsigned long *start, unsigned long *end,
spin_unlock(&purge_lock);
}

/*
* Kick off a purge of the outstanding lazy areas. Don't bother if somebody
* is already purging.
*/
static void try_purge_vmap_area_lazy(void)
{
unsigned long start = ULONG_MAX, end = 0;

__purge_vmap_area_lazy(&start, &end, 0, 0);
}

/*
* Kick off a purge of the outstanding lazy areas.
*/
static void purge_vmap_area_lazy(void)
{
unsigned long start = ULONG_MAX, end = 0;

__purge_vmap_area_lazy(&start, &end, 0, 0);
__purge_vmap_area_lazy(&start, &end, 1, 0);
}

/*
Expand All @@ -539,7 +550,7 @@ static void free_unmap_vmap_area(struct vmap_area *va)
va->flags |= VM_LAZY_FREE;
atomic_add((va->va_end - va->va_start) >> PAGE_SHIFT, &vmap_lazy_nr);
if (unlikely(atomic_read(&vmap_lazy_nr) > lazy_max_pages()))
purge_vmap_area_lazy();
try_purge_vmap_area_lazy();
}

static struct vmap_area *find_vmap_area(unsigned long addr)
Expand Down

0 comments on commit 496850e

Please sign in to comment.