From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161708AbbKFOLn (ORCPT ); Fri, 6 Nov 2015 09:11:43 -0500 Received: from shrek-s3.podlesie.net ([85.14.110.209]:39193 "EHLO shrek.podlesie.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161377AbbKFOLm (ORCPT ); Fri, 6 Nov 2015 09:11:42 -0500 Date: Fri, 6 Nov 2015 15:11:39 +0100 From: Krzysztof Mazur To: Borislav Petkov Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Andrew Morton , Andy Lutomirski , "H. Peter Anvin" , Ingo Molnar , Laszlo Ersek , Matt Fleming , Paolo Bonzini , Thomas Gleixner Subject: Re: [PATCH] x86/setup: fix low identity map for >= 2GB kernel range Message-ID: <20151106141139.GA2233@shrek.podlesie.net> References: <1446815916-22105-1-git-send-email-krzysiek@podlesie.net> <20151106132733.GC19522@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151106132733.GC19522@pd.tnic> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Krzysiek