Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752647AbbKGJnO (ORCPT ); Sat, 7 Nov 2015 04:43:14 -0500 Received: from mail-wi0-f178.google.com ([209.85.212.178]:36718 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020AbbKGJnJ (ORCPT ); Sat, 7 Nov 2015 04:43:09 -0500 Date: Sat, 7 Nov 2015 09:43:06 +0000 From: Matt Fleming To: Krzysztof Mazur Cc: Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org, Andrew Morton , Andy Lutomirski , "H. Peter Anvin" , Ingo Molnar , Laszlo Ersek , Paolo Bonzini , Thomas Gleixner Subject: Re: [PATCH] x86/setup: fix low identity map for >= 2GB kernel range Message-ID: <20151107094306.GA2387@codeblueprint.co.uk> References: <1446815916-22105-1-git-send-email-krzysiek@podlesie.net> <20151106132733.GC19522@pd.tnic> <20151106141139.GA2233@shrek.podlesie.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151106141139.GA2233@shrek.podlesie.net> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1414 Lines: 35 On Fri, 06 Nov, at 03:11:39PM, Krzysztof Mazur wrote: > On Fri, Nov 06, 2015 at 02:27:33PM +0100, Borislav Petkov wrote: > > On Fri, Nov 06, 2015 at 02:18:36PM +0100, Krzysztof Mazur wrote: > > > diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c > > > index a3cccbf..37c8ea8 100644 > > > --- a/arch/x86/kernel/setup.c > > > +++ b/arch/x86/kernel/setup.c > > > @@ -1180,7 +1180,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(); > > > > http://git.kernel.org/tip/1c5dac914794f0170e1582d8ffdee52d30e0e4dd > > > > Thanks and sorry. Yes, it has been already fixed. I've rechecked only > mainline. > > However, I think that there should be > min(KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY), not just KERNEL_PGD_BOUNDARY > (usually 768 for normal 1G/3G split), because swapper_pg_dir has only > 1024 entries and 768+768 is 1536. Yeah, this fix is preferable to the one that is currently sitting in tip/x86/urgent. Curse you VMSPLIT! -- 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/