From patchwork Wed May 8 09:52:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 2538211 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 3D2A1DF2E5 for ; Wed, 8 May 2013 09:58:21 +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 1Ua16I-0002DI-18; Wed, 08 May 2013 09:55:57 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ua15H-0005Fm-2A; Wed, 08 May 2013 09:54:51 +0000 Received: from mail-wg0-x236.google.com ([2a00:1450:400c:c00::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ua14D-00052h-Ez for linux-arm-kernel@lists.infradead.org; Wed, 08 May 2013 09:53:52 +0000 Received: by mail-wg0-f54.google.com with SMTP id x12so1612366wgg.33 for ; Wed, 08 May 2013 02:53:23 -0700 (PDT) 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=j/gu9HOj0P6wNm41HlQ+aYhKf2+FVa9XVtaeLkGS/Ow=; b=VUPSjAQMhAxbbGoaw9Bap5U4ubbqGVMCo22iWDV8x5ZTR7JcqyV79RYXcd7VOyj1F1 o0IwJweavTjEHbQ8mWb1gX1LZRGQ6ThIUmH/xHj8DHP+jm0bhORv0byR0BaiF38olzNu 9zFO11bsom7DoTOGh/LkQ9alPR/sgEhZsMN9jZiOvU/eekFqT37l/ruH0sAoSrSPVBMo oLGTUUy7b8sXGFL0wRkTFocupim71lUbw+TSjGrq8R1WO8ggmClIfH3udzRepSUEf4Qa piwwCOvHEU5/3Z5xA/JffEydNzJoEQGZbHt2qapsiaotSFPYWRtcUPlDzcXFkU2W0Rgy YFLg== X-Received: by 10.180.205.200 with SMTP id li8mr9057781wic.15.1368006803608; Wed, 08 May 2013 02:53:23 -0700 (PDT) Received: from localhost.localdomain (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id m14sm8068040wij.9.2013.05.08.02.53.22 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 08 May 2013 02:53:23 -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: [RFC PATCH v2 10/11] ARM64: mm: Raise MAX_ORDER for 64KB pages and THP. Date: Wed, 8 May 2013 10:52:42 +0100 Message-Id: <1368006763-30774-11-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1368006763-30774-1-git-send-email-steve.capper@linaro.org> References: <1368006763-30774-1-git-send-email-steve.capper@linaro.org> X-Gm-Message-State: ALoCoQlukyzXo+xe06qBPhdV0i9kxENmOAjf4UJmg2Q7EmWfkyU88+xKzwGSNMDUhYy/N5MiJzQm X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130508_055345_677333_5999386D X-CRM114-Status: GOOD ( 10.63 ) 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 053533b..a5f76cf 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -196,6 +196,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"