Skip to content

Commit

Permalink
mm: nommu: find vma using the sorted vma list
Browse files Browse the repository at this point in the history
Now we have the sorted vma list, use it in the find_vma[_exact]() rather
than doing linear search on the rb-tree.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Namhyung Kim authored and Linus Torvalds committed May 25, 2011
1 parent b951bf2 commit e922c4c
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions mm/nommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -804,17 +804,15 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
{
struct vm_area_struct *vma;
struct rb_node *n = mm->mm_rb.rb_node;

/* check the cache first */
vma = mm->mmap_cache;
if (vma && vma->vm_start <= addr && vma->vm_end > addr)
return vma;

/* trawl the tree (there may be multiple mappings in which addr
/* trawl the list (there may be multiple mappings in which addr
* resides) */
for (n = rb_first(&mm->mm_rb); n; n = rb_next(n)) {
vma = rb_entry(n, struct vm_area_struct, vm_rb);
for (vma = mm->mmap; vma; vma = vma->vm_next) {
if (vma->vm_start > addr)
return NULL;
if (vma->vm_end > addr) {
Expand Down Expand Up @@ -854,18 +852,16 @@ static struct vm_area_struct *find_vma_exact(struct mm_struct *mm,
unsigned long len)
{
struct vm_area_struct *vma;
struct rb_node *n = mm->mm_rb.rb_node;
unsigned long end = addr + len;

/* check the cache first */
vma = mm->mmap_cache;
if (vma && vma->vm_start == addr && vma->vm_end == end)
return vma;

/* trawl the tree (there may be multiple mappings in which addr
/* trawl the list (there may be multiple mappings in which addr
* resides) */
for (n = rb_first(&mm->mm_rb); n; n = rb_next(n)) {
vma = rb_entry(n, struct vm_area_struct, vm_rb);
for (vma = mm->mmap; vma; vma = vma->vm_next) {
if (vma->vm_start < addr)
continue;
if (vma->vm_start > addr)
Expand Down

0 comments on commit e922c4c

Please sign in to comment.