mmap: remove inline of vm_unmapped_area
Patch series "mm: mmap: add mmap trace point", v3. Create mmap trace file and add trace point of vm_unmapped_area(). This patch (of 2): In preparation for next patch remove inline of vm_unmapped_area and move code to mmap.c. There is no logical change. Also remove unmapped_area[_topdown] out of mm.h, there is no code calling to them. Signed-off-by: Jaewon Kim <jaewon31.kim@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Vlastimil Babka <vbabka@suse.cz> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Michel Lespinasse <walken@google.com> Cc: Borislav Petkov <bp@suse.de> Link: http://lkml.kernel.org/r/20200320055823.27089-2-jaewon31.kim@samsung.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>alistair/sensors
parent
abd69b9e00
commit
baceaf1c8b
|
@ -2530,26 +2530,7 @@ struct vm_unmapped_area_info {
|
||||||
unsigned long align_offset;
|
unsigned long align_offset;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
|
extern unsigned long vm_unmapped_area(struct vm_unmapped_area_info *info);
|
||||||
extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Search for an unmapped address range.
|
|
||||||
*
|
|
||||||
* We are looking for a range that:
|
|
||||||
* - does not intersect with any VMA;
|
|
||||||
* - is contained within the [low_limit, high_limit) interval;
|
|
||||||
* - is at least the desired size.
|
|
||||||
* - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
|
|
||||||
*/
|
|
||||||
static inline unsigned long
|
|
||||||
vm_unmapped_area(struct vm_unmapped_area_info *info)
|
|
||||||
{
|
|
||||||
if (info->flags & VM_UNMAPPED_AREA_TOPDOWN)
|
|
||||||
return unmapped_area_topdown(info);
|
|
||||||
else
|
|
||||||
return unmapped_area(info);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* truncate.c */
|
/* truncate.c */
|
||||||
extern void truncate_inode_pages(struct address_space *, loff_t);
|
extern void truncate_inode_pages(struct address_space *, loff_t);
|
||||||
|
|
20
mm/mmap.c
20
mm/mmap.c
|
@ -1848,7 +1848,7 @@ unacct_error:
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long unmapped_area(struct vm_unmapped_area_info *info)
|
static unsigned long unmapped_area(struct vm_unmapped_area_info *info)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* We implement the search by looking for an rbtree node that
|
* We implement the search by looking for an rbtree node that
|
||||||
|
@ -1951,7 +1951,7 @@ found:
|
||||||
return gap_start;
|
return gap_start;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
|
static unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
|
||||||
{
|
{
|
||||||
struct mm_struct *mm = current->mm;
|
struct mm_struct *mm = current->mm;
|
||||||
struct vm_area_struct *vma;
|
struct vm_area_struct *vma;
|
||||||
|
@ -2050,6 +2050,22 @@ found_highest:
|
||||||
return gap_end;
|
return gap_end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Search for an unmapped address range.
|
||||||
|
*
|
||||||
|
* We are looking for a range that:
|
||||||
|
* - does not intersect with any VMA;
|
||||||
|
* - is contained within the [low_limit, high_limit) interval;
|
||||||
|
* - is at least the desired size.
|
||||||
|
* - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
|
||||||
|
*/
|
||||||
|
unsigned long vm_unmapped_area(struct vm_unmapped_area_info *info)
|
||||||
|
{
|
||||||
|
if (info->flags & VM_UNMAPPED_AREA_TOPDOWN)
|
||||||
|
return unmapped_area_topdown(info);
|
||||||
|
else
|
||||||
|
return unmapped_area(info);
|
||||||
|
}
|
||||||
|
|
||||||
#ifndef arch_get_mmap_end
|
#ifndef arch_get_mmap_end
|
||||||
#define arch_get_mmap_end(addr) (TASK_SIZE)
|
#define arch_get_mmap_end(addr) (TASK_SIZE)
|
||||||
|
|
Loading…
Reference in New Issue