Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753072AbbKGJot (ORCPT ); Sat, 7 Nov 2015 04:44:49 -0500 Received: from terminus.zytor.com ([198.137.202.10]:33901 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752939AbbKGJoo (ORCPT ); Sat, 7 Nov 2015 04:44:44 -0500 Date: Sat, 7 Nov 2015 01:44:15 -0800 From: tip-bot for Krzysztof Mazur Message-ID: Cc: lersek@redhat.com, luto@amacapital.net, matt.fleming@intel.com, bp@alien8.de, krzysiek@podlesie.net, tglx@linutronix.de, pbonzini@redhat.com, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, pbonzini@redhat.com, krzysiek@podlesie.net, tglx@linutronix.de, matt.fleming@intel.com, bp@alien8.de, luto@amacapital.net, lersek@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <1446815916-22105-1-git-send-email-krzysiek@podlesie.net> References: <1446815916-22105-1-git-send-email-krzysiek@podlesie.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/setup: Fix low identity map for >= 2GB kernel range Git-Commit-ID: 68accac392d859d24adcf1be3a90e41f978bd54c 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 Content-Length: 1950 Lines: 47 Commit-ID: 68accac392d859d24adcf1be3a90e41f978bd54c Gitweb: http://git.kernel.org/tip/68accac392d859d24adcf1be3a90e41f978bd54c Author: Krzysztof Mazur AuthorDate: Fri, 6 Nov 2015 14:18:36 +0100 Committer: Thomas Gleixner CommitDate: Sat, 7 Nov 2015 10:39:40 +0100 x86/setup: Fix low identity map for >= 2GB kernel range The commit f5f3497cad8c extended the low identity mapping. However, if the kernel uses more than 2 GB (VMSPLIT_2G_OPT or VMSPLIT_1G memory split), the normal memory mapping is overwritten by the low identity mapping causing a crash. To avoid overwritting, limit the low identity map to cover only memory before kernel range (PAGE_OFFSET). Fixes: f5f3497cad8c "x86/setup: Extend low identity map to cover whole kernel range Signed-off-by: Krzysztof Mazur Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Laszlo Ersek Cc: Matt Fleming Cc: Paolo Bonzini Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/1446815916-22105-1-git-send-email-krzysiek@podlesie.net Signed-off-by: Thomas Gleixner --- arch/x86/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index a1e4da9..29db25f 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1188,7 +1188,7 @@ void __init setup_arch(char **cmdline_p) */ clone_pgd_range(initial_page_table, swapper_pg_dir + KERNEL_PGD_BOUNDARY, - KERNEL_PGD_PTRS); + min(KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY)); #endif tboot_probe(); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/