From: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> To: Dave Young <dyoung@redhat.com> Cc: kexec@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Eric Biederman <ebiederm@xmission.com> Subject: Re: [PATCH v2 2/9] kexec_file: Generalize kexec_add_buffer. Date: Fri, 17 Jun 2016 17:51:09 -0300 [thread overview] Message-ID: <12025213.W8oVnaovm1@hactar> (raw) In-Reply-To: <20160617073523.GA5091@dhcp-128-65.nay.redhat.com> Am Freitag, 17 Juni 2016, 15:35:23 schrieb Dave Young: > 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: > > > > +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 *)) Sounds good to me, but I had to move struct kexec_buf from kernel/kexec_internal.h to include/linux/kexec.h. Here's the updated patch. What do you think? []'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 <bauerman@linux.vnet.ibm.com> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Dave Young <dyoung@redhat.com> 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..d8df01107ae2 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -201,6 +201,20 @@ struct kimage { #endif }; +/* + * Keeps track of buffer parameters as provided by caller for requesting + * memory placement of buffer. + */ +struct kexec_buf { + struct kimage *image; + unsigned long mem; + unsigned long memsz; + unsigned long buf_align; + unsigned long buf_min; + unsigned long buf_max; + bool top_down; /* allocate from top of memory hole */ +}; + /* kexec interface functions */ extern void machine_kexec(struct kimage *image); extern int machine_kexec_prepare(struct kimage *image); @@ -315,6 +329,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(struct kexec_buf *kbuf, + 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..b1f1f6402518 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -428,6 +428,27 @@ 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 + * @kbuf: Context info for the search. Also passed 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(struct kexec_buf *kbuf, + int (*func)(u64, u64, void *)) +{ + if (kbuf->image->type == KEXEC_TYPE_CRASH) + return walk_iomem_res_desc(crashk_res.desc, + IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, + crashk_res.start, crashk_res.end, + kbuf, func); + else + return walk_system_ram_res(0, ULONG_MAX, kbuf, func); +} + /* * Helper function for placing a buffer in a kexec segment. This assumes * that kexec_mutex is held. @@ -472,14 +493,7 @@ 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(kbuf, locate_mem_hole_callback); if (ret != 1) { /* A suitable memory range could not be found for buffer */ return -EADDRNOTAVAIL; diff --git a/kernel/kexec_internal.h b/kernel/kexec_internal.h index eefd5bf960c2..4cef7e4706b0 100644 --- a/kernel/kexec_internal.h +++ b/kernel/kexec_internal.h @@ -20,20 +20,6 @@ struct kexec_sha_region { unsigned long len; }; -/* - * Keeps track of buffer parameters as provided by caller for requesting - * memory placement of buffer. - */ -struct kexec_buf { - struct kimage *image; - unsigned long mem; - unsigned long memsz; - unsigned long buf_align; - unsigned long buf_min; - unsigned long buf_max; - bool top_down; /* allocate from top of memory hole */ -}; - void kimage_file_post_load_cleanup(struct kimage *image); #else /* CONFIG_KEXEC_FILE */ static inline void kimage_file_post_load_cleanup(struct kimage *image) { }
WARNING: multiple messages have this Message-ID (diff)
From: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> To: Dave Young <dyoung@redhat.com> Cc: linuxppc-dev@lists.ozlabs.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Eric Biederman <ebiederm@xmission.com> Subject: Re: [PATCH v2 2/9] kexec_file: Generalize kexec_add_buffer. Date: Fri, 17 Jun 2016 17:51:09 -0300 [thread overview] Message-ID: <12025213.W8oVnaovm1@hactar> (raw) In-Reply-To: <20160617073523.GA5091@dhcp-128-65.nay.redhat.com> Am Freitag, 17 Juni 2016, 15:35:23 schrieb Dave Young: > 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: > > > > +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 *)) Sounds good to me, but I had to move struct kexec_buf from kernel/kexec_internal.h to include/linux/kexec.h. Here's the updated patch. What do you think? []'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 <bauerman@linux.vnet.ibm.com> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Dave Young <dyoung@redhat.com> 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..d8df01107ae2 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -201,6 +201,20 @@ struct kimage { #endif }; +/* + * Keeps track of buffer parameters as provided by caller for requesting + * memory placement of buffer. + */ +struct kexec_buf { + struct kimage *image; + unsigned long mem; + unsigned long memsz; + unsigned long buf_align; + unsigned long buf_min; + unsigned long buf_max; + bool top_down; /* allocate from top of memory hole */ +}; + /* kexec interface functions */ extern void machine_kexec(struct kimage *image); extern int machine_kexec_prepare(struct kimage *image); @@ -315,6 +329,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(struct kexec_buf *kbuf, + 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..b1f1f6402518 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -428,6 +428,27 @@ 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 + * @kbuf: Context info for the search. Also passed 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(struct kexec_buf *kbuf, + int (*func)(u64, u64, void *)) +{ + if (kbuf->image->type == KEXEC_TYPE_CRASH) + return walk_iomem_res_desc(crashk_res.desc, + IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY, + crashk_res.start, crashk_res.end, + kbuf, func); + else + return walk_system_ram_res(0, ULONG_MAX, kbuf, func); +} + /* * Helper function for placing a buffer in a kexec segment. This assumes * that kexec_mutex is held. @@ -472,14 +493,7 @@ 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(kbuf, locate_mem_hole_callback); if (ret != 1) { /* A suitable memory range could not be found for buffer */ return -EADDRNOTAVAIL; diff --git a/kernel/kexec_internal.h b/kernel/kexec_internal.h index eefd5bf960c2..4cef7e4706b0 100644 --- a/kernel/kexec_internal.h +++ b/kernel/kexec_internal.h @@ -20,20 +20,6 @@ struct kexec_sha_region { unsigned long len; }; -/* - * Keeps track of buffer parameters as provided by caller for requesting - * memory placement of buffer. - */ -struct kexec_buf { - struct kimage *image; - unsigned long mem; - unsigned long memsz; - unsigned long buf_align; - unsigned long buf_min; - unsigned long buf_max; - bool top_down; /* allocate from top of memory hole */ -}; - void kimage_file_post_load_cleanup(struct kimage *image); #else /* CONFIG_KEXEC_FILE */ static inline void kimage_file_post_load_cleanup(struct kimage *image) { } _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2016-06-17 20:51 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-14 14:59 [PATCH v2 0/9] kexec_file_load implementation for PowerPC Thiago Jung Bauermann 2016-06-14 14:59 ` Thiago Jung Bauermann 2016-06-14 14:59 ` [PATCH v2 1/9] kexec_file: Remove unused members from struct kexec_buf Thiago Jung Bauermann 2016-06-14 14:59 ` Thiago Jung Bauermann 2016-06-14 14:59 ` [PATCH v2 2/9] kexec_file: Generalize kexec_add_buffer Thiago Jung Bauermann 2016-06-14 14:59 ` Thiago Jung Bauermann 2016-06-15 7:33 ` Dave Young 2016-06-15 7:33 ` Dave Young 2016-06-15 16:21 ` Thiago Jung Bauermann 2016-06-15 16:21 ` Thiago Jung Bauermann 2016-06-16 1:58 ` Dave Young 2016-06-16 1:58 ` Dave Young 2016-06-16 20:39 ` Thiago Jung Bauermann 2016-06-16 20:39 ` Thiago Jung Bauermann 2016-06-17 7:35 ` Dave Young 2016-06-17 7:35 ` Dave Young 2016-06-17 20:51 ` Thiago Jung Bauermann [this message] 2016-06-17 20:51 ` Thiago Jung Bauermann 2016-06-20 2:26 ` Dave Young 2016-06-20 2:26 ` Dave Young 2016-06-20 16:01 ` Thiago Jung Bauermann 2016-06-20 16:01 ` Thiago Jung Bauermann 2016-06-14 14:59 ` [PATCH v2 3/9] kexec_file: Factor out kexec_locate_mem_hole from kexec_add_buffer Thiago Jung Bauermann 2016-06-14 14:59 ` Thiago Jung Bauermann 2016-06-14 14:59 ` [PATCH v2 4/9] powerpc: Factor out relocation code from module_64.c to elf_util_64.c Thiago Jung Bauermann 2016-06-14 14:59 ` Thiago Jung Bauermann 2016-06-14 14:59 ` [PATCH v2 5/9] powerpc: Generalize elf64_apply_relocate_add Thiago Jung Bauermann 2016-06-14 14:59 ` Thiago Jung Bauermann 2016-06-14 14:59 ` [PATCH v2 6/9] powerpc: Add functions to read ELF files of any endianness Thiago Jung Bauermann 2016-06-14 14:59 ` Thiago Jung Bauermann 2016-06-14 14:59 ` [PATCH v2 7/9] powerpc: Implement kexec_file_load Thiago Jung Bauermann 2016-06-14 14:59 ` Thiago Jung Bauermann 2016-06-14 14:59 ` [PATCH v2 8/9] powerpc: Add support for loading ELF kernels with kexec_file_load Thiago Jung Bauermann 2016-06-14 14:59 ` Thiago Jung Bauermann 2016-06-14 14:59 ` [PATCH v2 9/9] powerpc: Add purgatory for kexec_file_load implementation Thiago Jung Bauermann 2016-06-14 14:59 ` Thiago Jung Bauermann 2016-06-16 5:48 ` [PATCH v2 0/9] kexec_file_load implementation for PowerPC Michael Ellerman 2016-06-16 5:48 ` Michael Ellerman 2016-06-16 19:55 ` Thiago Jung Bauermann 2016-06-16 19:55 ` Thiago Jung Bauermann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=12025213.W8oVnaovm1@hactar \ --to=bauerman@linux.vnet.ibm.com \ --cc=dyoung@redhat.com \ --cc=ebiederm@xmission.com \ --cc=kexec@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.