From patchwork Wed Jan 9 01:28:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 210594 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 D8D632C050F for ; Wed, 9 Jan 2013 12:33:23 +1100 (EST) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) (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 CCE992C0320 for ; Wed, 9 Jan 2013 12:28:40 +1100 (EST) Received: by mail-pa0-f42.google.com with SMTP id rl6so681861pac.29 for ; Tue, 08 Jan 2013 17:28:38 -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=NT3uaiILTOLBXauwxpTInoGhDl70NlBHfOggBSbbhp4=; b=bEVftliyQBMpFTd1WcCUmWW1fs8EU3hc5cawEzO8awqLa7H8uGcUcJL5r4GG830YZe rxuhAuGuSx/4rGDgeL+tIbk7Jq0wERRf4aJJH8TcsR0H6+ka4eYyiQ/HuJOXIQzYkhtI HxibmfCoLQlDClep1eFcOYMD5SpPF7GdHgGT+3IIGx6IIZy+l1/SsBt/lrNijL+jEubf gs2dAVwvKwB9w202jPzWBMXdxHZgEwpRg5BHiNx6PpUZlcn2ChSiz4jhCWiI63HG2YQN wsOE9rHKDz1J13YKGOZFZ9bxHfIc6Ez81jHIDIOhwqxdy5JfetqLHw+odE8hFl0se6TT ExzA== 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=NT3uaiILTOLBXauwxpTInoGhDl70NlBHfOggBSbbhp4=; b=lBBEnrTe06UK3qMlKFDYFVAfWJB1629MAPd65hSONJ+84vhzS7EFL+b4jz67Eck36p mNZjomUR2Thra6GkbIIWarvfgBHsvyIhlWREnByoRNzuyMZtDW6D3AIqwKB6Pdu3p/VW /zGEFirgXEXemc60BkSIAGhnQvvkO+MH9cwUuq/+L5/VxH3x7cHPPazPKBVS8xsp0SXZ dMKbrt343ATE5h6YFb8/kpUYeuM4Uc+ww/sxgw4GWkICXurkymWrQfvtBRH9v4xieJdg 5tQnWZTU+Q/7vNNMOkepMbYGvd3c0QyBwHWCK61ol7kSvcqWMwAD/FcrUIhqhxphs1bB ++qw== X-Received: by 10.68.130.170 with SMTP id of10mr204090575pbb.131.1357694918857; Tue, 08 Jan 2013 17:28:38 -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.37 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Jan 2013 17:28:37 -0800 (PST) From: Michel Lespinasse To: Rik van Riel , Benjamin Herrenschmidt , "James E.J. Bottomley" , Matt Turner , David Howells , Tony Luck Subject: [PATCH 7/8] mm: use vm_unmapped_area() on powerpc architecture Date: Tue, 8 Jan 2013 17:28:14 -0800 Message-Id: <1357694895-520-8-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: ALoCoQlWGyaWsAfexPDHfUebdLFSjYvVfklAngn4GRfDqzfOxeiyZI/INpdXS52iYVEauSjWtBEgRs4c7Ut0GUPacLaFgk/0rcuHAXcwGSnv8vQHRRFTyB67VzMypuxrSqQ/rsYzPLG+JdH9V/J4YApR24IfcrKLHnB80ow7o8aWJgsir7pZl3EIZK67PbhYUZnKUxh1ew7Y++VPFUCeMzQmNRTVZSgptQ== 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 powerpc slice_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/powerpc/mm/slice.c | 128 +++++++++++++++++++++++++++++----------------- 1 files changed, 81 insertions(+), 47 deletions(-) diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c index 999a74f25ebe..048346b7eed5 100644 --- a/arch/powerpc/mm/slice.c +++ b/arch/powerpc/mm/slice.c @@ -242,31 +242,51 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm, struct slice_mask available, int psize) { - struct vm_area_struct *vma; - unsigned long addr; - struct slice_mask mask; int pshift = max_t(int, mmu_psize_defs[psize].shift, PAGE_SHIFT); + unsigned long addr, found, slice; + struct vm_unmapped_area_info info; - addr = TASK_UNMAPPED_BASE; + info.flags = 0; + info.length = len; + info.align_mask = PAGE_MASK & ((1ul << pshift) - 1); + info.align_offset = 0; - for (;;) { - addr = _ALIGN_UP(addr, 1ul << pshift); - if ((TASK_SIZE - len) < addr) - break; - vma = find_vma(mm, addr); - BUG_ON(vma && (addr >= vma->vm_end)); + addr = TASK_UNMAPPED_BASE; + while (addr < TASK_SIZE) { + info.low_limit = addr; + if (addr < SLICE_LOW_TOP) { + slice = GET_LOW_SLICE_INDEX(addr); + addr = (slice + 1) << SLICE_LOW_SHIFT; + if (!(available.low_slices & (1u << slice))) + continue; + } else { + slice = GET_HIGH_SLICE_INDEX(addr); + addr = (slice + 1) << SLICE_HIGH_SHIFT; + if (!(available.high_slices & (1u << slice))) + continue; + } - mask = slice_range_to_mask(addr, len); - if (!slice_check_fit(mask, available)) { - if (addr < SLICE_LOW_TOP) - addr = _ALIGN_UP(addr + 1, 1ul << SLICE_LOW_SHIFT); - else - addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT); - continue; + next_slice: + if (addr >= TASK_SIZE) + addr = TASK_SIZE; + else if (addr < SLICE_LOW_TOP) { + slice = GET_LOW_SLICE_INDEX(addr); + if (available.low_slices & (1u << slice)) { + addr = (slice + 1) << SLICE_LOW_SHIFT; + goto next_slice; + } + } else { + slice = GET_HIGH_SLICE_INDEX(addr); + if (available.high_slices & (1u << slice)) { + addr = (slice + 1) << SLICE_HIGH_SHIFT; + goto next_slice; + } } - if (!vma || addr + len <= vma->vm_start) - return addr; - addr = vma->vm_end; + info.high_limit = addr; + + found = vm_unmapped_area(&info); + if (!(found & ~PAGE_MASK)) + return found; } return -ENOMEM; @@ -277,39 +297,53 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm, struct slice_mask available, int psize) { - struct vm_area_struct *vma; - unsigned long addr; - struct slice_mask mask; int pshift = max_t(int, mmu_psize_defs[psize].shift, PAGE_SHIFT); + unsigned long addr, found, slice; + struct vm_unmapped_area_info info; - addr = mm->mmap_base; - while (addr > len) { - /* Go down by chunk size */ - addr = _ALIGN_DOWN(addr - len, 1ul << pshift); + info.flags = VM_UNMAPPED_AREA_TOPDOWN; + info.length = len; + info.align_mask = PAGE_MASK & ((1ul << pshift) - 1); + info.align_offset = 0; - /* Check for hit with different page size */ - mask = slice_range_to_mask(addr, len); - if (!slice_check_fit(mask, available)) { - if (addr < SLICE_LOW_TOP) - addr = _ALIGN_DOWN(addr, 1ul << SLICE_LOW_SHIFT); - else if (addr < (1ul << SLICE_HIGH_SHIFT)) - addr = SLICE_LOW_TOP; - else - addr = _ALIGN_DOWN(addr, 1ul << SLICE_HIGH_SHIFT); - continue; + addr = mm->mmap_base; + while (addr > PAGE_SIZE) { + info.high_limit = addr; + if (addr < SLICE_LOW_TOP) { + slice = GET_LOW_SLICE_INDEX(addr - 1); + addr = slice << SLICE_LOW_SHIFT; + if (!(available.low_slices & (1u << slice))) + continue; + } else { + slice = GET_HIGH_SLICE_INDEX(addr - 1); + addr = slice ? (slice << SLICE_HIGH_SHIFT) : + SLICE_LOW_TOP; + if (!(available.high_slices & (1u << slice))) + continue; } - /* - * 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) - return addr; + next_slice: + if (addr < PAGE_SIZE) + addr = PAGE_SIZE; + else if (addr < SLICE_LOW_TOP) { + slice = GET_LOW_SLICE_INDEX(addr - 1); + if (available.low_slices & (1u << slice)) { + addr = slice << SLICE_LOW_SHIFT; + goto next_slice; + } + } else { + slice = GET_HIGH_SLICE_INDEX(addr - 1); + if (available.high_slices & (1u << slice)) { + addr = slice ? (slice << SLICE_HIGH_SHIFT) : + SLICE_LOW_TOP; + goto next_slice; + } + } + info.low_limit = addr; - /* try just below the current vma->vm_start */ - addr = vma->vm_start; + found = vm_unmapped_area(&info); + if (!(found & ~PAGE_MASK)) + return found; } /*