From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE93CECDFB1 for ; Tue, 17 Jul 2018 16:57:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A3F39206B7 for ; Tue, 17 Jul 2018 16:57:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3F39206B7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729754AbeGQRap (ORCPT ); Tue, 17 Jul 2018 13:30:45 -0400 Received: from foss.arm.com ([217.140.101.70]:49912 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729689AbeGQRao (ORCPT ); Tue, 17 Jul 2018 13:30:44 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EC3B27A9; Tue, 17 Jul 2018 09:57:11 -0700 (PDT) Received: from [10.1.206.34] (melchizedek.cambridge.arm.com [10.1.206.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1BD193F318; Tue, 17 Jul 2018 09:57:07 -0700 (PDT) Subject: Re: [PATCH v11 09/15] arm64: kexec_file: load initrd and device-tree To: AKASHI Takahiro Cc: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de, ard.biesheuvel@linaro.org, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20180711074203.3019-1-takahiro.akashi@linaro.org> <20180711074203.3019-10-takahiro.akashi@linaro.org> From: James Morse Message-ID: Date: Tue, 17 Jul 2018 17:57:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <20180711074203.3019-10-takahiro.akashi@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Akashi, On 11/07/18 08:41, AKASHI Takahiro wrote: > load_other_segments() is expected to allocate and place all the necessary > memory segments other than kernel, including initrd and device-tree > blob (and elf core header for crash). > While most of the code was borrowed from kexec-tools' counterpart, > users may not be allowed to specify dtb explicitly, instead, the dtb > presented by the original boot loader is reused. > > arch_kimage_kernel_post_load_cleanup() is responsible for freeing arm64- > specific data allocated in load_other_segments(). > diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c > index c38a8048ed00..ca00681c25c6 100644 > --- a/arch/arm64/kernel/machine_kexec_file.c > +++ b/arch/arm64/kernel/machine_kexec_file.c > +int arch_kimage_file_post_load_cleanup(struct kimage *image) > +{ > + vfree(image->arch.dtb_buf); > + image->arch.dtb_buf = NULL; > + > + return kexec_image_post_load_cleanup_default(image); > +} A nit from sparse: | warning: symbol 'arch_kimage_file_post_load_cleanup' was not declared Can we add a definition for this to a header file somewhere. asm/kexec.h is probably the best bet. > +static int setup_dtb(struct kimage *image, > + unsigned long initrd_load_addr, unsigned long initrd_len, > + char *cmdline, unsigned long cmdline_len, > + char **dtb_buf, size_t *dtb_buf_len) > +{ > + /* add initrd-* */ > + if (initrd_load_addr) { > + value = cpu_to_fdt64(initrd_load_addr); > + ret = fdt_setprop_u64(buf, nodeoffset, "linux,initrd-start", > + value); fdt_setprop_u64() already does the endian conversion. >From scripts/dtc/libfdt/libfdt.h, its implemented as: | fdt64_t tmp = cpu_to_fdt64(val); | return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); (I think you were using setprop directly in an older version) This leads to: | ------------[ cut here ]------------ | initrd not fully accessible via the linear mapping -- please check your | bootloader ... | WARNING: CPU: 0 PID: 0 at ../arch/arm64/mm/init.c:429 | arm64_memblock_init+0x150/0x3d8 | Modules linked in: | CPU: 0 PID: 0 Comm: swapper Not tainted 4.18.0-rc5-00015-g95b5c843d0da #10150 | Hardware name: AMD Seattle (Rev.B0) Development Board (Overdrive) (DT) | pstate: 60000085 (nZCv daIf -PAN -UAO) | pc : arm64_memblock_init+0x150/0x3d8 | lr : arm64_memblock_init+0x150/0x3d8 | Call trace: | arm64_memblock_init+0x150/0x3d8 | setup_arch+0x1c0/0x510 | start_kernel+0x80/0x418 | random: get_random_bytes called from print_oops_end_marker+0x4c/0x68 with | crng_init=0 | ---[ end trace 0000000000000000 ]--- Which is caused by the values being miles outside ram due to the extra byte swapping: | morse@frikadeller:~$ sudo dtc -I dtb -O dts /sys/firmware/fdt | grep initrd | linux,initrd-end = <0x900b6c05 0x80000000>; | linux,initrd-start = <0x906a04 0x80000000>; With the two extra cpu_to_fdt64() calls removed: Reviewed-by: James Morse Thanks, James