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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C176C4706C for ; Fri, 22 Dec 2023 19:52:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B99F36B0095; Fri, 22 Dec 2023 14:52:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AFC396B0096; Fri, 22 Dec 2023 14:52:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 99DE36B0098; Fri, 22 Dec 2023 14:52:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 87D8F6B0095 for ; Fri, 22 Dec 2023 14:52:07 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5CC2F808C1 for ; Fri, 22 Dec 2023 19:52:07 +0000 (UTC) X-FDA: 81595500294.13.C781648 Received: from smtp-fw-52004.amazon.com (smtp-fw-52004.amazon.com [52.119.213.154]) by imf07.hostedemail.com (Postfix) with ESMTP id 58D7940026 for ; Fri, 22 Dec 2023 19:52:05 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=IVlgzGpa; spf=pass (imf07.hostedemail.com: domain of "prvs=71347c2e1=graf@amazon.de" designates 52.119.213.154 as permitted sender) smtp.mailfrom="prvs=71347c2e1=graf@amazon.de"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703274725; a=rsa-sha256; cv=none; b=dhG9a4JY1XCeaXVYayD2ie3PmETMxDSmmREy+GwDNBepHmKFy4vXqXzE+izg5n3RG8UB/Q FLFjRTL3RmwREoEGQvOfYxNfrEU6Fe9gGf9MolHDUdnNqzxTYYWt+fWlQ/UBGGPDgOM2jo j2SbKXw+iZt8nmmwa0TpfsBQm7YJlP0= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=IVlgzGpa; spf=pass (imf07.hostedemail.com: domain of "prvs=71347c2e1=graf@amazon.de" designates 52.119.213.154 as permitted sender) smtp.mailfrom="prvs=71347c2e1=graf@amazon.de"; dmarc=pass (policy=quarantine) header.from=amazon.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703274725; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=4hs41nrvxXplJ/QyH6HSlHLbtIDrbQgqX7R8fKuobQ4=; b=ZnDW9M/sIPlu2H2BOGDqt/kuquDpzj2AIv2EltQK7ZERZsjdpRIezvkTKBq/74A9tEmRlE HjcPlO/3qvxKhxiEiao1ym+AgFZhH4U5lFErbhCNl2bFCXuxpNh3ui3Qb6AyEbztb872Na 8vqHggfqNdyxf85271ukEzEGu//5F2w= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1703274725; x=1734810725; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4hs41nrvxXplJ/QyH6HSlHLbtIDrbQgqX7R8fKuobQ4=; b=IVlgzGpaN8od8GArgrPYl0D+L88eFpT+HS65ICb70i6zeDDoG9M0zIw+ K2aiJybVEC2Lr5XQ0ZMVXbOj3i4Zs/xjdzu6gK1zLSavtRiAgxOtNhHQT K5tQuDIO1KOBW9UiKV/FUfaof1fjffkGY6OhYDo6jnXGFIfLKoCivf8Hv 8=; X-IronPort-AV: E=Sophos;i="6.04,297,1695686400"; d="scan'208";a="174097104" Received: from iad12-co-svc-p1-lb1-vlan2.amazon.com (HELO email-inbound-relay-iad-1a-m6i4x-9fe6ad2f.us-east-1.amazon.com) ([10.43.8.2]) by smtp-border-fw-52004.iad7.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2023 19:52:05 +0000 Received: from smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev (iad7-ws-svc-p70-lb3-vlan3.iad.amazon.com [10.32.235.38]) by email-inbound-relay-iad-1a-m6i4x-9fe6ad2f.us-east-1.amazon.com (Postfix) with ESMTPS id 19E84808C4; Fri, 22 Dec 2023 19:51:57 +0000 (UTC) Received: from EX19MTAUWC001.ant.amazon.com [10.0.7.35:38232] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.16.72:2525] with esmtp (Farcaster) id 11d71bf8-2bc3-45a5-aa9e-d1953eed09b2; Fri, 22 Dec 2023 19:51:57 +0000 (UTC) X-Farcaster-Flow-ID: 11d71bf8-2bc3-45a5-aa9e-d1953eed09b2 Received: from EX19D020UWC004.ant.amazon.com (10.13.138.149) by EX19MTAUWC001.ant.amazon.com (10.250.64.174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Fri, 22 Dec 2023 19:51:57 +0000 Received: from dev-dsk-graf-1a-5ce218e4.eu-west-1.amazon.com (10.253.83.51) by EX19D020UWC004.ant.amazon.com (10.13.138.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Fri, 22 Dec 2023 19:51:53 +0000 From: Alexander Graf To: CC: , , , , , , , Eric Biederman , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , "Rob Herring" , Steven Rostedt , "Andrew Morton" , Mark Rutland , "Tom Lendacky" , Ashish Kalra , James Gowans , Stanislav Kinsburskii , , , , Anthony Yznaga , Usama Arif , David Woodhouse , Benjamin Herrenschmidt Subject: [PATCH v2 08/17] arm64: Add KHO support Date: Fri, 22 Dec 2023 19:51:35 +0000 Message-ID: <20231222195144.24532-3-graf@amazon.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231222195144.24532-1-graf@amazon.com> References: <20231222193607.15474-1-graf@amazon.com> <20231222195144.24532-1-graf@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.253.83.51] X-ClientProxiedBy: EX19D032UWA002.ant.amazon.com (10.13.139.81) To EX19D020UWC004.ant.amazon.com (10.13.138.149) Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 58D7940026 X-Stat-Signature: 4zo8akax357fz4qrpr8obkfdcakfhxet X-Rspam-User: X-HE-Tag: 1703274725-500572 X-HE-Meta: U2FsdGVkX18zYEy4oYW/l8dKrptQwj3bUT/q41elPvBP/V+tbjrqmbFxlC9iB1JNBq78270nF4lSV/rqPZRpYUETWTi5s/hOSzzcyMr+i3ZZYrPUOAhzI6Jg1FpvYX/0dEW1X0lQICZcPlCGanSka9bqXfPNgKMXi8wUfsEBEQ8KotCBT/jjRjA8W90VFOiZiNWDB5XmTyOkVWWxFuHRHMOypV7PE8cCx/AjiE2pnE3QFSuz96dihOHgiTCSLWpXpgBj1iETG389Fks3uQDr1Cnnx0adVUX0kKgkIYdqrw4VAdHdRxuck2afNQqUBJPER0m8BIi+oZ3udXBmPnu0551NgJQZr+eNDU+bJD3kmZVW51b2Zrap6nxGbfbhYDIY7IkEIUiOoiDhf3wHb1iOBCkOpsoTMV4VT52DNOce+RDryHW+D66g5NZpUTJrR2TTU1GbzfN/YZQhUQvUJ5rp7m2RlNLmVpxsuwcNcJ4SIENYON8E4ShJFzCKxM9GNmCGAue4+k7SU9ZFyYC5MpKfsgmpy7Q9AaUorGCKEkIwApOQDJQ/VkSsJDgdEy6ItgGMzRpggNrbntno+iW5Fd/zvIsy1xLK7OSDvhtrLnZTXcBuQDShBt3CyUEsHXYMyKN78PGi5qutpZMqdyFJGmJ7+jzJBqXTRLf+K/n0PLnW7S9DpDh5j4qKDyB9t+POPtSf8rH6FMUF0Bs+AP974swWb6cp8RpJwFC6ci2CRMheLwWExwaDNUeIQrB/6hvXD0tCIRpclIyuUMycZ5clCtG3MRQAIE32avX1mK9sIUluFCTuJjQ6xGle9t6g69fw0AmLaQDJJ5y3ogpFDJlfI9kfWRwpMST3pgEAjYRFqY9pHqjPoueT5s18V50s+5d6MFUui1gaxLf5Cm7F2phnn6MGIAxmdOA691/K9De+tIPZQLJMWszIr3n2KWFv7nYNHyfADS7aOZNQNlgiyglnakE K82RTSLs LfOHU7HpMbDn9728Re7j76Pml7Y7efuKkSVif9f/cszZPnUSxKsYMaYNzvDyPUAw9E6B9m5YueIRGKmFWDdWcFqxWnAPlhgFnfp7aQpVKjJaWJcRTHDbH/AidqsSbBVPW8cwRTRt9VL/ukpSc7BF0yY/Nqedn3wKQx/DdP3IZoQ8k/nIaBbrfBqFVk/5dIuaf97z+4tGcirwEkXGK2qSC1h3Ep2euI9FlN9g2gKA1OfxY/5f4SYFAkJaKSjLrV4AHKrwndnkeCF5XJY13TO2iaaWZ1n111xxMO/fTepMmS8CKdUlHjCBOUJHxsy/wLvXoApAGgAbTmRztcBNaZ1Rs5Z0kJEZzNVBcr347yrtPg3BfHxdIPFV20vSzwkoSOugDZjEVC0q0K8pfQiGzL6/Vqvyiqx+u5y3xX5b43JY2qx58qj3xs/fVV1tM1B35tzTVf3Dd3unYBB5GVSv5rrQpCuAxm5LurNtsJ7cbiDqNXAz78cWhZXk/SaPc2nqAJuGaPh0f55fNgF03n1IkO+2bV1DNY6RZH2CDhJEAIcJ9Pb3t1+HJ4obno8RdpsU1AhEuPTqSjda78SVVw3psJzvg3LYeo1qrEKbgMpQ/apsSbalGcKphihE+OCCOgg== 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: List-Subscribe: List-Unsubscribe: We now have all bits in place to support KHO kexecs. This patch adds awareness of KHO in the kexec file as well as boot path for arm64 and adds the respective kconfig option to the architecture so that it can use KHO successfully. Signed-off-by: Alexander Graf --- v1 -> v2: - test bot warning fix - Change kconfig option to ARCH_SUPPORTS_KEXEC_KHO - s/kho_reserve_mem/kho_reserve_previous_mem/g - s/kho_reserve/kho_reserve_scratch/g - Remove / reduce ifdefs for kho fdt code --- arch/arm64/Kconfig | 3 +++ arch/arm64/kernel/setup.c | 2 ++ arch/arm64/mm/init.c | 8 ++++++ drivers/of/fdt.c | 39 ++++++++++++++++++++++++++++ drivers/of/kexec.c | 54 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 106 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 7b071a00425d..4a2fd3deaa16 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1495,6 +1495,9 @@ config ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG config ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG def_bool y +config ARCH_SUPPORTS_KEXEC_KHO + def_bool y + config ARCH_SUPPORTS_CRASH_DUMP def_bool y diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 417a8a86b2db..9aa05b84d202 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -346,6 +346,8 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p) paging_init(); + kho_reserve_previous_mem(); + acpi_table_upgrade(); /* Parse the ACPI tables for possible boot-time configuration */ diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 74c1db8ce271..1a8fc91509af 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -358,6 +358,8 @@ void __init bootmem_init(void) */ arch_reserve_crashkernel(); + kho_reserve_scratch(); + memblock_dump_all(); } @@ -386,6 +388,12 @@ void __init mem_init(void) /* this will put all unused low memory onto the freelists */ memblock_free_all(); + /* + * Now that all KHO pages are marked as reserved, let's flip them back + * to normal pages with accurate refcount. + */ + kho_populate_refcount(); + /* * Check boundaries twice: Some fundamental inconsistencies can be * detected at build time already. diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index bf502ba8da95..f9b9a36fb722 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1006,6 +1006,42 @@ void __init early_init_dt_check_for_usable_mem_range(void) memblock_add(rgn[i].base, rgn[i].size); } +/** + * early_init_dt_check_kho - Decode info required for kexec handover from DT + */ +static void __init early_init_dt_check_kho(void) +{ + unsigned long node = chosen_node_offset; + u64 kho_start, scratch_start, scratch_size, mem_start, mem_size; + const __be32 *p; + int l; + + if (!IS_ENABLED(CONFIG_KEXEC_KHO) || (long)node < 0) + return; + + p = of_get_flat_dt_prop(node, "linux,kho-dt", &l); + if (l != (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32)) + return; + + kho_start = dt_mem_next_cell(dt_root_addr_cells, &p); + + p = of_get_flat_dt_prop(node, "linux,kho-scratch", &l); + if (l != (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32)) + return; + + scratch_start = dt_mem_next_cell(dt_root_addr_cells, &p); + scratch_size = dt_mem_next_cell(dt_root_addr_cells, &p); + + p = of_get_flat_dt_prop(node, "linux,kho-mem", &l); + if (l != (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32)) + return; + + mem_start = dt_mem_next_cell(dt_root_addr_cells, &p); + mem_size = dt_mem_next_cell(dt_root_addr_cells, &p); + + kho_populate(kho_start, scratch_start, scratch_size, mem_start, mem_size); +} + #ifdef CONFIG_SERIAL_EARLYCON int __init early_init_dt_scan_chosen_stdout(void) @@ -1304,6 +1340,9 @@ void __init early_init_dt_scan_nodes(void) /* Handle linux,usable-memory-range property */ early_init_dt_check_for_usable_mem_range(); + + /* Handle kexec handover */ + early_init_dt_check_kho(); } bool __init early_init_dt_scan(void *params) diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c index 68278340cecf..59070b09ad45 100644 --- a/drivers/of/kexec.c +++ b/drivers/of/kexec.c @@ -264,6 +264,55 @@ static inline int setup_ima_buffer(const struct kimage *image, void *fdt, } #endif /* CONFIG_IMA_KEXEC */ +static int kho_add_chosen(const struct kimage *image, void *fdt, int chosen_node) +{ + void *dt = NULL; + phys_addr_t dt_mem = 0; + phys_addr_t dt_len = 0; + phys_addr_t scratch_mem = 0; + phys_addr_t scratch_len = 0; + void *mem_cache = NULL; + phys_addr_t mem_cache_mem = 0; + phys_addr_t mem_cache_len = 0; + int ret = 0; + +#ifdef CONFIG_KEXEC_KHO + dt = image->kho.dt.buffer; + dt_mem = image->kho.dt.mem; + dt_len = image->kho.dt.bufsz; + + scratch_mem = kho_scratch_phys; + scratch_len = kho_scratch_len; + + mem_cache = image->kho.mem_cache.buffer; + mem_cache_mem = image->kho.mem_cache.mem; + mem_cache_len = image->kho.mem_cache.bufsz; +#endif + + if (!dt || !mem_cache) + goto out; + + pr_debug("Adding kho metadata to DT"); + + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, "linux,kho-dt", + dt_mem, dt_len); + if (ret) + goto out; + + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, "linux,kho-scratch", + scratch_mem, scratch_len); + if (ret) + goto out; + + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, "linux,kho-mem", + mem_cache_mem, mem_cache_len); + if (ret) + goto out; + +out: + return ret; +} + /* * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree * @@ -412,6 +461,11 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, } } + /* Add kho metadata if this is a KHO image */ + ret = kho_add_chosen(image, fdt, chosen_node); + if (ret) + goto out; + /* add bootargs */ if (cmdline) { ret = fdt_setprop_string(fdt, chosen_node, "bootargs", cmdline); -- 2.40.1 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879