FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-05 08:48:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm: nommu: find vma using the sorted vma list

Browse Source 
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>
This commit is contained in:
Namhyung Kim 2011-05-24 17:11:24 -07:00 committed by Linus Torvalds
parent b951bf2c46
commit e922c4c536
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mm/nommu.c
View File

@ -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 *find_vma(struct mm_struct *mm, unsigned long addr)
{ {
struct vm_area_struct *vma; struct vm_area_struct *vma;
struct rb_node *n = mm->mm_rb.rb_node;
/* check the cache first */ /* check the cache first */
vma = mm->mmap_cache; vma = mm->mmap_cache;
if (vma && vma->vm_start <= addr && vma->vm_end > addr) if (vma && vma->vm_start <= addr && vma->vm_end > addr)
return vma; 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) */ * resides) */
for (n = rb_first(&mm->mm_rb); n; n = rb_next(n)) { for (vma = mm->mmap; vma; vma = vma->vm_next) {
vma = rb_entry(n, struct vm_area_struct, vm_rb);
if (vma->vm_start > addr) if (vma->vm_start > addr)
return NULL; return NULL;
if (vma->vm_end > addr) { if (vma->vm_end > addr) {
@ -854,7 +852,6 @@ static struct vm_area_struct *find_vma_exact(struct mm_struct *mm,
unsigned long len) unsigned long len)
{ {
struct vm_area_struct *vma; struct vm_area_struct *vma;
struct rb_node *n = mm->mm_rb.rb_node;
unsigned long end = addr + len; unsigned long end = addr + len;
/* check the cache first */ /* check the cache first */
@ -862,10 +859,9 @@ static struct vm_area_struct *find_vma_exact(struct mm_struct *mm,
if (vma && vma->vm_start == addr && vma->vm_end == end) if (vma && vma->vm_start == addr && vma->vm_end == end)
return vma; 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) */ * resides) */
for (n = rb_first(&mm->mm_rb); n; n = rb_next(n)) { for (vma = mm->mmap; vma; vma = vma->vm_next) {
vma = rb_entry(n, struct vm_area_struct, vm_rb);
if (vma->vm_start < addr) if (vma->vm_start < addr)
continue; continue;
if (vma->vm_start > addr) if (vma->vm_start > addr)