Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752072AbbGAPHE (ORCPT ); Wed, 1 Jul 2015 11:07:04 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:34023 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754468AbbGAPGx (ORCPT ); Wed, 1 Jul 2015 11:06:53 -0400 Date: Wed, 1 Jul 2015 23:06:50 +0800 From: Minfei Huang To: Michael Holzheu Cc: ebiederm@xmission.com, vgoyal@redhat.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, linux390@de.ibm.com, linux-s390@vger.kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] kexec: Make a pair of map and unmap reserved pages when kdump fails to start Message-ID: <20150701150650.GA11010@huangminfeis-MacBook-Pro.local> References: <1435643086-8555-1-git-send-email-mnfhuang@gmail.com> <20150701164023.011988b1@holzheu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150701164023.011988b1@holzheu> 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 Content-Length: 2737 Lines: 93 On 07/01/15 at 04:40P, Michael Holzheu wrote: > Hello Minfei, > > Regarding functionality your patch looks ok for me. > But the code is not easy to read. > > What about replacing the "failure" label with "fail_unmap_pages"? Sure. I will repost v3 to fix it. Thanks Minfei > > Michael > > On Tue, 30 Jun 2015 13:44:46 +0800 > Minfei Huang wrote: > > > For some arch, kexec shall map the reserved pages, then use them, when > > we try to start the kdump service. > > > > Now kexec will never unmap the reserved pages, once it fails to continue > > starting the kdump service. > > > > Make a pair of reserved pages in kdump starting path, whatever kexec > > fails or not. > > > > Signed-off-by: Minfei Huang > > --- > > kernel/kexec.c | 26 ++++++++++++++------------ > > 1 file changed, 14 insertions(+), 12 deletions(-) > > > > diff --git a/kernel/kexec.c b/kernel/kexec.c > > index 4589899..68f6dfb 100644 > > --- a/kernel/kexec.c > > +++ b/kernel/kexec.c > > @@ -1291,35 +1291,37 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments, > > */ > > > > kimage_free(xchg(&kexec_crash_image, NULL)); > > - result = kimage_alloc_init(&image, entry, nr_segments, > > - segments, flags); > > - crash_map_reserved_pages(); > > - } else { > > - /* Loading another kernel to reboot into. */ > > - > > - result = kimage_alloc_init(&image, entry, nr_segments, > > - segments, flags); > > } > > + > > + result = kimage_alloc_init(&image, entry, nr_segments, > > + segments, flags); > > if (result) > > goto out; > > > > + if (flags & KEXEC_ON_CRASH) > > + crash_map_reserved_pages(); > > + > > if (flags & KEXEC_PRESERVE_CONTEXT) > > image->preserve_context = 1; > > result = machine_kexec_prepare(image); > > if (result) > > - goto out; > > + goto failure; > > > > for (i = 0; i < nr_segments; i++) { > > result = kimage_load_segment(image, &image->segment[i]); > > if (result) > > - goto out; > > + goto failure; > > } > > kimage_terminate(image); > > + > > +failure: > > if (flags & KEXEC_ON_CRASH) > > crash_unmap_reserved_pages(); > > } > > - /* Install the new kernel, and Uninstall the old */ > > - image = xchg(dest_image, image); > > + > > + if (result == 0) > > + /* Install the new kernel, and Uninstall the old */ > > + image = xchg(dest_image, image); > > > > out: > > mutex_unlock(&kexec_mutex); > -- 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/