From patchwork Mon Nov 5 22:47:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 197341 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 442112C0080 for ; Tue, 6 Nov 2012 09:47:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754980Ab2KEWrv (ORCPT ); Mon, 5 Nov 2012 17:47:51 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:64529 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964784Ab2KEWrt (ORCPT ); Mon, 5 Nov 2012 17:47:49 -0500 Received: by mail-pb0-f46.google.com with SMTP id rr4so4250694pbb.19 for ; Mon, 05 Nov 2012 14:47:49 -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=/7PVCT8hQvvPDZ5HFl9fZbfcTHvYH9ZQQQP+Y6+8Qx8=; b=FuaFqmMkSytt67V0CDdJNfirnExeWp5BLjr4AS017CP74cRdBB9rRR3oUwr7r/9P/Z iItdPrf+ESKJcSI+k1G5NMnYR6UREb8jq1kNdAasbV4TIW3aNsNaN18PUiqOdBiSD1aL UGMpKGViBtHFyOh5ODQhfnd8AQmcOvI7cEsNF9zZgjdCyl1OixRlR5KmfhRAk9++KJsO D+Cc9MsDU0y40LHp36A9ApDQS/MQ4PaEjEJrYh4kZkwAejTzE4QzXiZJhtSXDxRVr3+b DcLhcq1ihunu4hwMB6BQW3fsPJsWh4NlKwc42HOC5t0DsfKNYMq+mwl3Be0PcwvkRWI+ FFVg== 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=/7PVCT8hQvvPDZ5HFl9fZbfcTHvYH9ZQQQP+Y6+8Qx8=; b=eakxzxCvyHXLvmM36W0fHJ/6dTaJ1UW8Wp8Pf+i30bSQ3SbaXcFib1FIuxpZBlTFEn PSpeuU1072NT0KBxGm0AlfOe0X5GtEp/a47Ydey2lxOyXBBh2WeUCPCe85lolDosmOPJ bQnm+nXiY8RDpeFcX7r9DhaeRyZkJ2EXft9u9lpoFNUSdbvqM7WEYUbZgFLT1pW1PvKN qYerTaEP/rT3eiSDJlKY5wStG/UcIOuY6U+JXknFMcXUgHJCEg41+kYwVLXcEW0xiADa aqGGmALXVPTB+CKuswdye5fmmWQx1ISGu0adxEIUA3JZZTGFIXM85eLUe14mV87FdJrO VCqw== Received: by 10.66.89.98 with SMTP id bn2mr32261865pab.72.1352155668992; Mon, 05 Nov 2012 14:47:48 -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.46 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Nov 2012 14:47:47 -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 10/16] mm: use vm_unmapped_area() on mips architecture Date: Mon, 5 Nov 2012 14:47:07 -0800 Message-Id: <1352155633-8648-11-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: ALoCoQlkPwX9aIsJbnDadER+O0TbRmsa6Ngcv18JWo/l7YB8aZqbRXHazXsbcaEDFYRYydUIGlyEKuXACzKrOnkAHE/FZHyzQQx0Krtze08ligd8xB9qllOwUs/pK7z519bDxmUv+pliG9apaONjSTDJp+OgNxjqdIaJlXtXBhDSjPSVkZ2R7Qp6vTqqaMKcKZg+pTLBrktBvToDYv7Nm6uy+i+iSA1CDA== Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Update the mips 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/mips/mm/mmap.c | 99 +++++++++------------------------------------------ 1 files changed, 17 insertions(+), 82 deletions(-) diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c index 302d779d5b0d..e4b54b233e17 100644 --- a/arch/mips/mm/mmap.c +++ b/arch/mips/mm/mmap.c @@ -71,6 +71,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp, struct vm_area_struct *vma; unsigned long addr = addr0; int do_color_align; + struct vm_unmapped_area_info info; if (unlikely(len > TASK_SIZE)) return -ENOMEM; @@ -107,97 +108,31 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp, return addr; } - if (dir == UP) { - addr = mm->mmap_base; - if (do_color_align) - addr = COLOUR_ALIGN(addr, pgoff); - else - addr = PAGE_ALIGN(addr); + info.length = len; + info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0; + info.align_offset = pgoff << PAGE_SHIFT; - for (vma = find_vma(current->mm, addr); ; vma = vma->vm_next) { - /* At this point: (!vma || addr < vma->vm_end). */ - if (TASK_SIZE - len < addr) - return -ENOMEM; - if (!vma || addr + len <= vma->vm_start) - return addr; - addr = vma->vm_end; - if (do_color_align) - addr = COLOUR_ALIGN(addr, pgoff); - } - } else { - /* 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; - } + if (dir == DOWN) { + info.flags = VM_UNMAPPED_AREA_TOPDOWN; + info.low_limit = PAGE_SIZE; + info.high_limit = mm->mmap_base; + addr = vm_unmapped_area(&info); + + if (!(addr & ~PAGE_MASK)) + return addr; - /* - * either no address requested, or the mapping can't fit into - * the requested address hole - */ - addr = mm->free_area_cache; - if (do_color_align) { - unsigned long base = - COLOUR_ALIGN_DOWN(addr - len, pgoff); - addr = base + len; - } - - /* make sure it can fit in the remaining address space */ - if (likely(addr > len)) { - vma = find_vma(mm, addr - len); - if (!vma || addr <= vma->vm_start) { - /* cache the address as a hint for next time */ - return mm->free_area_cache = addr - len; - } - } - - if (unlikely(mm->mmap_base < len)) - goto bottomup; - - addr = mm->mmap_base - len; - if (do_color_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 (likely(!vma || addr + len <= vma->vm_start)) { - /* cache 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_color_align) - addr = COLOUR_ALIGN_DOWN(addr, pgoff); - } while (likely(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; - - return addr; } + + info.flags = 0; + info.low_limit = mm->mmap_base; + info.high_limit = TASK_SIZE; + return vm_unmapped_area(&info); } unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr0,