From patchwork Wed Jun 22 23:34:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 639444 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rZgtt0tlPz9t0N for ; Thu, 23 Jun 2016 09:35:18 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rZgtt07f5zDqmM for ; Thu, 23 Jun 2016 09:35:18 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rZgsm0W0PzDq60 for ; Thu, 23 Jun 2016 09:34:19 +1000 (AEST) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u5MNJbXR005946 for ; Wed, 22 Jun 2016 19:34:17 -0400 Received: from e24smtp03.br.ibm.com (e24smtp03.br.ibm.com [32.104.18.24]) by mx0b-001b2d01.pphosted.com with ESMTP id 23q703hwnw-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 22 Jun 2016 19:34:17 -0400 Received: from localhost by e24smtp03.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 22 Jun 2016 20:34:15 -0300 Received: from d24dlp02.br.ibm.com (9.18.248.206) by e24smtp03.br.ibm.com (10.172.0.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 22 Jun 2016 20:34:13 -0300 X-IBM-Helo: d24dlp02.br.ibm.com X-IBM-MailFrom: bauerman@linux.vnet.ibm.com X-IBM-RcptTo: linuxppc-dev@lists.ozlabs.org Received: from d24relay02.br.ibm.com (d24relay02.br.ibm.com [9.13.184.26]) by d24dlp02.br.ibm.com (Postfix) with ESMTP id A538C1DC006D for ; Wed, 22 Jun 2016 19:34:05 -0400 (EDT) Received: from d24av02.br.ibm.com (d24av02.br.ibm.com [9.8.31.93]) by d24relay02.br.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u5MNYCLr40829062 for ; Wed, 22 Jun 2016 20:34:12 -0300 Received: from d24av02.br.ibm.com (localhost [127.0.0.1]) by d24av02.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u5MNYCW9020982 for ; Wed, 22 Jun 2016 20:34:12 -0300 Received: from hactar.localnet ([9.18.201.71]) by d24av02.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u5MNYCbB020978; Wed, 22 Jun 2016 20:34:12 -0300 From: Thiago Jung Bauermann To: Dave Young Subject: Re: [PATCH v3 3/9] kexec_file: Factor out kexec_locate_mem_hole from kexec_add_buffer. Date: Wed, 22 Jun 2016 20:34:10 -0300 User-Agent: KMail/4.14.3 (Linux/3.13.0-87-generic; KDE/4.14.13; x86_64; ; ) In-Reply-To: <20160622101801.GB7752@dhcp-128-65.nay.redhat.com> References: <1466538521-31216-1-git-send-email-bauerman@linux.vnet.ibm.com> <1466538521-31216-4-git-send-email-bauerman@linux.vnet.ibm.com> <20160622101801.GB7752@dhcp-128-65.nay.redhat.com> MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16062223-0024-0000-0000-000000D93ADA X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16062223-0025-0000-0000-00001550CE4A Message-Id: <5025034.R6Ttz76WZM@hactar> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-06-22_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-1606220238 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kexec@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Eric Biederman Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Am Mittwoch, 22 Juni 2016, 18:18:01 schrieb Dave Young: > On 06/21/16 at 04:48pm, Thiago Jung Bauermann wrote: > > +/** > > + * kexec_locate_mem_hole - find free memory to load segment or use in > > purgatory + * @image: kexec image being updated. > > + * @size: Memory size. > > + * @align: Minimum alignment needed. > > + * @min_addr: Minimum starting address. > > + * @max_addr: Maximum end address. > > + * @top_down Find the highest free memory region? > > + * @addr On success, will have start address of the memory region > > found. > > + * > > + * Return: 0 on success, negative errno on error. > > + */ > > +int kexec_locate_mem_hole(struct kimage *image, unsigned long size, > > + unsigned long align, unsigned long min_addr, > > + unsigned long max_addr, bool top_down, > > + unsigned long *addr) > > +{ > > + int ret; > > + struct kexec_buf buf; > > + > > + memset(&buf, 0, sizeof(struct kexec_buf)); > > + buf.image = image; > > + > > + buf.memsz = size; > > + buf.buf_align = align; > > + buf.buf_min = min_addr; > > + buf.buf_max = max_addr; > > + buf.top_down = top_down; > > Since patch 2/9 moved kexec_buf from internal header file to kexec.h it > will be natural to passing a kexec_buf pointer intead of passing all > these arguments in kexec_locate_mem_hole. > > kbuf.mem can be used for addr. Ok. What about this version? diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 3d91bcfc180d..e8b099da47f5 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -147,9 +147,14 @@ struct kexec_file_ops { #endif }; -/* - * Keeps track of buffer parameters as provided by caller for requesting - * memory placement of buffer. +/** + * struct kexec_buf - parameters for finding a place for a buffer in memory + * @image: kexec image in which memory to search. + * @size: Memory size for the buffer. + * @align: Minimum alignment needed. + * @min_addr: Minimum starting address. + * @max_addr: Maximum end address. + * @top_down: Find the highest free memory region? */ struct kexec_buf { struct kimage *image; @@ -163,6 +168,7 @@ struct kexec_buf { int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(u64, u64, void *)); +int kexec_locate_mem_hole(struct kexec_buf *kbuf); #endif /* CONFIG_KEXEC_FILE */ struct kimage { diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index b1f1f6402518..445d66add8ca 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -449,6 +449,23 @@ int __weak arch_kexec_walk_mem(struct kexec_buf *kbuf, return walk_system_ram_res(0, ULONG_MAX, kbuf, func); } +/** + * kexec_locate_mem_hole - find free memory to load segment or use in purgatory + * @kbuf: Parameters for the memory search. + * + * On success, kbuf->mem will have the start address of the memory region found. + * + * Return: 0 on success, negative errno on error. + */ +int kexec_locate_mem_hole(struct kexec_buf *kbuf) +{ + int ret; + + ret = arch_kexec_walk_mem(kbuf, locate_mem_hole_callback); + + return ret == 1 ? 0 : -EADDRNOTAVAIL; +} + /* * Helper function for placing a buffer in a kexec segment. This assumes * that kexec_mutex is held. @@ -493,11 +510,9 @@ 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 */ - 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; - } + ret = kexec_locate_mem_hole(kbuf); + if (ret) + return ret; /* Found a suitable memory range */ ksegment = &image->segment[image->nr_segments];