From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964964AbcALKMz (ORCPT ); Tue, 12 Jan 2016 05:12:55 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56621 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964924AbcALKMv (ORCPT ); Tue, 12 Jan 2016 05:12:51 -0500 Date: Tue, 12 Jan 2016 02:12:37 -0800 From: tip-bot for Dave Jones Message-ID: Cc: mingo@kernel.org, davej@codemonkey.org.uk, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, mingo@kernel.org, davej@codemonkey.org.uk, hpa@zytor.com, linux-kernel@vger.kernel.org In-Reply-To: <20160111170428.GA8547@codemonkey.org.uk> References: <20160111170428.GA8547@codemonkey.org.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/mm: Make split_page_count check for empty levels Git-Commit-ID: 3f1ac1cdc4fdf894e35c0e4fd103b54eec8a28c0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3f1ac1cdc4fdf894e35c0e4fd103b54eec8a28c0 Gitweb: http://git.kernel.org/tip/3f1ac1cdc4fdf894e35c0e4fd103b54eec8a28c0 Author: Dave Jones AuthorDate: Mon, 11 Jan 2016 12:04:28 -0500 Committer: Thomas Gleixner CommitDate: Tue, 12 Jan 2016 11:04:53 +0100 x86/mm: Make split_page_count check for empty levels In PAGEALLOC_DEBUG builds, we disable the 2M pages. Unfortunatly when we split up mappings during boot, split_page_count doesn't take this into account, and starts decrementing an empty direct_pages_count level. This results in /proc/meminfo showing crazy things like DirectMap2M: 18446744073709543424 kB Signed-off-by: Dave Jones Link: http://lkml.kernel.org/r/20160111170428.GA8547@codemonkey.org.uk Cc: stable@vger.kernel.org Signed-off-by: Thomas Gleixner --- arch/x86/mm/pageattr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index a3137a4..ff0e0c6 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -66,6 +66,9 @@ void update_page_count(int level, unsigned long pages) static void split_page_count(int level) { + if (direct_pages_count[level] == 0) + return; + direct_pages_count[level]--; direct_pages_count[level - 1] += PTRS_PER_PTE; }