From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754456AbcFQHfc (ORCPT ); Fri, 17 Jun 2016 03:35:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51589 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711AbcFQHfa (ORCPT ); Fri, 17 Jun 2016 03:35:30 -0400 Date: Fri, 17 Jun 2016 15:35:23 +0800 From: Dave Young To: Thiago Jung Bauermann Cc: kexec@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Eric Biederman Subject: Re: [PATCH v2 2/9] kexec_file: Generalize kexec_add_buffer. Message-ID: <20160617073523.GA5091@dhcp-128-65.nay.redhat.com> References: <1465916349-3398-1-git-send-email-bauerman@linux.vnet.ibm.com> <3237367.XLxdnj8q4x@hactar> <20160616015853.GA4103@dhcp-128-65.nay.redhat.com> <16133071.BqvF7Se0c2@hactar> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <16133071.BqvF7Se0c2@hactar> User-Agent: Mutt/1.5.24 (2015-08-30) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 17 Jun 2016 07:35:30 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/16/16 at 05:39pm, Thiago Jung Bauermann wrote: > Am Donnerstag, 16 Juni 2016, 09:58:53 schrieb Dave Young: > > On 06/15/16 at 01:21pm, Thiago Jung Bauermann wrote: > > > +/** > > > + * arch_kexec_walk_mem - call func(data) on free memory regions > > > + * @image_type: kimage.type > > > + * @top_down: Start from the highest address? > > > + * @data: Argument to pass to @func. > > > + * @func: Function to call for each memory region. > > > + * > > > + * Return: The memory walk will stop when func returns a non-zero value > > > + * and that value will be returned. If all free regions are visited > > > without + * func returning non-zero, then zero will be returned. > > > + */ > > > +int __weak arch_kexec_walk_mem(unsigned int image_type, bool top_down, > > > + void *data, int (*func)(u64, u64, void *)) > > > +{ > > > > top_down is also not used? > > It's unused in the default implementation, but the powerpc implementation in patch 8 uses it: Well, arch_kexec_walk_mem use kbuf as "data", you can even drop "image_type" since kbuf has all you want kbuf->image->type, and kbuf->top_down int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(u64, u64, void *)) > > int arch_kexec_walk_mem(unsigned int type, bool top_down, void *data, > int (*func)(u64, u64, void *)) > { > int ret = 0; > u64 i; > phys_addr_t mstart, mend; > > if (top_down) { > for_each_free_mem_range_reverse(i, NUMA_NO_NODE, 0, > &mstart, &mend, NULL) { > ret = func(mstart, mend, data); > if (ret) > break; > } > } else { > for_each_free_mem_range(i, NUMA_NO_NODE, 0, &mstart, &mend, > NULL) { > ret = func(mstart, mend, data); > if (ret) > break; > } > } > > return ret; > } > > > Rethink about the argument name type should be better than image_type, > > it is obvious in the comments and the code and simpler. > > Ok, renamed in the patch below. > > []'s > Thiago Jung Bauermann > IBM Linux Technology Center > > > kexec_file: Generalize kexec_add_buffer. > > Allow architectures to specify different memory walking functions for > kexec_add_buffer. Intel uses iomem to track reserved memory ranges, > but PowerPC uses the memblock subsystem. > > Signed-off-by: Thiago Jung Bauermann > Cc: Eric Biederman > Cc: Dave Young > Cc: kexec@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > > diff --git a/include/linux/kexec.h b/include/linux/kexec.h > index e8acb2b43dd9..42b31f2e1d88 100644 > --- a/include/linux/kexec.h > +++ b/include/linux/kexec.h > @@ -315,6 +315,8 @@ int __weak arch_kexec_apply_relocations_add(const Elf_Ehdr *ehdr, > Elf_Shdr *sechdrs, unsigned int relsec); > int __weak arch_kexec_apply_relocations(const Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, > unsigned int relsec); > +int __weak arch_kexec_walk_mem(unsigned int type, bool top_down, void *data, > + int (*func)(u64, u64, void *)); > void arch_kexec_protect_crashkres(void); > void arch_kexec_unprotect_crashkres(void); > > diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c > index b6eec7527e9f..989647a324f2 100644 > --- a/kernel/kexec_file.c > +++ b/kernel/kexec_file.c > @@ -428,6 +428,29 @@ static int locate_mem_hole_callback(u64 start, u64 end, void *arg) > return locate_mem_hole_bottom_up(start, end, kbuf); > } > > +/** > + * arch_kexec_walk_mem - call func(data) on free memory regions > + * @type: kimage.type > + * @top_down: Start from the highest address? > + * @data: Argument to pass to @func. > + * @func: Function to call for each memory region. > + * > + * Return: The memory walk will stop when func returns a non-zero value > + * and that value will be returned. If all free regions are visited without > + * func returning non-zero, then zero will be returned. > + */ > +int __weak arch_kexec_walk_mem(unsigned int type, bool top_down, void *data, > + int (*func)(u64, u64, void *)) > +{ > + if (type == KEXEC_TYPE_CRASH) > + return walk_iomem_res_desc(crashk_res.desc, > + IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, > + crashk_res.start, crashk_res.end, > + data, func); > + else > + return walk_system_ram_res(0, ULONG_MAX, data, func); > +} > + > /* > * Helper function for placing a buffer in a kexec segment. This assumes > * that kexec_mutex is held. > @@ -472,14 +495,8 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, > kbuf->top_down = top_down; > > /* Walk the RAM ranges and allocate a suitable range for the buffer */ > - if (image->type == KEXEC_TYPE_CRASH) > - ret = walk_iomem_res_desc(crashk_res.desc, > - IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, > - crashk_res.start, crashk_res.end, kbuf, > - locate_mem_hole_callback); > - else > - ret = walk_system_ram_res(0, -1, kbuf, > - locate_mem_hole_callback); > + ret = arch_kexec_walk_mem(image->type, top_down, kbuf, > + locate_mem_hole_callback); > if (ret != 1) { > /* A suitable memory range could not be found for buffer */ > return -EADDRNOTAVAIL; > > > _______________________________________________ > kexec mailing list > kexec@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/kexec Thanks Dave From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDoJj-0008DK-AP for kexec@lists.infradead.org; Fri, 17 Jun 2016 07:35:52 +0000 Date: Fri, 17 Jun 2016 15:35:23 +0800 From: Dave Young Subject: Re: [PATCH v2 2/9] kexec_file: Generalize kexec_add_buffer. Message-ID: <20160617073523.GA5091@dhcp-128-65.nay.redhat.com> References: <1465916349-3398-1-git-send-email-bauerman@linux.vnet.ibm.com> <3237367.XLxdnj8q4x@hactar> <20160616015853.GA4103@dhcp-128-65.nay.redhat.com> <16133071.BqvF7Se0c2@hactar> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <16133071.BqvF7Se0c2@hactar> 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: Thiago Jung Bauermann Cc: linuxppc-dev@lists.ozlabs.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Eric Biederman On 06/16/16 at 05:39pm, Thiago Jung Bauermann wrote: > Am Donnerstag, 16 Juni 2016, 09:58:53 schrieb Dave Young: > > On 06/15/16 at 01:21pm, Thiago Jung Bauermann wrote: > > > +/** > > > + * arch_kexec_walk_mem - call func(data) on free memory regions > > > + * @image_type: kimage.type > > > + * @top_down: Start from the highest address? > > > + * @data: Argument to pass to @func. > > > + * @func: Function to call for each memory region. > > > + * > > > + * Return: The memory walk will stop when func returns a non-zero value > > > + * and that value will be returned. If all free regions are visited > > > without + * func returning non-zero, then zero will be returned. > > > + */ > > > +int __weak arch_kexec_walk_mem(unsigned int image_type, bool top_down, > > > + void *data, int (*func)(u64, u64, void *)) > > > +{ > > > > top_down is also not used? > > It's unused in the default implementation, but the powerpc implementation in patch 8 uses it: Well, arch_kexec_walk_mem use kbuf as "data", you can even drop "image_type" since kbuf has all you want kbuf->image->type, and kbuf->top_down int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(u64, u64, void *)) > > int arch_kexec_walk_mem(unsigned int type, bool top_down, void *data, > int (*func)(u64, u64, void *)) > { > int ret = 0; > u64 i; > phys_addr_t mstart, mend; > > if (top_down) { > for_each_free_mem_range_reverse(i, NUMA_NO_NODE, 0, > &mstart, &mend, NULL) { > ret = func(mstart, mend, data); > if (ret) > break; > } > } else { > for_each_free_mem_range(i, NUMA_NO_NODE, 0, &mstart, &mend, > NULL) { > ret = func(mstart, mend, data); > if (ret) > break; > } > } > > return ret; > } > > > Rethink about the argument name type should be better than image_type, > > it is obvious in the comments and the code and simpler. > > Ok, renamed in the patch below. > > []'s > Thiago Jung Bauermann > IBM Linux Technology Center > > > kexec_file: Generalize kexec_add_buffer. > > Allow architectures to specify different memory walking functions for > kexec_add_buffer. Intel uses iomem to track reserved memory ranges, > but PowerPC uses the memblock subsystem. > > Signed-off-by: Thiago Jung Bauermann > Cc: Eric Biederman > Cc: Dave Young > Cc: kexec@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > > diff --git a/include/linux/kexec.h b/include/linux/kexec.h > index e8acb2b43dd9..42b31f2e1d88 100644 > --- a/include/linux/kexec.h > +++ b/include/linux/kexec.h > @@ -315,6 +315,8 @@ int __weak arch_kexec_apply_relocations_add(const Elf_Ehdr *ehdr, > Elf_Shdr *sechdrs, unsigned int relsec); > int __weak arch_kexec_apply_relocations(const Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, > unsigned int relsec); > +int __weak arch_kexec_walk_mem(unsigned int type, bool top_down, void *data, > + int (*func)(u64, u64, void *)); > void arch_kexec_protect_crashkres(void); > void arch_kexec_unprotect_crashkres(void); > > diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c > index b6eec7527e9f..989647a324f2 100644 > --- a/kernel/kexec_file.c > +++ b/kernel/kexec_file.c > @@ -428,6 +428,29 @@ static int locate_mem_hole_callback(u64 start, u64 end, void *arg) > return locate_mem_hole_bottom_up(start, end, kbuf); > } > > +/** > + * arch_kexec_walk_mem - call func(data) on free memory regions > + * @type: kimage.type > + * @top_down: Start from the highest address? > + * @data: Argument to pass to @func. > + * @func: Function to call for each memory region. > + * > + * Return: The memory walk will stop when func returns a non-zero value > + * and that value will be returned. If all free regions are visited without > + * func returning non-zero, then zero will be returned. > + */ > +int __weak arch_kexec_walk_mem(unsigned int type, bool top_down, void *data, > + int (*func)(u64, u64, void *)) > +{ > + if (type == KEXEC_TYPE_CRASH) > + return walk_iomem_res_desc(crashk_res.desc, > + IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, > + crashk_res.start, crashk_res.end, > + data, func); > + else > + return walk_system_ram_res(0, ULONG_MAX, data, func); > +} > + > /* > * Helper function for placing a buffer in a kexec segment. This assumes > * that kexec_mutex is held. > @@ -472,14 +495,8 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, > kbuf->top_down = top_down; > > /* Walk the RAM ranges and allocate a suitable range for the buffer */ > - if (image->type == KEXEC_TYPE_CRASH) > - ret = walk_iomem_res_desc(crashk_res.desc, > - IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, > - crashk_res.start, crashk_res.end, kbuf, > - locate_mem_hole_callback); > - else > - ret = walk_system_ram_res(0, -1, kbuf, > - locate_mem_hole_callback); > + ret = arch_kexec_walk_mem(image->type, top_down, kbuf, > + locate_mem_hole_callback); > if (ret != 1) { > /* A suitable memory range could not be found for buffer */ > return -EADDRNOTAVAIL; > > > _______________________________________________ > kexec mailing list > kexec@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/kexec Thanks Dave _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec