From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752176AbdDCXzc (ORCPT ); Mon, 3 Apr 2017 19:55:32 -0400 Received: from mail-pg0-f50.google.com ([74.125.83.50]:36353 "EHLO mail-pg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751535AbdDCXza (ORCPT ); Mon, 3 Apr 2017 19:55:30 -0400 Date: Mon, 3 Apr 2017 16:54:34 -0700 From: Omar Sandoval To: Matt Fleming Cc: Dave Young , Ingo Molnar , linux-kernel@vger.kernel.org, kernel-team@fb.com, kexec@lists.infradead.org, linux-efi@vger.kernel.org Subject: Re: kexec regression since 4.9 caused by efi Message-ID: <20170403235434.GA22520@vader.DHCP.thefacebook.com> References: <20170308201616.GC8598@vader> <20170309063806.GB17257@dhcp-128-65.nay.redhat.com> <20170309095408.GA17883@vader> <20170313073748.GA6332@dhcp-128-65.nay.redhat.com> <20170316124132.GF6261@codeblueprint.co.uk> <20170316175048.GA25230@vader.DHCP.thefacebook.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170316175048.GA25230@vader.DHCP.thefacebook.com> User-Agent: Mutt/1.8.0 (2017-02-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 16, 2017 at 10:50:48AM -0700, Omar Sandoval wrote: > On Thu, Mar 16, 2017 at 12:41:32PM +0000, Matt Fleming wrote: > > On Mon, 13 Mar, at 03:37:48PM, Dave Young wrote: > > > > > > Omar, could you try below patch? Looking at the efi_mem_desc_lookup, it is not > > > correct to be used in efi_arch_mem_reserve, if it passed your test, I > > > can rewrite patch log with more background and send it out: > > > > > > for_each_efi_memory_desc(md) { > > > [snip] > > > if (!(md->attribute & EFI_MEMORY_RUNTIME) && > > > md->type != EFI_BOOT_SERVICES_DATA && > > > md->type != EFI_RUNTIME_SERVICES_DATA) { > > > continue; > > > } > > > > > > In above code, it meant to get a md of EFI_MEMORY_RUNTIME of either boot > > > data or runtime data, this is wrong for efi_mem_reserve, because we are > > > reserving boot data which has no EFI_MEMORY_RUNTIME attribute at the > > > running time. Just is happened to work and we did not capture the error. > > > > Wouldn't something like this be simpler? > > > > --- > > > > diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c > > index 30031d5293c4..cdfe8c628959 100644 > > --- a/arch/x86/platform/efi/quirks.c > > +++ b/arch/x86/platform/efi/quirks.c > > @@ -201,6 +201,10 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) > > return; > > } > > > > + /* No need to reserve regions that will never be freed. */ > > + if (md.attribute & EFI_MEMORY_RUNTIME) > > + return; > > + > > size += addr % EFI_PAGE_SIZE; > > size = round_up(size, EFI_PAGE_SIZE); > > addr = round_down(addr, EFI_PAGE_SIZE); > > This works for me. > > Reported-and-tested-by: Omar Sandoval Is this going to go in for 4.11? From mboxrd@z Thu Jan 1 00:00:00 1970 From: Omar Sandoval Subject: Re: kexec regression since 4.9 caused by efi Date: Mon, 3 Apr 2017 16:54:34 -0700 Message-ID: <20170403235434.GA22520@vader.DHCP.thefacebook.com> References: <20170308201616.GC8598@vader> <20170309063806.GB17257@dhcp-128-65.nay.redhat.com> <20170309095408.GA17883@vader> <20170313073748.GA6332@dhcp-128-65.nay.redhat.com> <20170316124132.GF6261@codeblueprint.co.uk> <20170316175048.GA25230@vader.DHCP.thefacebook.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20170316175048.GA25230-o7BRevgTZE6xlMhWRU56u/MCgOUTN/qS0E9HWUfgJXw@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Matt Fleming Cc: Dave Young , Ingo Molnar , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kernel-team-b10kYP2dOMg@public.gmane.org, kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-efi@vger.kernel.org On Thu, Mar 16, 2017 at 10:50:48AM -0700, Omar Sandoval wrote: > On Thu, Mar 16, 2017 at 12:41:32PM +0000, Matt Fleming wrote: > > On Mon, 13 Mar, at 03:37:48PM, Dave Young wrote: > > > > > > Omar, could you try below patch? Looking at the efi_mem_desc_lookup, it is not > > > correct to be used in efi_arch_mem_reserve, if it passed your test, I > > > can rewrite patch log with more background and send it out: > > > > > > for_each_efi_memory_desc(md) { > > > [snip] > > > if (!(md->attribute & EFI_MEMORY_RUNTIME) && > > > md->type != EFI_BOOT_SERVICES_DATA && > > > md->type != EFI_RUNTIME_SERVICES_DATA) { > > > continue; > > > } > > > > > > In above code, it meant to get a md of EFI_MEMORY_RUNTIME of either boot > > > data or runtime data, this is wrong for efi_mem_reserve, because we are > > > reserving boot data which has no EFI_MEMORY_RUNTIME attribute at the > > > running time. Just is happened to work and we did not capture the error. > > > > Wouldn't something like this be simpler? > > > > --- > > > > diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c > > index 30031d5293c4..cdfe8c628959 100644 > > --- a/arch/x86/platform/efi/quirks.c > > +++ b/arch/x86/platform/efi/quirks.c > > @@ -201,6 +201,10 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) > > return; > > } > > > > + /* No need to reserve regions that will never be freed. */ > > + if (md.attribute & EFI_MEMORY_RUNTIME) > > + return; > > + > > size += addr % EFI_PAGE_SIZE; > > size = round_up(size, EFI_PAGE_SIZE); > > addr = round_down(addr, EFI_PAGE_SIZE); > > This works for me. > > Reported-and-tested-by: Omar Sandoval Is this going to go in for 4.11? From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pg0-x22b.google.com ([2607:f8b0:400e:c05::22b]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvBp9-00061r-8Z for kexec@lists.infradead.org; Mon, 03 Apr 2017 23:55:53 +0000 Received: by mail-pg0-x22b.google.com with SMTP id 21so135116469pgg.1 for ; Mon, 03 Apr 2017 16:55:29 -0700 (PDT) Date: Mon, 3 Apr 2017 16:54:34 -0700 From: Omar Sandoval Subject: Re: kexec regression since 4.9 caused by efi Message-ID: <20170403235434.GA22520@vader.DHCP.thefacebook.com> References: <20170308201616.GC8598@vader> <20170309063806.GB17257@dhcp-128-65.nay.redhat.com> <20170309095408.GA17883@vader> <20170313073748.GA6332@dhcp-128-65.nay.redhat.com> <20170316124132.GF6261@codeblueprint.co.uk> <20170316175048.GA25230@vader.DHCP.thefacebook.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170316175048.GA25230@vader.DHCP.thefacebook.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Matt Fleming Cc: linux-efi@vger.kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, Dave Young , Ingo Molnar On Thu, Mar 16, 2017 at 10:50:48AM -0700, Omar Sandoval wrote: > On Thu, Mar 16, 2017 at 12:41:32PM +0000, Matt Fleming wrote: > > On Mon, 13 Mar, at 03:37:48PM, Dave Young wrote: > > > > > > Omar, could you try below patch? Looking at the efi_mem_desc_lookup, it is not > > > correct to be used in efi_arch_mem_reserve, if it passed your test, I > > > can rewrite patch log with more background and send it out: > > > > > > for_each_efi_memory_desc(md) { > > > [snip] > > > if (!(md->attribute & EFI_MEMORY_RUNTIME) && > > > md->type != EFI_BOOT_SERVICES_DATA && > > > md->type != EFI_RUNTIME_SERVICES_DATA) { > > > continue; > > > } > > > > > > In above code, it meant to get a md of EFI_MEMORY_RUNTIME of either boot > > > data or runtime data, this is wrong for efi_mem_reserve, because we are > > > reserving boot data which has no EFI_MEMORY_RUNTIME attribute at the > > > running time. Just is happened to work and we did not capture the error. > > > > Wouldn't something like this be simpler? > > > > --- > > > > diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c > > index 30031d5293c4..cdfe8c628959 100644 > > --- a/arch/x86/platform/efi/quirks.c > > +++ b/arch/x86/platform/efi/quirks.c > > @@ -201,6 +201,10 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) > > return; > > } > > > > + /* No need to reserve regions that will never be freed. */ > > + if (md.attribute & EFI_MEMORY_RUNTIME) > > + return; > > + > > size += addr % EFI_PAGE_SIZE; > > size = round_up(size, EFI_PAGE_SIZE); > > addr = round_down(addr, EFI_PAGE_SIZE); > > This works for me. > > Reported-and-tested-by: Omar Sandoval Is this going to go in for 4.11? _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec