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: 2608571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id D14FADFB78 for ; Thu, 23 May 2013 18:07:23 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfZ3E-0004zi-IR; Thu, 23 May 2013 17:11:44 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfZ24-0003Af-JE; Thu, 23 May 2013 17:10:28 +0000 Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfZ0S-0002uY-QL for linux-arm-kernel@lists.infradead.org; Thu, 23 May 2013 17:08:51 +0000 Received: by mail-wg0-f46.google.com with SMTP id l18so2176326wgh.13 for ; Thu, 23 May 2013 10:08:25 -0700 (PDT) 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=JvmH8ZQi5Lq5xNi3+LtuMrD4Wic7eLfWtvXGnGY+0Iw=; b=muQ4Ka95drvKz8aHlNYb69+YX8DC/NwFREsW5Ql5l4X9qiVE4W1scK962hxrAzWi8i gsNwiWcb60Vollx56lj+zBBBjU43BLrqYElal9JDFs4so2bRXK9q56ksjGcqU358SCO4 z/zryr+rFIiI2bkJ3p3o1OCST1bEvgx/TVV4iTV8LfrIBMkpLQJT3IrM4+hglz1tQt3d rGiny7o+YFkNV2sB6DDOwqVTKKjl+jC394HF3SZ8xPKhP57+HzIl4vWuzL3B0ydAiC6R tjLGf7Lx6U9/k/pN1iS/BHD2XQQeVLSJD9mSQkBZLkZFyU5S4YVxG4gManwku38LQ2CW 2/1g== 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 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: ALoCoQl9QQVJ/CgRFp4xNZ9824fLVCA7MssC5GSCqNXRr2+9VsEtXzzjJu22g6K8LIyVxLTXGwUW X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130523_130849_035248_71376D26 X-CRM114-Status: GOOD ( 10.37 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Steve Capper , patches@linaro.org, Catalin Marinas , Will Deacon , Michal Hocko , Ken Chen , Mel Gorman X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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"