From patchwork Mon Nov 5 22:47:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 197347 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 916022C0080 for ; Tue, 6 Nov 2012 09:50:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964819Ab2KEWtv (ORCPT ); Mon, 5 Nov 2012 17:49:51 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:56510 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754963Ab2KEWru (ORCPT ); Mon, 5 Nov 2012 17:47:50 -0500 Received: by mail-pb0-f46.google.com with SMTP id rr4so4250708pbb.19 for ; Mon, 05 Nov 2012 14:47:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=MWc6J7OqfM3miOevYSOwknDFbsAJCZ6PT1IGIKW/UV0=; b=o5xJXCz+TclulYKRY6QXfZzSVSNsP4WecozLL9IYsflIviGPHG2648uQ/1tN736AdA mtmzdhP/8+LeMY8CgOXefL0lj1DqmghDA4+MABZSpI/4HTSeF7vWrNU5pYpSCLS/BCZq nTJ7mPcDuylqt3SX9ppta719ac3fmuKq5d1szVA88E5BC8lhfhYk6xIgevgHZfUnxZz6 IfPucDW+a/q+c5zWaiVIW9hprsHgiCqjUpcq6F9UJ/Ed/Q2b6N+xKkf2NFlIWbCLXu5V CE8nFJtGC86haiWH1DXhJsliX79RjnSsA12o2DxRPFMc2gzEL7X+lJZVoCUy1WPEi9yn FvLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=MWc6J7OqfM3miOevYSOwknDFbsAJCZ6PT1IGIKW/UV0=; b=FOi8fkUDMhCco7LTJiWRWzaTZ19ZgKGYl4SOO6PtFi7Xtiyy0nm+VFpMuNyhBui1/4 5M9bWN8VqVQgP9NaJU6mItH9jzVNTwq7QMOYEvPOFFwSjq8//C7bUZjcAZDGLctrMt8k i6GAbJ4SeFQY1JTaSDE/44DTLZMeBf9DmZJBL+zFbVKrPQi1Qzad/Jl506VEdBsGqToV bENPMqvl9uli1fXI05/1G0LxqONVbeIjbQ3IIG1alvG+NRHB8EWojWP7EMfSHk2r1v1Q iLimO6zkdg7StC1ElL1xO5qDJhAWqmLZkViPPe7OipL5mn/QI0JI2wkbtmdxxtbrbhjX DWeg== Received: by 10.66.81.199 with SMTP id c7mr32516837pay.19.1352155670583; Mon, 05 Nov 2012 14:47:50 -0800 (PST) Received: from studio.mtv.corp.google.com (studio.mtv.corp.google.com [172.17.131.106]) by mx.google.com with ESMTPS id jx4sm11201653pbc.27.2012.11.05.14.47.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Nov 2012 14:47:49 -0800 (PST) From: Michel Lespinasse To: Andrew Morton , Rik van Riel , Hugh Dickins , linux-kernel@vger.kernel.org, Russell King , Ralf Baechle , Paul Mundt , "David S. Miller" , Chris Metcalf , x86@kernel.org, William Irwin 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 11/16] mm: use vm_unmapped_area() on arm architecture Date: Mon, 5 Nov 2012 14:47:08 -0800 Message-Id: <1352155633-8648-12-git-send-email-walken@google.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1352155633-8648-1-git-send-email-walken@google.com> References: <1352155633-8648-1-git-send-email-walken@google.com> X-Gm-Message-State: ALoCoQnq4VBdMvz8mR7Ybl83MnHYuV9yUYXLOzQru9hvYEtzAC2ld8g00qaNg02PlTHspQ6pn5N5AdNG8r2NydSH1xWv5kvYqejPN4b1AjccsVyxMiN58KpYWkJq/srvcdqlkhLdkpFowAqNXGQB8FGsHisnYHRqkwUygWlLnORPzdomLMiRwuqVorplseSDm8tCo12N/jjdnHVGPFVEl1XLXuxLC/ED6Q== Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Update the arm arch_get_unmapped_area[_topdown] functions to make use of vm_unmapped_area() instead of implementing a brute force search. Signed-off-by: Michel Lespinasse Reviewed-by: Rik van Riel --- arch/arm/mm/mmap.c | 119 ++++++++++------------------------------------------ 1 files changed, 23 insertions(+), 96 deletions(-) diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index ce8cb1970d7a..267e63f58098 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c @@ -72,6 +72,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long start_addr; int do_align = 0; int aliasing = cache_is_vipt_aliasing(); + struct vm_unmapped_area_info info; /* * We only need to do colour alignment if either the I or D @@ -104,46 +105,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, (!vma || addr + len <= vma->vm_start)) return addr; } - if (len > mm->cached_hole_size) { - start_addr = addr = mm->free_area_cache; - } else { - start_addr = addr = mm->mmap_base; - mm->cached_hole_size = 0; - } -full_search: - if (do_align) - addr = COLOUR_ALIGN(addr, pgoff); - else - addr = PAGE_ALIGN(addr); - - 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 = addr = TASK_UNMAPPED_BASE; - mm->cached_hole_size = 0; - goto full_search; - } - return -ENOMEM; - } - if (!vma || addr + len <= vma->vm_start) { - /* - * Remember the place where we stopped the search: - */ - 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 = vma->vm_end; - if (do_align) - addr = COLOUR_ALIGN(addr, pgoff); - } + info.flags = 0; + info.length = len; + info.low_limit = mm->mmap_base; + info.high_limit = TASK_SIZE; + info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0; + info.align_offset = pgoff << PAGE_SHIFT; + return vm_unmapped_area(&info); } unsigned long @@ -156,6 +125,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, unsigned long addr = addr0; int do_align = 0; int aliasing = cache_is_vipt_aliasing(); + struct vm_unmapped_area_info info; /* * We only need to do colour alignment if either the I or D @@ -187,70 +157,27 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, return addr; } - /* check if free_area_cache is useful for us */ - if (len <= mm->cached_hole_size) { - mm->cached_hole_size = 0; - mm->free_area_cache = mm->mmap_base; - } - - /* either no address requested or can't fit in requested address hole */ - addr = mm->free_area_cache; - if (do_align) { - unsigned long base = COLOUR_ALIGN_DOWN(addr - len, pgoff); - addr = base + len; - } - - /* make sure it can fit in the remaining address space */ - if (addr > len) { - vma = find_vma(mm, addr-len); - if (!vma || addr <= vma->vm_start) - /* remember the address as a hint for next time */ - return (mm->free_area_cache = addr-len); - } + info.flags = VM_UNMAPPED_AREA_TOPDOWN; + info.length = len; + info.low_limit = PAGE_SIZE; + info.high_limit = mm->mmap_base; + info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0; + info.align_offset = pgoff << PAGE_SHIFT; + addr = vm_unmapped_area(&info); - if (mm->mmap_base < len) - goto bottomup; - - addr = mm->mmap_base - len; - if (do_align) - addr = COLOUR_ALIGN_DOWN(addr, pgoff); - - do { - /* - * Lookup failure means no vma is above this address, - * else if new region fits below vma->vm_start, - * return with success: - */ - vma = find_vma(mm, addr); - if (!vma || addr+len <= vma->vm_start) - /* remember the address as a hint for next time */ - return (mm->free_area_cache = addr); - - /* remember the largest hole we saw so far */ - if (addr + mm->cached_hole_size < vma->vm_start) - mm->cached_hole_size = vma->vm_start - addr; - - /* try just below the current vma->vm_start */ - addr = vma->vm_start - len; - if (do_align) - addr = COLOUR_ALIGN_DOWN(addr, pgoff); - } while (len < vma->vm_start); - -bottomup: /* * A failed mmap() very likely causes application failure, * so fall back to the bottom-up function here. This scenario * can happen with large stack limits and large mmap() * allocations. */ - mm->cached_hole_size = ~0UL; - mm->free_area_cache = TASK_UNMAPPED_BASE; - addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags); - /* - * Restore the topdown base: - */ - mm->free_area_cache = mm->mmap_base; - mm->cached_hole_size = ~0UL; + if (addr & ~PAGE_MASK) { + VM_BUG_ON(addr != -ENOMEM); + info.flags = 0; + info.low_limit = mm->mmap_base; + info.high_limit = TASK_SIZE; + addr = vm_unmapped_area(&info); + } return addr; }