From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759828AbcISLmE (ORCPT ); Mon, 19 Sep 2016 07:42:04 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38367 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756608AbcISLl4 (ORCPT ); Mon, 19 Sep 2016 07:41:56 -0400 Date: Mon, 19 Sep 2016 12:41:53 +0100 From: Matt Fleming To: Mike Krinkin Cc: mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, ricardo.neri-calderon@linux.intel.com, ard.biesheuvel@linaro.org, pjones@redhat.com, scott.lawson@intel.com, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Mike Galbraith Subject: Re: Cannot load linux after recent efi-related changes Message-ID: <20160919114153.GD2892@codeblueprint.co.uk> References: <20160917162357.GA4122@gmail.com> <20160918011443.GA4475@gmail.com> <20160919111424.GB2892@codeblueprint.co.uk> <20160919113634.GA4140@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160919113634.GA4140@gmail.com> User-Agent: Mutt/1.5.24+41 (02bc14ed1569) (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 19 Sep, at 02:36:36PM, Mike Krinkin wrote: > On Mon, Sep 19, 2016 at 12:14:24PM +0100, Matt Fleming wrote: > > On Sun, 18 Sep, at 04:14:45AM, Mike Krinkin wrote: > > > > > > diff --git a/drivers/firmware/efi/memmap.c b/drivers/firmware/efi/memmap.c > > > index cd96086..34322d1 100644 > > > --- a/drivers/firmware/efi/memmap.c > > > +++ b/drivers/firmware/efi/memmap.c > > > @@ -221,8 +221,8 @@ void __init efi_memmap_insert(struct efi_memory_map *old_memmap, void *buf, > > > void *old, *new; > > > > > > /* modifying range */ > > > - m_start = mem->range.start; > > > - m_end = mem->range.end; > > > + m_start = mem->range.start & ~(u64)EFI_PAGE_SIZE; > > > + m_end = ALIGN(mem->range.end, EFI_PAGE_SIZE) - 1; > > > m_attr = mem->attribute; > > > > > > for (old = old_memmap->map, new = buf; > > > > Thanks for the analysis and patch Mike, but this needs fixing further > > up the call stack so that we don't map things the caller didn't > > expect. > > > > This bug was also reported in this thread, > > > > https://lkml.kernel.org/r/1474005912.3930.10.camel@gmail.com > > Sorry, i haven't seen that. No problem. > > > > Could you try this patch? > > Works fine for me. Thanks, I've added your Tested-by.