From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754316AbcFPUje (ORCPT ); Thu, 16 Jun 2016 16:39:34 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:44472 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752655AbcFPUjd (ORCPT ); Thu, 16 Jun 2016 16:39:33 -0400 X-IBM-Helo: d24dlp01.br.ibm.com X-IBM-MailFrom: bauerman@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org From: Thiago Jung Bauermann To: Dave Young Cc: linuxppc-dev@lists.ozlabs.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Eric Biederman Subject: Re: [PATCH v2 2/9] kexec_file: Generalize kexec_add_buffer. Date: Thu, 16 Jun 2016 17:39:21 -0300 User-Agent: KMail/4.14.3 (Linux/3.13.0-87-generic; KDE/4.14.13; x86_64; ; ) In-Reply-To: <20160616015853.GA4103@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> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16061620-0028-0000-0000-0000011775E1 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16061620-0029-0000-0000-000013B6A1CC Message-Id: <16133071.BqvF7Se0c2@hactar> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-16_12:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606160224 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: 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;