From patchwork Tue Jan 20 14:05:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 5669741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1E6E09F333 for ; Tue, 20 Jan 2015 14:09:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4FF5D20396 for ; Tue, 20 Jan 2015 14:09:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B41902035B for ; Tue, 20 Jan 2015 14:09:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YDZSs-0001GH-PO; Tue, 20 Jan 2015 14:07:30 +0000 Received: from mga14.intel.com ([192.55.52.115]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YDZRl-0000Nf-1F for linux-arm-kernel@lists.infradead.org; Tue, 20 Jan 2015 14:06:29 +0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP; 20 Jan 2015 06:00:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="442723658" Received: from black.fi.intel.com ([10.237.72.86]) by FMSMGA003.fm.intel.com with ESMTP; 20 Jan 2015 05:52:31 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id DDCB8D4; Tue, 20 Jan 2015 16:05:46 +0200 (EET) From: "Kirill A. Shutemov" To: Russell King - ARM Linux In-Reply-To: <20150120114555.GA11502@n2100.arm.linux.org.uk> References: <54BD33DC.40200@ti.com> <20150119174317.GK20386@saruman> <20150120001643.7D15AA8@black.fi.intel.com> <20150120114555.GA11502@n2100.arm.linux.org.uk> Subject: Re: [next-20150119]regression (mm)? Message-Id: <20150120140546.DDCB8D4@black.fi.intel.com> Date: Tue, 20 Jan 2015 16:05:46 +0200 (EET) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150120_060621_165772_DA698CD0 X-CRM114-Status: GOOD ( 12.89 ) X-Spam-Score: -5.0 (-----) Cc: Nishanth Menon , Felipe Balbi , linux-mm@kvack.org, linux-next , "linux-arm-kernel@lists.infradead.org" , linux-omap , "Kirill A. Shutemov" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Russell King - ARM Linux wrote: > On Tue, Jan 20, 2015 at 02:16:43AM +0200, Kirill A. Shutemov wrote: > > Better option would be converting 2-lvl ARM configuration to > > , but I'm not sure if it's possible. > > Well, IMHO the folded approach in asm-generic was done the wrong way > which barred ARM from ever using it. Okay, I see. Regarding the topic bug. Completely untested patch is below. Could anybody check if it helps? From 34b9182d08ef2b541829e305fcc91ef1d26b27ea Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Tue, 20 Jan 2015 15:47:22 +0200 Subject: [PATCH] arm: define __PAGETABLE_PMD_FOLDED for !LPAE ARM uses custom implementation of PMD folding in 2-level page table case. Generic code expects to see __PAGETABLE_PMD_FOLDED to be defined if PMD is folded, but ARM doesn't do this. Let's fix it. Defining __PAGETABLE_PMD_FOLDED will drop out unused __pmd_alloc(). It also fixes problems with recently-introduced pmd accounting on ARM without LPAE. Signed-off-by: Kirill A. Shutemov Reported-by: Nishanth Menon Tested-by: Nishanth Menon Tested-by: Peter Ujfalusi Tested-by: Krzysztof Kozlowski --- arch/arm/include/asm/pgtable-2level.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h index bcc5e300413f..bfd662e49a25 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -10,6 +10,8 @@ #ifndef _ASM_PGTABLE_2LEVEL_H #define _ASM_PGTABLE_2LEVEL_H +#define __PAGETABLE_PMD_FOLDED + /* * Hardware-wise, we have a two level page table structure, where the first * level has 4096 entries, and the second level has 256 entries. Each entry