From patchwork Wed Jan 17 14:46:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 13521808 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 CCEFCC47DA2 for ; Wed, 17 Jan 2024 14:48:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A3A36B00D3; Wed, 17 Jan 2024 09:48:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 52B656B00D4; Wed, 17 Jan 2024 09:48:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3CCF76B00D6; Wed, 17 Jan 2024 09:48:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 281516B00D3 for ; Wed, 17 Jan 2024 09:48:37 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id F419C1205FE for ; Wed, 17 Jan 2024 14:48:36 +0000 (UTC) X-FDA: 81689084274.13.891F140 Received: from smtp-fw-2101.amazon.com (smtp-fw-2101.amazon.com [72.21.196.25]) by imf29.hostedemail.com (Postfix) with ESMTP id C541D12001E for ; Wed, 17 Jan 2024 14:48:34 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b="D/YWXD1y"; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf29.hostedemail.com: domain of "prvs=7399cbc58=graf@amazon.de" designates 72.21.196.25 as permitted sender) smtp.mailfrom="prvs=7399cbc58=graf@amazon.de" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705502914; 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=5KRHAMu9yU5dNg0w2SWnmdVf58WPdmNSqcv1epJi1fM=; b=OqP4ENgzrSWIa6Ju//BjSEkF3n7311fTvSx6vUmsD7I1EbeXgKv5phwg1JGges7TGtLSdh oUoBn1VzGF8yzwsPiUTPvR92W4bNZPBTlRylxbS3XKQ7rQOY6jIwzyH/LmHjAJFn3tocRZ SJBvZw9TiQG4YjlE7dKOPQg33zjrea0= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b="D/YWXD1y"; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf29.hostedemail.com: domain of "prvs=7399cbc58=graf@amazon.de" designates 72.21.196.25 as permitted sender) smtp.mailfrom="prvs=7399cbc58=graf@amazon.de" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705502914; a=rsa-sha256; cv=none; b=i0WvXy7JAcQDrfx9jMiV0jpXpMl9bbLvf1Rk++SiW08fkbk8sx1esqK/sk6YySurRyNV4n Z6PY59yYJgUxDywU+89ybJvSj/sUU3VNR1GKkmYGDK5qPgbN2gGfJN91W/m2nVcmbluwrr 6v8ocP5mcKrkEi+6RWho+EEpzaLz39c= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1705502914; x=1737038914; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5KRHAMu9yU5dNg0w2SWnmdVf58WPdmNSqcv1epJi1fM=; b=D/YWXD1y1hC+Xm1IwpWl9yEDTgQEm8TZCUikarweYTm7OeYIYSZ2iFpb dAr4W4c6lPheZzelPZUnmFQIHPBM7RU7iPolMiq4y+HOCHDc0owDrDqKp kx0PCmLrAL2jsnEOVlVLcn5X/8NjMO5ol/euBf/GNy2Q37OBRjX3kPNCx A=; X-IronPort-AV: E=Sophos;i="6.05,200,1701129600"; d="scan'208";a="374981621" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-iad-1e-m6i4x-0aba4706.us-east-1.amazon.com) ([10.43.8.6]) by smtp-border-fw-2101.iad2.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2024 14:48:34 +0000 Received: from smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev (iad7-ws-svc-p70-lb3-vlan2.iad.amazon.com [10.32.235.34]) by email-inbound-relay-iad-1e-m6i4x-0aba4706.us-east-1.amazon.com (Postfix) with ESMTPS id D2FBCA25EE; Wed, 17 Jan 2024 14:48:26 +0000 (UTC) Received: from EX19MTAUWC002.ant.amazon.com [10.0.7.35:54739] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.24.5:2525] with esmtp (Farcaster) id 5dc96f43-86b0-43d4-b0c2-0f3115bf0b25; Wed, 17 Jan 2024 14:48:26 +0000 (UTC) X-Farcaster-Flow-ID: 5dc96f43-86b0-43d4-b0c2-0f3115bf0b25 Received: from EX19D020UWC004.ant.amazon.com (10.13.138.149) by EX19MTAUWC002.ant.amazon.com (10.250.64.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 17 Jan 2024 14:48:25 +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; Wed, 17 Jan 2024 14:48:21 +0000 From: Alexander Graf To: CC: , , , , , , , Eric Biederman , "H . Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Steven Rostedt , Andrew Morton , Mark Rutland , "Tom Lendacky" , Ashish Kalra , James Gowans , Stanislav Kinsburskii , , , , Anthony Yznaga , Usama Arif , David Woodhouse , Benjamin Herrenschmidt , Rob Herring , Krzysztof Kozlowski Subject: [PATCH v3 08/17] arm64: Add KHO support Date: Wed, 17 Jan 2024 14:46:55 +0000 Message-ID: <20240117144704.602-9-graf@amazon.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240117144704.602-1-graf@amazon.com> References: <20240117144704.602-1-graf@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.253.83.51] X-ClientProxiedBy: EX19D040UWA004.ant.amazon.com (10.13.139.93) To EX19D020UWC004.ant.amazon.com (10.13.138.149) X-Rspam-User: X-Stat-Signature: gbqkzu1otiqhafu1kmg6wuebgwpexqp6 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: C541D12001E X-HE-Tag: 1705502914-109991 X-HE-Meta: U2FsdGVkX1/ylrGlDMNo8BMJA+8Tkc0P7VyZypdtkkJM4BMjC5ZVP4LD6M7gCJAy9eyJP9IAUBvZ4Zn2yXRILqP/pxl1ykmdNy/L4AYNldr+paDQ/itH0F14Ky5CkNJO8wUQqBizFlY2PPLqJYfIZucZsqiaPDxJ0Se/9kvhpuu+6L79mmnJVZzTGOjhPgpOHz2kRafSchNYRytFfSN6DJQaUQFAcPt5amKk/+I2oV+xLR802mvRg/9ATl10YcRYbzH5IQ3hSwg7xiB9cpp7hl0Mq4aNo6Y4P1GSWbgGRoMUfPdA6fE/J5FZBz2kakhJp6g5TrL69fh0r2edVD+I9nJnnqhMxriv01aWEJOtCnGIUvd9E+PE2e49Rs/PEjfEMgA/QMh9eu81qNEc4I1EQY9ifLID58b9l56B8rT1nGDne8ZL1DqVDhRibPMREx2ygxc5tngrudGtgkvmCw6dTwj2Dp6DfZeb+9BG5YZRVy9IIsezgFZ7PWH/AL/omjehCyW3OpXNXlZrwpQc/La+8D0FGVcx4LUHoNpikNmm/PrFpJXnaDA7cuIi06E7805hfKJpe0FYc0mtIvCNjcbTek86AiL0mzqec8e/tEfW7FsPJ75W+9xSVPWx8DAJT86RAavWdKKvvzfkbc3SY3oQWQOD00WG2/JVA84m44VcFAwF1BerJkhwgbbWeNYcFDt/fs5PoycMBaEHmOIwkUTJ5wWyy++bUsfiQPFpitAIwHmE+uXljKOAxzhPR6ROHbykzS51SSXCh6DkSDeUPvDpQMeepP9vyW4lr9t8MShkDmauvacIEi7isYBQzpZ2cvKfau+TyIlUH2UbLOdgkUQQvttXlU+nWQmPMigU87aE+eDm0FqSt0A6ZanLQQZ7zu+rx1B166cfraboAX3j4MnTHXjbuySx2Ffx1kAdBLQVaXQ4UaAGBTckuKjYxEm/KyVRHUR8hRRbuw8OeoT+sSy 02iWydaW SxhIAHMPmjQ000/3nP+WT4pF+fqoOR1eL58qXOoGc4AXAQxub6hxTcUQ0Rmcp5AIuS6EQ3wuzYgaapuq6AiCZ5v+/0JtTBvACTLEu0A10C9UlUwjqna3FIV5cQldmhKkISxWSwxp3B6GAO+y7TZVNkJFkMevJMc9KoSEFBPZzs43J0MQp+SL0iAPZNqyxvQNeQAcNp4KOWembRH446lEJ8r3Uqfv7n8hOCrx90tb2S89O8BJxwmViKGlRcjUoJFAYY2oZKOQntcJfFpBlJ3OfdI4gFg+s03P2p4Jju40h1xzSVWuOreLttIyFrFghR/g3V0gamNigDgDbTxMaLd2Z4XqjDb6Xk1dqNPeeW6iVvFTvsmoPNz0vWMvuyVmmZIztblqO 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 8f6cf1221b6a..44d8923d9db4 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1496,6 +1496,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);