From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S933284AbcCNBJX (ORCPT <rfc822;w@1wt.eu>);
	Sun, 13 Mar 2016 21:09:23 -0400
Received: from nm24-vm7.bullet.mail.ir2.yahoo.com ([212.82.97.31]:45500 "EHLO
	nm24-vm7.bullet.mail.ir2.yahoo.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S933193AbcCNBJQ convert rfc822-to-8bit
	(ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sun, 13 Mar 2016 21:09:16 -0400
X-Yahoo-Newman-Id: 654901.61422.bm@smtp119.mail.ir2.yahoo.com
X-Yahoo-Newman-Property: ymail-3
X-YMail-OSG: xxEla.MVM1lcW3bdiZTdfinLElvbPsMI3JSBLf3rkxui43x
 K80yT7h.M33Libhe1Ky6LF4o94Lw6FCJro6r0elAFSoCXP71OV8M68T_KQF1
 XG_PW5xhckIaKjuV_cvbC.r0Q9yM13v5NKYfWBR2sROm03nB5XjJ_64CxM38
 ocYXyh9B2VkcQz.rHJtR6HEJ.OghwHDXX8uixMnbEhUhJQzT2L14lh9pvKIS
 1iKWEIrFrNxLTKgGkg3ScoTDjvSAtGZ_JhWsbc3gvkKnW41gHdilFedeeZ.k
 XgCaJkuVKK8xS2tYrMRwD21Gt4nk6scWBUCffFLAF52AR3FgBNbj63MHO2Wb
 4LD9sA.nnF3yVPRuFQihtvvmgFb97MCXvr_OQ8m3.3OUw.7H4jxf2DEmI.64
 089KVKP4RBxaMLW_ixkP7HwC_GcC8R8ig2502pLkKUK1aRxan5wSBlWB6x1E
 Ei8mRt.1kyIEAM5yM75gTMAzmi29xPoxuYQKEMfYW3H_6RGy1CoDb1jKfC37
 15oUgKKaOfLuUTXhHOp0b9Ne0I44iNxCYCDv0hFVbpyx.PZLfkDPvyIM8XqX
 tqtoR
X-Yahoo-SMTP: QkvOGgqswBAmJsuza22ON49AwlStQQptm2rSMAAtPmzNJRS9dZWns8gJWIle9A--
Message-ID: <1457917752.10465.6.camel@talk21.com>
Subject: Re: [PATCH] x86/efi: Always map boot service regions into new EFI
 page tables
From: Scott Ashcroft <scott.ashcroft@talk21.com>
To: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Ingo Molnar <mingo@kernel.org>, "H . Peter Anvin" <hpa@zytor.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ard Biesheuvel <ard.biesheuvel@linaro.org>,
        linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Matthew Garrett <mjg59@srcf.ucam.org>, Borislav Petkov <bp@alien8.de>,
        Ben Hutchings <ben@decadent.org.uk>,
        Raphael Hertzog <hertzog@debian.org>,
        Roger Shimizu <rogershimizu@gmail.com>,
        Alexis Murzeau <amurzeau@gmail.com>
Date: Mon, 14 Mar 2016 01:09:12 +0000
In-Reply-To: <20160313230736.GB2619@codeblueprint.co.uk>
References: <1457695163-29632-1-git-send-email-matt@codeblueprint.co.uk>
	 <1457695163-29632-2-git-send-email-matt@codeblueprint.co.uk>
	 <1457888975.3884.9.camel@talk21.com>
	 <20160313215847.GA2619@codeblueprint.co.uk>
	 <20160313230736.GB2619@codeblueprint.co.uk>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.18.5.1-1 
Mime-Version: 1.0
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, 2016-03-13 at 23:07 +0000, Matt Fleming wrote:
> Assuming the answer to this question is "no", can you try out this
> patch?
> 
> diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
> index 8fee5b6f8f66..af74849e8c0f 100644
> --- a/arch/x86/mm/pageattr.c
> +++ b/arch/x86/mm/pageattr.c
> @@ -1055,7 +1055,7 @@ static int populate_pud(struct cpa_data *cpa,
> unsigned long start, pgd_t *pgd,
>  	/*
>  	 * Map everything starting from the Gb boundary, possibly
> with 1G pages
>  	 */
> -	while (end - start >= PUD_SIZE) {
> +	while (cpu_has_gbpages && end - start >= PUD_SIZE) {
>  		set_pud(pud, __pud(cpa->pfn << PAGE_SHIFT |
> _PAGE_PSE |
>  				   massage_pgprot(pud_pgprot)));
> 

Yes, that does fix it.

Cheers,
Scott