From patchwork Wed Jan 9 01:28:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 210588 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id EE39B2C0334 for ; Wed, 9 Jan 2013 12:29:04 +1100 (EST) Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 7551F2C00B4 for ; Wed, 9 Jan 2013 12:28:31 +1100 (EST) Received: by mail-pa0-f48.google.com with SMTP id fa1so687153pad.7 for ; Tue, 08 Jan 2013 17:28:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=hJMXIlRXm4UDRvUmdOePVuFKoXSG6cPBUXOaAtDTo7E=; b=p1LX+BoSOKAcaZJSeMXN3Gnbph/8jOiG1DOzMWZKGZcFfhVusng82xzgcN0ujR9P7H AL3p99ppjwQNkCNLz8bqPRJsRlnONkJ53K5tFmCkEGiXdZ4Lf6Ifut4U89uL1ogsgOzX Ox37GGOiNNp7Q1Miv2amskJFYRtsSHJokZxZ6y8YTBZSQf2G9VWBqWwDLFRI+xFDw9PQ rkHvyHnptUqCjTXbAjf3mPhtdpi0buwcmnjwc4mTDMTzylxLio3w91tnPKZiUbuQV4y+ cyOfTEb9giOO/8gnpQafIpcSrnA4w+RdcuiRfdYg+tNjcyhOVQ2lYg5ioOoWd/76kXnl UlyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=hJMXIlRXm4UDRvUmdOePVuFKoXSG6cPBUXOaAtDTo7E=; b=fcut2HWS/gWhnGkab7HqstEQY2m9rUvDBtoDIa1JZuOAtT+xtXT7bWUjSOzP1aIytj GFyl3jpQpjprwZhHNFzQhAowDRJk7wSXPFccAIhk+a/e5OX/CGT4A+9L/DwqqWsbMvVq bu8reBMbejXFpXMrJVm2cnjDjA626G4kNkxK17h4OkhHY6HgARjdxCbGxSXCSJcF7gS2 qIvICbe/GYkCX+sPIXKPG0AMta+ErfEJqhDDDy06fUFyh6pw96q1rsKjG8HTHBrd+G61 znS6YeJQbQonT9o6LV0ulZtdGXDmwetUqjx2B/4Q9HL+DgIcfH4RVI2d3TvRtn/XK++n k+CQ== X-Received: by 10.68.238.106 with SMTP id vj10mr207918820pbc.40.1357694909370; Tue, 08 Jan 2013 17:28:29 -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 p10sm41711168pax.27.2013.01.08.17.28.27 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Jan 2013 17:28:28 -0800 (PST) From: Michel Lespinasse To: Rik van Riel , Benjamin Herrenschmidt , "James E.J. Bottomley" , Matt Turner , David Howells , Tony Luck Subject: [PATCH 1/8] mm: use vm_unmapped_area() on parisc architecture Date: Tue, 8 Jan 2013 17:28:08 -0800 Message-Id: <1357694895-520-2-git-send-email-walken@google.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1357694895-520-1-git-send-email-walken@google.com> References: <1357694895-520-1-git-send-email-walken@google.com> X-Gm-Message-State: ALoCoQkXUT0y6hmTc+jOhNMoJVt80vuc0fs8Fvys5A8goES7bSlCg+UGB2dF27Q+5GzvOf0iCR4uCj/g+1Q/onXkfeKJmeJOMiCGGm19/Dyp7K91CSWmg2ysOKoMUtSvff5S9qaVhqXXEHb3SUwSsqAyQ4K2MpVUKb5wi+sE3UBHAQc6wEAbMorn8PzNrPQJHwByUBmAG4TNMMNd7HWylDNzFSp+P8z8Rg== Cc: linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-alpha@vger.kernel.org, Andrew Morton , linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Update the parisc arch_get_unmapped_area function to make use of vm_unmapped_area() instead of implementing a brute force search. Signed-off-by: Michel Lespinasse Acked-by: Rik van Riel --- arch/parisc/kernel/sys_parisc.c | 46 ++++++++++++++------------------------ 1 files changed, 17 insertions(+), 29 deletions(-) diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c index f76c10863c62..6ab138088076 100644 --- a/arch/parisc/kernel/sys_parisc.c +++ b/arch/parisc/kernel/sys_parisc.c @@ -35,18 +35,15 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len) { - struct vm_area_struct *vma; + struct vm_unmapped_area_info info; - addr = PAGE_ALIGN(addr); - - 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; - } + info.flags = 0; + info.length = len; + info.low_limit = PAGE_ALIGN(addr); + info.high_limit = TASK_SIZE; + info.align_mask = 0; + info.align_offset = 0; + return vm_unmapped_area(&info); } #define DCACHE_ALIGN(addr) (((addr) + (SHMLBA - 1)) &~ (SHMLBA - 1)) @@ -63,30 +60,21 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len) */ static int get_offset(struct address_space *mapping) { - int offset = (unsigned long) mapping << (PAGE_SHIFT - 8); - return offset & 0x3FF000; + return (unsigned long) mapping >> 8; } static unsigned long get_shared_area(struct address_space *mapping, unsigned long addr, unsigned long len, unsigned long pgoff) { - struct vm_area_struct *vma; - int offset = mapping ? get_offset(mapping) : 0; - - offset = (offset + (pgoff << PAGE_SHIFT)) & 0x3FF000; + struct vm_unmapped_area_info info; - addr = DCACHE_ALIGN(addr - offset) + offset; - - 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 = DCACHE_ALIGN(vma->vm_end - offset) + offset; - if (addr < vma->vm_end) /* handle wraparound */ - return -ENOMEM; - } + info.flags = 0; + info.length = len; + info.low_limit = PAGE_ALIGN(addr); + info.high_limit = TASK_SIZE; + info.align_mask = PAGE_MASK & (SHMLBA - 1); + info.align_offset = (get_offset(mapping) + pgoff) << PAGE_SHIFT; + return vm_unmapped_area(&info); } unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,