From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932660AbcFUDXV (ORCPT ); Mon, 20 Jun 2016 23:23:21 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:25787 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752445AbcFUDXT (ORCPT ); Mon, 20 Jun 2016 23:23:19 -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, x86@kernel.org, linux-kernel@vger.kernel.org, Eric Biederman , Dave Young , Michael Ellerman , Mimi Zohar , Eric Richter , Thiago Jung Bauermann Subject: [PATCH 2/6] powerpc: kexec_file: Add buffer hand-over support for the next kernel Date: Mon, 20 Jun 2016 22:44:32 -0300 X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466473476-10104-1-git-send-email-bauerman@linux.vnet.ibm.com> References: <1466473476-10104-1-git-send-email-bauerman@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16062101-0024-0000-0000-000000D7F8AE X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16062101-0025-0000-0000-0000154E88D9 Message-Id: <1466473476-10104-3-git-send-email-bauerman@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-21_01:,, 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-1606210018 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The buffer hand-over mechanism allows the currently running kernel to pass data to kernel that will be kexec'd via a kexec segment. The second kernel can check whether the previous kernel sent data and retrieve it. This is the architecture-specific part. Signed-off-by: Thiago Jung Bauermann --- arch/powerpc/include/asm/kexec.h | 9 +++++ arch/powerpc/kernel/kexec_elf_64.c | 44 +++++++++++++++++++++++ arch/powerpc/kernel/machine_kexec_64.c | 64 ++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index a46f5f45570c..9b1ff59bc188 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -55,6 +55,15 @@ typedef void (*crash_shutdown_t)(void); #ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_FILE +#define ARCH_HAS_KIMAGE_ARCH + +struct kimage_arch { + phys_addr_t handover_buffer_addr; + unsigned long handover_buffer_size; +}; +#endif + /* * This function is responsible for capturing register states if coming * via panic or invoking dump using sysrq-trigger. diff --git a/arch/powerpc/kernel/kexec_elf_64.c b/arch/powerpc/kernel/kexec_elf_64.c index 4e71595300ed..5d2b7036fee7 100644 --- a/arch/powerpc/kernel/kexec_elf_64.c +++ b/arch/powerpc/kernel/kexec_elf_64.c @@ -96,6 +96,46 @@ static int elf64_probe(const char *buf, unsigned long len) return elf_check_arch(&ehdr)? 0 : -ENOEXEC; } +static int setup_handover_buffer(struct kimage *image, void *fdt, + int chosen_node) +{ + int ret; + + if (image->arch.handover_buffer_addr) { + ret = fdt_setprop_u64(fdt, chosen_node, + "linux,kexec-handover-buffer-start", + image->arch.handover_buffer_addr); + if (ret < 0) { + pr_err("Error setting up the new device tree.\n"); + return -EINVAL; + } + + /* -end is the first address after the buffer. */ + ret = fdt_setprop_u64(fdt, chosen_node, + "linux,kexec-handover-buffer-end", + image->arch.handover_buffer_addr + + image->arch.handover_buffer_size); + if (ret < 0) { + pr_err("Error setting up the new device tree.\n"); + return -EINVAL; + } + + ret = fdt_add_mem_rsv(fdt, image->arch.handover_buffer_addr, + image->arch.handover_buffer_size); + if (ret) { + pr_err("Error reserving kexec handover buffer: %s\n", + fdt_strerror(ret)); + return -EINVAL; + } + + pr_debug("kexec handover buffer at 0x%llx, size = 0x%lx\n", + image->arch.handover_buffer_addr, + image->arch.handover_buffer_size); + } + + return 0; +} + static bool find_debug_console(void *fdt, int chosen_node) { int len; @@ -494,6 +534,10 @@ void *elf64_load(struct kimage *image, char *kernel_buf, } } + ret = setup_handover_buffer(image, fdt, chosen_node); + if (ret) + goto out; + ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0); if (ret) { pr_err("Error setting up the new device tree.\n"); diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c index 43e8185ab6f7..c582abf726f5 100644 --- a/arch/powerpc/kernel/machine_kexec_64.c +++ b/arch/powerpc/kernel/machine_kexec_64.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -481,6 +482,69 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) return image->fops->cleanup(image->image_loader_data); } +bool kexec_can_hand_over_buffer(void) +{ + return true; +} + +int arch_kexec_add_handover_buffer(struct kimage *image, + unsigned long load_addr, unsigned long size) +{ + image->arch.handover_buffer_addr = load_addr; + image->arch.handover_buffer_size = size; + + return 0; +} + +int kexec_get_handover_buffer(void **addr, unsigned long *size) +{ + int chosen_node; + int startsz, endsz; + const void *startp, *endp; + unsigned long start_addr, end_addr; + + chosen_node = fdt_path_offset(initial_boot_params, "/chosen"); + if (chosen_node < 0) { + pr_err("Malformed device tree: /chosen not found.\n"); + return -EINVAL; + } + + startp = of_get_flat_dt_prop(chosen_node, + "linux,kexec-handover-buffer-start", + &startsz); + endp = of_get_flat_dt_prop(chosen_node, + "linux,kexec-handover-buffer-end", + &endsz); + if (!startp || !endp) { + pr_debug("kexec handover buffer not found in the device tree.\n"); + return -ENOENT; + } + + start_addr = of_read_number(startp, startsz/4); + end_addr = of_read_number(endp, endsz/4); + + *addr = __va(start_addr); + /* -end is the first address after the buffer. */ + *size = end_addr - start_addr; + + pr_debug("kexec handover buffer at %p, size = %lu\n", *addr, *size); + + return 0; +} + +int kexec_free_handover_buffer(void) +{ + int ret; + void *addr; + unsigned long size; + + ret = kexec_get_handover_buffer(&addr, &size); + if (ret) + return ret; + + return memblock_free((phys_addr_t) addr, size); +} + /** * arch_kexec_walk_mem - call func(data) for each unreserved memory block * @image_type: kimage.type -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bFAki-0004mj-0J for kexec@lists.infradead.org; Tue, 21 Jun 2016 01:45:21 +0000 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u5L1hXK2099174 for ; Mon, 20 Jun 2016 21:44:59 -0400 Received: from e24smtp03.br.ibm.com (e24smtp03.br.ibm.com [32.104.18.24]) by mx0a-001b2d01.pphosted.com with ESMTP id 23n2u6rdv1-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 20 Jun 2016 21:44:59 -0400 Received: from localhost by e24smtp03.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 20 Jun 2016 22:44:56 -0300 Received: from d24relay02.br.ibm.com (d24relay02.br.ibm.com [9.13.184.26]) by d24dlp02.br.ibm.com (Postfix) with ESMTP id 126A01DC0054 for ; Mon, 20 Jun 2016 21:44:48 -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 u5L1itFJ29753664 for ; Mon, 20 Jun 2016 22:44:55 -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 u5L1isPc029970 for ; Mon, 20 Jun 2016 22:44:55 -0300 From: Thiago Jung Bauermann Subject: [PATCH 2/6] powerpc: kexec_file: Add buffer hand-over support for the next kernel Date: Mon, 20 Jun 2016 22:44:32 -0300 In-Reply-To: <1466473476-10104-1-git-send-email-bauerman@linux.vnet.ibm.com> References: <1466473476-10104-1-git-send-email-bauerman@linux.vnet.ibm.com> Message-Id: <1466473476-10104-3-git-send-email-bauerman@linux.vnet.ibm.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: linuxppc-dev@lists.ozlabs.org Cc: Michael Ellerman , x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Eric Biederman , Thiago Jung Bauermann , Mimi Zohar , Dave Young , Eric Richter The buffer hand-over mechanism allows the currently running kernel to pass data to kernel that will be kexec'd via a kexec segment. The second kernel can check whether the previous kernel sent data and retrieve it. This is the architecture-specific part. Signed-off-by: Thiago Jung Bauermann --- arch/powerpc/include/asm/kexec.h | 9 +++++ arch/powerpc/kernel/kexec_elf_64.c | 44 +++++++++++++++++++++++ arch/powerpc/kernel/machine_kexec_64.c | 64 ++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index a46f5f45570c..9b1ff59bc188 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -55,6 +55,15 @@ typedef void (*crash_shutdown_t)(void); #ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_FILE +#define ARCH_HAS_KIMAGE_ARCH + +struct kimage_arch { + phys_addr_t handover_buffer_addr; + unsigned long handover_buffer_size; +}; +#endif + /* * This function is responsible for capturing register states if coming * via panic or invoking dump using sysrq-trigger. diff --git a/arch/powerpc/kernel/kexec_elf_64.c b/arch/powerpc/kernel/kexec_elf_64.c index 4e71595300ed..5d2b7036fee7 100644 --- a/arch/powerpc/kernel/kexec_elf_64.c +++ b/arch/powerpc/kernel/kexec_elf_64.c @@ -96,6 +96,46 @@ static int elf64_probe(const char *buf, unsigned long len) return elf_check_arch(&ehdr)? 0 : -ENOEXEC; } +static int setup_handover_buffer(struct kimage *image, void *fdt, + int chosen_node) +{ + int ret; + + if (image->arch.handover_buffer_addr) { + ret = fdt_setprop_u64(fdt, chosen_node, + "linux,kexec-handover-buffer-start", + image->arch.handover_buffer_addr); + if (ret < 0) { + pr_err("Error setting up the new device tree.\n"); + return -EINVAL; + } + + /* -end is the first address after the buffer. */ + ret = fdt_setprop_u64(fdt, chosen_node, + "linux,kexec-handover-buffer-end", + image->arch.handover_buffer_addr + + image->arch.handover_buffer_size); + if (ret < 0) { + pr_err("Error setting up the new device tree.\n"); + return -EINVAL; + } + + ret = fdt_add_mem_rsv(fdt, image->arch.handover_buffer_addr, + image->arch.handover_buffer_size); + if (ret) { + pr_err("Error reserving kexec handover buffer: %s\n", + fdt_strerror(ret)); + return -EINVAL; + } + + pr_debug("kexec handover buffer at 0x%llx, size = 0x%lx\n", + image->arch.handover_buffer_addr, + image->arch.handover_buffer_size); + } + + return 0; +} + static bool find_debug_console(void *fdt, int chosen_node) { int len; @@ -494,6 +534,10 @@ void *elf64_load(struct kimage *image, char *kernel_buf, } } + ret = setup_handover_buffer(image, fdt, chosen_node); + if (ret) + goto out; + ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0); if (ret) { pr_err("Error setting up the new device tree.\n"); diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c index 43e8185ab6f7..c582abf726f5 100644 --- a/arch/powerpc/kernel/machine_kexec_64.c +++ b/arch/powerpc/kernel/machine_kexec_64.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -481,6 +482,69 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) return image->fops->cleanup(image->image_loader_data); } +bool kexec_can_hand_over_buffer(void) +{ + return true; +} + +int arch_kexec_add_handover_buffer(struct kimage *image, + unsigned long load_addr, unsigned long size) +{ + image->arch.handover_buffer_addr = load_addr; + image->arch.handover_buffer_size = size; + + return 0; +} + +int kexec_get_handover_buffer(void **addr, unsigned long *size) +{ + int chosen_node; + int startsz, endsz; + const void *startp, *endp; + unsigned long start_addr, end_addr; + + chosen_node = fdt_path_offset(initial_boot_params, "/chosen"); + if (chosen_node < 0) { + pr_err("Malformed device tree: /chosen not found.\n"); + return -EINVAL; + } + + startp = of_get_flat_dt_prop(chosen_node, + "linux,kexec-handover-buffer-start", + &startsz); + endp = of_get_flat_dt_prop(chosen_node, + "linux,kexec-handover-buffer-end", + &endsz); + if (!startp || !endp) { + pr_debug("kexec handover buffer not found in the device tree.\n"); + return -ENOENT; + } + + start_addr = of_read_number(startp, startsz/4); + end_addr = of_read_number(endp, endsz/4); + + *addr = __va(start_addr); + /* -end is the first address after the buffer. */ + *size = end_addr - start_addr; + + pr_debug("kexec handover buffer at %p, size = %lu\n", *addr, *size); + + return 0; +} + +int kexec_free_handover_buffer(void) +{ + int ret; + void *addr; + unsigned long size; + + ret = kexec_get_handover_buffer(&addr, &size); + if (ret) + return ret; + + return memblock_free((phys_addr_t) addr, size); +} + /** * arch_kexec_walk_mem - call func(data) for each unreserved memory block * @image_type: kimage.type -- 1.9.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec