From patchwork Thu May 23 17:07:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 17162 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2DB502395B for ; Thu, 23 May 2013 17:09:45 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id m1sf4792134ves.3 for ; Thu, 23 May 2013 10:08:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=JvmH8ZQi5Lq5xNi3+LtuMrD4Wic7eLfWtvXGnGY+0Iw=; b=m1ciFSD+uWIYjTwnnkaQkSzkqihXw4xok0qWO03Q4iT8HtDlk5aLKCszlaiGYufmqO 2gWjsiaX6E/NGo4La9cn8ZtnAYC8kS5zLQi/1B1BAi8PwjT2gPYsyKtVkji8gVkZvMCN /CQ+I5EdwGRoHk6jIzlo+Gxh43MzPYMREHjyGaPBaCn3OhN0mtD44Q+kywTqQfyQXM5G oqOEXKWegD4shUcYoV+t1Wl/1xk7a+tDMiPW8dLNLfm2/KENCKCxmudbJT98CHOTsJIV qeoZWOGr/6mElpmwqgPS/bpEED800REitNYD6jjnaeEMOPBG8vmBvC54Vd6j3Xkxb03t qPfA== X-Received: by 10.236.29.80 with SMTP id h56mr6498814yha.38.1369328929678; Thu, 23 May 2013 10:08:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.78 with SMTP id 14ls1618042qec.10.gmail; Thu, 23 May 2013 10:08:49 -0700 (PDT) X-Received: by 10.220.105.9 with SMTP id r9mr5956009vco.60.1369328929482; Thu, 23 May 2013 10:08:49 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id of10si6877181vcb.57.2013.05.23.10.08.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 May 2013 10:08:49 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hz10so2434670vcb.10 for ; Thu, 23 May 2013 10:08:49 -0700 (PDT) X-Received: by 10.220.246.8 with SMTP id lw8mr5918625vcb.8.1369328929140; Thu, 23 May 2013 10:08:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.126.138 with SMTP id c10csp61553vcs; Thu, 23 May 2013 10:08:46 -0700 (PDT) X-Received: by 10.180.86.38 with SMTP id m6mr45380296wiz.25.1369328905958; Thu, 23 May 2013 10:08:25 -0700 (PDT) Received: from mail-we0-x22b.google.com (mail-we0-x22b.google.com [2a00:1450:400c:c03::22b]) by mx.google.com with ESMTPS id cm10si15067930wib.3.2013.05.23.10.08.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 May 2013 10:08:25 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::22b is neither permitted nor denied by best guess record for domain of steve.capper@linaro.org) client-ip=2a00:1450:400c:c03::22b; Received: by mail-we0-f171.google.com with SMTP id t59so2295402wes.30 for ; Thu, 23 May 2013 10:08:25 -0700 (PDT) X-Received: by 10.180.205.200 with SMTP id li8mr26602979wic.15.1369328905549; Thu, 23 May 2013 10:08:25 -0700 (PDT) Received: from localhost.localdomain (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id ca19sm36989435wib.3.2013.05.23.10.08.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 May 2013 10:08:25 -0700 (PDT) From: Steve Capper To: linux-mm@kvack.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Michal Hocko , Ken Chen , Mel Gorman , Catalin Marinas , Will Deacon , patches@linaro.org, Steve Capper Subject: [PATCH 10/11] ARM64: mm: Raise MAX_ORDER for 64KB pages and THP. Date: Thu, 23 May 2013 18:07:57 +0100 Message-Id: <1369328878-11706-11-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1369328878-11706-1-git-send-email-steve.capper@linaro.org> References: <1369328878-11706-1-git-send-email-steve.capper@linaro.org> X-Gm-Message-State: ALoCoQmQAcK1B6Y4I4CzhzVtRBuAAQHGk0N8cQIaHzPtAFgwII6wCBO8U6157XkrUGV8+Vrm84ii X-Original-Sender: steve.capper@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The buddy allocator has a default MAX_ORDER of 11, which is too low to allocate enough memory for 512MB Transparent HugePages if our base page size is 64KB. This patch introduces MAX_ZONE_ORDER and sets it to 14 when 64KB pages are used in conjuction with THP, otherwise the default value of 11 is used. Signed-off-by: Steve Capper Acked-by: Catalin Marinas --- arch/arm64/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index cd6eca8..10607d6 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -191,6 +191,11 @@ config ARCH_WANT_HUGE_PMD_SHARE source "mm/Kconfig" +config FORCE_MAX_ZONEORDER + int + default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE) + default "11" + endmenu menu "Boot options"