From patchwork Wed Jan 9 01:28:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 210591 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 8BBDA2C07BB for ; Wed, 9 Jan 2013 12:31:38 +1100 (EST) Received: from mail-da0-f48.google.com (mail-da0-f48.google.com [209.85.210.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 05C712C023D for ; Wed, 9 Jan 2013 12:28:35 +1100 (EST) Received: by mail-da0-f48.google.com with SMTP id k18so466943dae.35 for ; Tue, 08 Jan 2013 17:28:34 -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=rmX0kPlia+PUaoIgdgKV+zd7+Z+psdbVLfo8bOitlVc=; b=Xegap4c+J0mP5khwwaHVzEe7tl1JGJ4Etb1YPnkSYA/RirKFycaAkrQzusm0xZewfC b2ikqSuSFZ4qOFzfDhu6hHAxfrycVUxRsGjxFuyppN8jVIR7Lhx+HUCZhhnW6FA9ES9B z42oJPTCqaU+p1lpO7lvA17lySQITPoC8mfXGs1boyeJ6XUSFL6/hcwzlYwS1+7mlRmp nUkFglbhfhyLQLLdZJDtjwl5cQmwiyfVTFW5WruiT4T1qYSL/L7IMtElxb1hK/oflDKm mjSZrDtaBksaCuUdFGXcACtMkuAcJSoKf/Yu9EM2Vr07JwGvCKdKctiAlg1YQJffC7yE MsVA== 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=rmX0kPlia+PUaoIgdgKV+zd7+Z+psdbVLfo8bOitlVc=; b=ZKgmXB2u/6SPynhXkad+g43SdKI4cOIeEFsa3izB97UWPmgGvz82E1KdXAuTatGg1B phoLoAzBCAoDMsHFGetzMizVCQ0QACndzIQO7xTkuQ2+70ggth8x26MXF1l+Naub90ZC ScjBGgg+m2mPpza/pumyzR7SUw2xhg7ekZU1ej5yqRW+artxJWjmTC0Ixx9CTBxygQiG mRciwiDLS3OjCB0lHYUzu7ELa6qGhwtDwHZcvqP0a3ROuQ64nf1dGypLERUPp43pusDo 2XK+CnDXkxuJeXD7FxjFDP9mNfJgXYpIt53IlRDIi84UNd2mwSMNYx46njf0imUZWDjV 2RZw== X-Received: by 10.68.238.39 with SMTP id vh7mr29804512pbc.6.1357694914019; Tue, 08 Jan 2013 17:28:34 -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.32 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Jan 2013 17:28:33 -0800 (PST) From: Michel Lespinasse To: Rik van Riel , Benjamin Herrenschmidt , "James E.J. Bottomley" , Matt Turner , David Howells , Tony Luck Subject: [PATCH 4/8] mm: use vm_unmapped_area() on ia64 architecture Date: Tue, 8 Jan 2013 17:28:11 -0800 Message-Id: <1357694895-520-5-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: ALoCoQkSSZedOdZ+jRyJ+npfB84Tfyre2XAfmTcnygKc+mTnNGM6ahliLKsEy4ARNzOZp9nBtpHPac8xtVyHpH32H2ZVE288aGLGvh3AsWVZvtL5DwypT09sr2m6OB8x39EGcg2BHSKS/8J+DB5eqEwX6VPQ4GNVN3Q+o5Ls3aWcAZbd6lORVg8zhq1G1OKg2bFHsAcvhhXG6cUOnH+OdJVd4F0+tNX6wg== 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 ia64 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/ia64/kernel/sys_ia64.c | 37 ++++++++++++------------------------- 1 files changed, 12 insertions(+), 25 deletions(-) diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c index d9439ef2f661..41e33f84c185 100644 --- a/arch/ia64/kernel/sys_ia64.c +++ b/arch/ia64/kernel/sys_ia64.c @@ -25,9 +25,9 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len unsigned long pgoff, unsigned long flags) { long map_shared = (flags & MAP_SHARED); - unsigned long start_addr, align_mask = PAGE_SIZE - 1; + unsigned long align_mask = 0; struct mm_struct *mm = current->mm; - struct vm_area_struct *vma; + struct vm_unmapped_area_info info; if (len > RGN_MAP_LIMIT) return -ENOMEM; @@ -44,7 +44,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len addr = 0; #endif if (!addr) - addr = mm->free_area_cache; + addr = TASK_UNMAPPED_BASE; if (map_shared && (TASK_SIZE > 0xfffffffful)) /* @@ -53,28 +53,15 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len * tasks, we prefer to avoid exhausting the address space too quickly by * limiting alignment to a single page. */ - align_mask = SHMLBA - 1; - - full_search: - start_addr = addr = (addr + align_mask) & ~align_mask; - - for (vma = find_vma(mm, addr); ; vma = vma->vm_next) { - /* At this point: (!vma || addr < vma->vm_end). */ - if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) { - if (start_addr != TASK_UNMAPPED_BASE) { - /* Start a new search --- just in case we missed some holes. */ - addr = TASK_UNMAPPED_BASE; - goto full_search; - } - return -ENOMEM; - } - if (!vma || addr + len <= vma->vm_start) { - /* Remember the address where we stopped this search: */ - mm->free_area_cache = addr + len; - return addr; - } - addr = (vma->vm_end + align_mask) & ~align_mask; - } + align_mask = PAGE_MASK & (SHMLBA - 1); + + info.flags = 0; + info.length = len; + info.low_limit = addr; + info.high_limit = TASK_SIZE; + info.align_mask = align_mask; + info.align_offset = 0; + return vm_unmapped_area(&info); } asmlinkage long