From patchwork Mon Sep 25 21:27:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Kinsburskii X-Patchwork-Id: 13398422 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11A62CE79A4 for ; Mon, 25 Sep 2023 21:28:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D1F78D0001; Mon, 25 Sep 2023 17:27:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 85A2E6B016C; Mon, 25 Sep 2023 17:27:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6D42F8D0001; Mon, 25 Sep 2023 17:27:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 53F016B016B for ; Mon, 25 Sep 2023 17:27:59 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0B5B2C0CF1 for ; Mon, 25 Sep 2023 21:27:59 +0000 (UTC) X-FDA: 81276407478.01.6D67A66 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf03.hostedemail.com (Postfix) with ESMTP id 240B620019 for ; Mon, 25 Sep 2023 21:27:56 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=M5iue+Y1; spf=pass (imf03.hostedemail.com: domain of skinsburskii@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=skinsburskii@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695677277; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=d9fPt1clGeRPn33BCC4tdwVX7ro+BQvAJ2DtTNtITFk=; b=YG385+2xd4sSnAPMhAhb4bs1E40oWEin8ND7ejz4JHWHuCDpEGoBB90vm2cMsUkC0yze+W KgwpZaqCpMxISUfMjQh2OqKA1OrMJ7ymYbBy4CzBcWlb3QJ42Ub16uBQdP3ozwduAm6Z4q 2xbacZQRDMRH3uyQZVQvxMAVYnz6GlA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=M5iue+Y1; spf=pass (imf03.hostedemail.com: domain of skinsburskii@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=skinsburskii@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695677277; a=rsa-sha256; cv=none; b=8Er9OwLaE594X5UB47DfEkoFaZuVElHWS1a61I+9/80jntfTaaDDeF8dpBJ5i6EJ68LmAX qaZdrqPh+e1uQsSqiuF72LoQfwuR0Q3Ix3OwTphoDzDp5vIEgZsk6e4afkj/vLNVIKFysg pOxkPSoTnh7IDc2GlZBZFGeHHYAwMAM= Received: from skinsburskii. (c-67-170-100-148.hsd1.wa.comcast.net [67.170.100.148]) by linux.microsoft.com (Postfix) with ESMTPSA id 56A83212C81D; Mon, 25 Sep 2023 14:27:55 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 56A83212C81D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1695677276; bh=d9fPt1clGeRPn33BCC4tdwVX7ro+BQvAJ2DtTNtITFk=; h=Subject:From:To:Date:In-Reply-To:References:From; b=M5iue+Y1JZxYmVpZGoFvxEC2uHrLO++xRekrarcyv8eucItPvhyhI0pBWIGDqy/YH zbKtO4aZcaHwng+EkfdrvfZQzrmwoEQ8KVjOKzfbhg765UJp+xnL83VY0D5B7W19SP nZ/hV7gclgrLaT3sBr4WarWvWwETcysRoe+548+I= Subject: [RFC PATCH v2 2/7] x86: kexec: Transfer existing fdt to the new kernel From: Stanislav Kinsburskii To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, ebiederm@xmission.com, akpm@linux-foundation.org, stanislav.kinsburskii@gmail.com, corbet@lwn.net, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-mm@kvack.org, kys@microsoft.com, jgowans@amazon.com, wei.liu@kernel.org, arnd@arndb.de, gregkh@linuxfoundation.org, graf@amazon.de, pbonzini@redhat.com Date: Mon, 25 Sep 2023 14:27:54 -0700 Message-ID: <169567727460.19708.8733721379247990958.stgit@skinsburskii.> In-Reply-To: <169567722094.19708.3583735425859054859.stgit@skinsburskii.> References: <169567722094.19708.3583735425859054859.stgit@skinsburskii.> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Rspamd-Queue-Id: 240B620019 X-Rspam-User: X-Stat-Signature: pb8q8p81zz6ta9qt6ji8yxan3kzwngh9 X-Rspamd-Server: rspam01 X-HE-Tag: 1695677276-761503 X-HE-Meta: U2FsdGVkX1+smrGjcvQnu12FZuUgySvvMRbnYo+g7tEn1zk/oCQ4W0f7e+DTnkq/zum1AvBOfqn6rak+qbp88Posc60c4Mh6UuTfT/DptZ0kReR17eZZb2qrEb8Oy0J52loe3rBmC7If//A0+OdfCS8kpKSze1Ae7scnH/l/XQCKNFY7HeGfGYVPicCJwXTwffjVyvlxSBp9BLDuMwR7Oibzag0TatRpVrfI4JKyFLnxE8dAiBpaohAZ0Gan4xt+iJleU6NJmTi4Frgph4ypS6dGOOIgy/tv2Fh9xB58KTFSEUIHi3R+v1qctW+QpdwTBFXfjzF94vVfulhfz0PfM79ja7TxlivqF5EjAbE3yvxq/Uz8tg7SojUAMPn0Glk2hJ99OM6xoOLFPcOMNlNOdImmsy9K1vfnLWcvqN7tuR+YS8B72EXWa+TYQ9yHKVp+sSBJDofo/nCyjbrJ+Wx56+OTT1Cavn0bbBQRPCLBANg6BjUiyrv/GUSokmvgCHCckYVcDURPyxl/j5dUvq0XkM5fFxBzDMjV+QzZi4kV6yuItHfzINO47eq8wvDkQNTqIkWXdlttzrZfLMqq5yhRWESs4zTadf1a0wZHrch1xfOlbOR/kfvPfCrTIVBoi+la9J59AUQYW1aEZNWUw4BUuCMRGEUJyh7cNOT3kC2OYd1okdHBK5GybrfzdKphePy3AV05z5PWYbOd4QXDQI/Eq6gvwNzsLQhbXc5iKlBE3P+dJO3EuFQo1ivII3kO1MvWRemXZ1sOBgCOLo3XGwRO4V32NbxI7Nh86TvPtvwFRGmHLII/LFXup5XX6tDkFoSpPeJSAKKs8bskpE45miK/H9qMfzoVgO7ennB6MWgI1CY1Rd0jQJCPAcK5qd9OlDEYAxjC8EBk0f+kHbPZQanDwh8NF4YRM+xvZJSFOfi3JMp6Qs/QIWhOpAtK0tqOvR1gPai7DJWkUx9WwKY7VXZ cAlfRedj Qo/LcOTDAsSrHSTpDfehK58IzRFaNhITLPoxSPB9S492kfcvz8FJxQeVKPb8tn1AnJ6hMzJDnaUcNpX3+Ml7yCBgZSB/svenS7YZeHe1Qv7ZC95N9iYsj3Ivp89Gt5XAqV2oUenDTSdz3s6N072AsmuC5ih5Izx7Cs3QF8dr/fRaLujBaiCEKCSGUGevovzj6OtOAqWEjL6PZHuo7hjdtzOo3jq3acpqlPJZH/NF2vKLv4bitm6kv7mHPjhe7X97ftQyYZmt/7IhpoM2eD+oDGU63d4J8PYJA9YDzUB+SwATHG1M= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Stanislav Kinsburskii Enable passing of the Flattened Device Tree (fdt) over kexec for x86 architecture, as outlined in Documentation/x86/booting-dt.rst. Signed-off-by: Stanislav Kinsburskii --- arch/x86/Kconfig | 8 +++++ arch/x86/kernel/kexec-bzimage64.c | 58 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e36261b4ea14..efb472e267ec 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2070,6 +2070,14 @@ config KEXEC_FILE for kernel and initramfs as opposed to list of segments as accepted by previous system call. +config KEXEC_FILE_FDT + bool "Pass fdt over kexec" + depends on KEXEC_FILE && X86_64 + depends on OF_FLATTREE + help + This option enables passing existent Flattened Device Tree to the new + kernel when kexec is invoked by the file based system call. + config ARCH_HAS_KEXEC_PURGATORY def_bool KEXEC_FILE diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c index a61c12c01270..ab9ae02c9a5f 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include @@ -381,7 +383,59 @@ static int bzImage64_probe(const char *buf, unsigned long len) return ret; } +#ifdef CONFIG_KEXEC_FILE_FDT +static void *fdt_get_runtime(void) +{ + return initial_boot_params; +} + +static int kexec_setup_fdt(struct kexec_buf *kbuf, struct boot_params *params) +{ + void *fdt; + struct setup_data *sd; + unsigned long fdt_load_addr, fdt_sz; + int ret; + + fdt = fdt_get_runtime(); + if (!fdt) + return 0; + + fdt_sz = fdt_totalsize(fdt); + + kbuf->bufsz = kbuf->memsz = sizeof(struct setup_data) + fdt_sz; + + sd = kzalloc(kbuf->bufsz, GFP_KERNEL); + if (!sd) + return -ENOMEM; + + kbuf->buffer = sd; + kbuf->buf_align = PAGE_SIZE; + kbuf->buf_min = MIN_INITRD_LOAD_ADDR; + kbuf->mem = KEXEC_BUF_MEM_UNKNOWN; + ret = kexec_add_buffer(kbuf); + if (ret) + return ret; + + fdt_load_addr = kbuf->mem; + pr_debug("Loaded fdt at 0x%lx bufsz=0x%lx memsz=0x%lx\n", + fdt_load_addr, fdt_sz, fdt_sz); + + sd->type = SETUP_DTB; + sd->len = fdt_sz; + memcpy(sd->data, fdt, fdt_sz); + + sd->next = params->hdr.setup_data; + params->hdr.setup_data = fdt_load_addr; + + return 0; +} +#else +static int kexec_setup_fdt(struct kexec_buf *kbuf, struct boot_params *params) +{ + return 0; +} +#endif static void *bzImage64_load(struct kimage *image, char *kernel, unsigned long kernel_len, char *initrd, unsigned long initrd_len, char *cmdline, @@ -561,6 +615,10 @@ static void *bzImage64_load(struct kimage *image, char *kernel, if (ret) goto out_free_params; + ret = kexec_setup_fdt(&kbuf, params); + if (ret) + goto out_free_params; + /* Allocate loader specific data */ ldata = kzalloc(sizeof(struct bzimage64_data), GFP_KERNEL); if (!ldata) {