From: Michel Lespinasse <walken@google.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Rik van Riel <riel@redhat.com>, Hugh Dickins <hughd@google.com>,
linux-kernel@vger.kernel.org,
Russell King <linux@arm.linux.org.uk>,
Ralf Baechle <ralf@linux-mips.org>,
Paul Mundt <lethal@linux-sh.org>,
"David S. Miller" <davem@davemloft.net>,
Chris Metcalf <cmetcalf@tilera.com>,
x86@kernel.org, William Irwin <wli@holomorphy.com>
Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org,
linux-mips@linux-mips.org, linux-sh@vger.kernel.org,
sparclinux@vger.kernel.org
Subject: [PATCH 08/16] mm: use vm_unmapped_area() in hugetlbfs
Date: Mon, 5 Nov 2012 14:47:05 -0800 [thread overview]
Message-ID: <1352155633-8648-9-git-send-email-walken@google.com> (raw)
In-Reply-To: <1352155633-8648-1-git-send-email-walken@google.com>
Update the hugetlb_get_unmapped_area function to make use of
vm_unmapped_area() instead of implementing a brute force search.
Signed-off-by: Michel Lespinasse <walken@google.com>
---
fs/hugetlbfs/inode.c | 42 ++++++++----------------------------------
1 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index c5bc355d8243..14bc0c1fb4fb 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -151,8 +151,8 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
{
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
- unsigned long start_addr;
struct hstate *h = hstate_file(file);
+ struct vm_unmapped_area_info info;
if (len & ~huge_page_mask(h))
return -EINVAL;
@@ -173,39 +173,13 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
return addr;
}
- if (len > mm->cached_hole_size)
- start_addr = mm->free_area_cache;
- else {
- start_addr = TASK_UNMAPPED_BASE;
- mm->cached_hole_size = 0;
- }
-
-full_search:
- addr = ALIGN(start_addr, huge_page_size(h));
-
- for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
- /* At this point: (!vma || addr < vma->vm_end). */
- if (TASK_SIZE - len < addr) {
- /*
- * Start a new search - just in case we missed
- * some holes.
- */
- if (start_addr != TASK_UNMAPPED_BASE) {
- start_addr = TASK_UNMAPPED_BASE;
- mm->cached_hole_size = 0;
- goto full_search;
- }
- return -ENOMEM;
- }
-
- if (!vma || addr + len <= vma->vm_start) {
- mm->free_area_cache = addr + len;
- return addr;
- }
- if (addr + mm->cached_hole_size < vma->vm_start)
- mm->cached_hole_size = vma->vm_start - addr;
- addr = ALIGN(vma->vm_end, huge_page_size(h));
- }
+ info.flags = 0;
+ info.length = len;
+ info.low_limit = TASK_UNMAPPED_BASE;
+ info.high_limit = TASK_SIZE;
+ info.align_mask = PAGE_MASK & ~huge_page_mask(h);
+ info.align_offset = 0;
+ return vm_unmapped_area(&info);
}
#endif
--
1.7.7.3
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-11-05 22:47 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-05 22:46 [PATCH 00/16] mm: use augmented rbtrees for finding unmapped areas Michel Lespinasse
2012-11-05 22:46 ` [PATCH 01/16] mm: add anon_vma_lock to validate_mm() Michel Lespinasse
2012-11-05 23:06 ` Rik van Riel
2012-11-06 8:00 ` Michel Lespinasse
2012-11-05 22:46 ` [PATCH 02/16] mm: augment vma rbtree with rb_subtree_gap Michel Lespinasse
2012-11-05 22:47 ` [PATCH 03/16] mm: check rb_subtree_gap correctness Michel Lespinasse
2012-11-06 22:38 ` Andrew Morton
2012-11-09 14:13 ` Sasha Levin
2012-11-09 20:06 ` Hugh Dickins
2012-11-12 11:55 ` Michel Lespinasse
2012-11-05 22:47 ` [PATCH 04/16] mm: rearrange vm_area_struct for fewer cache misses Michel Lespinasse
2012-11-05 22:47 ` [PATCH 05/16] mm: vm_unmapped_area() lookup function Michel Lespinasse
2012-11-05 22:47 ` [PATCH 06/16] mm: use vm_unmapped_area() on x86_64 architecture Michel Lespinasse
2012-11-05 22:47 ` [PATCH 07/16] mm: fix cache coloring " Michel Lespinasse
2012-11-06 22:38 ` Andrew Morton
2012-11-05 22:47 ` Michel Lespinasse [this message]
2012-11-05 23:33 ` [PATCH 08/16] mm: use vm_unmapped_area() in hugetlbfs Rik van Riel
2012-11-05 22:47 ` [PATCH 09/16] mm: use vm_unmapped_area() in hugetlbfs on i386 architecture Michel Lespinasse
2012-11-05 23:07 ` Rik van Riel
2012-11-06 22:38 ` Andrew Morton
2012-11-06 22:48 ` Rik van Riel
2012-11-05 22:47 ` [PATCH 10/16] mm: use vm_unmapped_area() on mips architecture Michel Lespinasse
2012-11-05 23:34 ` Rik van Riel
2012-11-06 22:38 ` Andrew Morton
2012-11-05 22:47 ` [PATCH 11/16] mm: use vm_unmapped_area() on arm architecture Michel Lespinasse
2012-11-05 23:35 ` Rik van Riel
2012-11-06 22:38 ` Andrew Morton
2012-11-05 22:47 ` [PATCH 12/16] mm: use vm_unmapped_area() on sh architecture Michel Lespinasse
2012-11-05 23:35 ` Rik van Riel
2012-11-05 22:47 ` [PATCH 13/16] mm: use vm_unmapped_area() on sparc64 architecture Michel Lespinasse
2012-11-05 23:36 ` Rik van Riel
2012-11-05 22:47 ` [PATCH 14/16] mm: use vm_unmapped_area() in hugetlbfs " Michel Lespinasse
2012-11-05 23:36 ` Rik van Riel
2012-11-05 22:47 ` [PATCH 15/16] mm: use vm_unmapped_area() on sparc32 architecture Michel Lespinasse
2012-11-05 23:37 ` Rik van Riel
2012-11-06 1:25 ` David Miller
2012-11-06 3:13 ` Michel Lespinasse
2012-11-06 7:30 ` Rik van Riel
2012-11-06 17:41 ` David Miller
2012-11-05 22:47 ` [PATCH 16/16] mm: use vm_unmapped_area() in hugetlbfs on tile architecture Michel Lespinasse
2012-11-05 23:37 ` Rik van Riel
2012-11-06 22:11 ` [PATCH 00/16] mm: use augmented rbtrees for finding unmapped areas Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352155633-8648-9-git-send-email-walken@google.com \
--to=walken@google.com \
--cc=akpm@linux-foundation.org \
--cc=cmetcalf@tilera.com \
--cc=davem@davemloft.net \
--cc=hughd@google.com \
--cc=lethal@linux-sh.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-mm@kvack.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=ralf@linux-mips.org \
--cc=riel@redhat.com \
--cc=sparclinux@vger.kernel.org \
--cc=wli@holomorphy.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).