From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751858AbcFNPAF (ORCPT ); Tue, 14 Jun 2016 11:00:05 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33730 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751702AbcFNPAD (ORCPT ); Tue, 14 Jun 2016 11:00:03 -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: linuxppc-dev@lists.ozlabs.org Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Thiago Jung Bauermann , Eric Biederman , Dave Young Subject: [PATCH v2 3/9] kexec_file: Factor out kexec_locate_mem_hole from kexec_add_buffer. Date: Tue, 14 Jun 2016 11:59:03 -0300 X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465916349-3398-1-git-send-email-bauerman@linux.vnet.ibm.com> References: <1465916349-3398-1-git-send-email-bauerman@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16061415-1523-0000-0000-000001F5E49E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16061414-1524-0000-0000-000026784108 Message-Id: <1465916349-3398-4-git-send-email-bauerman@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-14_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606140164 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kexec_locate_mem_hole will be used by the PowerPC kexec_file_load implementation to find free memory for the purgatory stack. Signed-off-by: Thiago Jung Bauermann Cc: Eric Biederman Cc: Dave Young Cc: kexec@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- include/linux/kexec.h | 4 +++ kernel/kexec_file.c | 88 +++++++++++++++++++++++++++++++++++---------------- 2 files changed, 64 insertions(+), 28 deletions(-) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 7321043aa65a..a08cd986b5a1 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -210,6 +210,10 @@ extern asmlinkage long sys_kexec_load(unsigned long entry, struct kexec_segment __user *segments, unsigned long flags); extern int kernel_kexec(void); +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); extern int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, unsigned long memsz, unsigned long buf_align, unsigned long buf_min, diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index a3ca7cfe070e..3e494261d32a 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -453,6 +453,57 @@ int __weak arch_kexec_walk_mem(unsigned int image_type, unsigned long start, return walk_system_ram_res(start, end, data, func); } +/** + * 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; + unsigned long start, end; + + 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; + + /* Walk the RAM ranges and allocate a suitable range for the buffer */ + if (image->type == KEXEC_TYPE_CRASH) { + start = crashk_res.start; + end = crashk_res.end; + } else { + start = 0; + end = ULONG_MAX; + } + + ret = arch_kexec_walk_mem(image->type, start, end, top_down, &buf, + locate_mem_hole_callback); + if (ret != 1) { + /* A suitable memory range could not be found for buffer */ + return -EADDRNOTAVAIL; + } + + *addr = buf.mem; + + return 0; +} + /* * Helper function for placing a buffer in a kexec segment. This assumes * that kexec_mutex is held. @@ -464,9 +515,8 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, { struct kexec_segment *ksegment; - struct kexec_buf buf, *kbuf; int ret; - unsigned long start, end; + unsigned long addr, align, size; /* Currently adding segment this way is allowed only in file mode */ if (!image->file_mode) @@ -487,38 +537,20 @@ int kexec_add_buffer(struct kimage *image, char *buffer, unsigned long bufsz, return -EINVAL; } - memset(&buf, 0, sizeof(struct kexec_buf)); - kbuf = &buf; - kbuf->image = image; - - kbuf->memsz = ALIGN(memsz, PAGE_SIZE); - kbuf->buf_align = max(buf_align, PAGE_SIZE); - kbuf->buf_min = buf_min; - kbuf->buf_max = buf_max; - kbuf->top_down = top_down; + size = ALIGN(memsz, PAGE_SIZE); + align = max(buf_align, PAGE_SIZE); - /* Walk the RAM ranges and allocate a suitable range for the buffer */ - if (image->type == KEXEC_TYPE_CRASH) { - start = crashk_res.start; - end = crashk_res.end; - } else { - start = 0; - end = ULONG_MAX; - } - - ret = arch_kexec_walk_mem(image->type, start, end, top_down, 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(image, size, align, buf_min, buf_max, + top_down, &addr); + if (ret) + return ret; /* Found a suitable memory range */ ksegment = &image->segment[image->nr_segments]; ksegment->kbuf = buffer; ksegment->bufsz = bufsz; - ksegment->mem = kbuf->mem; - ksegment->memsz = kbuf->memsz; + ksegment->mem = addr; + ksegment->memsz = size; image->nr_segments++; *load_addr = ksegment->mem; return 0; -- 1.9.1