From patchwork Fri Apr 11 05:37:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047561 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 41CE1C369A8 for ; Fri, 11 Apr 2025 05:38:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87814280158; Fri, 11 Apr 2025 01:38:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DDC0280154; Fri, 11 Apr 2025 01:38:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 656CC280158; Fri, 11 Apr 2025 01:38:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3D572280154 for ; Fri, 11 Apr 2025 01:38:21 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EC4FCBCA64 for ; Fri, 11 Apr 2025 05:38:21 +0000 (UTC) X-FDA: 83320657602.11.C676206 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf05.hostedemail.com (Postfix) with ESMTP id 21C87100007 for ; Fri, 11 Apr 2025 05:38:19 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=F01OVu1j; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3yqr4ZwoKCEknslyr95lywrzzrwp.nzxwty58-xxv6lnv.z2r@flex--changyuanl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3yqr4ZwoKCEknslyr95lywrzzrwp.nzxwty58-xxv6lnv.z2r@flex--changyuanl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349900; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=z/qZgzMmxZEsawIy31A7dWlG2yn5UQrX3y3KTJwsEo8=; b=wU68ioeaNkrqxw27n1uGmJC/1nwej+zAzqgIsFzPgG8KxyqXKnxU/FlRbxDB/CMSJUqdEG c8QaeaHcaoBdPksT5lcLGbtutN1bVVn30Pa74gWuGKBmsoy+kcM/AvrtoJ58a+6wJBJK9g V0VoS7pq/KT3lpMrqXKS5YITwExrOEI= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=F01OVu1j; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3yqr4ZwoKCEknslyr95lywrzzrwp.nzxwty58-xxv6lnv.z2r@flex--changyuanl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3yqr4ZwoKCEknslyr95lywrzzrwp.nzxwty58-xxv6lnv.z2r@flex--changyuanl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349900; a=rsa-sha256; cv=none; b=CB6K+C3Noawr/u3wc3TL0ydGjZjx2OAWcLEvr0AHdtY9XeZvLbZPsLqv1v7/ucrBwCtsi0 M1c/pFZIJAALKUWh+WbLE6kT42UMOp4hSAsRPRsHAXc+nbK7lVCFLZyqSJURHbS3c2WT7A 7cLpbJ2R2gBnqicyPrXnURSFT28KiI8= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-225107fbdc7so14497945ad.0 for ; Thu, 10 Apr 2025 22:38:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349899; x=1744954699; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=z/qZgzMmxZEsawIy31A7dWlG2yn5UQrX3y3KTJwsEo8=; b=F01OVu1jkzzcmHtynl1JL1yPDL0tDqWOijZF0sdhyToVNC9tH05DZfx5IAAxwUhB0D 7X4DrmPrX+RuiS9UgEey34e/M43ZYL5497Z/oJrw47B5fUX0HmaNn0f7HumjGYBQNJOM wLiq1cuPHt3XQ1E9Z0fyRLj831AN3TLTZXSk+gDph3FPbWH04fc0ozYOgltrp+HtLL5y HLFpPH2bVVZBa9Pz5aeWgmZwezhlr1IRgIDPjk1KstLE8KBKbkPKPtGHoJHMf6sKZbd7 qzNtc0cITeocslMUsm7ZtR3W1dmLBhRyjGisdAoNpiWZyFqvE+ycbRLCFRAZ7jQGS0sY glJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349899; x=1744954699; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=z/qZgzMmxZEsawIy31A7dWlG2yn5UQrX3y3KTJwsEo8=; b=Ikj6LYbIOYuy41cNIVavRNf9XJmPu3O3hWNiOripeEvN71U9BadPeXqJLqRHRrT+Uo t9VHivf7cdwtJcRCc3sqjXoEzp5XjkOe2YtAwWDaBEydVxB78eirJXB6JIkBkLAUk4Ky aPSbHP2N1vOR0/QE+DyVtRI4djjuMIYwIDxnrgoNoIm0zoTXJAfr/h2rQCKcnHsYFWHW SbFURndcVxGBxQyam7k5ZHTFcfiOCCHtZbbk0ngXNF60zAoRK7fmgszWocKkQbtVSfJR p+Tgp+FW/G7QOoJRws7UqLQMD89eQWkcovu/7XhfcZ/k3IiMnIcRnrKb0Op0OJ5NZ/1V NSCg== X-Forwarded-Encrypted: i=1; AJvYcCVijWn8vXB5Yl4l0aBjnARfhUvW9QPLbrgQvGJfDCOM4WaF+h4XVnCbXC6It66PQGIcNKPwCVst3Q==@kvack.org X-Gm-Message-State: AOJu0YzDk+ba35Kdq7dANBmNu8l1BB5jFeRtrk/Sy1jTr8CPWw+kgw3t +b0qkGwgOe8EqXsWV1+yRzG8iGcps9pY2ANMMiJOEfodZH/Kwyc7ON3FOc10f0nX6iNep9LwCrU Wmi9VXmbibjnzoH62Zw== X-Google-Smtp-Source: AGHT+IG99LUNNyI0F5UCDR00CoDYpDqXcEmBQa4iTq8cZs6Lne71ZulPB0DnHumN1g4tR4PErtiR85Wp6/nGpAgv X-Received: from plgw6.prod.google.com ([2002:a17:902:e886:b0:227:967c:4f38]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2385:b0:227:e74a:a066 with SMTP id d9443c01a7336-22bea4c755cmr27075215ad.28.1744349898687; Thu, 10 Apr 2025 22:38:18 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:32 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-2-changyuanl@google.com> Subject: [PATCH v6 01/14] memblock: add MEMBLOCK_RSRV_KERN flag From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 21C87100007 X-Stat-Signature: 5oaf6yb88iepe4moy7wzxt1s3as9691r X-Rspam-User: X-HE-Tag: 1744349899-506029 X-HE-Meta: U2FsdGVkX1+Ft9Om0e/hNzC0Q43pR8+yzlobygK0AuEE6IWUCbzpfbeV2ekwsogbnvdDtFBR9OHTmA8A+n/RtDPsmTuAzEn4N6Keo64kIQoWRoXHtoFhsV5td3hnNNjJpkaJZ3Hh5BQVybwMXT+zcTGiCKgNXaaa8RPrDb9FOCFBYvhqfYwrSXi0ZeophYIOCWKR4ZxleOZEa1VFipSYSAr//ETLpVSdoik/Myy8soNOZ0Rt6ke4G+ME/+U5D8f+bwyahM7pGA5xid/8MOMwT5Hwtv+dJmkaYhBqktGt0EKKa9+f3hPn45XVWfJ25VM8j91tWG8qYP5n4JG8uwvPlN2aserVboI4Q6FoPUsrUj//rYNGeKALTZDVl/45H48iQbPsM8SgJRHbbBk4y2FCv41Y9Q0Z680IDS1d2X8bv3JQUIJAyT1/O9LKTcWECv6EFkKtDkuR3UGFzUaynBnD/Y4X8iasJ4/yBLvYBN/atlrZRTUMJOLtMSJfD4QB3ybalKxtBKBJts6OTRKHAXGy6mZGqsZlKm4cEwn/fLo99+9ZjSKV5cyotDhgYmWnN1e/hlpd/XXuHvjv5uG2yOBd7iQHzljUpHvJbtY0k24pnAGbgwO1r74+5u/cJ4mHsLsSPdG6F4m6qOm7Q7f5dpADFgNvGQd/7g4YxvtTirHKbTzOqqUTcTf65yoe+uAWmQbmOt0PvvY85lwXM5+EfyEhynubxNmIoVjHAgTcQpq4H9urhubBpNO1k6Lxadhk2V5RxTeGd+cb1iuwpsWgJH8532WV2ONwzLNVb8pa2T6z8Gf8E1siZrFpB79AV3Q7xIgB6FSTTbOGmBoUkN0LEQ3oLu1NlyOP4yqoE40KCnhHUBQzLZT3GKurVbms/9DXFOHOHnemsjnID7yLasMmk38iu9mg8B3tnMaNGL59hU/204lhWVJjU/stQHbTPym4qPgXhVig+J2aRIR9F0+Nyuc oUxYuLPC sBSu272GAvRg9vFbRM1h8JtRDsEthIdFKKfyBohwqs5lmzIG9cqA18yHosFAtb1NdS4N7ZeBLi3GZ2P6PoCKjBw+yIXdCqijesC3Sh5zeEc0eTSckaboqvXtjAhWsl4eRwcYrbqEOxPI6+1HEzRQ0dYWhydpQFXynARDEVjObUPTmBg+YWVFX55vidBlq1Vag657NG+C069wKyWpbNFAFnv2bvlcgvD06OzfDd1B/DvlQwk2uzcGSRT9DjcKNwk3JE4YBdhY9twYQOqomFuWss2JHOeqeKK96dHGkJ+9lWjgKDtn/OnTZ5lxJU09tnIiXZc4IMbIhCbvm4z55O8By53mt9h164pziRmnCFvu1CY7xUMSa+zzbS9x3K0zngaOBuJwcdMJPQZG+vuNRr2orAaeWh313X4GH8NKJFlEcZljIowyS7rQWS4Cnvb0VHYI2O3CKgJyztC16SdtPh4RaK6sv1x9PqGedkWMmHlcKBtCtXyEALGjsApKCWC5L8d5hv54M7dgaHewsfaU9I2SAVT7cIztZk7rYW128Zg9uPBOTkuRHmwxCTiGQFUJUALLOn/pQy0RDgOWvScjKuM+55mNICuT5SDHaVNv9tfwhpFqvZo4uTBZ8FXt0KKCt/YqP1tIvcDwHeIDQEK4= 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: From: "Mike Rapoport (Microsoft)" to denote areas that were reserved for kernel use either directly with memblock_reserve_kern() or via memblock allocations. Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- include/linux/memblock.h | 19 ++++++++- mm/memblock.c | 40 +++++++++++++++---- tools/testing/memblock/tests/alloc_api.c | 22 +++++----- .../memblock/tests/alloc_helpers_api.c | 4 +- tools/testing/memblock/tests/alloc_nid_api.c | 20 +++++----- 5 files changed, 73 insertions(+), 32 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index ef5a1ecc6e595..6c00fbc085132 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -42,6 +42,9 @@ extern unsigned long long max_possible_pfn; * kernel resource tree. * @MEMBLOCK_RSRV_NOINIT: memory region for which struct pages are * not initialized (only for reserved regions). + * @MEMBLOCK_RSRV_KERN: memory region that is reserved for kernel use, + * either explictitly with memblock_reserve_kern() or via memblock + * allocation APIs. All memblock allocations set this flag. */ enum memblock_flags { MEMBLOCK_NONE = 0x0, /* No special request */ @@ -50,6 +53,7 @@ enum memblock_flags { MEMBLOCK_NOMAP = 0x4, /* don't add to kernel direct mapping */ MEMBLOCK_DRIVER_MANAGED = 0x8, /* always detected via a driver */ MEMBLOCK_RSRV_NOINIT = 0x10, /* don't initialize struct pages */ + MEMBLOCK_RSRV_KERN = 0x20, /* memory reserved for kernel use */ }; /** @@ -116,7 +120,19 @@ int memblock_add_node(phys_addr_t base, phys_addr_t size, int nid, int memblock_add(phys_addr_t base, phys_addr_t size); int memblock_remove(phys_addr_t base, phys_addr_t size); int memblock_phys_free(phys_addr_t base, phys_addr_t size); -int memblock_reserve(phys_addr_t base, phys_addr_t size); +int __memblock_reserve(phys_addr_t base, phys_addr_t size, int nid, + enum memblock_flags flags); + +static __always_inline int memblock_reserve(phys_addr_t base, phys_addr_t size) +{ + return __memblock_reserve(base, size, NUMA_NO_NODE, 0); +} + +static __always_inline int memblock_reserve_kern(phys_addr_t base, phys_addr_t size) +{ + return __memblock_reserve(base, size, NUMA_NO_NODE, MEMBLOCK_RSRV_KERN); +} + #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP int memblock_physmem_add(phys_addr_t base, phys_addr_t size); #endif @@ -476,6 +492,7 @@ static inline __init_memblock bool memblock_bottom_up(void) phys_addr_t memblock_phys_mem_size(void); phys_addr_t memblock_reserved_size(void); +phys_addr_t memblock_reserved_kern_size(phys_addr_t limit, int nid); unsigned long memblock_estimated_nr_free_pages(void); phys_addr_t memblock_start_of_DRAM(void); phys_addr_t memblock_end_of_DRAM(void); diff --git a/mm/memblock.c b/mm/memblock.c index 0a53db4d9f7be..2dc95ecdee5ce 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -492,7 +492,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type, * needn't do it */ if (!use_slab) - BUG_ON(memblock_reserve(addr, new_alloc_size)); + BUG_ON(memblock_reserve_kern(addr, new_alloc_size)); /* Update slab flag */ *in_slab = use_slab; @@ -642,7 +642,7 @@ static int __init_memblock memblock_add_range(struct memblock_type *type, #ifdef CONFIG_NUMA WARN_ON(nid != memblock_get_region_node(rgn)); #endif - WARN_ON(flags != rgn->flags); + WARN_ON(flags != MEMBLOCK_NONE && flags != rgn->flags); nr_new++; if (insert) { if (start_rgn == -1) @@ -902,14 +902,15 @@ int __init_memblock memblock_phys_free(phys_addr_t base, phys_addr_t size) return memblock_remove_range(&memblock.reserved, base, size); } -int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) +int __init_memblock __memblock_reserve(phys_addr_t base, phys_addr_t size, + int nid, enum memblock_flags flags) { phys_addr_t end = base + size - 1; - memblock_dbg("%s: [%pa-%pa] %pS\n", __func__, - &base, &end, (void *)_RET_IP_); + memblock_dbg("%s: [%pa-%pa] nid=%d flags=%x %pS\n", __func__, + &base, &end, nid, flags, (void *)_RET_IP_); - return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0); + return memblock_add_range(&memblock.reserved, base, size, nid, flags); } #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP @@ -1460,14 +1461,14 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, again: found = memblock_find_in_range_node(size, align, start, end, nid, flags); - if (found && !memblock_reserve(found, size)) + if (found && !__memblock_reserve(found, size, nid, MEMBLOCK_RSRV_KERN)) goto done; if (numa_valid_node(nid) && !exact_nid) { found = memblock_find_in_range_node(size, align, start, end, NUMA_NO_NODE, flags); - if (found && !memblock_reserve(found, size)) + if (found && !memblock_reserve_kern(found, size)) goto done; } @@ -1752,6 +1753,28 @@ phys_addr_t __init_memblock memblock_reserved_size(void) return memblock.reserved.total_size; } +phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit, int nid) +{ + struct memblock_region *r; + phys_addr_t total = 0; + + for_each_reserved_mem_region(r) { + phys_addr_t size = r->size; + + if (r->base > limit) + break; + + if (r->base + r->size > limit) + size = limit - r->base; + + if (nid == memblock_get_region_node(r) || !numa_valid_node(nid)) + if (r->flags & MEMBLOCK_RSRV_KERN) + total += size; + } + + return total; +} + /** * memblock_estimated_nr_free_pages - return estimated number of free pages * from memblock point of view @@ -2441,6 +2464,7 @@ static const char * const flagname[] = { [ilog2(MEMBLOCK_NOMAP)] = "NOMAP", [ilog2(MEMBLOCK_DRIVER_MANAGED)] = "DRV_MNG", [ilog2(MEMBLOCK_RSRV_NOINIT)] = "RSV_NIT", + [ilog2(MEMBLOCK_RSRV_KERN)] = "RSV_KERN", }; static int memblock_debug_show(struct seq_file *m, void *private) diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/memblock/tests/alloc_api.c index 68f1a75cd72c4..c55f67dd367d0 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -134,7 +134,7 @@ static int alloc_top_down_before_check(void) PREFIX_PUSH(); setup_memblock(); - memblock_reserve(memblock_end_of_DRAM() - total_size, r1_size); + memblock_reserve_kern(memblock_end_of_DRAM() - total_size, r1_size); allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES); @@ -182,7 +182,7 @@ static int alloc_top_down_after_check(void) total_size = r1.size + r2_size; - memblock_reserve(r1.base, r1.size); + memblock_reserve_kern(r1.base, r1.size); allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES); @@ -231,8 +231,8 @@ static int alloc_top_down_second_fit_check(void) total_size = r1.size + r2.size + r3_size; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES); @@ -285,8 +285,8 @@ static int alloc_in_between_generic_check(void) total_size = r1.size + r2.size + r3_size; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES); @@ -422,7 +422,7 @@ static int alloc_limited_space_generic_check(void) setup_memblock(); /* Simulate almost-full memory */ - memblock_reserve(memblock_start_of_DRAM(), reserved_size); + memblock_reserve_kern(memblock_start_of_DRAM(), reserved_size); allocated_ptr = run_memblock_alloc(available_size, SMP_CACHE_BYTES); @@ -608,7 +608,7 @@ static int alloc_bottom_up_before_check(void) PREFIX_PUSH(); setup_memblock(); - memblock_reserve(memblock_start_of_DRAM() + r1_size, r2_size); + memblock_reserve_kern(memblock_start_of_DRAM() + r1_size, r2_size); allocated_ptr = run_memblock_alloc(r1_size, SMP_CACHE_BYTES); @@ -655,7 +655,7 @@ static int alloc_bottom_up_after_check(void) total_size = r1.size + r2_size; - memblock_reserve(r1.base, r1.size); + memblock_reserve_kern(r1.base, r1.size); allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES); @@ -705,8 +705,8 @@ static int alloc_bottom_up_second_fit_check(void) total_size = r1.size + r2.size + r3_size; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES); diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testing/memblock/tests/alloc_helpers_api.c index 3ef9486da8a09..e5362cfd2ff30 100644 --- a/tools/testing/memblock/tests/alloc_helpers_api.c +++ b/tools/testing/memblock/tests/alloc_helpers_api.c @@ -163,7 +163,7 @@ static int alloc_from_top_down_no_space_above_check(void) min_addr = memblock_end_of_DRAM() - SMP_CACHE_BYTES * 2; /* No space above this address */ - memblock_reserve(min_addr, r2_size); + memblock_reserve_kern(min_addr, r2_size); allocated_ptr = memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr); @@ -199,7 +199,7 @@ static int alloc_from_top_down_min_addr_cap_check(void) start_addr = (phys_addr_t)memblock_start_of_DRAM(); min_addr = start_addr - SMP_CACHE_BYTES * 3; - memblock_reserve(start_addr + r1_size, MEM_SIZE - r1_size); + memblock_reserve_kern(start_addr + r1_size, MEM_SIZE - r1_size); allocated_ptr = memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr); diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/memblock/tests/alloc_nid_api.c index 49bb416d34ffc..562e4701b0e02 100644 --- a/tools/testing/memblock/tests/alloc_nid_api.c +++ b/tools/testing/memblock/tests/alloc_nid_api.c @@ -324,7 +324,7 @@ static int alloc_nid_min_reserved_generic_check(void) min_addr = max_addr - r2_size; reserved_base = min_addr - r1_size; - memblock_reserve(reserved_base, r1_size); + memblock_reserve_kern(reserved_base, r1_size); allocated_ptr = run_memblock_alloc_nid(r2_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -374,7 +374,7 @@ static int alloc_nid_max_reserved_generic_check(void) max_addr = memblock_end_of_DRAM() - r1_size; min_addr = max_addr - r2_size; - memblock_reserve(max_addr, r1_size); + memblock_reserve_kern(max_addr, r1_size); allocated_ptr = run_memblock_alloc_nid(r2_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -436,8 +436,8 @@ static int alloc_nid_top_down_reserved_with_space_check(void) min_addr = r2.base + r2.size; max_addr = r1.base; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -499,8 +499,8 @@ static int alloc_nid_reserved_full_merge_generic_check(void) min_addr = r2.base + r2.size; max_addr = r1.base; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -563,8 +563,8 @@ static int alloc_nid_top_down_reserved_no_space_check(void) min_addr = r2.base + r2.size; max_addr = r1.base; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -909,8 +909,8 @@ static int alloc_nid_bottom_up_reserved_with_space_check(void) min_addr = r2.base + r2.size; max_addr = r1.base; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, From patchwork Fri Apr 11 05:37:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047562 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 A38BDC369A2 for ; Fri, 11 Apr 2025 05:38:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 43075280159; Fri, 11 Apr 2025 01:38:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 32462280154; Fri, 11 Apr 2025 01:38:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B692280159; Fri, 11 Apr 2025 01:38:22 -0400 (EDT) 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 CDA5F280154 for ; Fri, 11 Apr 2025 01:38:22 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AA9DBC1D45 for ; Fri, 11 Apr 2025 05:38:23 +0000 (UTC) X-FDA: 83320657686.27.75FC944 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf15.hostedemail.com (Postfix) with ESMTP id DE94CA0003 for ; Fri, 11 Apr 2025 05:38:21 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Dvcc9E4r; spf=pass (imf15.hostedemail.com: domain of 3zKr4ZwoKCEspun0tB7n0yt11tyr.p1zyv07A-zzx8npx.14t@flex--changyuanl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3zKr4ZwoKCEspun0tB7n0yt11tyr.p1zyv07A-zzx8npx.14t@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349901; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=IlX8nA7Xk9H5c98D5iYmnhzWmAB9L4MDv6xIzYdT0mI=; b=Mm1YbMYUSadUaLyzjriVMyY7r7eWYcP4jWTZL/pBA9uByU9J0Du0Hf9swzCeQUoBNLFOrW P42fR401Mq5Pnbk+h3HGnDDVTHJKZK/4GgdcRB+EHry1fXRdR9L3pl4tM3O4q6+52OfrbF a9CMk8zWO7zxj0qfKIZEJpo9f6K3V4g= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Dvcc9E4r; spf=pass (imf15.hostedemail.com: domain of 3zKr4ZwoKCEspun0tB7n0yt11tyr.p1zyv07A-zzx8npx.14t@flex--changyuanl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3zKr4ZwoKCEspun0tB7n0yt11tyr.p1zyv07A-zzx8npx.14t@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349901; a=rsa-sha256; cv=none; b=j1KN5VFUSryn13cQ2vxRUmx3tPxzczjDq7sw6qdGzadpQ57TsfNRByCm3vDt1u55XcA2P4 pkcAf93JsSJrYaafje5yLnSK0CewVVZ+XGQXV/yEtPqKQUKEB5xxiihuDbLfep4mVbSHLI /9/8q0c8ZSHA5O8/yZk1LD02j58pBGg= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-227a8cdd272so14415785ad.2 for ; Thu, 10 Apr 2025 22:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349901; x=1744954701; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=IlX8nA7Xk9H5c98D5iYmnhzWmAB9L4MDv6xIzYdT0mI=; b=Dvcc9E4rGp77iqvS5zXcwxRqQNpTiYknfE8OnWOSa1PxRr3YdCJAVX14YXxV1/Wffu IpcCXPlkt0i09Y5j2fPBI74OYJycAUEB8Og9Og8QgMYUvD4oIlG8UGDkD/pYT129afQR nPKSVPrDEzsGEma/i+WA84oI0fYazLTyEy1+7Kq51xgJIXQwLc/gMYFKWjJ59HgvXwUD TMASW9U4cZ0k2Fwwd2ekFMTPPrVVHl3AZHCWL+9zRoNbmpg9K1QgCIjCg8E5cWhj2wSg fKOVxNmsNurN8D8oOOIXuGVHVzwWUIngIZVQJTyRlytQqsHtWtdgKsVNOK6gu0uLCOZq 9+Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349901; x=1744954701; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IlX8nA7Xk9H5c98D5iYmnhzWmAB9L4MDv6xIzYdT0mI=; b=rVtqeThC2dvvTuDyvcywneyjv7GeDi0JlSQg0MUKW0THTD6E++3um+Ko2o7H9Z6rYe yxL7i1Q8Is4o18orjHwAJiqV3WKik0d+94Udqv6siQLGIXwfluf44qdYRGI5KtM5RzKV XfFEA1e2aML7I71jls3GQDwncK0fJmfIIOTqY6YoSqLFRRuGPEBrXZA2TrUC4vr72EZ5 AGicPmS1poL/kW+km9oLchl/l+oeADmL2yUXV/9W+sZOiXikCnc1HPdtTyG5/YRZRoJe J81BkH7HIBinaHzqxwK++gscVyAtwlmtp9OnWZivjzJZAl/SUUUPg6qT10rsvq/UK6hO fFxg== X-Forwarded-Encrypted: i=1; AJvYcCXRZJKCLCoHtH06CZs357U1+Gcf7L1ZhChF6Um/XE8JpHHBm032FmTAD6jJnG/0L4WqWnrMeyZMeQ==@kvack.org X-Gm-Message-State: AOJu0YxhHvhBNPup9g+gUp76Yyjpyxkf4JaMH4GrWMUiYRAiLnhg/9Kc 3SHLIw6iPdfjWydGdZPgx+rvlC1CN88niyHumAtBg95ukmGkwuqV8du0PwLJp3bYzcQBPvqUBKp tYlt9bQxkTO6vMNhOfQ== X-Google-Smtp-Source: AGHT+IGmLdsivViTeSGIGhIMJrpZ+eiCfZe7b18ElxHjAINDV7KJLIeK9aAKlBDGOH8e7R2YQZlTLbj0XmtsWn8h X-Received: from plfu7.prod.google.com ([2002:a17:902:e5c7:b0:220:ddee:5ee]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:c951:b0:21f:68ae:56e3 with SMTP id d9443c01a7336-22bea4f009amr23225795ad.39.1744349900801; Thu, 10 Apr 2025 22:38:20 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:33 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-3-changyuanl@google.com> Subject: [PATCH v6 02/14] memblock: Add support for scratch memory From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Queue-Id: DE94CA0003 X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: buo9nqdgnx4bfqyirbxyjt83wxmu5dis X-HE-Tag: 1744349901-814440 X-HE-Meta: U2FsdGVkX1+QgMW1AJNHw5+McG/GQIg5mTvu173BXdrhc0oIuwk/mPZjeO/5ZX8osGucUiFgZRzPitUnKhfrjvSorjzE85i9htrTpIf3/QLfg76qJFNTHrfFwMRgdalHxiLTUJF+0j3XYwrasJIhPckG8MbhukxUsRksfyJEpFsmqAj18RH0lCQqd82mRqZv574DrOiYjf+PI/0pc9GNZfhMruSNiOlclxr9eCv2jlc+VWTimmuMB6hSIZOCnfjpN7HJl4Kd0uWXxJkmVAvRyk3LQS1oD2VEp1wNoYffQw/VV4wgJhKpuBr0KioSMAHp+c03/VS9DKSjNpq0qUObzWFNX7YvxFbgDCR6TIaOpd689TNieeWvZYkrfhGfQLHe4qdX9SSdBvqqMclff2M/TpemMgHVChhGDVCO6W31KlqrQJQwIamPDvOTzt57e9dEPQbWLT3NhBHgDu0es0E4rCVQi9+sczE9GAPveLw57zHb8J3zXnXITyShj6n4yebQPre85O3e2c9sSmbp4+Tu62/D5Gigb8C755tSDTf1KilNKwG0sAWfUXCBq2lUqB0SZ3U0JFgUaLmYA6OSZ+C09BlcjSKzZ3yQigk7CGhOG9x6aNG47sTJ4yXTFqee4+5UbEYr1huPPA8yxMCvHWmj3MrI2qP/38N9XyCDZImpSp1hZgSlwX0nGTQHydGq6ItvpUA5H1V6JMuB50oK2Znum1Pdn5Z8On/S0Tq/xcbuvRZ5ivMT59y1BSDsOXcuZktdaUqrHXPwWEWHbHeu5lLCuBSorSRkDvcLTG1mToVUvzF37Vrg3ak+owgYjhTvOjcsqz3GFNvyHlwHrVJelpDeYYwjszVwOS+Mv8SBeCPqe92BZcxvMVMKOl5eIwkeHMaBfZM4KGh9EfClZXAlQg66s2B/TBsy07bd312CUhXWYNrxtf/2ITaUOf4P+AV8HqgkpPKTonejJIw+JGp/NXs PjBf/DQ7 +Lj+6szlNLf2OmV1tBfVopS+3RKjPaS46S3iuOsbLVqPYcLotn/DuHjZ7c9d/Bx0bIRosyztVn03PyWE/zSgTtm+5oHCfE+OW2Fi9hy2q2c+wWFhalPdLLe5SuIsINVwkeEabQB6SF3KnlskshdhGvIGuLMGhas7ju0TbhwnNGAjggNIRRB5QynWyEwvsoQhW5hMVMW05G4eYi7NCeknx8KW1mJC8aWaO2//43CdZ4cim8fZIIMVYAI5nE/0bL0IhvXGvCPQPTx79ar0TbCfL/hokb5VNDwth5Ldtee9bhDP7H6rKGmSdolIDqtbOZ0ONV/QRaZmAZf+pzQGzvfGkbM3MzE+Wv+vpk4dd18PqVQiXxtYKJDHq65ZpKmriiC2auYAmI8Yg0WSiDVUM2DCA7iykG1TcVStk7lkYVE6GiWB4XJnL6eU8ahEFCX4R5ul/lZmDA9phEDKLTx7Pq8w/Wze1oM7xDUp0PKy+Lr86q5Lq7ClgX2nFzdxBlDtDUoQ6MdoIC951KJ7vyME4DBhSp5HQraLVhewC11wi947KJYUkeCWxC5NSNvhusI943ZF6BTYI+zGrGxJ1LXQA27juipjFluJaDp0Kfc7cKJgayOalZ4iDQb63rkwUDQ== 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: From: Alexander Graf With KHO (Kexec HandOver), we need a way to ensure that the new kernel does not allocate memory on top of any memory regions that the previous kernel was handing over. But to know where those are, we need to include them in the memblock.reserved array which may not be big enough to hold all ranges that need to be persisted across kexec. To resize the array, we need to allocate memory. That brings us into a catch 22 situation. The solution to that is limit memblock allocations to the scratch regions: safe regions to operate in the case when there is memory that should remain intact across kexec. KHO provides several "scratch regions" as part of its metadata. These scratch regions are contiguous memory blocks that known not to contain any memory that should be persisted across kexec. These regions should be large enough to accommodate all memblock allocations done by the kexeced kernel. We introduce a new memblock_set_scratch_only() function that allows KHO to indicate that any memblock allocation must happen from the scratch regions. Later, we may want to perform another KHO kexec. For that, we reuse the same scratch regions. To ensure that no eventually handed over data gets allocated inside a scratch region, we flip the semantics of the scratch region with memblock_clear_scratch_only(): After that call, no allocations may happen from scratch memblock regions. We will lift that restriction in the next patch. Signed-off-by: Alexander Graf Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Signed-off-by: Changyuan Lyu --- include/linux/memblock.h | 20 +++++++++++++ mm/Kconfig | 4 +++ mm/memblock.c | 61 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 6c00fbc085132..993937a6b9620 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -45,6 +45,11 @@ extern unsigned long long max_possible_pfn; * @MEMBLOCK_RSRV_KERN: memory region that is reserved for kernel use, * either explictitly with memblock_reserve_kern() or via memblock * allocation APIs. All memblock allocations set this flag. + * @MEMBLOCK_KHO_SCRATCH: memory region that kexec can pass to the next + * kernel in handover mode. During early boot, we do not know about all + * memory reservations yet, so we get scratch memory from the previous + * kernel that we know is good to use. It is the only memory that + * allocations may happen from in this phase. */ enum memblock_flags { MEMBLOCK_NONE = 0x0, /* No special request */ @@ -54,6 +59,7 @@ enum memblock_flags { MEMBLOCK_DRIVER_MANAGED = 0x8, /* always detected via a driver */ MEMBLOCK_RSRV_NOINIT = 0x10, /* don't initialize struct pages */ MEMBLOCK_RSRV_KERN = 0x20, /* memory reserved for kernel use */ + MEMBLOCK_KHO_SCRATCH = 0x40, /* scratch memory for kexec handover */ }; /** @@ -148,6 +154,8 @@ int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); int memblock_mark_nomap(phys_addr_t base, phys_addr_t size); int memblock_clear_nomap(phys_addr_t base, phys_addr_t size); int memblock_reserved_mark_noinit(phys_addr_t base, phys_addr_t size); +int memblock_mark_kho_scratch(phys_addr_t base, phys_addr_t size); +int memblock_clear_kho_scratch(phys_addr_t base, phys_addr_t size); void memblock_free(void *ptr, size_t size); void reset_all_zones_managed_pages(void); @@ -291,6 +299,11 @@ static inline bool memblock_is_driver_managed(struct memblock_region *m) return m->flags & MEMBLOCK_DRIVER_MANAGED; } +static inline bool memblock_is_kho_scratch(struct memblock_region *m) +{ + return m->flags & MEMBLOCK_KHO_SCRATCH; +} + int memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn, unsigned long *end_pfn); void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn, @@ -619,5 +632,12 @@ static inline void early_memtest(phys_addr_t start, phys_addr_t end) { } static inline void memtest_report_meminfo(struct seq_file *m) { } #endif +#ifdef CONFIG_MEMBLOCK_KHO_SCRATCH +void memblock_set_kho_scratch_only(void); +void memblock_clear_kho_scratch_only(void); +#else +static inline void memblock_set_kho_scratch_only(void) { } +static inline void memblock_clear_kho_scratch_only(void) { } +#endif #endif /* _LINUX_MEMBLOCK_H */ diff --git a/mm/Kconfig b/mm/Kconfig index e113f713b4938..60ea9eba48140 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -469,6 +469,10 @@ config HAVE_GUP_FAST depends on MMU bool +# Enable memblock support for scratch memory which is needed for kexec handover +config MEMBLOCK_KHO_SCRATCH + bool + # Don't discard allocated memory used to track "memory" and "reserved" memblocks # after early boot, so it can still be used to test for validity of memory. # Also, memblocks are updated with memory hot(un)plug. diff --git a/mm/memblock.c b/mm/memblock.c index 2dc95ecdee5ce..3a213e2a485bc 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -107,6 +107,13 @@ unsigned long min_low_pfn; unsigned long max_pfn; unsigned long long max_possible_pfn; +#ifdef CONFIG_MEMBLOCK_KHO_SCRATCH +/* When set to true, only allocate from MEMBLOCK_KHO_SCRATCH ranges */ +static bool kho_scratch_only; +#else +#define kho_scratch_only false +#endif + static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_MEMORY_REGIONS] __initdata_memblock; static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_RESERVED_REGIONS] __initdata_memblock; #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP @@ -166,6 +173,10 @@ bool __init_memblock memblock_has_mirror(void) static enum memblock_flags __init_memblock choose_memblock_flags(void) { + /* skip non-scratch memory for kho early boot allocations */ + if (kho_scratch_only) + return MEMBLOCK_KHO_SCRATCH; + return system_has_some_mirror ? MEMBLOCK_MIRROR : MEMBLOCK_NONE; } @@ -925,6 +936,18 @@ int __init_memblock memblock_physmem_add(phys_addr_t base, phys_addr_t size) } #endif +#ifdef CONFIG_MEMBLOCK_KHO_SCRATCH +__init_memblock void memblock_set_kho_scratch_only(void) +{ + kho_scratch_only = true; +} + +__init_memblock void memblock_clear_kho_scratch_only(void) +{ + kho_scratch_only = false; +} +#endif + /** * memblock_setclr_flag - set or clear flag for a memory region * @type: memblock type to set/clear flag for @@ -1050,6 +1073,36 @@ int __init_memblock memblock_reserved_mark_noinit(phys_addr_t base, phys_addr_t MEMBLOCK_RSRV_NOINIT); } +/** + * memblock_mark_kho_scratch - Mark a memory region as MEMBLOCK_KHO_SCRATCH. + * @base: the base phys addr of the region + * @size: the size of the region + * + * Only memory regions marked with %MEMBLOCK_KHO_SCRATCH will be considered + * for allocations during early boot with kexec handover. + * + * Return: 0 on success, -errno on failure. + */ +int __init_memblock memblock_mark_kho_scratch(phys_addr_t base, phys_addr_t size) +{ + return memblock_setclr_flag(&memblock.memory, base, size, 1, + MEMBLOCK_KHO_SCRATCH); +} + +/** + * memblock_clear_kho_scratch - Clear MEMBLOCK_KHO_SCRATCH flag for a + * specified region. + * @base: the base phys addr of the region + * @size: the size of the region + * + * Return: 0 on success, -errno on failure. + */ +int __init_memblock memblock_clear_kho_scratch(phys_addr_t base, phys_addr_t size) +{ + return memblock_setclr_flag(&memblock.memory, base, size, 0, + MEMBLOCK_KHO_SCRATCH); +} + static bool should_skip_region(struct memblock_type *type, struct memblock_region *m, int nid, int flags) @@ -1081,6 +1134,13 @@ static bool should_skip_region(struct memblock_type *type, if (!(flags & MEMBLOCK_DRIVER_MANAGED) && memblock_is_driver_managed(m)) return true; + /* + * In early alloc during kexec handover, we can only consider + * MEMBLOCK_KHO_SCRATCH regions for the allocations + */ + if ((flags & MEMBLOCK_KHO_SCRATCH) && !memblock_is_kho_scratch(m)) + return true; + return false; } @@ -2465,6 +2525,7 @@ static const char * const flagname[] = { [ilog2(MEMBLOCK_DRIVER_MANAGED)] = "DRV_MNG", [ilog2(MEMBLOCK_RSRV_NOINIT)] = "RSV_NIT", [ilog2(MEMBLOCK_RSRV_KERN)] = "RSV_KERN", + [ilog2(MEMBLOCK_KHO_SCRATCH)] = "KHO_SCRATCH", }; static int memblock_debug_show(struct seq_file *m, void *private) From patchwork Fri Apr 11 05:37:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047563 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 C534AC36010 for ; Fri, 11 Apr 2025 05:38:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B1F8628015A; Fri, 11 Apr 2025 01:38:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AAA54280154; Fri, 11 Apr 2025 01:38:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BE5A28015A; Fri, 11 Apr 2025 01:38:25 -0400 (EDT) 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 59977280154 for ; Fri, 11 Apr 2025 01:38:25 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id F1D7881ABA for ; Fri, 11 Apr 2025 05:38:25 +0000 (UTC) X-FDA: 83320657770.20.BDAA84A Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf29.hostedemail.com (Postfix) with ESMTP id 39947120011 for ; Fri, 11 Apr 2025 05:38:24 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=1DtlM0vv; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 3z6r4ZwoKCE4sxq3wEAq31w44w1u.s421y3AD-220Bqs0.47w@flex--changyuanl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3z6r4ZwoKCE4sxq3wEAq31w44w1u.s421y3AD-220Bqs0.47w@flex--changyuanl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349904; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HQ8M8ey1Gl2HMhesfO/gX2yR3JwZ2sRCN/VQXFdpiJQ=; b=GoUYkIWtwfiv+2ZF+zwe2RstS/2aq/ZxiDrtCyAhNDwfCr0sJGbTn7P12BsUv90KCL62XO /Qsgia1crU0837kW5EQef0N+W3IM0tNwJE1UhAxoJsTAbtwqJ9FDBCVrVZyz/rzhcOF/sA Z7NhRyzp9dhBdCvAev2/nbg9ZPWiulA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349904; a=rsa-sha256; cv=none; b=RDiNNlA7tc22CWxPfUwFqrsFknaJfwArv4GpTK6Yr72KZOoywlbFGkkTpdrQKf5zWazrhp C9Ygb0b0WKgBrEpnw5lxtk7yRIyUZ91+M0UPRhiQ9KkjwwVJoN01CW/cFAYKN8cy1rxHn3 c6dNuycrHRThkNBVnuyup4QJFpOXSOY= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=1DtlM0vv; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 3z6r4ZwoKCE4sxq3wEAq31w44w1u.s421y3AD-220Bqs0.47w@flex--changyuanl.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3z6r4ZwoKCE4sxq3wEAq31w44w1u.s421y3AD-220Bqs0.47w@flex--changyuanl.bounces.google.com Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ff62f96b10so2264075a91.0 for ; Thu, 10 Apr 2025 22:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349903; x=1744954703; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=HQ8M8ey1Gl2HMhesfO/gX2yR3JwZ2sRCN/VQXFdpiJQ=; b=1DtlM0vvRDglv/+LGLf+7b5Zyf05aeewnsIYrDy9iDnAkpwLtLEba6335IpK4vTPPV QnNLKlgzTbybV1ugT2074H4pAGOLrtcKzO+q51utIK6Gpe1717n0e9KS/xbQQKRJv/th Or55fgSO3VGqzjScr0Yf0EQlB1G1eNl1duQ2HAUsbco/tMZo6af8uKPUN9uAQZ7jwg9m HavwfU0CrgIlTZMSDFT1b/0KQcUve8qIWBc7pdtwSDpHD/BQYd2ycj6TmBOpDeNX1xaC IObMQeGmcVJ5VO4Z2NNgZEiWToMyMqGOOouXMLquF8HuJWXfXro/eyXU/xHUhGjxbwvH yC7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349903; x=1744954703; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HQ8M8ey1Gl2HMhesfO/gX2yR3JwZ2sRCN/VQXFdpiJQ=; b=rv5zBnk7GEyjtW0SnRE6oI9E8bJOQgybA7CuqO7QnrymmX4tqdvV/EaMRdDH+uduH9 VsYZlyaBzbh1gpgVkXpn5o5h7pqPq+TNgLNDFSrxO/JQyziLdqJSFp7eQG7A//fw7MNx 7VY6TpuVcm4UqM/oaRPKSpeja3f3nV3MwhdqCGqBjN/NjxV5ofrYq7uZrksP4phNlEUR v13dnObPG6io6gRhuPiS6OgBawQEXdBHIUBwd+YKFaZk7OnYbDYuACHtVKVkBji+YMP2 xJ09abHTL2CvWW8r0yGRrn5i+33Y8CCbov6e7HUYFW8mXuY1kzhBZaZkzzygp8EDPQ1l Kd/w== X-Forwarded-Encrypted: i=1; AJvYcCVV74VmCnCOCpeUzprvuKf3d91mpz0DXmx69mCLLG3DKE/iMyEY3u+A60SrFIBprfSC2NEzQ7oKIw==@kvack.org X-Gm-Message-State: AOJu0YxhTD7ktuStbbaCHGKVXsbGW1xITum4FIqdw0SWD3U0DpO8H63P eQV2swc+bQL3N7PNahQGDNITzAIlixCy/bSXzkZ6l07hI0BsbU8vpnFzHELS/u5gig4c2MJ3voO mnFtXgtkFM4M4D62SgA== X-Google-Smtp-Source: AGHT+IEQLxxV+9EOL9iBdjttC+lt0gaa754ZypvrGgSETMYeFa4LebcqyNIPVN8012BWASehCUTqTktaMea5N6/C X-Received: from pjbsg2.prod.google.com ([2002:a17:90b:5202:b0:2ee:3128:390f]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:58cf:b0:2fc:aaf:74d3 with SMTP id 98e67ed59e1d1-307730fecb0mr7763347a91.4.1744349903054; Thu, 10 Apr 2025 22:38:23 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:34 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-4-changyuanl@google.com> Subject: [PATCH v6 03/14] memblock: introduce memmap_init_kho_scratch() From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 39947120011 X-Stat-Signature: sxdwxb88fjqxrmet8sios45y9jo1ny6e X-Rspam-User: X-HE-Tag: 1744349904-140569 X-HE-Meta: U2FsdGVkX19H4fCQ5jh51wOM/+/k53+re5YcsayYtwDQxSFWxmgjD8qNV31V+6Y+C0MOZx/4UyDd1+322Vr1gvKY0+e1iK/+b86j2sEYVR8mWjV4Mve5j4AAiCpjHOkbAyxiHMibeajV6jDjd1GLzBEsECiVLYDP+Fke90Fwds3qN6cgHz/bwdPo6aHnRrZs3LE891Hu0/RgLrHgZIMwbeu+89VX2PvAxz+6jlh15OcRIvTI3JdzqFdixT8ocHbm2wN/AsOsDHZOIkolEPDUUgXXCAbEbRtYC4s41OWWD6F1XzjuVx+Y7ZZFLQZF5xJWJpD4ABiz9eC7Tneb190BT3bZp/AKndXvTIubovaASThhSGBkRNAjnHYIxt8LgheTBuMWP+tu09U+qzKiFA3VdOV6hN+Sjgzglu95kzhWT2ofCuaADrHLHoBxvS6NKYqC9po3WqsPFZI2ra3V7oATMz8RhuJSpUdkQBfiuwrpb2wu5fjmKUJFxL6JTjfB0aJ+utEGBqAcTffUHJSRNNZ+BbcT3mwGWZe/oSMrPYFUEyS0lRvvM9OoDBHf4aCgXrJc8vlWxDQYhWnnFgNgH+UwOFVRT5hP1+B5mkx0OTMoFcAt52fvZ7emaTGK1ic14zV6BPrwv++To3kDtgPwgt8AaBcHxFoFszX7EHNHPU+c+CPZTq4/jBTGmfhzZX6ENcm85Rw1xtQkMWkUD0ASQeK1rDlKOJajZVDMkL9BTEAqN6x0rL17EdnIRl9AgUo0OVJGNQpKlT5j90P5cp3Pe3Nk6IylYPSVv6xBiQDjdhBoa2oP+u6JOQjLpOYQ99BIwv0+LBuQDT9UhJdTZxbtWGj9HkQBpYJHTzCeK4wE4XlGNsS3GP3w+2jxujQY1XKnSlwB7CR6QaQTo1NLU4Yrae6wt0qADtwM2HygiwosKsq3ijV63dRbI+llw8Avs6uxMTgoLe0ANt3vtsPPYCdOGN6 jDhp40Z7 4r66MfjFI1iNDeFN0VnBFztTQ4sCcYRDMFszhAWFfhw5611eSnTF1jD8oSKMZYRii6XpfOngQ4A+aYiLPa7/S4o5aj2LADoZxfVFKat7hC6anULEmf8F/DFYexqwYD7Lx4ES9740YzspZCr7KOBeUgkfKQfDsRRCm+RdNyw/Hr4CUOLYxOZTiLpJdOFeXyrCy3rGP7yRungaJpqdUEAfhKEZOHo0BBCzTruPHMPoE0aNrN2IEY0GKsgO2K42HocAdIWQyUkfZUq+jieJeWDJtQ1aXni1C3+pxou2Rwh5VYbqUH41aiSfP68k7Nd5fMdIMo+NBJBtJrs3rNYsTAcSusRsKzDKs6fF4J865msK7UgE5C8LbfpyrbT9AqNVR14ftsrlJ21FXd9P3R0ViNxcew0OChEO5hmlKukCYYzdgfK6cRcTHHMlZ9El0t+a6GtzYLdRq3LuT1ytogSKKQbgVsWdpZxxJAkYJTbgMtfeMUjK9PlSTRXIlvPs4Q1dHrlc63ElFWhsNGBsMELG67f68/tMtwcalQU6dEFxVaIZZqLMOf1uEP20uv3zn2FKz2YDGdwNJpyKTHdJd0C6zKbXtvhowHcnmDYdxePttf/dPjz8hXpVX3fvXB70JvolKhmFK9i38TUoBccmeNsY= 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: From: "Mike Rapoport (Microsoft)" With deferred initialization of struct page it will be necessary to initialize memory map for KHO scratch regions early. Add memmap_init_kho_scratch() method that will allow such initialization in upcoming patches. Signed-off-by: Mike Rapoport (Microsoft) Signed-off-by: Changyuan Lyu --- include/linux/memblock.h | 2 ++ mm/internal.h | 2 ++ mm/memblock.c | 22 ++++++++++++++++++++++ mm/mm_init.c | 11 ++++++++--- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 993937a6b9620..bb19a25342246 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -635,9 +635,11 @@ static inline void memtest_report_meminfo(struct seq_file *m) { } #ifdef CONFIG_MEMBLOCK_KHO_SCRATCH void memblock_set_kho_scratch_only(void); void memblock_clear_kho_scratch_only(void); +void memmap_init_kho_scratch_pages(void); #else static inline void memblock_set_kho_scratch_only(void) { } static inline void memblock_clear_kho_scratch_only(void) { } +static inline void memmap_init_kho_scratch_pages(void) {} #endif #endif /* _LINUX_MEMBLOCK_H */ diff --git a/mm/internal.h b/mm/internal.h index 50c2f590b2d04..a47e5539321b4 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1121,6 +1121,8 @@ DECLARE_STATIC_KEY_TRUE(deferred_pages); bool __init deferred_grow_zone(struct zone *zone, unsigned int order); #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */ +void init_deferred_page(unsigned long pfn, int nid); + enum mminit_level { MMINIT_WARNING, MMINIT_VERIFY, diff --git a/mm/memblock.c b/mm/memblock.c index 3a213e2a485bc..c2633003ed8ea 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -946,6 +946,28 @@ __init_memblock void memblock_clear_kho_scratch_only(void) { kho_scratch_only = false; } + +void __init_memblock memmap_init_kho_scratch_pages(void) +{ + phys_addr_t start, end; + unsigned long pfn; + int nid; + u64 i; + + if (!IS_ENABLED(CONFIG_DEFERRED_STRUCT_PAGE_INIT)) + return; + + /* + * Initialize struct pages for free scratch memory. + * The struct pages for reserved scratch memory will be set up in + * reserve_bootmem_region() + */ + __for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, + MEMBLOCK_KHO_SCRATCH, &start, &end, &nid) { + for (pfn = PFN_UP(start); pfn < PFN_DOWN(end); pfn++) + init_deferred_page(pfn, nid); + } +} #endif /** diff --git a/mm/mm_init.c b/mm/mm_init.c index 84f14fa12d0dd..1451cb250fd3f 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -743,7 +743,7 @@ defer_init(int nid, unsigned long pfn, unsigned long end_pfn) return false; } -static void __meminit init_deferred_page(unsigned long pfn, int nid) +static void __meminit __init_deferred_page(unsigned long pfn, int nid) { if (early_page_initialised(pfn, nid)) return; @@ -763,11 +763,16 @@ static inline bool defer_init(int nid, unsigned long pfn, unsigned long end_pfn) return false; } -static inline void init_deferred_page(unsigned long pfn, int nid) +static inline void __init_deferred_page(unsigned long pfn, int nid) { } #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */ +void __meminit init_deferred_page(unsigned long pfn, int nid) +{ + __init_deferred_page(pfn, nid); +} + /* * Initialised pages do not have PageReserved set. This function is * called for each range allocated by the bootmem allocator and @@ -784,7 +789,7 @@ void __meminit reserve_bootmem_region(phys_addr_t start, if (pfn_valid(start_pfn)) { struct page *page = pfn_to_page(start_pfn); - init_deferred_page(start_pfn, nid); + __init_deferred_page(start_pfn, nid); /* * no need for atomic set_bit because the struct From patchwork Fri Apr 11 05:37:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047564 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 B3E7FC36010 for ; Fri, 11 Apr 2025 05:38:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 29B4128015C; Fri, 11 Apr 2025 01:38:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 223E628015B; Fri, 11 Apr 2025 01:38:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D424E28015C; Fri, 11 Apr 2025 01:38:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A3FEE28015B for ; Fri, 11 Apr 2025 01:38:27 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 67A72160E83 for ; Fri, 11 Apr 2025 05:38:28 +0000 (UTC) X-FDA: 83320657896.01.D81D261 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by imf03.hostedemail.com (Postfix) with ESMTP id 7E09320009 for ; Fri, 11 Apr 2025 05:38:26 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=kKmnfZ7R; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 30ar4ZwoKCFAuzs5yGCs53y66y3w.u64305CF-442Dsu2.69y@flex--changyuanl.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=30ar4ZwoKCFAuzs5yGCs53y66y3w.u64305CF-442Dsu2.69y@flex--changyuanl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349906; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eMaXaCye5JvtI4iyq2OlhLRAarHJFPgt7ym62C9j544=; b=IyzQwW5lYKQmbhnBHQHikQVm2AdF/dZCc8VEnb4yeZTA+NYFIRyIV0lvGrhhJu4J4L/pye b8g/o2lnOlYr66t0ZZmKIRYcx6KrKHl9trYK3ixdM4LRFIQGnjAMgyjJ002pE4hgoX2+DH isRn6toHlGhkI15wtWwtWXXm+4ZFodc= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=kKmnfZ7R; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 30ar4ZwoKCFAuzs5yGCs53y66y3w.u64305CF-442Dsu2.69y@flex--changyuanl.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=30ar4ZwoKCFAuzs5yGCs53y66y3w.u64305CF-442Dsu2.69y@flex--changyuanl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349906; a=rsa-sha256; cv=none; b=OmfvdKTDatbCBHZck3FYiXubyAPxGN/f7UDCD2VZ9tqTmOkF37IRAPCKwKoilJVX2e0n63 YbWtDuGg6ibRPqZGn5hvPXlwq5fE760a+NUBvB6XpiyxY/D0C00XdlQDqpfnus6hG20XP8 959dP2vNVvcWd08gGZ14Majswoh13Zs= Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-af9070a5311so1031289a12.0 for ; Thu, 10 Apr 2025 22:38:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349905; x=1744954705; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=eMaXaCye5JvtI4iyq2OlhLRAarHJFPgt7ym62C9j544=; b=kKmnfZ7R1EqjomQr35WEDBcv3nhkZYveC6r2LmcI2R4xEXpt2+xbtEP68Vkz0C6gi/ P3Wa9Vc6S9iWJrFFWX5jKFVh3rMsP4SwaJYfZiXy5MuirVRdaBs3iattok/H7DblTfKv xXe51jHMcUSOYJrWcifx7Wls6nDhIkkgNwGOyPPYdDfqfOOwWMdM+qJ/e1oAmFDWHMHF l5YzLctpmTjUPVNRFOSIPsMk+FukblzKtHSu+Cl30z1oV2aEfUtTqE1bxy8gKE4bAhL/ dM1ZCxvYQxgSCZc84wHajphTzwQruMmULBaj+9GhREyZBZ3XbCnfaDdjszJpcfIJiw5D ORFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349905; x=1744954705; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=eMaXaCye5JvtI4iyq2OlhLRAarHJFPgt7ym62C9j544=; b=DJzCsXJIWmTCU0aNKDDuJGe3CR7x0zqt+PMvRwRwK+LsVc2yeti5CGcBB5vtyUr814 pVbwwktJ29ddk+exUOr3sZTj4H4HGQykPFz3rcZwP03nvO6C4usBEX5xq+7OQbfZ/ljX cw5+hmjZe9lyda3GQhOez/dBXe2flrXcrccjdGiJcg2IAQBdjDWPXHy7FTwYK3kTEbbh yH10Ya437BtDNVqA46juUrLgKCyawmH+kw05CRJNzLn/OZPnnGNMqNbOp4ho7aV/A9i5 OiX8H5waaex+0bnqmwGLtpjSzkboOkC72BC4Wt6bscfUL+LP2cbPrb0iKdWBZNXQNw4m yQjg== X-Forwarded-Encrypted: i=1; AJvYcCUoZB7S00xbN341H/92nrklX4wGZ2TcKshvAZPFgk0zanZf81x+Bo6RuKLb4cjqyAau6NRQfP61TQ==@kvack.org X-Gm-Message-State: AOJu0YyjSoHFzJR0CGtnRWC8y8Oy3gFF9Ws/BY/nMcY9ZFB2AWc9i9SG kbTMOZLgpd+XEZDYZpCs1RoY2HhlU6yK0ENqxvys6MHeYFfOP05rw6df9xUJmcW9As52fYjqSjU Mcvy/l6rtqA000F1gWw== X-Google-Smtp-Source: AGHT+IGwSu9aNWfQIOBnQbdZr+ygz4y4oMysfSRpcImKsShqnahENQw9VGbWNqaJvvzzPUBBp+sxjKZowmWc7RK0 X-Received: from plpn16.prod.google.com ([2002:a17:902:9690:b0:220:c59b:c80d]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:41c2:b0:224:3db:a296 with SMTP id d9443c01a7336-22bea49e9e4mr18763355ad.2.1744349905261; Thu, 10 Apr 2025 22:38:25 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:35 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-5-changyuanl@google.com> Subject: [PATCH v6 04/14] kexec: add Kexec HandOver (KHO) generation helpers From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Server: rspam01 X-Stat-Signature: ut9dz6ekc6ises7pfnuewzqgxhjc49oj X-Rspam-User: X-Rspamd-Queue-Id: 7E09320009 X-HE-Tag: 1744349906-186508 X-HE-Meta: U2FsdGVkX19H0cf10+IU4N3KN498oDsRV30XKJsL3Bar3OiH3hBMR1E80n6xrNr1tcSe5dmxnNqTsN59F6wFowbVTdBi8Ff4rFwcoud9cNjIqRHd+y59RYsQHQfbhuH4c1Ek0SDiiuQYfgJXv7jGRgSAS93jyRBOSFWsgOfhFRUlAUJcg3Oo062NP+QNSJNWAc4TOVZaGogJq+y10xIgNXGsiFA9pqjUuCUyF0vtdTicVi/CegXjCBBeHXMP0sHrEskov0Qw9MFMI08XSAC/tn0Qp8qzTE9jAMwIgwgGpgEAhYpXgj8v6edpEXY2Fv8hdb5NDyiVfcLykqDwcul+5XHtWpU/+tkrL+gBTvIUXw8FxuzSX1A2N6muaM/G5GKpeiaxgFbtfrNkAeaEpJtSZ2lqvUJgWhlZS9Tg+4g8l5G2SVSoBS9j+whJgcF4cpzQr6F+2G6q5sYzTxdK6n9nWQ3ItGRyMcr1m+Ug38BvmbMF8NJ+nb9XmiGOoYObxThPJdD7JwvR813AqGzbtTBtfRlg1NPl5WlzzN6sueoh5NdEYIPnX2qcIaxfXGcmfu9bYJ7cZlZNkKmnAdPIqoGvdznkwUW6HLObTYzvkc7tzKsevKx/kA73VYOTOWduEoZm5W9V44wxlk/uG61JannYZ30oZfkyTIl3uhWkyoN0Z/cPUirptrLZusZ7d1WGh0er0verkk18gFbnSShl0Zf/kT0vohIsYmQr7TF32Qpa2StUuzfQQ5XDe92KAvSOoGTiNNtvmcZD7i9Y+rDx1f5CRAVf4oNeVqhshw3ZznETyHYLZTjkgqQT/Me7GelzjLqPgpYBRLzLhID/1hRc+g1JjY2dNJfQ8dAFnTR5nt5rPw4RwK1JrvQKeK8O0WKIG8xIwJBkNuswp+a8JGqns/mKJv4empVAwMIEqJlaJZ95zZUCSsQLofQ/NGFjSeEhLpGQe0za5S8pOBsoWWgrT53 gyQEnoRE 6pbbmGRS4lGJCsKJE0FmiHvIBk4B5iZ3t0ZOj0WOUvJYOXsAQfo4IRZHjmZeYai3Mbj+VJlB4T0xPWJj8fGywayfR9SjNSd8UigIJhUCaKOTGVCydeW4IV6G+Lan11b7IKTWhluG4ESfPgsNr76MV7S7zweXveLVgmmeOH8jLU4AZ4lIDHwGJ5QEoY8GR1AgraY6nANBBUIUczTcnf7OFU16Oeb+01rVkdwJ/s0/qV0WbhpEgiS4KiPSiFwl2yfjbl18GuejFsRI0cPbTjXyQM0f2HKkdFpx9sfnSEW0xhjeDAyYXfE6ivGdnoIcCeE33z8TVN1SyZCsXAiIHAtNnxTYWqcgZX9ed7SIl3mrke5xyXlDHQ9sFVmE0MtJHa/UudoETFn6D7pK4fIaXoNMbnThRAB8CQhRHKu+RMLBnDv+ahzhalCrpwbquC308AEVdZc1F+Rg30hjLLQotfT0KtVnogBmPD6FfPZnIKfGZM8SHS0QXPja6G5mK0SSeBEW7ug8p8XU4NIYcMWWwT3cjpThvOwc5luxNFr9Fgc8/G8BjMVh8TiJVew/CQjl//0gQzy3huKHxmguVJ24j8o0Mss+WcXwUktLsRW5eUTXhXT2+n2z6zxpniPF7lUyR3cLS9m+aady4+cgKxPq2BtjwA0Crz9/6rPGxA2Jg5Nkbxc/0QmPah2EzxPNmhIOa9t0gT5Pg9RSxsfOtoAQ= 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: From: Alexander Graf Add the infrastructure to generate Kexec HandOver metadata. Kexec HandOver is a mechanism that allows Linux to preserve state - arbitrary properties as well as memory locations - across kexec. It does so using 2 concepts: 1) KHO FDT - Every KHO kexec carries a KHO specific flattened device tree blob that describes preserved memory regions. Device drivers can register to KHO to serialize and preserve their states before kexec. 2) Scratch Regions - CMA regions that we allocate in the first kernel. CMA gives us the guarantee that no handover pages land in those regions, because handover pages must be at a static physical memory location. We use these regions as the place to load future kexec images so that they won't collide with any handover data. Signed-off-by: Alexander Graf Co-developed-by: Pratyush Yadav Signed-off-by: Pratyush Yadav Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- MAINTAINERS | 9 + include/linux/kexec_handover.h | 58 ++++ kernel/Makefile | 1 + kernel/kexec_handover.c | 557 +++++++++++++++++++++++++++++++++ mm/mm_init.c | 8 + 5 files changed, 633 insertions(+) create mode 100644 include/linux/kexec_handover.h create mode 100644 kernel/kexec_handover.c diff --git a/MAINTAINERS b/MAINTAINERS index 96b8270495018..5f33e18385cbc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13117,6 +13117,15 @@ F: include/linux/kexec.h F: include/uapi/linux/kexec.h F: kernel/kexec* +KEXEC HANDOVER (KHO) +M: Alexander Graf +M: Mike Rapoport +M: Changyuan Lyu +L: kexec@lists.infradead.org +S: Maintained +F: include/linux/kexec_handover.h +F: kernel/kexec_handover.c + KEYS-ENCRYPTED M: Mimi Zohar L: linux-integrity@vger.kernel.org diff --git a/include/linux/kexec_handover.h b/include/linux/kexec_handover.h new file mode 100644 index 0000000000000..593ea842a5b61 --- /dev/null +++ b/include/linux/kexec_handover.h @@ -0,0 +1,58 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef LINUX_KEXEC_HANDOVER_H +#define LINUX_KEXEC_HANDOVER_H + +#include + +struct kho_scratch { + phys_addr_t addr; + phys_addr_t size; +}; + +/* KHO Notifier index */ +enum kho_event { + KEXEC_KHO_FINALIZE = 0, + KEXEC_KHO_ABORT = 1, +}; + +struct notifier_block; + +struct kho_serialization; + +#ifdef CONFIG_KEXEC_HANDOVER +bool kho_is_enabled(void); + +int kho_add_subtree(struct kho_serialization *ser, const char *name, void *fdt); + +int register_kho_notifier(struct notifier_block *nb); +int unregister_kho_notifier(struct notifier_block *nb); + +void kho_memory_init(void); +#else +static inline bool kho_is_enabled(void) +{ + return false; +} + +static inline int kho_add_subtree(struct kho_serialization *ser, + const char *name, void *fdt) +{ + return -EOPNOTSUPP; +} + +static inline int register_kho_notifier(struct notifier_block *nb) +{ + return -EOPNOTSUPP; +} + +static inline int unregister_kho_notifier(struct notifier_block *nb) +{ + return -EOPNOTSUPP; +} + +static inline void kho_memory_init(void) +{ +} +#endif /* CONFIG_KEXEC_HANDOVER */ + +#endif /* LINUX_KEXEC_HANDOVER_H */ diff --git a/kernel/Makefile b/kernel/Makefile index 434929de17ef2..97c09847db42f 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -80,6 +80,7 @@ obj-$(CONFIG_CRASH_DUMP) += crash_core.o obj-$(CONFIG_KEXEC) += kexec.o obj-$(CONFIG_KEXEC_FILE) += kexec_file.o obj-$(CONFIG_KEXEC_ELF) += kexec_elf.o +obj-$(CONFIG_KEXEC_HANDOVER) += kexec_handover.o obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o obj-$(CONFIG_COMPAT) += compat.o obj-$(CONFIG_CGROUPS) += cgroup/ diff --git a/kernel/kexec_handover.c b/kernel/kexec_handover.c new file mode 100644 index 0000000000000..e541d3d5003d1 --- /dev/null +++ b/kernel/kexec_handover.c @@ -0,0 +1,557 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * kexec_handover.c - kexec handover metadata processing + * Copyright (C) 2023 Alexander Graf + * Copyright (C) 2025 Microsoft Corporation, Mike Rapoport + * Copyright (C) 2025 Google LLC, Changyuan Lyu + */ + +#define pr_fmt(fmt) "KHO: " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include +/* + * KHO is tightly coupled with mm init and needs access to some of mm + * internal APIs. + */ +#include "../mm/internal.h" + +#define KHO_FDT_COMPATIBLE "kho-v1" +#define PROP_PRESERVED_MEMORY_MAP "preserved-memory-map" +#define PROP_SUB_FDT "fdt" + +static bool kho_enable __ro_after_init; + +bool kho_is_enabled(void) +{ + return kho_enable; +} +EXPORT_SYMBOL_GPL(kho_is_enabled); + +static int __init kho_parse_enable(char *p) +{ + return kstrtobool(p, &kho_enable); +} +early_param("kho", kho_parse_enable); + +struct kho_serialization { + struct page *fdt; + struct list_head fdt_list; + struct dentry *sub_fdt_dir; +}; + +/* + * With KHO enabled, memory can become fragmented because KHO regions may + * be anywhere in physical address space. The scratch regions give us a + * safe zones that we will never see KHO allocations from. This is where we + * can later safely load our new kexec images into and then use the scratch + * area for early allocations that happen before page allocator is + * initialized. + */ +static struct kho_scratch *kho_scratch; +static unsigned int kho_scratch_cnt; + +/* + * The scratch areas are scaled by default as percent of memory allocated from + * memblock. A user can override the scale with command line parameter: + * + * kho_scratch=N% + * + * It is also possible to explicitly define size for a lowmem, a global and + * per-node scratch areas: + * + * kho_scratch=l[KMG],n[KMG],m[KMG] + * + * The explicit size definition takes precedence over scale definition. + */ +static unsigned int scratch_scale __initdata = 200; +static phys_addr_t scratch_size_global __initdata; +static phys_addr_t scratch_size_pernode __initdata; +static phys_addr_t scratch_size_lowmem __initdata; + +static int __init kho_parse_scratch_size(char *p) +{ + size_t len; + unsigned long sizes[3]; + int i; + + if (!p) + return -EINVAL; + + len = strlen(p); + if (!len) + return -EINVAL; + + /* parse nn% */ + if (p[len - 1] == '%') { + /* unsigned int max is 4,294,967,295, 10 chars */ + char s_scale[11] = {}; + int ret = 0; + + if (len > ARRAY_SIZE(s_scale)) + return -EINVAL; + + memcpy(s_scale, p, len - 1); + ret = kstrtouint(s_scale, 10, &scratch_scale); + if (!ret) + pr_notice("scratch scale is %d%%\n", scratch_scale); + return ret; + } + + /* parse ll[KMG],mm[KMG],nn[KMG] */ + for (i = 0; i < ARRAY_SIZE(sizes); i++) { + char *endp = p; + + if (i > 0) { + if (*p != ',') + return -EINVAL; + p += 1; + } + + sizes[i] = memparse(p, &endp); + if (!sizes[i] || endp == p) + return -EINVAL; + p = endp; + } + + scratch_size_lowmem = sizes[0]; + scratch_size_global = sizes[1]; + scratch_size_pernode = sizes[2]; + scratch_scale = 0; + + pr_notice("scratch areas: lowmem: %lluMiB global: %lluMiB pernode: %lldMiB\n", + (u64)(scratch_size_lowmem >> 20), + (u64)(scratch_size_global >> 20), + (u64)(scratch_size_pernode >> 20)); + + return 0; +} +early_param("kho_scratch", kho_parse_scratch_size); + +static void __init scratch_size_update(void) +{ + phys_addr_t size; + + if (!scratch_scale) + return; + + size = memblock_reserved_kern_size(ARCH_LOW_ADDRESS_LIMIT, + NUMA_NO_NODE); + size = size * scratch_scale / 100; + scratch_size_lowmem = round_up(size, CMA_MIN_ALIGNMENT_BYTES); + + size = memblock_reserved_kern_size(MEMBLOCK_ALLOC_ANYWHERE, + NUMA_NO_NODE); + size = size * scratch_scale / 100 - scratch_size_lowmem; + scratch_size_global = round_up(size, CMA_MIN_ALIGNMENT_BYTES); +} + +static phys_addr_t __init scratch_size_node(int nid) +{ + phys_addr_t size; + + if (scratch_scale) { + size = memblock_reserved_kern_size(MEMBLOCK_ALLOC_ANYWHERE, + nid); + size = size * scratch_scale / 100; + } else { + size = scratch_size_pernode; + } + + return round_up(size, CMA_MIN_ALIGNMENT_BYTES); +} + +/** + * kho_reserve_scratch - Reserve a contiguous chunk of memory for kexec + * + * With KHO we can preserve arbitrary pages in the system. To ensure we still + * have a large contiguous region of memory when we search the physical address + * space for target memory, let's make sure we always have a large CMA region + * active. This CMA region will only be used for movable pages which are not a + * problem for us during KHO because we can just move them somewhere else. + */ +static void __init kho_reserve_scratch(void) +{ + phys_addr_t addr, size; + int nid, i = 0; + + if (!kho_enable) + return; + + scratch_size_update(); + + /* FIXME: deal with node hot-plug/remove */ + kho_scratch_cnt = num_online_nodes() + 2; + size = kho_scratch_cnt * sizeof(*kho_scratch); + kho_scratch = memblock_alloc(size, PAGE_SIZE); + if (!kho_scratch) + goto err_disable_kho; + + /* + * reserve scratch area in low memory for lowmem allocations in the + * next kernel + */ + size = scratch_size_lowmem; + addr = memblock_phys_alloc_range(size, CMA_MIN_ALIGNMENT_BYTES, 0, + ARCH_LOW_ADDRESS_LIMIT); + if (!addr) + goto err_free_scratch_desc; + + kho_scratch[i].addr = addr; + kho_scratch[i].size = size; + i++; + + /* reserve large contiguous area for allocations without nid */ + size = scratch_size_global; + addr = memblock_phys_alloc(size, CMA_MIN_ALIGNMENT_BYTES); + if (!addr) + goto err_free_scratch_areas; + + kho_scratch[i].addr = addr; + kho_scratch[i].size = size; + i++; + + for_each_online_node(nid) { + size = scratch_size_node(nid); + addr = memblock_alloc_range_nid(size, CMA_MIN_ALIGNMENT_BYTES, + 0, MEMBLOCK_ALLOC_ACCESSIBLE, + nid, true); + if (!addr) + goto err_free_scratch_areas; + + kho_scratch[i].addr = addr; + kho_scratch[i].size = size; + i++; + } + + return; + +err_free_scratch_areas: + for (i--; i >= 0; i--) + memblock_phys_free(kho_scratch[i].addr, kho_scratch[i].size); +err_free_scratch_desc: + memblock_free(kho_scratch, kho_scratch_cnt * sizeof(*kho_scratch)); +err_disable_kho: + kho_enable = false; +} + +struct fdt_debugfs { + struct list_head list; + struct debugfs_blob_wrapper wrapper; + struct dentry *file; +}; + +static int kho_debugfs_fdt_add(struct list_head *list, struct dentry *dir, + const char *name, const void *fdt) +{ + struct fdt_debugfs *f; + struct dentry *file; + + f = kmalloc(sizeof(*f), GFP_KERNEL); + if (!f) + return -ENOMEM; + + f->wrapper.data = (void *)fdt; + f->wrapper.size = fdt_totalsize(fdt); + + file = debugfs_create_blob(name, 0400, dir, &f->wrapper); + if (IS_ERR(file)) { + kfree(f); + return PTR_ERR(file); + } + + f->file = file; + list_add(&f->list, list); + + return 0; +} + +/** + * kho_add_subtree - record the physical address of a sub FDT in KHO root tree. + * @ser: serialization control object passed by KHO notifiers. + * @name: name of the sub tree. + * @fdt: the sub tree blob. + * + * Creates a new child node named @name in KHO root FDT and records + * the physical address of @fdt. The pages of @fdt must also be preserved + * by KHO for the new kernel to retrieve it after kexec. + * + * A debugfs blob entry is also created at + * ``/sys/kernel/debug/kho/out/sub_fdts/@name``. + * + * Return: 0 on success, error code on failure + */ +int kho_add_subtree(struct kho_serialization *ser, const char *name, void *fdt) +{ + int err = 0; + u64 phys = (u64)virt_to_phys(fdt); + void *root = page_to_virt(ser->fdt); + + err |= fdt_begin_node(root, name); + err |= fdt_property(root, PROP_SUB_FDT, &phys, sizeof(phys)); + err |= fdt_end_node(root); + + if (err) + return err; + + return kho_debugfs_fdt_add(&ser->fdt_list, ser->sub_fdt_dir, name, fdt); +} +EXPORT_SYMBOL_GPL(kho_add_subtree); + +struct kho_out { + struct blocking_notifier_head chain_head; + + struct dentry *dir; + + struct mutex lock; /* protects KHO FDT finalization */ + + struct kho_serialization ser; + bool finalized; +}; + +static struct kho_out kho_out = { + .chain_head = BLOCKING_NOTIFIER_INIT(kho_out.chain_head), + .lock = __MUTEX_INITIALIZER(kho_out.lock), + .ser = { + .fdt_list = LIST_HEAD_INIT(kho_out.ser.fdt_list), + }, + .finalized = false, +}; + +int register_kho_notifier(struct notifier_block *nb) +{ + return blocking_notifier_chain_register(&kho_out.chain_head, nb); +} +EXPORT_SYMBOL_GPL(register_kho_notifier); + +int unregister_kho_notifier(struct notifier_block *nb) +{ + return blocking_notifier_chain_unregister(&kho_out.chain_head, nb); +} +EXPORT_SYMBOL_GPL(unregister_kho_notifier); + +/* Handling for debug/kho/out */ + +static struct dentry *debugfs_root; + +static int kho_out_update_debugfs_fdt(void) +{ + int err = 0; + struct fdt_debugfs *ff, *tmp; + + if (kho_out.finalized) { + err = kho_debugfs_fdt_add(&kho_out.ser.fdt_list, kho_out.dir, + "fdt", page_to_virt(kho_out.ser.fdt)); + } else { + list_for_each_entry_safe(ff, tmp, &kho_out.ser.fdt_list, list) { + debugfs_remove(ff->file); + list_del(&ff->list); + kfree(ff); + } + } + + return err; +} + +static int kho_abort(void) +{ + int err; + + err = blocking_notifier_call_chain(&kho_out.chain_head, KEXEC_KHO_ABORT, + NULL); + err = notifier_to_errno(err); + + if (err) + pr_err("Failed to abort KHO finalization: %d\n", err); + + return err; +} + +static int kho_finalize(void) +{ + int err = 0; + void *fdt = page_to_virt(kho_out.ser.fdt); + + err |= fdt_create(fdt, PAGE_SIZE); + err |= fdt_finish_reservemap(fdt); + err |= fdt_begin_node(fdt, ""); + err |= fdt_property_string(fdt, "compatible", KHO_FDT_COMPATIBLE); + if (err) + goto abort; + + err = blocking_notifier_call_chain(&kho_out.chain_head, + KEXEC_KHO_FINALIZE, &kho_out.ser); + err = notifier_to_errno(err); + if (err) + goto abort; + + err |= fdt_end_node(fdt); + err |= fdt_finish(fdt); + +abort: + if (err) { + pr_err("Failed to convert KHO state tree: %d\n", err); + kho_abort(); + } + + return err; +} + +static int kho_out_finalize_get(void *data, u64 *val) +{ + mutex_lock(&kho_out.lock); + *val = kho_out.finalized; + mutex_unlock(&kho_out.lock); + + return 0; +} + +static int kho_out_finalize_set(void *data, u64 _val) +{ + int ret = 0; + bool val = !!_val; + + mutex_lock(&kho_out.lock); + + if (val == kho_out.finalized) { + if (kho_out.finalized) + ret = -EEXIST; + else + ret = -ENOENT; + goto unlock; + } + + if (val) + ret = kho_finalize(); + else + ret = kho_abort(); + + if (ret) + goto unlock; + + kho_out.finalized = val; + ret = kho_out_update_debugfs_fdt(); + +unlock: + mutex_unlock(&kho_out.lock); + return ret; +} + +DEFINE_DEBUGFS_ATTRIBUTE(fops_kho_out_finalize, kho_out_finalize_get, + kho_out_finalize_set, "%llu\n"); + +static int scratch_phys_show(struct seq_file *m, void *v) +{ + for (int i = 0; i < kho_scratch_cnt; i++) + seq_printf(m, "0x%llx\n", kho_scratch[i].addr); + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(scratch_phys); + +static int scratch_len_show(struct seq_file *m, void *v) +{ + for (int i = 0; i < kho_scratch_cnt; i++) + seq_printf(m, "0x%llx\n", kho_scratch[i].size); + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(scratch_len); + +static __init int kho_out_debugfs_init(void) +{ + struct dentry *dir, *f, *sub_fdt_dir; + + dir = debugfs_create_dir("out", debugfs_root); + if (IS_ERR(dir)) + return -ENOMEM; + + sub_fdt_dir = debugfs_create_dir("sub_fdts", dir); + if (IS_ERR(sub_fdt_dir)) + goto err_rmdir; + + f = debugfs_create_file("scratch_phys", 0400, dir, NULL, + &scratch_phys_fops); + if (IS_ERR(f)) + goto err_rmdir; + + f = debugfs_create_file("scratch_len", 0400, dir, NULL, + &scratch_len_fops); + if (IS_ERR(f)) + goto err_rmdir; + + f = debugfs_create_file("finalize", 0600, dir, NULL, + &fops_kho_out_finalize); + if (IS_ERR(f)) + goto err_rmdir; + + kho_out.dir = dir; + kho_out.ser.sub_fdt_dir = sub_fdt_dir; + return 0; + +err_rmdir: + debugfs_remove_recursive(dir); + return -ENOENT; +} + +static __init int kho_init(void) +{ + int err = 0; + + if (!kho_enable) + return 0; + + kho_out.ser.fdt = alloc_page(GFP_KERNEL); + if (!kho_out.ser.fdt) { + err = -ENOMEM; + goto err_free_scratch; + } + + debugfs_root = debugfs_create_dir("kho", NULL); + if (IS_ERR(debugfs_root)) { + err = -ENOENT; + goto err_free_fdt; + } + + err = kho_out_debugfs_init(); + if (err) + goto err_free_fdt; + + for (int i = 0; i < kho_scratch_cnt; i++) { + unsigned long base_pfn = PHYS_PFN(kho_scratch[i].addr); + unsigned long count = kho_scratch[i].size >> PAGE_SHIFT; + unsigned long pfn; + + for (pfn = base_pfn; pfn < base_pfn + count; + pfn += pageblock_nr_pages) + init_cma_reserved_pageblock(pfn_to_page(pfn)); + } + + return 0; + +err_free_fdt: + put_page(kho_out.ser.fdt); + kho_out.ser.fdt = NULL; +err_free_scratch: + for (int i = 0; i < kho_scratch_cnt; i++) { + void *start = __va(kho_scratch[i].addr); + void *end = start + kho_scratch[i].size; + + free_reserved_area(start, end, -1, ""); + } + kho_enable = false; + return err; +} +late_initcall(kho_init); + +void __init kho_memory_init(void) +{ + kho_reserve_scratch(); +} diff --git a/mm/mm_init.c b/mm/mm_init.c index 1451cb250fd3f..9ed4a0dda6e39 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include "internal.h" #include "slab.h" @@ -2770,6 +2771,13 @@ void __init mm_core_init(void) report_meminit(); kmsan_init_shadow(); stack_depot_early_init(); + + /* + * KHO memory setup must happen while memblock is still active, but + * as close as possible to buddy initialization + */ + kho_memory_init(); + memblock_free_all(); mem_init(); kmem_cache_init(); From patchwork Fri Apr 11 05:37:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047565 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 C316BC369A8 for ; Fri, 11 Apr 2025 05:38:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3381628015D; Fri, 11 Apr 2025 01:38:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2CFE328015B; Fri, 11 Apr 2025 01:38:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F1EAA28015D; Fri, 11 Apr 2025 01:38:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CCD3128015B for ; Fri, 11 Apr 2025 01:38:29 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A3ED41A1DAD for ; Fri, 11 Apr 2025 05:38:30 +0000 (UTC) X-FDA: 83320657980.01.265B5FE Received: from mail-ot1-f74.google.com (mail-ot1-f74.google.com [209.85.210.74]) by imf17.hostedemail.com (Postfix) with ESMTP id CF48340002 for ; Fri, 11 Apr 2025 05:38:28 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=T0HEjtG+; spf=pass (imf17.hostedemail.com: domain of 306r4ZwoKCFIw1u70IEu7508805y.w86527EH-664Fuw4.8B0@flex--changyuanl.bounces.google.com designates 209.85.210.74 as permitted sender) smtp.mailfrom=306r4ZwoKCFIw1u70IEu7508805y.w86527EH-664Fuw4.8B0@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349908; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=u8/tw64ZaXw3+8Mw68exs5moBeGsA6izDAl/HLWUnHo=; b=W9N+Vse0rPmg61ALBoFQSj00dJG/MUKjt5vSdHZNKmFJi+/wWEYvtWpwR9yCxCW+uIB49u bI66rtMQq/ZhbWSyMSkp1H2eVp0n2WMKIEcxKTCdI1hA8EZPMxD3lwo04GLieSxeSVEyOy x3cTXn/VPTD2BC5kv4yJDDosPFW8GUg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=T0HEjtG+; spf=pass (imf17.hostedemail.com: domain of 306r4ZwoKCFIw1u70IEu7508805y.w86527EH-664Fuw4.8B0@flex--changyuanl.bounces.google.com designates 209.85.210.74 as permitted sender) smtp.mailfrom=306r4ZwoKCFIw1u70IEu7508805y.w86527EH-664Fuw4.8B0@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349908; a=rsa-sha256; cv=none; b=KU6MKCJVJ9RGCdhsUazc62bze87nQqT8lzPxDMl4lQh/Ec3MmWUp8eWUJQQV+kFxAg0z+n 0diPDD1a76RQlkOVQuMJJAxskWtKaf2bZoK/UVN07AOKX0qEMKDBVc7MsyuVv1kC8Q5OFU yiGANHoLdMXwMmYtmTfFpaVl7jjS+s0= Received: by mail-ot1-f74.google.com with SMTP id 46e09a7af769-72b881599f6so1364566a34.1 for ; Thu, 10 Apr 2025 22:38:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349908; x=1744954708; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=u8/tw64ZaXw3+8Mw68exs5moBeGsA6izDAl/HLWUnHo=; b=T0HEjtG+3JB5VvFx/OTUWixR1lkUNNQe1rOWCkoDDEX7GxDW3DTPrcF6W7AwnM6veC JdwNzsmE4IOINd6w7Zb1YXYmDzdF39BUcSVot4uuIfi2JX4eiNX4mRLk8ExSsl3IvQcl VzKm7Ng2fzgldwNNrR0eqoMF2SJjFtL618uDIACYyjZ4WZOZVafzO+8Qf9sQ9sAD0McJ 4BhyPH7TnQsKKO8u2ZNP1VbeiOm9EPeszHRYXfxuAfTkhM6IjvnXlMX21aM3bCRULFti 36oHs1maZ54TwkqvAE7BGtkUtbM5vOwSLwLJX2jRK4IL23vFexkTzbxntuv6K2K2Bh3f XIFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349908; x=1744954708; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=u8/tw64ZaXw3+8Mw68exs5moBeGsA6izDAl/HLWUnHo=; b=Bqn4GKPVzUQVVlfqM/iE88k6MlnmQRCq+GPulXdZsFJo5wp7OCro5CSLoDzjWwymhL FXMrX6f/ltViH+no9idfSliyDuXoJNKVOOwfA7iQKuxzwvv62UoRF/3NsREHxt2n88mR +zBCPE+KGDJ1P7n/AfSPVzZrKmM/t5BpD4Y/pDR777E9aHZg10VFszACjfPuEMJQ86N6 Oa6Q33eIqSOmbx42C2UPHcMFFpeIUz06+TxErlN4J+AUD9fGtN+uvQCZ8kjc0Kst45hp MdOSq9UUdSw4N52BoR/go+m/QMnbqfQpIXy+eJLsbmViPkWJWGoo0sNvqhr9BfU7q/yL uj2A== X-Forwarded-Encrypted: i=1; AJvYcCWIMUXfpjIdjX7jT5PcuHP8Hozsv1qug6/0f0/5/IuUjfGAeNwNF4cXL038OjRrkJS7FaDD4L/V4g==@kvack.org X-Gm-Message-State: AOJu0YzTxIE5N5GYy4zh4cPgb00MwBenOhuNDPG4cCFHBNcGIRmCaFlB 0p0uJnW3aEchTCGFTbrsRhyPCx6HELzo6PhRm4VvtAOaBwNfxQhE7f0GFs/A6hq/0qAi84Exsoy dN9zwkPuP6U0sukjF8A== X-Google-Smtp-Source: AGHT+IGwZ1eisxe0ymuYtmLoCJqD7rlopgQFj4rrMwmM4Wrelc58jw3CKa/b1F9+keU+6losfGrOoBNzqRMO1/hD X-Received: from oabvs3.prod.google.com ([2002:a05:6871:a103:b0:2b8:40a0:4445]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6830:6987:b0:72b:823c:8f66 with SMTP id 46e09a7af769-72e862fbc8amr968642a34.9.1744349907721; Thu, 10 Apr 2025 22:38:27 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:36 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-6-changyuanl@google.com> Subject: [PATCH v6 05/14] kexec: add KHO parsing support From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Queue-Id: CF48340002 X-Stat-Signature: u8m8n6z4n4hia5nzwndh9nt4pofm7xfq X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1744349908-424247 X-HE-Meta: U2FsdGVkX1/RLvry5qU2gWn19kOPcYIoTfK39NOw6XjNZDsX4PHlD7cw47mjhqE1M6RU4Us1C0YSfd2Yp+HvG9F8JJMAEfazHcUrjkLvVn+4sNx2xi4gETtdj2YJm30AZqxjVYB4WAXZBdqTdzPlaSJ4Do09XYFr+sH78bwoIw86FhNwOPsjwUNwHXC+hcM28gfF9LoMv71PhYUMaidclNsM0OzVTtioTwsOr0+3RhxdlsRaIaIVfvDRPFR2tJKIVX4tCejAalUwjjEM3K+PXQC9AbX/hIWaW9H0dvhqw0cr+s77UwMWm+7GKLkTVmo3C5ovATZ3raOjdP3fK+UAt29mejXtGxGRuI4VXmBCNxtsiIMpAQ9rAcXqs/Hfn8kSU+R0Q49ctim4EchOGNsYGhcTlaIeKBqaW2lxrRhy47A52rlkseeC2RTx4H7Bv3z12bCgNqlVxKjk8AcNcVoMvUxgeUWbZRKcHiEPxU1agrlvHg9UreeUKatDTKW8C0ryADbHkcQWI/1DffYgJuU30/dfK5ZZMWUPA7FVbkJnxHlEn8/e+kKMz92YpY3sadrUcUMcvgfu35mZ/y08qjG7Yazeq7JL7edbFjW8khwGIHr12AIHbwdnNjPkQXAGWYPLjzWzykCLKP9DNmly7T0P+bJVYlgLMx14qd3/y1bhUX8GK8mjdvSHi+wZak9EcK6bW1F+FFOobsVC7+erWW3tUyAL1NnkxEuk7n4c258t9q+CtMi+W2dFcDmJZpmln9qm9Fqd8InGem0z3Wn2gPrs3f7n8crJNuNncqObeaM9lQpiv7sHkCmpJLCEWMvJCiU7oQoMS9WBB/XswlZbsDwAsiH4uw8Qxa5/XD8Q8lTFjo4eddzFDZEQXD9lVpTq0dbGeFjbEalqx5f+epQI4cNG0lg8xbd6meLqFgnYJn4YcEAobzE4nI4GjhuhgiSCAlKkAldm21hhAZEhVrgcOuA pj82CHWq s/eJqfoYOLWBLwO3nw8P+c1EIGUfilEi3OI+YNZGf2juIu/OZjbIezAO9lbdmUv0EexNGAGqteSF11Cj6rhTqLZBGY7/ITxdX/tNYS9CoNac2iN1aIFfZtduk1kPXdy+ji+J5ajZw6kLX6FEYOBNb3lrHF3gXIC5TNbFGoUoE173+Nc4GF/dleKf/w15AaM2aAnnUrPHhZhm8OqNPeYCtObGmQJlmyYrA+sBSm1W9yfgsUOTLVh7cQ5nBFiynNe/e4De8lPN4fABR2eHekzxnOzBAFZVZRUDHLefWbzN8fnuDsmSzA15sPrdmDVS4fz1nmc18ABVstUi13iYSQPs3JbxZFQ5GXbUV1f760tdjVrnfVrkmsWoiPfmMvgqsZ467Ronqlpw/DXpZGfJsPQSxtJ4l4d1fXa8blTH+AN9l2MhPv+a3wHXgZmDnlQtINTwbzhJZsDCOKuoPA3ZYiwnpo//nFFvjlM1gfSJtdnbe0S5w1SJnW5TsCshRbJNxuPYDvsHzlcsoaFnT4HyoFDvem0LjwnGN1JeRPhPoeIhE1mRn9g60053bdLqFS8V+padTu2s6woCCbC84DZlA9tekX/jGLbzufHhS9Q6hs86pzwNvvV1RBsjE0i4ylw== 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: From: Alexander Graf When we have a KHO kexec, we get an FDT blob and scratch region to populate the state of the system. Provide helper functions that allow architecture code to easily handle memory reservations based on them and give device drivers visibility into the KHO FDT and memory reservations so they can recover their own state. Signed-off-by: Alexander Graf Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- include/linux/kexec_handover.h | 14 ++ kernel/kexec_handover.c | 230 ++++++++++++++++++++++++++++++++- mm/memblock.c | 1 + 3 files changed, 244 insertions(+), 1 deletion(-) diff --git a/include/linux/kexec_handover.h b/include/linux/kexec_handover.h index 593ea842a5b61..2b77d4b9fbc3c 100644 --- a/include/linux/kexec_handover.h +++ b/include/linux/kexec_handover.h @@ -23,11 +23,15 @@ struct kho_serialization; bool kho_is_enabled(void); int kho_add_subtree(struct kho_serialization *ser, const char *name, void *fdt); +int kho_retrieve_subtree(const char *name, phys_addr_t *phys); int register_kho_notifier(struct notifier_block *nb); int unregister_kho_notifier(struct notifier_block *nb); void kho_memory_init(void); + +void kho_populate(phys_addr_t fdt_phys, u64 fdt_len, phys_addr_t scratch_phys, + u64 scratch_len); #else static inline bool kho_is_enabled(void) { @@ -40,6 +44,11 @@ static inline int kho_add_subtree(struct kho_serialization *ser, return -EOPNOTSUPP; } +static inline int kho_retrieve_subtree(const char *name, phys_addr_t *phys) +{ + return -EOPNOTSUPP; +} + static inline int register_kho_notifier(struct notifier_block *nb) { return -EOPNOTSUPP; @@ -53,6 +62,11 @@ static inline int unregister_kho_notifier(struct notifier_block *nb) static inline void kho_memory_init(void) { } + +static inline void kho_populate(phys_addr_t fdt_phys, u64 fdt_len, + phys_addr_t scratch_phys, u64 scratch_len) +{ +} #endif /* CONFIG_KEXEC_HANDOVER */ #endif /* LINUX_KEXEC_HANDOVER_H */ diff --git a/kernel/kexec_handover.c b/kernel/kexec_handover.c index e541d3d5003d1..a1e1cd0330143 100644 --- a/kernel/kexec_handover.c +++ b/kernel/kexec_handover.c @@ -501,9 +501,112 @@ static __init int kho_out_debugfs_init(void) return -ENOENT; } +struct kho_in { + struct dentry *dir; + phys_addr_t fdt_phys; + phys_addr_t scratch_phys; + struct list_head fdt_list; +}; + +static struct kho_in kho_in = { + .fdt_list = LIST_HEAD_INIT(kho_in.fdt_list), +}; + +static const void *kho_get_fdt(void) +{ + return kho_in.fdt_phys ? phys_to_virt(kho_in.fdt_phys) : NULL; +} + +/** + * kho_retrieve_subtree - retrieve a preserved sub FDT by its name. + * @name: the name of the sub FDT passed to kho_add_subtree(). + * @phys: if found, the physical address of the sub FDT is stored in @phys. + * + * Retrieve a preserved sub FDT named @name and store its physical + * address in @phys. + * + * Return: 0 on success, error code on failure + */ +int kho_retrieve_subtree(const char *name, phys_addr_t *phys) +{ + const void *fdt = kho_get_fdt(); + const u64 *val; + int offset, len; + + if (!fdt) + return -ENOENT; + + if (!phys) + return -EINVAL; + + offset = fdt_subnode_offset(fdt, 0, name); + if (offset < 0) + return -ENOENT; + + val = fdt_getprop(fdt, offset, PROP_SUB_FDT, &len); + if (!val || len != sizeof(*val)) + return -EINVAL; + + *phys = (phys_addr_t)*val; + + return 0; +} +EXPORT_SYMBOL_GPL(kho_retrieve_subtree); + +/* Handling for debugfs/kho/in */ + +static __init int kho_in_debugfs_init(const void *fdt) +{ + struct dentry *sub_fdt_dir; + int err, child; + + kho_in.dir = debugfs_create_dir("in", debugfs_root); + if (IS_ERR(kho_in.dir)) + return PTR_ERR(kho_in.dir); + + sub_fdt_dir = debugfs_create_dir("sub_fdts", kho_in.dir); + if (IS_ERR(sub_fdt_dir)) { + err = PTR_ERR(sub_fdt_dir); + goto err_rmdir; + } + + err = kho_debugfs_fdt_add(&kho_in.fdt_list, kho_in.dir, "fdt", fdt); + if (err) + goto err_rmdir; + + fdt_for_each_subnode(child, fdt, 0) { + int len = 0; + const char *name = fdt_get_name(fdt, child, NULL); + const u64 *fdt_phys; + + fdt_phys = fdt_getprop(fdt, child, "fdt", &len); + if (!fdt_phys) + continue; + if (len != sizeof(*fdt_phys)) { + pr_warn("node `%s`'s prop `fdt` has invalid length: %d\n", + name, len); + continue; + } + err = kho_debugfs_fdt_add(&kho_in.fdt_list, sub_fdt_dir, name, + phys_to_virt(*fdt_phys)); + if (err) { + pr_warn("failed to add fdt `%s` to debugfs: %d\n", name, + err); + continue; + } + } + + return 0; + +err_rmdir: + debugfs_remove_recursive(kho_in.dir); + return err; +} + static __init int kho_init(void) { int err = 0; + const void *fdt = kho_get_fdt(); if (!kho_enable) return 0; @@ -524,6 +627,20 @@ static __init int kho_init(void) if (err) goto err_free_fdt; + if (fdt) { + err = kho_in_debugfs_init(fdt); + /* + * Failure to create /sys/kernel/debug/kho/in does not prevent + * reviving state from KHO and setting up KHO for the next + * kexec. + */ + if (err) + pr_err("failed exposing handover FDT in debugfs: %d\n", + err); + + return 0; + } + for (int i = 0; i < kho_scratch_cnt; i++) { unsigned long base_pfn = PHYS_PFN(kho_scratch[i].addr); unsigned long count = kho_scratch[i].size >> PAGE_SHIFT; @@ -551,7 +668,118 @@ static __init int kho_init(void) } late_initcall(kho_init); +static void __init kho_release_scratch(void) +{ + phys_addr_t start, end; + u64 i; + + memmap_init_kho_scratch_pages(); + + /* + * Mark scratch mem as CMA before we return it. That way we + * ensure that no kernel allocations happen on it. That means + * we can reuse it as scratch memory again later. + */ + __for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, + MEMBLOCK_KHO_SCRATCH, &start, &end, NULL) { + ulong start_pfn = pageblock_start_pfn(PFN_DOWN(start)); + ulong end_pfn = pageblock_align(PFN_UP(end)); + ulong pfn; + + for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) + set_pageblock_migratetype(pfn_to_page(pfn), + MIGRATE_CMA); + } +} + void __init kho_memory_init(void) { - kho_reserve_scratch(); + if (kho_in.scratch_phys) { + kho_scratch = phys_to_virt(kho_in.scratch_phys); + kho_release_scratch(); + } else { + kho_reserve_scratch(); + } +} + +void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len, + phys_addr_t scratch_phys, u64 scratch_len) +{ + void *fdt = NULL; + struct kho_scratch *scratch = NULL; + int err = 0; + unsigned int scratch_cnt = scratch_len / sizeof(*kho_scratch); + + /* Validate the input FDT */ + fdt = early_memremap(fdt_phys, fdt_len); + if (!fdt) { + pr_warn("setup: failed to memremap FDT (0x%llx)\n", fdt_phys); + err = -EFAULT; + goto out; + } + err = fdt_check_header(fdt); + if (err) { + pr_warn("setup: handover FDT (0x%llx) is invalid: %d\n", + fdt_phys, err); + err = -EINVAL; + goto out; + } + err = fdt_node_check_compatible(fdt, 0, KHO_FDT_COMPATIBLE); + if (err) { + pr_warn("setup: handover FDT (0x%llx) is incompatible with '%s': %d\n", + fdt_phys, KHO_FDT_COMPATIBLE, err); + err = -EINVAL; + goto out; + } + + scratch = early_memremap(scratch_phys, scratch_len); + if (!scratch) { + pr_warn("setup: failed to memremap scratch (phys=0x%llx, len=%lld)\n", + scratch_phys, scratch_len); + err = -EFAULT; + goto out; + } + + /* + * We pass a safe contiguous blocks of memory to use for early boot + * purporses from the previous kernel so that we can resize the + * memblock array as needed. + */ + for (int i = 0; i < scratch_cnt; i++) { + struct kho_scratch *area = &scratch[i]; + u64 size = area->size; + + memblock_add(area->addr, size); + err = memblock_mark_kho_scratch(area->addr, size); + if (WARN_ON(err)) { + pr_warn("failed to mark the scratch region 0x%pa+0x%pa: %d", + &area->addr, &size, err); + goto out; + } + pr_debug("Marked 0x%pa+0x%pa as scratch", &area->addr, &size); + } + + memblock_reserve(scratch_phys, scratch_len); + + /* + * Now that we have a viable region of scratch memory, let's tell + * the memblocks allocator to only use that for any allocations. + * That way we ensure that nothing scribbles over in use data while + * we initialize the page tables which we will need to ingest all + * memory reservations from the previous kernel. + */ + memblock_set_kho_scratch_only(); + + kho_in.fdt_phys = fdt_phys; + kho_in.scratch_phys = scratch_phys; + kho_scratch_cnt = scratch_cnt; + pr_info("found kexec handover data. Will skip init for some devices\n"); + +out: + if (fdt) + early_memunmap(fdt, fdt_len); + if (scratch) + early_memunmap(scratch, scratch_len); + if (err) + pr_warn("disabling KHO revival: %d\n", err); } diff --git a/mm/memblock.c b/mm/memblock.c index c2633003ed8ea..456689cb73e20 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2377,6 +2377,7 @@ void __init memblock_free_all(void) free_unused_memmap(); reset_all_zones_managed_pages(); + memblock_clear_kho_scratch_only(); pages = free_low_memory_core_early(); totalram_pages_add(pages); } From patchwork Fri Apr 11 05:37:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047566 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 4F38EC36010 for ; Fri, 11 Apr 2025 05:38:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 69B9628015E; Fri, 11 Apr 2025 01:38:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6218428015B; Fri, 11 Apr 2025 01:38:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C7AE28015E; Fri, 11 Apr 2025 01:38:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id ECFCE28015B for ; Fri, 11 Apr 2025 01:38:31 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 975151CCF91 for ; Fri, 11 Apr 2025 05:38:32 +0000 (UTC) X-FDA: 83320658064.23.69C379A Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf30.hostedemail.com (Postfix) with ESMTP id ED13B80006 for ; Fri, 11 Apr 2025 05:38:30 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=YCrcYMBF; spf=pass (imf30.hostedemail.com: domain of 31ar4ZwoKCFQy3w92KGw972AA270.yA8749GJ-886Hwy6.AD2@flex--changyuanl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=31ar4ZwoKCFQy3w92KGw972AA270.yA8749GJ-886Hwy6.AD2@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349911; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Lff/IlhssaSE8/N5WWt3O745ULQMov2cvh2wPJvEqbY=; b=HrSo0Dqlep35mxN3BAnniCKh+coi0CLGujs2xu/Qbkw9UE2dEv+/PJ3sijA4zMujnYpA94 C/Qi0L88Rm11xa1onjEmb89MWuykXPSnNScoV0BYZI3Fi0c83r0O/e/wG9GXl9zzlxz461 VeBIyRWv22mIpdH0If5M47rou4/IgGI= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=YCrcYMBF; spf=pass (imf30.hostedemail.com: domain of 31ar4ZwoKCFQy3w92KGw972AA270.yA8749GJ-886Hwy6.AD2@flex--changyuanl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=31ar4ZwoKCFQy3w92KGw972AA270.yA8749GJ-886Hwy6.AD2@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349911; a=rsa-sha256; cv=none; b=VJNWnbs0eTF9yC7fa8o9TPhgcSwUEJrgtZw1ruCRIIeeWZNocDjGaKwsS389NoDwmWcqmP Q8Q6/DXgAaSrADbhLJBp/KEmmCKPwztj6+uRpEiU1pvR3z/eV5lI9USzU+p6dCNWuP0hZm Qoh0ABz9kNSMDZif/FucXmPeff/bLY8= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-223fd6e9408so17843765ad.1 for ; Thu, 10 Apr 2025 22:38:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349910; x=1744954710; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Lff/IlhssaSE8/N5WWt3O745ULQMov2cvh2wPJvEqbY=; b=YCrcYMBF+zFF25C2KMraE0CnBiYMxa58fsEOH/A56OGzaTxYRSFOZU+fwLtybmQiLv 8N4g0w/VJGTrYAwwm0XBlQTymEqLl6bF1jFfaB13qt6J9TpSuEluAybWBEeViwgQT6nH ELVz4tkxHZhHfcKaKZ9SftT5fNwRHB5pl5Jo3UQktV1Z4Cy7ltNW5K9YGiI37QPVhvvR TKrW1EeBRNsyAxxV3Xny9PahSQaTKe/0j3ubrF3hRBNBE0gX0fz41E+MFnbmFnLkTpZ3 62+83xum6ggif+/gORcGZpdUf+Qa1NiVT1OjrRSjPxZGj5eET3ZQAlJGag1G6+wkdFCn V39w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349910; x=1744954710; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Lff/IlhssaSE8/N5WWt3O745ULQMov2cvh2wPJvEqbY=; b=Nqf4f8gZx8VeS/w6Hdpt7kydGKyWpve0YV45lq5xZb//Wbi0X0oNKoGt504DH1zH2c eN4TgULUFXhor6vb3YIzdkGJAwOjTPBbwYHWTNSUODhOnvra4Ripyrl+7dP+2Y3Hudpl HRBznPLRtH+NXYwC3DEy6a11POnd7Knoc3cXygyl0F1pmosJw/LFnrEpNNjC+oAitBSm iGJ/yjp8Z1bG7EdEF/Kbf6SrRHhQATAqSj4QWafWrCYj3woTtdiXjk6z8OB5/sBVzf+s V/qvr7NP1tPODbp2G/Hfg9j8ohURNjOFyHmcv1nj7enEemBOjgz5/6/ZgQ3/Lat9pbSH c+tg== X-Forwarded-Encrypted: i=1; AJvYcCW0aOTrV1FZMFsUwQnuIEgpnSbBw/54YUSA+X0Qiv21ylf2jfZbVTi/u7eXSEhGm1pJInq6Bz3N1A==@kvack.org X-Gm-Message-State: AOJu0Yx1203wMu3xYFumUxK/0zdhe75EKK95M7lyj3OqX4FvZoeKzvMG edtz+XcWkI9UvzQlHtsIWozO2/rDXS7fgDAJ4xU9097hJqXXqmkOeCdSCtLktguQDrwgnMyPiIn i7AlxPOLcdL/dE3k7QQ== X-Google-Smtp-Source: AGHT+IEeiwtLzkCdqR92c0X+CgHOPc95gWH4nzUne44aCdHmdyons9NHHROp5P+cGzv44OjKXLvj1zX98VnQItkb X-Received: from plblc7.prod.google.com ([2002:a17:902:fa87:b0:21f:40e5:a651]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f54f:b0:220:ff82:1c60 with SMTP id d9443c01a7336-22b694abda1mr76874555ad.14.1744349909808; Thu, 10 Apr 2025 22:38:29 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:37 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-7-changyuanl@google.com> Subject: [PATCH v6 06/14] kexec: enable KHO support for memory preservation From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Jason Gunthorpe , Changyuan Lyu X-Rspamd-Queue-Id: ED13B80006 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: hu3si4rzb9m3mrwmm36csfmpphnn7tsz X-HE-Tag: 1744349910-895039 X-HE-Meta: U2FsdGVkX1/GL5q1z24zAB5oqjV6X+u1qaJBYlQdbD5nK8Ig/2S3Bz2sk/V0z4u67YzsuEHLW8lcbRm2EJcpxW05H9hR6GxSV7bAKaCJ6O2U83C8kJ5sBVkoPJqOcGwc977ITAvEvp+0uG4cqgd9boW8lA4ge5JAn6AaUe7b0TXZOOcOsupghv+etCMdNKVcXZ14zrYaSD/lSdmUCi284hyx2Zo1c58JA7GPki2a//MV/xlRfKmkNiC9MsS57YVfp2uJjPeRIRjqSeH6JVsMCHevw2TiFY8KMecDA4UqJ/LXnoqVzmrb2DlpzDRG9Yl0yIyZrI3WO5yCY3gX90Et0gxCUoK3eQivCZslUk5hXjX6u/J/12gMvwS2idyqU/BEOGtd88VgTHs17fd3sJonoJkoekRS1l/4R0rEaxw6RwnUcmGZAGaX4nDgIMjixOwh96DeacmmSsAlRZ1emcDtfcm3TyceXRvrQx0OCUn0vvSlhyrZBO4uBAnG97WVNpW3Bdo+qeYHLBZQ6oJo4KeToOxBFeB7zlkTTFreyebfLdiCjDhL0g9B6B2nrstYjBulDVBmVLNgkCqBojnJcY6iei55vjfLAz6esXMqR5jp1pbL2Dcg+0FbBrcUUYYKe8CDPpBPUFqukqthnj5QFOOLVmFuVkEXOJY+JJ5A4dibjUpvUPIHV01Nb98h3Nd1hms04bdzXmoJJ615NW+b3NJ5vs9jTrABStk2x7my/o/lPMYzGPtoTaWku1eB1PNah2QCFzWPDOWTdT0P5Uvu8PrHVKLoFVBW8HNC2B6GC0MDoj/ACqAOCV34cGHxqkA2GEXS+xofCwXn46Ldq4OIoqWSinGtHn69uBP/hWzlpwZszEiyuDWE6HY6QbREDOQuQUIYOnPgKCxUyPJtZjiuRJcpuSM3FcfgcWv52LehduwXsvEQfiVvbaBHk7EA1KkMWTakZ33uYmNR144+gccJJ4r an3ZHwBg 7Gi1alsT/UPMqH+YsFhK/R+tSxJ95wXgym93ZAciKcQo8lXlBG5Nlj1plNPoLQ3vMK3waJgyuRbLWYXzyzbgAccj1d8uHuVuyPxEbO59ExXtqpMsnePndddK8HoKipS1eHbk/5aAchoGcH46nz18gMvFpH1HsF3GY7MEh/GfashiowkJ7ioLgUV5bbg6iyHLvjmCBEVblzAyhnfh8Ks2yYVneCiA6r/IZs6Uw8aGUW8GHXv65oLC6xVQzif951PcZ0KY6sUbpMYoP8cdZulNkLEKe6nxVR3we9K2z 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: From: "Mike Rapoport (Microsoft)" Introduce APIs allowing KHO users to preserve memory across kexec and get access to that memory after boot of the kexeced kernel kho_preserve_folio() - record a folio to be preserved over kexec kho_restore_folio() - recreates the folio from the preserved memory kho_preserve_phys() - record physically contiguous range to be preserved over kexec. The memory preservations are tracked by two levels of xarrays to manage chunks of per-order 512 byte bitmaps. For instance if PAGE_SIZE = 4096, the entire 1G order of a 1TB x86 system would fit inside a single 512 byte bitmap. For order 0 allocations each bitmap will cover 16M of address space. Thus, for 16G of memory at most 512K of bitmap memory will be needed for order 0. At serialization time all bitmaps are recorded in a linked list of pages for the next kernel to process and the physical address of the list is recorded in KHO FDT. The next kernel then processes that list, reserves the memory ranges and later, when a user requests a folio or a physical range, KHO restores corresponding memory map entries. Suggested-by: Jason Gunthorpe Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- include/linux/kexec_handover.h | 39 ++++ kernel/kexec_handover.c | 401 +++++++++++++++++++++++++++++++++ 2 files changed, 440 insertions(+) diff --git a/include/linux/kexec_handover.h b/include/linux/kexec_handover.h index 2b77d4b9fbc3c..d96ba4fb27704 100644 --- a/include/linux/kexec_handover.h +++ b/include/linux/kexec_handover.h @@ -15,13 +15,35 @@ enum kho_event { KEXEC_KHO_ABORT = 1, }; +struct folio; struct notifier_block; +#define DECLARE_KHOSER_PTR(name, type) \ + union { \ + phys_addr_t phys; \ + type ptr; \ + } name +#define KHOSER_STORE_PTR(dest, val) \ + ({ \ + typeof(val) v = val; \ + typecheck(typeof((dest).ptr), v); \ + (dest).phys = virt_to_phys(v); \ + }) +#define KHOSER_LOAD_PTR(src) \ + ({ \ + typeof(src) s = src; \ + (typeof((s).ptr))((s).phys ? phys_to_virt((s).phys) : NULL); \ + }) + struct kho_serialization; #ifdef CONFIG_KEXEC_HANDOVER bool kho_is_enabled(void); +int kho_preserve_folio(struct kho_serialization *ser, struct folio *folio); +int kho_preserve_phys(struct kho_serialization *ser, phys_addr_t phys, + size_t size); +struct folio *kho_restore_folio(phys_addr_t phys); int kho_add_subtree(struct kho_serialization *ser, const char *name, void *fdt); int kho_retrieve_subtree(const char *name, phys_addr_t *phys); @@ -38,6 +60,23 @@ static inline bool kho_is_enabled(void) return false; } +static inline int kho_preserve_folio(struct kho_serialization *ser, + struct folio *folio) +{ + return -EOPNOTSUPP; +} + +static inline int kho_preserve_phys(struct kho_serialization *ser, + phys_addr_t phys, size_t size) +{ + return -EOPNOTSUPP; +} + +static inline struct folio *kho_restore_folio(phys_addr_t phys) +{ + return NULL; +} + static inline int kho_add_subtree(struct kho_serialization *ser, const char *name, void *fdt) { diff --git a/kernel/kexec_handover.c b/kernel/kexec_handover.c index a1e1cd0330143..a594da2a22912 100644 --- a/kernel/kexec_handover.c +++ b/kernel/kexec_handover.c @@ -9,6 +9,7 @@ #define pr_fmt(fmt) "KHO: " fmt #include +#include #include #include #include @@ -41,12 +42,369 @@ static int __init kho_parse_enable(char *p) } early_param("kho", kho_parse_enable); +/* + * Keep track of memory that is to be preserved across KHO. + * + * The serializing side uses two levels of xarrays to manage chunks of per-order + * 512 byte bitmaps. For instance if PAGE_SIZE = 4096, the entire 1G order of a + * 1TB system would fit inside a single 512 byte bitmap. For order 0 allocations + * each bitmap will cover 16M of address space. Thus, for 16G of memory at most + * 512K of bitmap memory will be needed for order 0. + * + * This approach is fully incremental, as the serialization progresses folios + * can continue be aggregated to the tracker. The final step, immediately prior + * to kexec would serialize the xarray information into a linked list for the + * successor kernel to parse. + */ + +#define PRESERVE_BITS (512 * 8) + +struct kho_mem_phys_bits { + DECLARE_BITMAP(preserve, PRESERVE_BITS); +}; + +struct kho_mem_phys { + /* + * Points to kho_mem_phys_bits, a sparse bitmap array. Each bit is sized + * to order. + */ + struct xarray phys_bits; +}; + +struct kho_mem_track { + /* Points to kho_mem_phys, each order gets its own bitmap tree */ + struct xarray orders; +}; + +struct khoser_mem_chunk; + struct kho_serialization { struct page *fdt; struct list_head fdt_list; struct dentry *sub_fdt_dir; + struct kho_mem_track track; + /* First chunk of serialized preserved memory map */ + struct khoser_mem_chunk *preserved_mem_map; +}; + +static void *xa_load_or_alloc(struct xarray *xa, unsigned long index, size_t sz) +{ + void *elm, *res; + + elm = xa_load(xa, index); + if (elm) + return elm; + + elm = kzalloc(sz, GFP_KERNEL); + if (!elm) + return ERR_PTR(-ENOMEM); + + res = xa_cmpxchg(xa, index, NULL, elm, GFP_KERNEL); + if (xa_is_err(res)) + res = ERR_PTR(xa_err(res)); + + if (res) { + kfree(elm); + return res; + } + + return elm; +} + +static void __kho_unpreserve(struct kho_mem_track *track, unsigned long pfn, + unsigned long end_pfn) +{ + struct kho_mem_phys_bits *bits; + struct kho_mem_phys *physxa; + + while (pfn < end_pfn) { + const unsigned int order = + min(count_trailing_zeros(pfn), ilog2(end_pfn - pfn)); + const unsigned long pfn_high = pfn >> order; + + physxa = xa_load(&track->orders, order); + if (!physxa) + continue; + + bits = xa_load(&physxa->phys_bits, pfn_high / PRESERVE_BITS); + if (!bits) + continue; + + clear_bit(pfn_high % PRESERVE_BITS, bits->preserve); + + pfn += 1 << order; + } +} + +static int __kho_preserve_order(struct kho_mem_track *track, unsigned long pfn, + unsigned int order) +{ + struct kho_mem_phys_bits *bits; + struct kho_mem_phys *physxa; + const unsigned long pfn_high = pfn >> order; + + might_sleep(); + + physxa = xa_load_or_alloc(&track->orders, order, sizeof(*physxa)); + if (IS_ERR(physxa)) + return PTR_ERR(physxa); + + bits = xa_load_or_alloc(&physxa->phys_bits, pfn_high / PRESERVE_BITS, + sizeof(*bits)); + if (IS_ERR(bits)) + return PTR_ERR(bits); + + set_bit(pfn_high % PRESERVE_BITS, bits->preserve); + + return 0; +} + +/** + * kho_preserve_folio - preserve a folio across kexec. + * @ser: serialization control object passed by KHO notifiers. + * @folio: folio to preserve. + * + * Instructs KHO to preserve the whole folio across kexec. The order + * will be preserved as well. + * + * Return: 0 on success, error code on failure + */ +int kho_preserve_folio(struct kho_serialization *ser, struct folio *folio) +{ + const unsigned long pfn = folio_pfn(folio); + const unsigned int order = folio_order(folio); + + return __kho_preserve_order(&ser->track, pfn, order); +} +EXPORT_SYMBOL_GPL(kho_preserve_folio); + +/** + * kho_preserve_phys - preserve a physically contiguous range across kexec. + * @ser: serialization control object passed by KHO notifiers. + * @phys: physical address of the range. + * @size: size of the range. + * + * Instructs KHO to preserve the memory range from @phys to @phys + @size + * across kexec. + * + * Return: 0 on success, error code on failure + */ +int kho_preserve_phys(struct kho_serialization *ser, phys_addr_t phys, + size_t size) +{ + unsigned long pfn = PHYS_PFN(phys); + unsigned long failed_pfn = 0; + const unsigned long start_pfn = pfn; + const unsigned long end_pfn = PHYS_PFN(phys + size); + int err = 0; + + if (!PAGE_ALIGNED(phys) || !PAGE_ALIGNED(size)) + return -EINVAL; + + while (pfn < end_pfn) { + const unsigned int order = + min(count_trailing_zeros(pfn), ilog2(end_pfn - pfn)); + + err = __kho_preserve_order(&ser->track, pfn, order); + if (err) { + failed_pfn = pfn; + break; + } + + pfn += 1 << order; + } + + if (err) + __kho_unpreserve(&ser->track, start_pfn, failed_pfn); + + return err; +} +EXPORT_SYMBOL_GPL(kho_preserve_phys); + +/* almost as free_reserved_page(), just don't free the page */ +static void kho_restore_page(struct page *page) +{ + ClearPageReserved(page); + init_page_count(page); + adjust_managed_page_count(page, 1); +} + +/** + * kho_restore_folio - recreates the folio from the preserved memory. + * @phys: physical address of the folio. + * + * Return: pointer to the struct folio on success, NULL on failure. + */ +struct folio *kho_restore_folio(phys_addr_t phys) +{ + struct page *page = pfn_to_online_page(PHYS_PFN(phys)); + unsigned long order; + + if (!page) + return NULL; + + order = page->private; + if (order) { + if (order > MAX_PAGE_ORDER) + return NULL; + + prep_compound_page(page, order); + } else { + kho_restore_page(page); + } + + return page_folio(page); +} +EXPORT_SYMBOL_GPL(kho_restore_folio); + +/* Serialize and deserialize struct kho_mem_phys across kexec + * + * Record all the bitmaps in a linked list of pages for the next kernel to + * process. Each chunk holds bitmaps of the same order and each block of bitmaps + * starts at a given physical address. This allows the bitmaps to be sparse. The + * xarray is used to store them in a tree while building up the data structure, + * but the KHO successor kernel only needs to process them once in order. + * + * All of this memory is normal kmalloc() memory and is not marked for + * preservation. The successor kernel will remain isolated to the scratch space + * until it completes processing this list. Once processed all the memory + * storing these ranges will be marked as free. + */ + +struct khoser_mem_bitmap_ptr { + phys_addr_t phys_start; + DECLARE_KHOSER_PTR(bitmap, struct kho_mem_phys_bits *); +}; + +struct khoser_mem_chunk_hdr { + DECLARE_KHOSER_PTR(next, struct khoser_mem_chunk *); + unsigned int order; + unsigned int num_elms; }; +#define KHOSER_BITMAP_SIZE \ + ((PAGE_SIZE - sizeof(struct khoser_mem_chunk_hdr)) / \ + sizeof(struct khoser_mem_bitmap_ptr)) + +struct khoser_mem_chunk { + struct khoser_mem_chunk_hdr hdr; + struct khoser_mem_bitmap_ptr bitmaps[KHOSER_BITMAP_SIZE]; +}; + +static_assert(sizeof(struct khoser_mem_chunk) == PAGE_SIZE); + +static struct khoser_mem_chunk *new_chunk(struct khoser_mem_chunk *cur_chunk, + unsigned long order) +{ + struct khoser_mem_chunk *chunk; + + chunk = kzalloc(PAGE_SIZE, GFP_KERNEL); + if (!chunk) + return NULL; + chunk->hdr.order = order; + if (cur_chunk) + KHOSER_STORE_PTR(cur_chunk->hdr.next, chunk); + return chunk; +} + +static void kho_mem_ser_free(struct khoser_mem_chunk *first_chunk) +{ + struct khoser_mem_chunk *chunk = first_chunk; + + while (chunk) { + struct khoser_mem_chunk *tmp = chunk; + + chunk = KHOSER_LOAD_PTR(chunk->hdr.next); + kfree(tmp); + } +} + +static int kho_mem_serialize(struct kho_serialization *ser) +{ + struct khoser_mem_chunk *first_chunk = NULL; + struct khoser_mem_chunk *chunk = NULL; + struct kho_mem_phys *physxa; + unsigned long order; + + xa_for_each(&ser->track.orders, order, physxa) { + struct kho_mem_phys_bits *bits; + unsigned long phys; + + chunk = new_chunk(chunk, order); + if (!chunk) + goto err_free; + + if (!first_chunk) + first_chunk = chunk; + + xa_for_each(&physxa->phys_bits, phys, bits) { + struct khoser_mem_bitmap_ptr *elm; + + if (chunk->hdr.num_elms == ARRAY_SIZE(chunk->bitmaps)) { + chunk = new_chunk(chunk, order); + if (!chunk) + goto err_free; + } + + elm = &chunk->bitmaps[chunk->hdr.num_elms]; + chunk->hdr.num_elms++; + elm->phys_start = (phys * PRESERVE_BITS) + << (order + PAGE_SHIFT); + KHOSER_STORE_PTR(elm->bitmap, bits); + } + } + + ser->preserved_mem_map = first_chunk; + + return 0; + +err_free: + kho_mem_ser_free(first_chunk); + return -ENOMEM; +} + +static void deserialize_bitmap(unsigned int order, + struct khoser_mem_bitmap_ptr *elm) +{ + struct kho_mem_phys_bits *bitmap = KHOSER_LOAD_PTR(elm->bitmap); + unsigned long bit; + + for_each_set_bit(bit, bitmap->preserve, PRESERVE_BITS) { + int sz = 1 << (order + PAGE_SHIFT); + phys_addr_t phys = + elm->phys_start + (bit << (order + PAGE_SHIFT)); + struct page *page = phys_to_page(phys); + + memblock_reserve(phys, sz); + memblock_reserved_mark_noinit(phys, sz); + page->private = order; + } +} + +static void __init kho_mem_deserialize(const void *fdt) +{ + struct khoser_mem_chunk *chunk; + const phys_addr_t *mem; + int len; + + mem = fdt_getprop(fdt, 0, PROP_PRESERVED_MEMORY_MAP, &len); + + if (!mem || len != sizeof(*mem)) { + pr_err("failed to get preserved memory bitmaps\n"); + return; + } + + chunk = *mem ? phys_to_virt(*mem) : NULL; + while (chunk) { + unsigned int i; + + for (i = 0; i != chunk->hdr.num_elms; i++) + deserialize_bitmap(chunk->hdr.order, + &chunk->bitmaps[i]); + chunk = KHOSER_LOAD_PTR(chunk->hdr.next); + } +} + /* * With KHO enabled, memory can become fragmented because KHO regions may * be anywhere in physical address space. The scratch regions give us a @@ -321,6 +679,9 @@ static struct kho_out kho_out = { .lock = __MUTEX_INITIALIZER(kho_out.lock), .ser = { .fdt_list = LIST_HEAD_INIT(kho_out.ser.fdt_list), + .track = { + .orders = XARRAY_INIT(kho_out.ser.track.orders, 0), + }, }, .finalized = false, }; @@ -363,6 +724,25 @@ static int kho_out_update_debugfs_fdt(void) static int kho_abort(void) { int err; + unsigned long order; + struct kho_mem_phys *physxa; + + xa_for_each(&kho_out.ser.track.orders, order, physxa) { + struct kho_mem_phys_bits *bits; + unsigned long phys; + + xa_for_each(&physxa->phys_bits, phys, bits) + kfree(bits); + + xa_destroy(&physxa->phys_bits); + kfree(physxa); + } + xa_destroy(&kho_out.ser.track.orders); + + if (kho_out.ser.preserved_mem_map) { + kho_mem_ser_free(kho_out.ser.preserved_mem_map); + kho_out.ser.preserved_mem_map = NULL; + } err = blocking_notifier_call_chain(&kho_out.chain_head, KEXEC_KHO_ABORT, NULL); @@ -377,12 +757,25 @@ static int kho_abort(void) static int kho_finalize(void) { int err = 0; + u64 *preserved_mem_map; void *fdt = page_to_virt(kho_out.ser.fdt); err |= fdt_create(fdt, PAGE_SIZE); err |= fdt_finish_reservemap(fdt); err |= fdt_begin_node(fdt, ""); err |= fdt_property_string(fdt, "compatible", KHO_FDT_COMPATIBLE); + /** + * Reserve the preserved-memory-map property in the root FDT, so + * that all property definitions will precede subnodes created by + * KHO callers. + */ + err |= fdt_property_placeholder(fdt, PROP_PRESERVED_MEMORY_MAP, + sizeof(*preserved_mem_map), + (void **)&preserved_mem_map); + if (err) + goto abort; + + err = kho_preserve_folio(&kho_out.ser, page_folio(kho_out.ser.fdt)); if (err) goto abort; @@ -392,6 +785,12 @@ static int kho_finalize(void) if (err) goto abort; + err = kho_mem_serialize(&kho_out.ser); + if (err) + goto abort; + + *preserved_mem_map = (u64)virt_to_phys(kho_out.ser.preserved_mem_map); + err |= fdt_end_node(fdt); err |= fdt_finish(fdt); @@ -697,6 +1096,8 @@ void __init kho_memory_init(void) if (kho_in.scratch_phys) { kho_scratch = phys_to_virt(kho_in.scratch_phys); kho_release_scratch(); + + kho_mem_deserialize(kho_get_fdt()); } else { kho_reserve_scratch(); } From patchwork Fri Apr 11 05:37:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047567 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 4FDF3C36010 for ; Fri, 11 Apr 2025 05:38:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D586D28015F; Fri, 11 Apr 2025 01:38:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CE38F28015B; Fri, 11 Apr 2025 01:38:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B092228015F; Fri, 11 Apr 2025 01:38:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 887B228015B for ; Fri, 11 Apr 2025 01:38:33 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 64039121DD9 for ; Fri, 11 Apr 2025 05:38:34 +0000 (UTC) X-FDA: 83320658148.08.D076DCC Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) by imf29.hostedemail.com (Postfix) with ESMTP id 95CC0120005 for ; Fri, 11 Apr 2025 05:38:32 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=iPzGkkG8; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 316r4ZwoKCFY05yB4MIyB94CC492.0CA96BIL-AA8Jy08.CF4@flex--changyuanl.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=316r4ZwoKCFY05yB4MIyB94CC492.0CA96BIL-AA8Jy08.CF4@flex--changyuanl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349912; a=rsa-sha256; cv=none; b=OiIB561HTRrOuyGCaOXgwFbLvrJRccJh8Vi1rjVUHJgBGAE9nQri/4737JavUKS0OwAnBr c7FvMaoNFrPLIzoIpUCy75hLL9L0pxmjUgnmQpkLTuHi015RkK3EZl2YZlqEhC5qxtSRdw odGfxFB1BhMhXBnYE4IyMVacGyqQWyE= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=iPzGkkG8; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf29.hostedemail.com: domain of 316r4ZwoKCFY05yB4MIyB94CC492.0CA96BIL-AA8Jy08.CF4@flex--changyuanl.bounces.google.com designates 209.85.215.202 as permitted sender) smtp.mailfrom=316r4ZwoKCFY05yB4MIyB94CC492.0CA96BIL-AA8Jy08.CF4@flex--changyuanl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349912; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NQ4ycF7gsLT06FnekoMeMnv8oicyD3TdT/CesWgek8A=; b=nKrynTaA7Fmut7Bh7qjZRZhjwh/hMxcZZFFNeujIXDq+XKk/dGwC0VA7pVEQ30CXICintI 8h3uK4zAR0HGvrMEqg8tGomjT6uZb3TyM7ze4rB/XbgG2G7TlBYunOJjQoUw8BZXhJcQEa 6pCt9bKqNn1rJbhpoGjCMRxz2EmxPGM= Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-af5310c1ac1so1094909a12.2 for ; Thu, 10 Apr 2025 22:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349911; x=1744954711; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NQ4ycF7gsLT06FnekoMeMnv8oicyD3TdT/CesWgek8A=; b=iPzGkkG8Zk+6XXHIvVK9Y1JtWF/jQVWxrTheCC8Yr/xlZrCRITFhMXJoBZxkCSuNtP A793aaRne1Yi0dt4B2xOBI9Jd+Es+r9UVHcMELL9kgvS+SKBDVpOGy8AOlRjQBtlYA3q oP7vuxx8Vn5eoKiM7Rkh/XMyPVQ4W5Bg00z/trhfeq1p4DhCp5bbCy38aaxZQXmVI/aR 4WSTJpACE0d6RAkq1WFYa9qHFl4SGdvGw1VYbWeTFO7SuZAztvgXKrcF6Cj7gkIld7zT kQ8oROrUm6AN8OEkVF5ar3iyh3cB4kev3tRrFf18XmijJNV/fIwwFStQlqsT3ckvY4Zc hmrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349911; x=1744954711; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NQ4ycF7gsLT06FnekoMeMnv8oicyD3TdT/CesWgek8A=; b=wfnWJlvaZIY6NNcoimnK8Wg8ZA56luDiu4KqZTsAFejXPxnAqvD9M/ckTBHgLbfG3k W7w7QUNyggn/FlHlqt4ioY0y8MIKQXSEG01qwJ4BIEn1gRuWtlbWdX14NCimu74iXJ7l Hh/R93R50aqPj/MqdK6ZRBNocMaxUWRASYnFfncktzvpLfgOFEorckctwcnR5VbTeY54 ifeQpMPJy89voDOVvvwOUZZo2oN/FvS/EyRU00BW5s/LemffMvEoNoCkgqXtXwRDCOhh NjnKwRXbmaovfr0VcacCuZpE6f/8QQW/FWvqs103T1ZTfoOK4DMXj7WzBh0iI2ajbW5L 1e1g== X-Forwarded-Encrypted: i=1; AJvYcCWpisfGx1RekMBN3XERE871z0iZpitY3Y0UG8Baaj58g6t59oKqQF3s6EUqBXXw3NJfcZwMwQI+1g==@kvack.org X-Gm-Message-State: AOJu0YxJ+SZ1S/MHYvL3Q0/FydPclYL0wBe0weE4XHUEMlkRmVPWLz8K 2kVKX+5jjtxsccC96pdwdszQCVj0V/+UM3Vb9OUxlUrqL72pbiyJapIkGHJGECCp3O+bGQkXCjO 4k/3FpYrjhfg2aOdiIg== X-Google-Smtp-Source: AGHT+IFmHMamHSCxGJ9jONFAPmV1A91iPoS28bApZs3vQoT8HryanIff8vx754Cryl7fBwGV08e16HC+nkdncy1g X-Received: from plcc1.prod.google.com ([2002:a17:902:c1c1:b0:220:da6b:5d08]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f705:b0:220:e9ac:e746 with SMTP id d9443c01a7336-22bea4fdc7amr25793305ad.53.1744349911576; Thu, 10 Apr 2025 22:38:31 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:38 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-8-changyuanl@google.com> Subject: [PATCH v6 07/14] kexec: add KHO support to kexec file loads From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 95CC0120005 X-Stat-Signature: afwtws4jmyffi694rc85nehz8qpy4ber X-HE-Tag: 1744349912-484689 X-HE-Meta: U2FsdGVkX1+RXbwvDZO1+Fu0qd1tvmIDRwADzfzNI0JSq/YJCV3+PBdwg7OL26ZAEJuyqaahCgdtAhe09X1ylAEPqCd+tCf0zfa4Vthc5aK5suGpopHdHj65rqkiv5arqcbihcJuPqXekIRwLpvxkNeRVayI+dZBXiqs/DrTUUAFnmNga6nrgWSgmg20C+FCLeNH4YFsoE0d/IJsz4JYRp7sU0dXC6EX2grmi/zpaOCCou0hRhPc4G/JSJzBWswO4dBkVknVMU4+XLIkmyZP7R4rbXFu2jYriIX6tDgSNmsCi87yFtgC+KnyFEuWpup36HRyCwt1jrCQ1G5Q6pQ0FsvUl0XHpACYeo3r28vbnK8EuGC3pJSXOnC1or5AWeUCmi6Nv7i+PCJSwMQL+cK8/mtW4d05a5DGj313tkncxvAXLpI+9uB0VCIsLOtZOHHAFV3b+nD+hpMHXfGYlKmizDt5tLChJNF7hNHbHY+XVCcwrrrtcy9KeBUu+fCpu0SQKJJwKwjDQNsdugRm0QDkSsz0fptJzYYmaH9iCqQ9IAtq9qQiKMC6s75xWX/xcElWBTRUt/sdln4WrAiv4cFrY/spNeyY4PLlV9WX6b/oF+weDesvp0IWrDuxHIqvD7tnxoldHNAn+gyzQpKv2GVsj/ukuNceQkEcbgc7SmocCsxquvaSOK8HaS0hD5p4aaotIrUNSe+sSt0i976Ht6vZGWpJtLSmLSnewBEzkPJOWOhsYXqz5T5vfsA2sqPRn7MbLpD17e1bazBJK1owxMVnxD50SD8pOCjqkcGcYn5DyYPBXgGq9AJUBijFmS+A7ZZW0MNWL3vOz7d4qQjb4o5hpHkBlRVccWClkxL5TlQppU3FbTYqkmmCAznhPCscyf7jWPOsBi/A2tJsNt458CxPvsLs0Ke3hUWMrc2PzTq0Ft9m10Xi8wSR6s868wSkOVa8GYTF9s5fqIBBg8QlHAE DSfanj84 aK6T2/9freFmVlwupgGAqNJbSj90xDRAUXiSB3LLFsZNEo7yeScI+pZ9Gl8hrDjvM+MyHEC9MVrxwnHnKuWs99S77l04sunXS/EZXx4Pjh9IIZtgz0oleK5jR9dt32yKgZKgci8x9MWqmknhH+7oS2N/7x+T55Hw7zPe75ovY4WTKT+tHt8TDUMYu1LELykHgUH1s60TmANcQzVZXT5DwfILd1DxzaTCQumwtsbkvyF8IzVkmhvcJQy6FQOgBBm1uIa3O56upu7rWuT1opxjRykvb2X1JNXxLsYzYgbZKDPKh3EtzCBn1P5QoJSX+AgtQG/K3y2xM7m8ycMRDB2NkMdGdYrjVfuTjVk4gF5K0mT8wt9oZ6S5JdItvZeKZCM3j50tcQVuAQ5SFYMXQx7gUF6VYCq7o6/oZeMjT7sqwj3flC5toEDChGULp6BadibD78wLru3VrtOKHr9JIs+KK+4JwsleKw9zTxKaN3P2gnQCqHRIWhtThD+/6xiD1xBWAP+a8Oyg7rSoFyWOwntbwIAo5XS2/HIFPukAvym7Rlbi0pe5exqgunXEFXJLF52pIPlmnClBZ2D722kENnJQXeah0ztvkOVw7xTBRlVyFKG/5yEbQ9a/QUHAVXQ== 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: From: Alexander Graf Kexec has 2 modes: A user space driven mode and a kernel driven mode. For the kernel driven mode, kernel code determines the physical addresses of all target buffers that the payload gets copied into. With KHO, we can only safely copy payloads into the "scratch area". Teach the kexec file loader about it, so it only allocates for that area. In addition, enlighten it with support to ask the KHO subsystem for its respective payloads to copy into target memory. Also teach the KHO subsystem how to fill the images for file loads. Signed-off-by: Alexander Graf Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- include/linux/kexec.h | 7 +++++ kernel/kexec_file.c | 13 ++++++++ kernel/kexec_handover.c | 67 +++++++++++++++++++++++++++++++++++++++++ kernel/kexec_internal.h | 16 ++++++++++ 4 files changed, 103 insertions(+) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index c8971861521a5..d3cad108b8076 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -371,6 +371,13 @@ struct kimage { size_t ima_buffer_size; #endif +#ifdef CONFIG_KEXEC_HANDOVER + struct { + struct kexec_segment *scratch; + phys_addr_t fdt; + } kho; +#endif + /* Core ELF header buffer */ void *elf_headers; unsigned long elf_headers_sz; diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index fba686487e3b5..77758c5331229 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -253,6 +253,11 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd, /* IMA needs to pass the measurement list to the next kernel. */ ima_add_kexec_buffer(image); + /* If KHO is active, add its images to the list */ + ret = kho_fill_kimage(image); + if (ret) + goto out; + /* Call image load handler */ ldata = kexec_image_load_default(image); @@ -648,6 +653,14 @@ int kexec_locate_mem_hole(struct kexec_buf *kbuf) if (kbuf->mem != KEXEC_BUF_MEM_UNKNOWN) return 0; + /* + * If KHO is active, only use KHO scratch memory. All other memory + * could potentially be handed over. + */ + ret = kho_locate_mem_hole(kbuf, locate_mem_hole_callback); + if (ret <= 0) + return ret; + if (!IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK)) ret = kexec_walk_resources(kbuf, locate_mem_hole_callback); else diff --git a/kernel/kexec_handover.c b/kernel/kexec_handover.c index a594da2a22912..4bbc6f5ef7230 100644 --- a/kernel/kexec_handover.c +++ b/kernel/kexec_handover.c @@ -23,6 +23,7 @@ * internal APIs. */ #include "../mm/internal.h" +#include "kexec_internal.h" #define KHO_FDT_COMPATIBLE "kho-v1" #define PROP_PRESERVED_MEMORY_MAP "preserved-memory-map" @@ -1184,3 +1185,69 @@ void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len, if (err) pr_warn("disabling KHO revival: %d\n", err); } + +/* Helper functions for kexec_file_load */ + +int kho_fill_kimage(struct kimage *image) +{ + ssize_t scratch_size; + int err = 0; + struct kexec_buf scratch; + + if (!kho_enable) + return 0; + + image->kho.fdt = page_to_phys(kho_out.ser.fdt); + + scratch_size = sizeof(*kho_scratch) * kho_scratch_cnt; + scratch = (struct kexec_buf){ + .image = image, + .buffer = kho_scratch, + .bufsz = scratch_size, + .mem = KEXEC_BUF_MEM_UNKNOWN, + .memsz = scratch_size, + .buf_align = SZ_64K, /* Makes it easier to map */ + .buf_max = ULONG_MAX, + .top_down = true, + }; + err = kexec_add_buffer(&scratch); + if (err) + return err; + image->kho.scratch = &image->segment[image->nr_segments - 1]; + + return 0; +} + +static int kho_walk_scratch(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)) +{ + int ret = 0; + int i; + + for (i = 0; i < kho_scratch_cnt; i++) { + struct resource res = { + .start = kho_scratch[i].addr, + .end = kho_scratch[i].addr + kho_scratch[i].size - 1, + }; + + /* Try to fit the kimage into our KHO scratch region */ + ret = func(&res, kbuf); + if (ret) + break; + } + + return ret; +} + +int kho_locate_mem_hole(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)) +{ + int ret; + + if (!kho_enable || kbuf->image->type == KEXEC_TYPE_CRASH) + return 1; + + ret = kho_walk_scratch(kbuf, func); + + return ret == 1 ? 0 : -EADDRNOTAVAIL; +} diff --git a/kernel/kexec_internal.h b/kernel/kexec_internal.h index d35d9792402d1..30a733a55a67b 100644 --- a/kernel/kexec_internal.h +++ b/kernel/kexec_internal.h @@ -39,4 +39,20 @@ extern size_t kexec_purgatory_size; #else /* CONFIG_KEXEC_FILE */ static inline void kimage_file_post_load_cleanup(struct kimage *image) { } #endif /* CONFIG_KEXEC_FILE */ + +struct kexec_buf; + +#ifdef CONFIG_KEXEC_HANDOVER +int kho_locate_mem_hole(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)); +int kho_fill_kimage(struct kimage *image); +#else +static inline int kho_locate_mem_hole(struct kexec_buf *kbuf, + int (*func)(struct resource *, void *)) +{ + return 1; +} + +static inline int kho_fill_kimage(struct kimage *image) { return 0; } +#endif /* CONFIG_KEXEC_HANDOVER */ #endif /* LINUX_KEXEC_INTERNAL_H */ From patchwork Fri Apr 11 05:37:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047568 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 5C339C369A2 for ; Fri, 11 Apr 2025 05:38:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B866D280160; Fri, 11 Apr 2025 01:38:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B360228015B; Fri, 11 Apr 2025 01:38:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C089280160; Fri, 11 Apr 2025 01:38:35 -0400 (EDT) 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 6CCC228015B for ; Fri, 11 Apr 2025 01:38:35 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4E7B3161D83 for ; Fri, 11 Apr 2025 05:38:36 +0000 (UTC) X-FDA: 83320658232.06.EFC0107 Received: from mail-oa1-f74.google.com (mail-oa1-f74.google.com [209.85.160.74]) by imf03.hostedemail.com (Postfix) with ESMTP id 8A7EE20009 for ; Fri, 11 Apr 2025 05:38:34 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=W0CTUNbS; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 32ar4ZwoKCFg270D6OK0DB6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--changyuanl.bounces.google.com designates 209.85.160.74 as permitted sender) smtp.mailfrom=32ar4ZwoKCFg270D6OK0DB6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--changyuanl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349914; a=rsa-sha256; cv=none; b=SoK8yCLruU0S6u/Ol8Ce6vhZbzu6EItTtZpAOxmGMwsaQA1gHms4qYK8BRbBV5FIbfDGoQ aUs+akIx1aj66uU96wR+a3QsSxVhAU9d8krLnGTuUve7Tcb+vRjsm3tRUqvz/czsB315K0 CBIMc+ZWu0RvinKew4V2KF0fNPdGhcY= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=W0CTUNbS; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf03.hostedemail.com: domain of 32ar4ZwoKCFg270D6OK0DB6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--changyuanl.bounces.google.com designates 209.85.160.74 as permitted sender) smtp.mailfrom=32ar4ZwoKCFg270D6OK0DB6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--changyuanl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349914; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=R+F5ZVtp8VQ2jTtukTzm1g0sjnjetiGa2oNQPDhGJdk=; b=RsaEdKiZmd7KpC1JNa1DrYuLMEK73H3P7YCRrbUugNKQyyC0CktyMY9HLW56QghNAWk2MT P2Ks1acaSjJ29nRUzkorEvabKYDNu338SAtUYU4+cUwm+o75vGQANr4NYNDMgjZsH/Z5EL 7jNbqbwj2wSSbDnN4VdzrUxyVjjfTnw= Received: by mail-oa1-f74.google.com with SMTP id 586e51a60fabf-2c81fffd501so543651fac.2 for ; Thu, 10 Apr 2025 22:38:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349913; x=1744954713; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=R+F5ZVtp8VQ2jTtukTzm1g0sjnjetiGa2oNQPDhGJdk=; b=W0CTUNbSZtV+ZyiQF+tXV58EcomRoDuwE6MF/LSkR0LsU9kRV7oKqob9L0rRtjaJxd otTJO+8/6EluDYrVEtUcvPDNc7dh8/KSTavh6VagmDLH3j+gg+59mBU1tG3y2HjCfe1b kYZk/CZ0e3OpwQK1duD1fBpcfoHoFjHbs1Wlz29mk++u4JwBqeWtde1gVIRvAjZDshmI S6FL2ePE1AtvrwtE9xaSMAxRJVRAjOLVeSWJLSjQ2GcasFTQ3yFX4DuAL5C/euFbz2tr 8NXReE/fRRJ7jUR1yD7YUmh8IW6jd3Xmtu0H8WlL7JxbJU06uYMch84uzy9159HMKun9 SkqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349913; x=1744954713; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=R+F5ZVtp8VQ2jTtukTzm1g0sjnjetiGa2oNQPDhGJdk=; b=aWIbdBnnycbl/xZYYeAFkkaymeSswhGtQPTuDxUx53TdHyS2j01I7TFzOMueleT2fv FtNt/UgzYOm2yDtny3TXQo6mpmLigilOzsi83aGPsztoQV4IGWmzjpKx1gBTkWoYxUZF Now6F8G4OmokWgD2s+I0Mi7VAdAS+lx6twTMXNdPhVgGn3pdWtwjPcjnHePmWhdRm+Nn GudBKoIEVx0V03hzAmxpaItFCfm64p1QkcOhXCardXsoxJlXgsSHXGLuaq1dsjAgcnqK vgCmhtMUUW+vxDNHGz482Q65i4xb2/7n2IKuSzoa1hKTivdx63QOEdxHaFp96QTz+wBv 2heA== X-Forwarded-Encrypted: i=1; AJvYcCV1pIEHJc6+8R2Z6JQZp4hTVGNqFjXTrYMKHnAddm2vQFxX8eETrFLcP3pjZ1UFBV40IykEJX5E4w==@kvack.org X-Gm-Message-State: AOJu0YxoyT0bO9vDBzaepjVaynW/yDwgWyKbFYGUhndIMGLZDfmlPJhm TLmfhiydLI53Hu8CGNazFaETaXeqEKJPyWLdYHTe6fJGOO41Yj2UI17tT8JNcIr8XfhdzMPngB1 QkD6Ny2Bt4YWTDmUTig== X-Google-Smtp-Source: AGHT+IEjpGd8eC8T8F34QaHuVI3jNyHvNCtvTu5MIil37ui6UPNb1k9rZZ5tsoZfvaAkADx2c261Byn0pKs5T0Sn X-Received: from oabwh16.prod.google.com ([2002:a05:6871:a690:b0:2c2:13d6:cf76]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6871:7a8b:b0:2c1:650b:fc86 with SMTP id 586e51a60fabf-2d0d5c2ef03mr764210fac.1.1744349913649; Thu, 10 Apr 2025 22:38:33 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:39 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-9-changyuanl@google.com> Subject: [PATCH v6 08/14] kexec: add config option for KHO From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 8A7EE20009 X-Stat-Signature: nt3ywbf6pr5kmic9wccbfh3wiu4akizk X-Rspam-User: X-HE-Tag: 1744349914-599826 X-HE-Meta: U2FsdGVkX19Vbi71zu/RO0g7/W2yqOcp6BRG2xceuEWmHcpAeIhb5dbsUhGAieldnz4s5svJQVGCPx14q4coaioqfCRavMyQWCOA5koNJ+T1ZWWj/RmGr4b5IJQ2KXJsCm5JPh+aqmXOuSf48g5YhKBPvAWMoXDKOEqmTQ9r5CfypYrd88hw9l5wtysvgDhXCz/luWNfqLCAyaAu268PtCbje0ruqTxQJ/PxZTgHdVbAQB6o5ZXUXJ4ympeb58aYd9XLD8p4Op5zyhDQgLMDSXWpFOjrg1hlhvkXaOoG73D4CHU7pskc8ugyblQpmenviaL/6K38UN7Tcq9sWeFOTHWo7SqekzUJ8mNqA/9NSAm4ZfiTnHxrYE9ekJoZMTZ68U9meRg9J+m62eMjPxGLsQA9/khcetcKvIoMsr/W+CHkO6HIv98ydTvumQdrDXBj/mpqn17+O8NZTcXhM7/jzFxxjgC+HRdKhX997kOxKhy4suHGi+mhvzOwdh1Q4ANNZ2Q/aGlEPRXURHD2DTmmCoUHINIwaPud311SI0OB5e/XJvgxl1Qa2x5unZKDDk3PJQm9h8AGcamQPT8MK5MbidmY3xaOCuI5O4o7ZKMsQgtKZ4vdcISUQDkmEwMQBeCm7znorWUdA9Eju1U6Ygemmr0/dmZIz8g7LBsc0iYUgdKSEkm2M6EH6h77tx1pMihqskYB8Go/TAM0Exarq+bFh8y0CLXSMShUmRzGaSTB00LrzoSM+Tgd2MjfNL60ITmB1KwYtiVqQUBmQ/jWDyt9676smmhBTruUqtg6L42rkrjUHx18FXQJbMfLaPf/cLxbQQrxfsapg2as3KXFZxg6/Ao9AsOn/CSxDzCKg/OIX1CSItoKMnIGM0M+LACPLPQ3u3HB2xrqLqzCnqgELNZgCkiDOGDDAqnjsDufsgMwGIASg8XB42uHZ7kCFEa4BbtqRO5JeAiUVSMVWgykgOP YaSkHG0i vJcB7xpCVmFWfP9fsphd+SnQTI63FqWERIm8v80YU1LdOw5koF8XCuKscadvHS+WooW05mFxUOvC1WMiLTW0TFidFQRsrXdSdGFbXlQCTU4sy+UuOdzCEGZ0M7mvTVaflzYX04A2sLTm+IlpcgiTXpmThXH5UDpuWxpjXcBVje22Rlegrs6dCoSZzQ554gFZjQeQmZva731KiFZU40BlHng9ieC0p6oNiWISVY0N4HppZGkk2r9d1k/brqrBF2ByTLnTNxW/XwcObqPghD/Qs9a8E5//auD9AAO/QGmCWqjhLYPFrb9kiKJLKxp30q4nwAvJPP3IhAepdQoE8yVDCvHPxid+HvQiiFGo15aqPvc2eLvdM8jvt+2RH4MM/Rw7ltXMY5TXLYyYehfUmfOgqyGhZE11T4Ku+V8F97f296IgHjnHeL1t6z5qlpBcWJxVc3cJ8lhIaOynZcvbCWKYBxQfvMC6e3g1DbGs97Q95jaEt0T9irltOr+aLJn8QTbnk1PkvJXQgxBb2vX6dEio22mVWSBIPIAeBPw+NCfeNQjEIHwqj6wJdGVEKY8i9NwzkgBlIq6k/j7yBJMjmCtKtOV9W65V+bRtn3JiE8Y4SS1LbPWRHSbXUAMmAcA== 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: From: Alexander Graf We have all generic code in place now to support Kexec with KHO. This patch adds a config option that depends on architecture support to enable KHO support. Signed-off-by: Alexander Graf Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Signed-off-by: Changyuan Lyu --- kernel/Kconfig.kexec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/kernel/Kconfig.kexec b/kernel/Kconfig.kexec index 4d111f8719516..4fa212909d699 100644 --- a/kernel/Kconfig.kexec +++ b/kernel/Kconfig.kexec @@ -95,6 +95,20 @@ config KEXEC_JUMP Jump between original kernel and kexeced kernel and invoke code in physical address mode via KEXEC +config KEXEC_HANDOVER + bool "kexec handover" + depends on ARCH_SUPPORTS_KEXEC_HANDOVER && ARCH_SUPPORTS_KEXEC_FILE + select MEMBLOCK_KHO_SCRATCH + select KEXEC_FILE + select DEBUG_FS + select LIBFDT + select CMA + help + Allow kexec to hand over state across kernels by generating and + passing additional metadata to the target kernel. This is useful + to keep data or state alive across the kexec. For this to work, + both source and target kernels need to have this option enabled. + config CRASH_DUMP bool "kernel crash dumps" default ARCH_DEFAULT_CRASH_DUMP From patchwork Fri Apr 11 05:37:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047569 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 ADC36C369A2 for ; Fri, 11 Apr 2025 05:38:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DDEDC280161; Fri, 11 Apr 2025 01:38:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D5C2C28015B; Fri, 11 Apr 2025 01:38:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B8768280161; Fri, 11 Apr 2025 01:38:37 -0400 (EDT) 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 9814128015B for ; Fri, 11 Apr 2025 01:38:37 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 81EFABC274 for ; Fri, 11 Apr 2025 05:38:38 +0000 (UTC) X-FDA: 83320658316.23.55549AB Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf22.hostedemail.com (Postfix) with ESMTP id DF078C0009 for ; Fri, 11 Apr 2025 05:38:36 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ErTMKEuf; spf=pass (imf22.hostedemail.com: domain of 326r4ZwoKCFo492F8QM2FD8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--changyuanl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=326r4ZwoKCFo492F8QM2FD8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349916; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=XwVp4OOgPlRngbn5ra+015ZDy9PB79QtA1kcHgCX6xE=; b=agn2YrTU44IZQzGIYjadcLhg4tb201qVBLs6Ocfe1X087izKfTa6SwCTfQMmWwtN5TnjsC lpgfeBUPp0i0zw8YZ059yz2K/jRpazuYrHabEFQF5y+kRNMbIOAgIj98XZdHkEh6NdWe9k orRFTqAjYk98PNoihWOBMWpkR5mgjaw= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ErTMKEuf; spf=pass (imf22.hostedemail.com: domain of 326r4ZwoKCFo492F8QM2FD8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--changyuanl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=326r4ZwoKCFo492F8QM2FD8GG8D6.4GEDAFMP-EECN24C.GJ8@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349916; a=rsa-sha256; cv=none; b=RotHVPxLjhUZQMaP5zM65wLznCErMUoWFq631/U2Vj7hAcsmFVWVImfPQxV7FthSCwCEfg dfL8nkHboSNackVjOVW//86v2Fsi8+8U5D35nrluDU0qv+pST2C3Z/1KR+xyuoFsbIslPQ a3wZIAjbSOxbe0rJg4ebbw3CljhtZaQ= Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-225974c6272so13492735ad.1 for ; Thu, 10 Apr 2025 22:38:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349916; x=1744954716; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=XwVp4OOgPlRngbn5ra+015ZDy9PB79QtA1kcHgCX6xE=; b=ErTMKEufisQx7SSfC6LjZZhvn71KNEAjKwDlckz64lr8TMgllIL3eBYyHS1DmAfGF8 1WfzIxd2MG1ye5PkZPut+6wfydm6DA1OaJVJssdayV5jjlVZyxR4H/ijrhJ2w1B3z2su iZOowC0N/4rbJ3oX+mpMQQRP7uJng3TaCS0bQXYFkHZQnBr9Z135BcBn5JOZP6JSaDIA FbLbEbvuQE77uSFBQa0GZrMagiVLvFoM/yIBlmC3B5dGj+HtE8qaBF8Hi2DW5HiOvqVh jTOEhL4NzfF2wi5iNqDF9RWF9tMT4EQGo1P1/gXzJUVMmKEF5KzMrDHGQyAvpXCQ56Fv BmZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349916; x=1744954716; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XwVp4OOgPlRngbn5ra+015ZDy9PB79QtA1kcHgCX6xE=; b=Lfd5Sj7tGMzAOHaTqekHRl9Rot2s2Ml2WrPI3WCKo8sgfxAM09miALM1dj74xnpmB5 EwXvdVIr93YAtV7EVH2oV6j4CF/a7AgAAgO8A0uovegGnDpJx4iitOpRr5XaYrjquhat NZtz9yB4HoHTRKac77OTFkRQBNPV7w2LiQ6wcKkLMLeILO5y3yYvZAV2reqKEDnFh9FQ /T83rOg+dIUZUuTEAUayf+0PixB81ewhs9eBgxsXuFl9tCO9ZDHNDKfHdFNoXIiNBkc1 9j1sRCi/PnCainNgErCSnaqXa+I6GuQtrAW+pjLY4lSY3dV1b4+Hq+YW++4aTvQX9eDk L0sQ== X-Forwarded-Encrypted: i=1; AJvYcCVe9TRUfwl0UEiLzZJsFi27OuxL9BiXmNn1NiIMp89sAVIu1YR70oRAmzuvNoiyBQApipRUOuTduQ==@kvack.org X-Gm-Message-State: AOJu0Yy/eo0A7ddUse9FW9dj9W2qBlABcvq/XAkVF6gafb14nIVnR8jS 8YPOKqDC4ViX4nwELffRmEFOoUTCPP4EpEU1J0MD/wwXNT7b3Jwm5ThsNEzA9KRRU9EJg7E59hZ jklFBHPTG+mtogEWYMQ== X-Google-Smtp-Source: AGHT+IHxdPnuc2TYfLwCd9IDe8ouX7KQHFzd57k3DfleSG8BDX2oEcNCF76lTSltuytpC8emM71yRGFfu+F93+HC X-Received: from plgf6.prod.google.com ([2002:a17:902:ce86:b0:223:fb3a:ac08]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ebcb:b0:21a:7e04:7021 with SMTP id d9443c01a7336-22bea0c6794mr26802705ad.24.1744349915769; Thu, 10 Apr 2025 22:38:35 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:40 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-10-changyuanl@google.com> Subject: [PATCH v6 09/14] arm64: add KHO support From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Queue-Id: DF078C0009 X-Stat-Signature: kjrn5fnt66hoeswkarpbmyes5opu6btb X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1744349916-891163 X-HE-Meta: U2FsdGVkX18ly1w4+RtgKtoq+T1Dubdf+ZnKOxsNSt/p8PRJEQ10N0eO3bpm97PZtW9hkPOhNyiE4TTpOG4uHDnLQ5/OVhaSPgwseZEAP4YEJoOyZzJ1XpOHA4aOWJm5ZBfn7ObgLWP81Sn5vzEIvxxSfr7ZJov1F28JxGPRrfzepvz4aQ7FfD5TYby8CVaGAYlK2+LajvWWPxRqH4TlfR1Lx602tAyhaDYyYS2g3bTIjG6GtOHRoFGx4XctTwqrP2CM0Tiq4ckB8Egq5mBmk+6hf2euSryMt2YN6AYLUVVtVgFyGjBNcIyGkqimP0LY/8mhGB39/4YavaBpBIu/oygLDCvBktETHLasH4YJxJhjJ4NA1B3D4nXunx7ehBSSCI06eApqI8AuuwmSWWrNFvbk8Fw1pUcP5L6YAq6CxcVswUuAwT1F0Md5X+as3ujm9DNtfiAhj4NWL7xa2YPn5+2+1GJcqiJDSgmHJcdjwTxpZhbuxI37hBYXcCtmtJLs9w/FoyPSPvu4jaIW3PPRgjtqOpm6o8dLtswjSJv9ETCH40IDDut9c3Qep8FfRIQiJj5oOJe6XiuS9vWhwnlo63aXoidZgN8D0Oy2+V1bhucbFRdAJAvqXgl5c/o3Cvy8M3/v76h6p01Tx8WdYq8bxg70OfgG4QzYINFm+kClwVIo8kDyShm39Tq8keyXzh16C2s5QmZjLI7Qj3LamILg+HSQLC0qgCD0Ro1MVaurYzy8TcgVB0JLzyIM4Rn5fOZzoQudsR99C6oxNPsChTJqqsaUCekPdl0cADF+vOtRK0ip5Zwkua63DJgfZXIc7/FgDkvlVmSiKWV/BUIhGMEAc2/dbFUlE5ztnXaVwBinmeejgeR2nK20Oev2uHNwMeJvIIW71jnrHZvdlfGYzFPTXO1IUfNdmoPsmhI3dWjJb57w1ACCzhjAm4sqM5Bo6nogohb/hNj9Zf5R0jrQyKu 04D8X7Xs VKxE7YB+Vv5t4dI34hLnD3TLUWTRk0/vjpUms+M8INq2qR7GpOWpQq5N1V4bPDcmKiG8cIL+dZ2MJXuodJOnZQmDkewiBHEdpKlX0oj7+nwpTVMTeFTTLa/Iwylv6cpGKuY1ABXWqY4rS6sf8XBx9NihtbSNK1RY+LsDnC5QLrXrogl6ejRcuebvPhMDYG4PnriTi7guqscwluZApGJI3/xONJvIAnzQBk5CWsdK2sVj0FFCtmMOv34N7/11qNWsvwhdS2bBi908SHiF6vKtD6Aj9WhrVEbokfoJw 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: From: Alexander Graf We now have all bits in place to support KHO kexecs. Add 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. Changes to the "chosen" node have been sent to https://github.com/devicetree-org/dt-schema/pull/158. Signed-off-by: Alexander Graf Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- arch/arm64/Kconfig | 3 +++ drivers/of/fdt.c | 34 ++++++++++++++++++++++++++++++++++ drivers/of/kexec.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a182295e6f08b..34c79f4fee3f9 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1602,6 +1602,9 @@ config ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG config ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG def_bool y +config ARCH_SUPPORTS_KEXEC_HANDOVER + def_bool y + config ARCH_SUPPORTS_CRASH_DUMP def_bool y diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index aedd0e2dcd890..0edd639898a63 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -25,6 +25,7 @@ #include #include #include +#include #include /* for COMMAND_LINE_SIZE */ #include @@ -875,6 +876,36 @@ 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 fdt_start, fdt_size, scratch_start, scratch_size; + const __be32 *p; + int l; + + if (!IS_ENABLED(CONFIG_KEXEC_HANDOVER) || (long)node < 0) + return; + + p = of_get_flat_dt_prop(node, "linux,kho-fdt", &l); + if (l != (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32)) + return; + + fdt_start = dt_mem_next_cell(dt_root_addr_cells, &p); + fdt_size = 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); + + kho_populate(fdt_start, fdt_size, scratch_start, scratch_size); +} + #ifdef CONFIG_SERIAL_EARLYCON int __init early_init_dt_scan_chosen_stdout(void) @@ -1169,6 +1200,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 *dt_virt, phys_addr_t dt_phys) diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c index 5b924597a4deb..1ee2d31816aeb 100644 --- a/drivers/of/kexec.c +++ b/drivers/of/kexec.c @@ -264,6 +264,43 @@ 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) +{ + int ret = 0; +#ifdef CONFIG_KEXEC_HANDOVER + phys_addr_t fdt_mem = 0; + phys_addr_t fdt_len = 0; + phys_addr_t scratch_mem = 0; + phys_addr_t scratch_len = 0; + + ret = fdt_delprop(fdt, chosen_node, "linux,kho-fdt"); + if (ret && ret != -FDT_ERR_NOTFOUND) + return ret; + ret = fdt_delprop(fdt, chosen_node, "linux,kho-scratch"); + if (ret && ret != -FDT_ERR_NOTFOUND) + return ret; + + if (!image->kho.fdt || !image->kho.scratch) + return 0; + + fdt_mem = image->kho.fdt; + fdt_len = PAGE_SIZE; + scratch_mem = image->kho.scratch->mem; + scratch_len = image->kho.scratch->bufsz; + + pr_debug("Adding kho metadata to DT"); + + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, "linux,kho-fdt", + fdt_mem, fdt_len); + if (ret) + return ret; + ret = fdt_appendprop_addrrange(fdt, 0, chosen_node, "linux,kho-scratch", + scratch_mem, scratch_len); + +#endif /* CONFIG_KEXEC_HANDOVER */ + return ret; +} + /* * of_kexec_alloc_and_setup_fdt - Alloc and setup a new Flattened Device Tree * @@ -414,6 +451,11 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image, #endif } + /* 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); From patchwork Fri Apr 11 05:37:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047570 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 42A93C369A2 for ; Fri, 11 Apr 2025 05:38:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 88285280162; Fri, 11 Apr 2025 01:38:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 80A7128015B; Fri, 11 Apr 2025 01:38:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 683F0280162; Fri, 11 Apr 2025 01:38:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 4535128015B for ; Fri, 11 Apr 2025 01:38:40 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2BA55C1D49 for ; Fri, 11 Apr 2025 05:38:41 +0000 (UTC) X-FDA: 83320658442.09.87986D5 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) by imf13.hostedemail.com (Postfix) with ESMTP id 5E94620002 for ; Fri, 11 Apr 2025 05:38:39 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=MVTWnGoI; spf=pass (imf13.hostedemail.com: domain of 33qr4ZwoKCF07C5IBTP5IGBJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--changyuanl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=33qr4ZwoKCF07C5IBTP5IGBJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349919; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lv1l1I9z2A9RMTDP3pEjoh98A/jPPW1Y8prl67P6/Ys=; b=sGe4ThKdjrdYjs21vfAAX3WuWujvpovvsY/wp+AP5vVoXuDJ0RA0XwGb0rhjXmHoGoEa/0 NBViucCtEgkGA3RDkxwCo3bN5FZxOoJQRpnbXCRGEWkaaU4kosPwI3f6b+2Xs5//y/9OuP Qyw1X6+sGFOq/7L96ZoWiuOKSEKL/LI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=MVTWnGoI; spf=pass (imf13.hostedemail.com: domain of 33qr4ZwoKCF07C5IBTP5IGBJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--changyuanl.bounces.google.com designates 209.85.216.73 as permitted sender) smtp.mailfrom=33qr4ZwoKCF07C5IBTP5IGBJJBG9.7JHGDIPS-HHFQ57F.JMB@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349919; a=rsa-sha256; cv=none; b=bbud6pFZ28XBnaHcRBX6RDjQQdD/zBeFeGhPdBgt9MZ6crun9w6sGhGCASn2wjv1Q6Uaos PCWBDrc9fKsx1Iy63HCAKHyhWZ7HYVlac1LKiklmGABgKMvMX2Sx15TELPq/Iq/OeFmQz/ wGrIzotzOiGKSZBC7g8PfCxlt+kbG50= Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2ff4b130bb2so1759573a91.0 for ; Thu, 10 Apr 2025 22:38:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349918; x=1744954718; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=lv1l1I9z2A9RMTDP3pEjoh98A/jPPW1Y8prl67P6/Ys=; b=MVTWnGoIWU3ecBGr5p3grdVSiwrlV9iL32P/0ZLBT3tnWvJqYL+rh1x0CqFzbkaY0m xsyzArd8oGFvKg3yCExWAQLY42c1uOGjb+uxPV9MVgiR4ypzgV3KFK2M9tr+N6q6JzHl 3hQGlyMXDdWPoQim/73OZo7CxQg4v8Im22mXhvUpk23be7XKZZJSm0eD74ggenfR5OO5 bxYGaLkMstg189+JXSz6rxPnUOCsy9cr+fn3ltYFiLzROjB5QdNVM31YITf6fQ5/GQYp rA96nzj0Wqt/Sp9dV2b1/uMhIFwCgaIcHfm720tKPU4yD9qupCkYMJSCj2B/K7hLUo9Z JrSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349918; x=1744954718; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lv1l1I9z2A9RMTDP3pEjoh98A/jPPW1Y8prl67P6/Ys=; b=JLeWcTcwYNvY8pbUZmoA/B7elFXDMJ9h/JJ1CDTZJsSBKoXaTyJT7DaLp3Q0V0/AJ4 RaqtRfnhmov2or4x/BTmDd/3ZodR8D3yJbbYqzqo6JjXQQUS2e4jlmOJ+Xj3lBhDiJ6I c1y2A0uGS/2KDSmbZlyBvj1sCcJndMNX2Lzng7vUL+02xCJhgwAAez+bBBLSNgfWGyWW 0U9I2V9H7bGID2fiJZOHfnPnIoefucx75uVnuzjJrEmX3ZPOZvwRBvKRihjTlomYjh8x K5f8ds4bxxjfi832JM3+YCsNhDY5+5gsPPGAVaddbuZ2BShQ1ym2H3vNLEUO6LmKEs2W LqxA== X-Forwarded-Encrypted: i=1; AJvYcCWzKhA2Q9q1Fg3xlcwNTluYm/r3z5GbjQ8G11nOStzXF1YL+XVX4izfaH85x931oYWNT1kvyXEO9Q==@kvack.org X-Gm-Message-State: AOJu0YzTnj+3XIY4TsumpNqqpVMUl+BmM0R3BkH20+G5NGCAgdax1tqz dQtKpP0Tj4a9HL2J4i7SfGLVWFivioKvwqAPUaGFHIkYfdOcpqwZS2KIvfv4xOcDP4YjyGYwLHt Yg+ASAlooaISoSRirpg== X-Google-Smtp-Source: AGHT+IFDqnNrJ1yb2xJtOtea7MkZiHxum/paNcnypq1SzNi+wbhuEeT68KNiC92Vyv1O3vh0BoBg+A6LFRWhbKjQ X-Received: from pjc12.prod.google.com ([2002:a17:90b:2f4c:b0:2f4:465d:5c61]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:274e:b0:2fe:80cb:ac05 with SMTP id 98e67ed59e1d1-3082367024emr2450558a91.9.1744349918309; Thu, 10 Apr 2025 22:38:38 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:41 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-11-changyuanl@google.com> Subject: [PATCH v6 10/14] x86/setup: use memblock_reserve_kern for memory used by kernel From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Queue-Id: 5E94620002 X-Stat-Signature: fo7p1u6yefkeb7zsmib1a9tz11mkotuz X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1744349919-468702 X-HE-Meta: U2FsdGVkX1/3PQMbUM+Uo7pJ8ZcM2HvVBJDnGQ378pg237P4Eq+mrrdsNTJdkvxFBq0uC9xHks2NRvXP/iGA6ML1UdpEF7xlAjCRbpMay7Z/Fhum39Xg3Q5SEptASFMVej2JNT/b9V4EmvC0a4ARHwIegaeVJ9I89W6xfnJzW+gStn1i6slpUNbPCdQkZvp8h6fVZzIl5JaiP9Uw34GpLZPnTTAudJe0OFZ1QCp8MzfONFzfrWuC59F10VqUR5iBUyMt1UOSMy1Alx+X+IykFB/CT1fs+Zex7DfnLAkeLQRVBzDrZcMPwdcrncPCgWBBNlh5vM6KAJw0I+t2UWz6AoHWuQ6nSjrMCx2ZkLFuw6DTFEIvnrmKWbuvycg7ooHHhdi7YZSVS7w6nFonGqnakDs1KlBq/UoUHLu9JJNjLs3GrEBw5FB5OLufnMF0eZHPFEo6SOwSBXM6WZjV8pf6xCpCIXj3CD6eaM7lV1ppyvAF7IIc/mi44qZ6sfE1l4FN9eUa6oWvQ6tLyLkYHXIitwbCrWhXbd0ebgLLhwJii1qdfrSk0Nzn6spH6RIxtA8X4t4HyORA0ppElep7CEqGZ0w4EbH6bfmtp016UH6tU4wOAJZ4Fd2+yzJyjHqHTm2z+JO2CWVke7TfMNrRXPdYY4CROBwgEQwIOgkj5aM128Jx0kCL9YpDCPXxaI9KBIyGTLznPtu71nkGEZ46GrRg7UDE9RvCZAaydCOfxDFJxN/aAgGq37nQ2Gi0WkB6wmUjnR/aHrBrCFFsnkRl+17kWyFg6MulIyOb51f06CXSDnShMenT5zBxjYUYAzELocp7MNHTBj2/ImddiVwWJ1r7kJqMu8SV+PCAY8YKyCHdresoy231QyVskVjiqEmtWoeTV5+0jB9xIgIvzGQogpxKMmnnuXwtig2VZF7ZC54eA4HBup9GgfqV5kVjV2LKGVPUkPrqiwqmHteQMoGAK30 qeAui38U 1kSiqCHtI8PjRnqlkPIJ/dSCYiemH5ye0+inv/U3CkwObRYrg4y9onIKQ0xIsk4jE0tmpfXPb/dB8c5tLSPke4F2BUfd+GBLzjTvehgCgIUCAojXTyi9SG2mLAeZCJTQbH6yqAryWfFiWzMiZwhs83PI+uf2eF/5obRFpDlpuBGyq63S8wXlfGR/4I66A4I35HCDteO2fsVRhFPTpZfTNiXumaB1GnhMd0JQaKEs6K4gMDXaUQ5rRPwJujR5VeV3nsrKf8zFBsk4XRgodGTxuY5Yq0BrMSV692IXzOkzHLMUXYyo1BfbOp8s1FsvswPEfW0AYcfzBtw6PEhUycfl2naOBjTsVotLGU1oUXHozEahKFLtGKhz+F7eCAMjTkBibwzcXuWiJi2prXvt/E3tMNhT5QglL8iM5z3MID3ugtVoYehz8gZMZjb9rOztEE7mqwTvSPazanSSd+HMzSs7rqI7LF9SyYsO0Z37z0PaEfwWBHP+5M/hXrxwCwQv4lIovUS7c8ds1ukyi0dFAaRrtahYDDlq1/GPfrmrhYdd0G+uc8u90CQ5CVc+tx3yiWd4Ci1DGL23SxdFczQUhOrpMwZxzZbjaKXIkOEF/71iFWMyzHJc0jb6E1H3QqWi++s4wHzA3kDII1jGgHpg= 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: From: "Mike Rapoport (Microsoft)" memblock_reserve() does not distinguish memory used by firmware from memory used by kernel. The distinction is nice to have for accounting of early memory allocations and reservations, but it is essential for kexec handover (kho) to know how much memory kernel consumes during boot. Use memblock_reserve_kern() to reserve kernel memory, such as kernel image, initrd and setup data. Signed-off-by: Mike Rapoport (Microsoft) Signed-off-by: Changyuan Lyu --- arch/x86/kernel/setup.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 9d2a13b37833c..766176c4f5ee8 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -286,8 +286,8 @@ static void __init cleanup_highmap(void) static void __init reserve_brk(void) { if (_brk_end > _brk_start) - memblock_reserve(__pa_symbol(_brk_start), - _brk_end - _brk_start); + memblock_reserve_kern(__pa_symbol(_brk_start), + _brk_end - _brk_start); /* Mark brk area as locked down and no longer taking any new allocations */ @@ -360,7 +360,7 @@ static void __init early_reserve_initrd(void) !ramdisk_image || !ramdisk_size) return; /* No initrd provided by bootloader */ - memblock_reserve(ramdisk_image, ramdisk_end - ramdisk_image); + memblock_reserve_kern(ramdisk_image, ramdisk_end - ramdisk_image); } static void __init reserve_initrd(void) @@ -413,7 +413,7 @@ static void __init add_early_ima_buffer(u64 phys_addr) } if (data->size) { - memblock_reserve(data->addr, data->size); + memblock_reserve_kern(data->addr, data->size); ima_kexec_buffer_phys = data->addr; ima_kexec_buffer_size = data->size; } @@ -553,7 +553,7 @@ static void __init memblock_x86_reserve_range_setup_data(void) len = sizeof(*data); pa_next = data->next; - memblock_reserve(pa_data, sizeof(*data) + data->len); + memblock_reserve_kern(pa_data, sizeof(*data) + data->len); if (data->type == SETUP_INDIRECT) { len += data->len; @@ -567,7 +567,7 @@ static void __init memblock_x86_reserve_range_setup_data(void) indirect = (struct setup_indirect *)data->data; if (indirect->type != SETUP_INDIRECT) - memblock_reserve(indirect->addr, indirect->len); + memblock_reserve_kern(indirect->addr, indirect->len); } pa_data = pa_next; @@ -770,8 +770,8 @@ static void __init early_reserve_memory(void) * __end_of_kernel_reserve symbol must be explicitly reserved with a * separate memblock_reserve() or they will be discarded. */ - memblock_reserve(__pa_symbol(_text), - (unsigned long)__end_of_kernel_reserve - (unsigned long)_text); + memblock_reserve_kern(__pa_symbol(_text), + (unsigned long)__end_of_kernel_reserve - (unsigned long)_text); /* * The first 4Kb of memory is a BIOS owned area, but generally it is From patchwork Fri Apr 11 05:37:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047571 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 876DDC369A2 for ; Fri, 11 Apr 2025 05:38:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 99EBB280163; Fri, 11 Apr 2025 01:38:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9236628015B; Fri, 11 Apr 2025 01:38:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 75544280163; Fri, 11 Apr 2025 01:38:42 -0400 (EDT) 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 446DB28015B for ; Fri, 11 Apr 2025 01:38:42 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2AD50BA29E for ; Fri, 11 Apr 2025 05:38:43 +0000 (UTC) X-FDA: 83320658526.09.5B6BBA2 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) by imf30.hostedemail.com (Postfix) with ESMTP id 6897A80006 for ; Fri, 11 Apr 2025 05:38:41 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=gSTLbvpt; spf=pass (imf30.hostedemail.com: domain of 34Kr4ZwoKCF89E7KDVR7KIDLLDIB.9LJIFKRU-JJHS79H.LOD@flex--changyuanl.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=34Kr4ZwoKCF89E7KDVR7KIDLLDIB.9LJIFKRU-JJHS79H.LOD@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349921; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZI11LMBEjiEIqA0HumHiypztcAsK57x8QNsaft7FaF0=; b=ksubsn/jIIQcq1aTwsFXR/4+bph1B8rYbEFr58BIYcTS66XXC/I9FvFACS9jtJRgKsaG/H 9pf9qOOV2WyM6N4J85SNaIcPV/T/5RSD+hgY1rqy5V0uvCTbSb6ux82nAGmVv+c90BYlll YsWI4BCrlAk6kXyPFGvMfhOntmsjbfs= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=gSTLbvpt; spf=pass (imf30.hostedemail.com: domain of 34Kr4ZwoKCF89E7KDVR7KIDLLDIB.9LJIFKRU-JJHS79H.LOD@flex--changyuanl.bounces.google.com designates 209.85.210.202 as permitted sender) smtp.mailfrom=34Kr4ZwoKCF89E7KDVR7KIDLLDIB.9LJIFKRU-JJHS79H.LOD@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349921; a=rsa-sha256; cv=none; b=JLoeF7KIoHjRUaEtMLDNvt2asy4BX5UqgE0LjZcDR8w1EewWXRa+WLBKlPHt6xsbSD1IVc r9hxXUOqeVO1OFEL3XaRaZwEJ6ZweyILSuTL+XViQmmOOK8yDpostLBLEODj0G8dkTCKNK 7AvccEqKvWRpgjMFiVcbsVuiRdmFaUg= Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-739515de999so1471747b3a.1 for ; Thu, 10 Apr 2025 22:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349920; x=1744954720; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ZI11LMBEjiEIqA0HumHiypztcAsK57x8QNsaft7FaF0=; b=gSTLbvptBaCgRHk3Me+a8K0SegPvxS3xSm7AdyjXLjOBJixaJByfkJRMw/KSMUBeB7 P6nvMg3C6EddElCzfyqFM0Fla76ziaYm5UXC0tbkfcznDFFbUnRt/3ZoOEhrVHxsnx0h v3ee1jV0AzC1+0sg5EVuiFyaQ2Ye/Y+UznHfMz5qPe45T3zcvR3n4NGWqiucptu8KaA9 xrU7WE2YRTZqerUS/eH4VtGEsEn6AyssJK9JOHRV20QwrWK+Lg8vqX4OByOVtzAODowu DhsYL6Mxre6pdmo+7g/NIHH1VV3W7x3QawGDpAK8kthV+Ejx0obsys/EoYL7PS8Fw8Re lUsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349920; x=1744954720; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZI11LMBEjiEIqA0HumHiypztcAsK57x8QNsaft7FaF0=; b=bdAVjSdYdjdoNev7zQP8By5N++r0wbTjgxez7s5ToikMzzmdCfGRHBlkv4WGJo0uKP isndWwr4dLMqr66wxmHsD8comikCMTrphkwfgYB8J4UAl2TYM5k6PMrmqSUmU7c9TkMt uLZsdNM5dKqfkN7UI64wK77IteDiAI9OqRo40iOQCGDReHaX9nm9zhkqLcdhSWXsHQ+4 0d/R5+rH2QbxuWveAJSQ9k4WXOJs97QA7yLHmRqWYw52NGxJZR3DhmmZKCp0JwdPLF28 uY49E2AQALb7WEobczSRkJeApGEV/C1vW9jyb150kH/+tDPU73nMICaJXiFWhCHRJXDV Nyqw== X-Forwarded-Encrypted: i=1; AJvYcCW7UCQogVc+7AcaNKYgKKd86R3OgmE4pZy/X74Xq2xXPhDx23iHtCEFqAb5Nrq2hRbjkvfN7FnBVQ==@kvack.org X-Gm-Message-State: AOJu0YyA+A8kP+vdYjs1mj6p6sARTYieHdw2cwQSvj8ZaxsLuMg0VYr1 ghoehHQHVAmigboARpBqr8BDtXMwGgnyrvVJfdDZrVJeTesG2agN8cMtnxs0X+e2yG+qm0mg05B hkAGR1wpq3kETuh/41w== X-Google-Smtp-Source: AGHT+IGL9bShyIuFbehpqVS3P2jU3hH2DH9GD61wHNRFxBW3gbczYn8weYxBH/KHuEP/3fwm9Znlao4IefNW9iwc X-Received: from plbbf5.prod.google.com ([2002:a17:902:b905:b0:223:52c5:17f6]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2a86:b0:224:e33:8896 with SMTP id d9443c01a7336-22bea4934a1mr25148505ad.11.1744349920329; Thu, 10 Apr 2025 22:38:40 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:42 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-12-changyuanl@google.com> Subject: [PATCH v6 11/14] x86: add KHO support From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Queue-Id: 6897A80006 X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: gux3ekfoaqd6w8zxuifxhtg31i337n4h X-HE-Tag: 1744349921-806782 X-HE-Meta: U2FsdGVkX1/yGYWdfIgpbPbC5dhPw7HqDi3DE+SqU+LksDblvWWrCrnx+s6UZ7PQLwta53U0dxp6kKZGMKEZ/4TJFHJx57+/K+33C4I9AsqGXl24k6a64CXKoI4MA3RhLK73CUD0XGx5sxc6tSLi5NnAvIyDwkEqHQwDVRTkPPqkVQOnUJwH+aBE6/crJCWUQrPkZc2aQuma7ZXzsg+/xkCdS+8OJfF4eqGebNRRMXl5UByTiK2bqP2J7tVx4wNEKUrKjFEM/BfWvOoaFMsPnvw+JnBxkrgVewVkZPnouo7zmR64BYHVIAbfV9zQA38lOX66C+XV4HGsSrmucqHu1oxZNwoeCE2DQkqdx+jaJl/oCzcahuF2MhcSm7AerTu9zK6Nxn7K+sjsAU+shXtbf9YMzHdqHOKA0tZ7p9nVpmKvlilT7nCscv25qGVGpLXJPpMqu9lNVLAP44Hmg1jpxQHY6q4nf/c+somzJbpKfxOZkuOinj4QAodG9/MsHUn709bwCOx2DLviSib/V86vTDoozHG2KksOm2UtRpZ6OTJsC+6ad6A4vc9U/umyI7Slm2az4PuJ6xAyUCX22YnBeqyUrM8ncYP9wTPMK1AfeMVdMd9cMd0QeWCqZjDazV2FE+NJ1tDm4ZdHp8ZLLbRfgmfeNRVFXFVhkqpGdIhyOZv1in39CobfGES0YJOCEwl0yVQhwTwP4i08XEADoT6FWC1o4m0Ilmq41dEibKp9WPk6XEFHXraanPOv6PTsIiWgf5+X0Qlr4C9Vs78ZNBCW/bpHx0/EDTPX0Bg1TPdrzjjFjl/7o0fb7TN7PEc9FOBmXmxNZ8nItn355ubHMOJaHGKdn04eNJyjOqqnFukcUBiPDkyW6nZQd+/HHB4AQhgBHF1vFT400io2DVt35wkY/IYge3hEtKHEwXES14P7w7JlYadxnDi9HbS0w6aXNzVkUJlCxmp835KokA8+rS5 s3uxeF/8 war4ZlBLFC2MhVg9sRew7/WVuMOcQhqKRts9Ds8DQ3KNiRqf2LWNiHin7TE/Y1IKLKm/ZSrZBJlCi40/RtdDmAszbxvfZ7kEBqhIlcki6jgnLaFqo2PAKjTP4enTjAL/6RL1wFBnizxgYIXFq+cZXj2DkE9Pd9ix0Je7TJ9vp3dPaGYM/7/CRdNlyepNrKu5heDNomKwHaBr/2u5k949wspxORug20s8tDb3BcU5DKZgHbHs6OTLr+kDR0EYQJvr6Yod5FPvfJT3uaEnujmRlHisNEDkps0nfglu58ckT4nsBcd+l2QTX4bBLiXEdiu20f55YzusA93LQhA3uvWmFcQsaeOZdKZIphFVZQ2DactyUm3t/EqfG5I/vdOlb9V5dd6FHL6K5BQRU3TKCa14ZSVj3x4r7oafbc3g8EXM7jNrEIqbVEOJTvowTuoqDbmpOuwQFrnYzUlY/tvNne4YYkpORakJleNtG8MFqO4j/Bwgsv2JvPH85+pJw7SM5BZI/ghIoHPsGq3jVfYKRcoQ198f9FXV4MIlda0ez+C5bQH3ZvJ+5IT0X4w2k5ELsWCaGra6RZVeDf55n2M1QUAhLdUfD4BpcoIZC6jMFNlWCZSrfFw90h82y0PYj7Q== 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: From: Alexander Graf 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 x86 and adds the respective kconfig option to the architecture so that it can use KHO successfully. In addition, it enlightens it decompression code with KHO so that its KASLR location finder only considers memory regions that are not already occupied by KHO memory. Signed-off-by: Alexander Graf Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- arch/x86/Kconfig | 3 ++ arch/x86/boot/compressed/kaslr.c | 52 +++++++++++++++++++++++++- arch/x86/include/asm/setup.h | 4 ++ arch/x86/include/uapi/asm/setup_data.h | 13 ++++++- arch/x86/kernel/e820.c | 18 +++++++++ arch/x86/kernel/kexec-bzimage64.c | 36 ++++++++++++++++++ arch/x86/kernel/setup.c | 25 +++++++++++++ arch/x86/realmode/init.c | 2 + 8 files changed, 151 insertions(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4b9f378e05f6b..ae82a42ff70e7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2029,6 +2029,9 @@ config ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG config ARCH_SUPPORTS_KEXEC_JUMP def_bool y +config ARCH_SUPPORTS_KEXEC_HANDOVER + def_bool y + config ARCH_SUPPORTS_CRASH_DUMP def_bool X86_64 || (X86_32 && HIGHMEM) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index f03d59ea6e40f..ff11688810162 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -760,6 +760,55 @@ static void process_e820_entries(unsigned long minimum, } } +/* + * If KHO is active, only process its scratch areas to ensure we are not + * stepping onto preserved memory. + */ +#ifdef CONFIG_KEXEC_HANDOVER +static bool process_kho_entries(unsigned long minimum, unsigned long image_size) +{ + struct kho_scratch *kho_scratch; + struct setup_data *ptr; + int i, nr_areas = 0; + + ptr = (struct setup_data *)(unsigned long)boot_params_ptr->hdr.setup_data; + while (ptr) { + if (ptr->type == SETUP_KEXEC_KHO) { + struct kho_data *kho = (struct kho_data *)ptr->data; + + kho_scratch = (void *)kho->scratch_addr; + nr_areas = kho->scratch_size / sizeof(*kho_scratch); + + break; + } + + ptr = (struct setup_data *)(unsigned long)ptr->next; + } + + if (!nr_areas) + return false; + + for (i = 0; i < nr_areas; i++) { + struct kho_scratch *area = &kho_scratch[i]; + struct mem_vector region = { + .start = area->addr, + .size = area->size, + }; + + if (process_mem_region(®ion, minimum, image_size)) + break; + } + + return true; +} +#else +static inline bool process_kho_entries(unsigned long minimum, + unsigned long image_size) +{ + return false; +} +#endif + static unsigned long find_random_phys_addr(unsigned long minimum, unsigned long image_size) { @@ -775,7 +824,8 @@ static unsigned long find_random_phys_addr(unsigned long minimum, return 0; } - if (!process_efi_entries(minimum, image_size)) + if (!process_kho_entries(minimum, image_size) && + !process_efi_entries(minimum, image_size)) process_e820_entries(minimum, image_size); phys_addr = slots_fetch_random(); diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index ad9212df0ec0c..906ab5e6d25fe 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -67,6 +67,10 @@ extern void x86_ce4100_early_setup(void); static inline void x86_ce4100_early_setup(void) { } #endif +#ifdef CONFIG_KEXEC_HANDOVER +#include +#endif + #ifndef _SETUP #include diff --git a/arch/x86/include/uapi/asm/setup_data.h b/arch/x86/include/uapi/asm/setup_data.h index 50c45ead4e7c9..2671c4e1b3a0b 100644 --- a/arch/x86/include/uapi/asm/setup_data.h +++ b/arch/x86/include/uapi/asm/setup_data.h @@ -13,7 +13,8 @@ #define SETUP_CC_BLOB 7 #define SETUP_IMA 8 #define SETUP_RNG_SEED 9 -#define SETUP_ENUM_MAX SETUP_RNG_SEED +#define SETUP_KEXEC_KHO 10 +#define SETUP_ENUM_MAX SETUP_KEXEC_KHO #define SETUP_INDIRECT (1<<31) #define SETUP_TYPE_MAX (SETUP_ENUM_MAX | SETUP_INDIRECT) @@ -78,6 +79,16 @@ struct ima_setup_data { __u64 size; } __attribute__((packed)); +/* + * Locations of kexec handover metadata + */ +struct kho_data { + __u64 fdt_addr; + __u64 fdt_size; + __u64 scratch_addr; + __u64 scratch_size; +} __attribute__((packed)); + #endif /* __ASSEMBLER__ */ #endif /* _UAPI_ASM_X86_SETUP_DATA_H */ diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 57120f0749cc3..c314212a5ecd5 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -1300,6 +1300,24 @@ void __init e820__memblock_setup(void) memblock_add(entry->addr, entry->size); } + /* + * At this point with KHO we only allocate from scratch memory. + * At the same time, we configure memblock to only allow + * allocations from memory below ISA_END_ADDRESS which is not + * a natural scratch region, because Linux ignores memory below + * ISA_END_ADDRESS at runtime. Beside very few (if any) early + * allocations, we must allocate real-mode trapoline below + * ISA_END_ADDRESS. + * + * To make sure that we can actually perform allocations during + * this phase, let's mark memory below ISA_END_ADDRESS as scratch + * so we can allocate from there in a scratch-only world. + * + * After real mode trampoline is allocated, we clear scratch + * marking from the memory below ISA_END_ADDRESS + */ + memblock_mark_kho_scratch(0, ISA_END_ADDRESS); + /* Throw away partial pages: */ memblock_trim_memory(PAGE_SIZE); diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c index 68530fad05f74..518635cc0876c 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -233,6 +233,31 @@ setup_ima_state(const struct kimage *image, struct boot_params *params, #endif /* CONFIG_IMA_KEXEC */ } +static void setup_kho(const struct kimage *image, struct boot_params *params, + unsigned long params_load_addr, + unsigned int setup_data_offset) +{ +#ifdef CONFIG_KEXEC_HANDOVER + struct setup_data *sd = (void *)params + setup_data_offset; + struct kho_data *kho = (void *)sd + sizeof(*sd); + + sd->type = SETUP_KEXEC_KHO; + sd->len = sizeof(struct kho_data); + + /* Only add if we have all KHO images in place */ + if (!image->kho.fdt || !image->kho.scratch) + return; + + /* Add setup data */ + kho->fdt_addr = image->kho.fdt; + kho->fdt_size = PAGE_SIZE; + kho->scratch_addr = image->kho.scratch->mem; + kho->scratch_size = image->kho.scratch->bufsz; + sd->next = params->hdr.setup_data; + params->hdr.setup_data = params_load_addr + setup_data_offset; +#endif /* CONFIG_KEXEC_HANDOVER */ +} + static int setup_boot_parameters(struct kimage *image, struct boot_params *params, unsigned long params_load_addr, @@ -312,6 +337,13 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params, sizeof(struct ima_setup_data); } + if (IS_ENABLED(CONFIG_KEXEC_HANDOVER)) { + /* Setup space to store preservation metadata */ + setup_kho(image, params, params_load_addr, setup_data_offset); + setup_data_offset += sizeof(struct setup_data) + + sizeof(struct kho_data); + } + /* Setup RNG seed */ setup_rng_seed(params, params_load_addr, setup_data_offset); @@ -479,6 +511,10 @@ static void *bzImage64_load(struct kimage *image, char *kernel, kbuf.bufsz += sizeof(struct setup_data) + sizeof(struct ima_setup_data); + if (IS_ENABLED(CONFIG_KEXEC_HANDOVER)) + kbuf.bufsz += sizeof(struct setup_data) + + sizeof(struct kho_data); + params = kzalloc(kbuf.bufsz, GFP_KERNEL); if (!params) return ERR_PTR(-ENOMEM); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 766176c4f5ee8..496dae89cf95d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -451,6 +451,28 @@ int __init ima_get_kexec_buffer(void **addr, size_t *size) } #endif +static void __init add_kho(u64 phys_addr, u32 data_len) +{ +#ifdef CONFIG_KEXEC_HANDOVER + struct kho_data *kho; + u64 addr = phys_addr + sizeof(struct setup_data); + u64 size = data_len - sizeof(struct setup_data); + + kho = early_memremap(addr, size); + if (!kho) { + pr_warn("setup: failed to memremap kho data (0x%llx, 0x%llx)\n", + addr, size); + return; + } + + kho_populate(kho->fdt_addr, kho->fdt_size, kho->scratch_addr, kho->scratch_size); + + early_memunmap(kho, size); +#else + pr_warn("Passed KHO data, but CONFIG_KEXEC_HANDOVER not set. Ignoring.\n"); +#endif +} + static void __init parse_setup_data(void) { struct setup_data *data; @@ -479,6 +501,9 @@ static void __init parse_setup_data(void) case SETUP_IMA: add_early_ima_buffer(pa_data); break; + case SETUP_KEXEC_KHO: + add_kho(pa_data, data_len); + break; case SETUP_RNG_SEED: data = early_memremap(pa_data, data_len); add_bootloader_randomness(data->data, data->len); diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c index f9bc444a3064d..9b9f4534086d2 100644 --- a/arch/x86/realmode/init.c +++ b/arch/x86/realmode/init.c @@ -65,6 +65,8 @@ void __init reserve_real_mode(void) * setup_arch(). */ memblock_reserve(0, SZ_1M); + + memblock_clear_kho_scratch(0, SZ_1M); } static void __init sme_sev_setup_real_mode(struct trampoline_header *th) From patchwork Fri Apr 11 05:37:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047572 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 09101C369A2 for ; Fri, 11 Apr 2025 05:38:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF2A1280164; Fri, 11 Apr 2025 01:38:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B9A0228015B; Fri, 11 Apr 2025 01:38:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92B99280164; Fri, 11 Apr 2025 01:38:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 6B59E28015B for ; Fri, 11 Apr 2025 01:38:44 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4E09E161B2E for ; Fri, 11 Apr 2025 05:38:45 +0000 (UTC) X-FDA: 83320658610.20.4A6E00A Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf16.hostedemail.com (Postfix) with ESMTP id 80B17180006 for ; Fri, 11 Apr 2025 05:38:43 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=zyrNY5lA; spf=pass (imf16.hostedemail.com: domain of 34qr4ZwoKCGEBG9MFXT9MKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--changyuanl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=34qr4ZwoKCGEBG9MFXT9MKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349923; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kA+rlZCcqa8ZBpJsZPffMW5upf9/jLnF7y6wsXcCijE=; b=QWY0eCj76vBf/4o9Ok8xVuRaazUK9n5+7PhogPuEWk6qZXFT+O3jAYN/I1CBj/4tdyrMOt Y8PdlL8VrXqX+s/2WbZ4IVACmOMXvhgnOzLEQRZuUbCmW282vYCqET4guuMhSm4TqBksop PLARCVWmQ/X81MZoJWvWZpBiHau8joU= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=zyrNY5lA; spf=pass (imf16.hostedemail.com: domain of 34qr4ZwoKCGEBG9MFXT9MKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--changyuanl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=34qr4ZwoKCGEBG9MFXT9MKFNNFKD.BNLKHMTW-LLJU9BJ.NQF@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349923; a=rsa-sha256; cv=none; b=GJ1XwjdIFEqCOtm4oc+WrzfMLNVykSsFucTqt/FrUbMDwg661bpiZD6CVTKEKM6qwaDKU5 Mc+1gO401YMhw6NYUwB+LNCXiIzJRNag//tqJF89QBuB+DNOG8RTvhN4JQqFODJFGtJUM7 N4k+3acJU1beljtoAZYWUWW3POz/WJc= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2241ae15dcbso19027305ad.0 for ; Thu, 10 Apr 2025 22:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349922; x=1744954722; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=kA+rlZCcqa8ZBpJsZPffMW5upf9/jLnF7y6wsXcCijE=; b=zyrNY5lA716Aagv2Ibw1zGDOk4TY2TOBVoKNGweeyk/Cf8odClCZFMlQEsDhSPGifp gnClB4iZUNq1EgBbp6X/ZExPkkir0NvVi+MY++U4QTNNOMdESAuwqyuZfZ85d8crLhSP Yeoubj45xYHs3DHN/nqmozBkQBCEwnoFD2xgOS4b+AEdhiBUx3PGV1snzG8I7pSQTHX7 FDnSz0N22Ve5BwKn0D2uW3Vq5fa6f4i6t8vDqPA6uDyaKw+W40rX8u1s4/EeiRaEz3KR DsH8lHJiyC38CVahXk4z6L3JiJ8+aZriJIL1fhzZU52ShQXRF6cno1EoG7FoWwTdhJDe bP7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349922; x=1744954722; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kA+rlZCcqa8ZBpJsZPffMW5upf9/jLnF7y6wsXcCijE=; b=iHeTeT9Sav1Yt+SH+UkDsK1JwGaXgfAaulDeliwpGlLZyr/4NBvrGYH5rZOIcy5GlF xCukAw/FX8pmV8iHsGI80wZKnFzRiR1I8NH65hEQXb6DV1MSWKihuCyCrgCHaqWI2YXz RePmbgbktiQi24dkIjWJPm2GumDPEgJknefNydM5mtJJuur00ucniHkCrcLbcHGim51C qT4tP5yjXzxeJinzG/f37/QEwCluf73WQ0SP/Vr5OdBlwbanLbdz0dEHDRCo3gSA62Nm yKaFMsRYNFGVOzhsNWZ0/ys7NBnMrnhaZnM+BSF2fjTuL6Z4JOFKtP5jYTZ/adfMyypx 3vkg== X-Forwarded-Encrypted: i=1; AJvYcCWObwGe8718hitGiXo9vgHl+XUMN+uGfi4Y7aX2S3rAcedB4kBfmCJSgAF3eM08UVVIWoRUDR3VtA==@kvack.org X-Gm-Message-State: AOJu0YwFW00zXxb937A+kxqAEcih7wU1+yKmgMi0X6qWWC/HIAN2qDbk +WU6rimq3lSdDAzWLHyeIlXiDwIVeUkeFpq3npxaXP9XjVevEwH69dT9/Be+FqglN1i6PSeQmhU ENDftbD9l87VtYLlTuQ== X-Google-Smtp-Source: AGHT+IFMNgH3FeNkL43VcSwOV5hq+5tHGG0G6gtWFb6aZTBEqWyHMIBbsA40BOUPJoyVSd2JH8itZpILADhQmm2q X-Received: from plbjg10.prod.google.com ([2002:a17:903:26ca:b0:223:f321:1a96]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:fc4d:b0:224:1ce1:a3f4 with SMTP id d9443c01a7336-22bea4a1e8bmr23409575ad.1.1744349922412; Thu, 10 Apr 2025 22:38:42 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:43 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-13-changyuanl@google.com> Subject: [PATCH v6 12/14] memblock: add KHO support for reserve_mem From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Queue-Id: 80B17180006 X-Stat-Signature: pb4d16jwbd5geogfq968nwj6o4w9zr7b X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1744349923-855699 X-HE-Meta: U2FsdGVkX197mzmlrkTCK9uez6/E2Dj8T18CSHyWI0ZDU6qPd9OpHCNxmkshsPdd0+9t6xMXNl3qKKsHTtkYOcqentUD3voXA3LokN9iALLKBsYnh2Kj0moM+MudqJMbTom6xoP4ZtLGwJktoAFbBBL5GtpIuYpjJGxDHU2xSy9bP7pvKCaraoB4XVVYzrMTQgDwmTxDFTBcqUtv3E7l+PIB7z6F283l533Tx4NbDSxdhb4To5XlsHCW1tPQUH/uUKrV82uyN+lHKZ3EAQDPH+Iipn3BUQNwnrk67YXbUohZ8Fj8g9Qnh9+jbA4rsViSNsbxKOprre5YCF4RseAM0PRGlLhFiDylbwWNc/aGjkH7rls807qRB8eZJid7vin+MoqoGID7kG+V4GKskZnF1CgYzUWBosLBOLJ55K2O/mYNLjoImwGlKGaUm+wOVZb3c3g9Yiqud2SImPx1hnRT7jHlilfLX1LkYHJjorHDQGQZvfKZUP21XoxqiY2ey5D2oW0hJS45MgfBVMovaZdhr7GEaodB1egtqrSJ2wC68APnBpaNb4u8CiJ1qjTU5tu+rxIpdoZOAs/+JU9vhoUULk5qpTCoWSA+3Of7QhHjssgGkN6sPDtIHEDRIiN1jRhulydVRK1jAUy/3OOvJ1EfShaRY2bOf+G54c59r+Q8OI+etdJbmcNm3ZGdmYWnzwJE0oSffK5UPdN2OTqz/ScdW9tE9cy9NOLkXxozR3cvQ24DTN4BQEL4vbc0kzVlajgWC+K0UlZEJtu9+BODC5onI4QRMhYuAl0zqJAusLx7Lry8xi923FdafZ0sOni6xJgY/4v6CIvHO5LFASoOHlypSYMWka8QJWthOUOFM4PkBl04qBJ37gPI5w9TGBoriSWHZRwUCpPD07TAKFkKp7JOWLgGrQQOj369cdmbgxG8v5qhSPn05ZHhC/9rX2GlfHnbQzNAyYnxiM1R6/nISik GZXn6Xfl lRzeXoqroHL88pcWMq/v5J97wTVhL18c53h5UJjYP75WG7AiJzYGY96lpZV5YmFP76zB2PHNa24kgL9DGbJX6n2KpCdgnwk6HVKog9fxInTWq/iU71x+F9VhQvaGkhsc/NKEeZ2Cr3ftdPEwWPaOm+JSMcW/kMatVP1OQP24Nu1F1cedi7tWaQ95QDgK8Inpa0MDpFc69eOfr2/mV1P4Ke3tabR/3irp2LD9c3lmuz52lD7FMjsQ3aba7EasN9mCr/uYDVoAC2Us9la+nZkNqtF7AQ8fkVRQ89mpvCCqOSX38JyadwrUXod/Kv/WLbwqSZgxdIROQltxVFSLb0VdgBbVCr6Z+z8LqqgRwuMF9bsNTfBlzm82rVaGyvN23Yc5a4AoDrH4B7TLsoWyHD7cvd5im2arTel4b+7tQYQZsMdNLuZDHc1xDZgmHCPvy7mX5HvHGHgFZ4IryubEM3KIKjyNN7n2h5Rs81bFS1LuIW7XxlxNQh0gwPAcSNw8p9bcWRjPKaBdcrYXG+RCgqshHx2X6NxAaH8U9+Bk0qXzRcBq/YUIaH18gGMzGa/4j5+EBdRR/6BMRfmdrjZBjcOKwal2Q5tKbe2k9VpxxT6lMovI598sWeHWJS+w7JeQT1nuwTlUtXAez6s4O/U8DH6QpwKZtAIPA0jGYiqso8YZaQ7fUduI= 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: From: Alexander Graf Linux has recently gained support for "reserve_mem": A mechanism to allocate a region of memory early enough in boot that we can cross our fingers and hope it stays at the same location during most boots, so we can store for example ftrace buffers into it. Thanks to KASLR, we can never be really sure that "reserve_mem" allocations are static across kexec. Let's teach it KHO awareness so that it serializes its reservations on kexec exit and deserializes them again on boot, preserving the exact same mapping across kexec. This is an example user for KHO in the KHO patch set to ensure we have at least one (not very controversial) user in the tree before extending KHO's use to more subsystems. Signed-off-by: Alexander Graf Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- mm/memblock.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) diff --git a/mm/memblock.c b/mm/memblock.c index 456689cb73e20..3571a859f2fe1 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -18,6 +18,11 @@ #include #include +#ifdef CONFIG_KEXEC_HANDOVER +#include +#include +#endif /* CONFIG_KEXEC_HANDOVER */ + #include #include @@ -2475,6 +2480,201 @@ int reserve_mem_release_by_name(const char *name) return 1; } +#ifdef CONFIG_KEXEC_HANDOVER +#define MEMBLOCK_KHO_FDT "memblock" +#define MEMBLOCK_KHO_NODE_COMPATIBLE "memblock-v1" +#define RESERVE_MEM_KHO_NODE_COMPATIBLE "reserve-mem-v1" +static struct page *kho_fdt; + +static int reserve_mem_kho_finalize(struct kho_serialization *ser) +{ + int err = 0, i; + + if (!reserved_mem_count) + return NOTIFY_DONE; + + if (IS_ERR(kho_fdt)) { + err = PTR_ERR(kho_fdt); + pr_err("memblock FDT was not prepared successfully: %d\n", err); + return notifier_from_errno(err); + } + + for (i = 0; i < reserved_mem_count; i++) { + struct reserve_mem_table *map = &reserved_mem_table[i]; + + err |= kho_preserve_phys(ser, map->start, map->size); + } + + err |= kho_preserve_folio(ser, page_folio(kho_fdt)); + err |= kho_add_subtree(ser, MEMBLOCK_KHO_FDT, page_to_virt(kho_fdt)); + + return notifier_from_errno(err); +} + +static int reserve_mem_kho_notifier(struct notifier_block *self, + unsigned long cmd, void *v) +{ + switch (cmd) { + case KEXEC_KHO_FINALIZE: + return reserve_mem_kho_finalize((struct kho_serialization *)v); + case KEXEC_KHO_ABORT: + return NOTIFY_DONE; + default: + return NOTIFY_BAD; + } +} + +static struct notifier_block reserve_mem_kho_nb = { + .notifier_call = reserve_mem_kho_notifier, +}; + +static void __init prepare_kho_fdt(void) +{ + int err = 0, i; + void *fdt; + + if (!reserved_mem_count) + return; + + kho_fdt = alloc_page(GFP_KERNEL); + if (!kho_fdt) { + kho_fdt = ERR_PTR(-ENOMEM); + return; + } + + fdt = page_to_virt(kho_fdt); + + err |= fdt_create(fdt, PAGE_SIZE); + err |= fdt_finish_reservemap(fdt); + + err |= fdt_begin_node(fdt, ""); + err |= fdt_property_string(fdt, "compatible", MEMBLOCK_KHO_NODE_COMPATIBLE); + for (i = 0; i < reserved_mem_count; i++) { + struct reserve_mem_table *map = &reserved_mem_table[i]; + + err |= fdt_begin_node(fdt, map->name); + err |= fdt_property_string(fdt, "compatible", RESERVE_MEM_KHO_NODE_COMPATIBLE); + err |= fdt_property(fdt, "start", &map->start, sizeof(map->start)); + err |= fdt_property(fdt, "size", &map->size, sizeof(map->size)); + err |= fdt_end_node(fdt); + } + err |= fdt_end_node(fdt); + + err |= fdt_finish(fdt); + + if (err) { + pr_err("failed to prepare memblock FDT for KHO: %d\n", err); + put_page(kho_fdt); + kho_fdt = ERR_PTR(-EINVAL); + } +} + +static int __init reserve_mem_init(void) +{ + if (!kho_is_enabled()) + return 0; + + prepare_kho_fdt(); + + return register_kho_notifier(&reserve_mem_kho_nb); +} +late_initcall(reserve_mem_init); + +static void *kho_fdt_in __initdata; + +static void *__init reserve_mem_kho_retrieve_fdt(void) +{ + phys_addr_t fdt_phys; + struct folio *fdt_folio; + void *fdt; + int err; + + err = kho_retrieve_subtree(MEMBLOCK_KHO_FDT, &fdt_phys); + if (err) { + if (err != -ENOENT) + pr_warn("failed to retrieve FDT '%s' from KHO: %d\n", + MEMBLOCK_KHO_FDT, err); + return ERR_PTR(err); + } + + fdt_folio = kho_restore_folio(fdt_phys); + if (!fdt_folio) { + pr_warn("failed to restore memblock KHO FDT (0x%llx)\n", fdt_phys); + return ERR_PTR(-EFAULT); + } + + fdt = page_to_virt(folio_page(fdt_folio, 0)); + + err = fdt_node_check_compatible(fdt, 0, MEMBLOCK_KHO_NODE_COMPATIBLE); + if (err) { + pr_warn("FDT '%s' is incompatible with '%s': %d\n", + MEMBLOCK_KHO_FDT, MEMBLOCK_KHO_NODE_COMPATIBLE, err); + return ERR_PTR(-EINVAL); + } + + return fdt; +} + +static bool __init reserve_mem_kho_revive(const char *name, phys_addr_t size, + phys_addr_t align) +{ + int err, len_start, len_size, offset; + const phys_addr_t *p_start, *p_size; + const void *fdt; + + if (!kho_fdt_in) + kho_fdt_in = reserve_mem_kho_retrieve_fdt(); + + if (IS_ERR(kho_fdt_in)) + return false; + + fdt = kho_fdt_in; + + offset = fdt_subnode_offset(fdt, 0, name); + if (offset < 0) { + pr_warn("FDT '%s' has no child '%s': %d\n", + MEMBLOCK_KHO_FDT, name, offset); + return false; + } + err = fdt_node_check_compatible(fdt, offset, RESERVE_MEM_KHO_NODE_COMPATIBLE); + if (err) { + pr_warn("Node '%s' is incompatible with '%s': %d\n", + name, RESERVE_MEM_KHO_NODE_COMPATIBLE, err); + return false; + } + + p_start = fdt_getprop(fdt, offset, "start", &len_start); + p_size = fdt_getprop(fdt, offset, "size", &len_size); + if (!p_start || len_start != sizeof(*p_start) || !p_size || + len_size != sizeof(*p_size)) { + return false; + } + + if (*p_start & (align - 1)) { + pr_warn("KHO reserve-mem '%s' has wrong alignment (0x%lx, 0x%lx)\n", + name, (long)align, (long)*p_start); + return false; + } + + if (*p_size != size) { + pr_warn("KHO reserve-mem '%s' has wrong size (0x%lx != 0x%lx)\n", + name, (long)*p_size, (long)size); + return false; + } + + reserved_mem_add(*p_start, size, name); + pr_info("Revived memory reservation '%s' from KHO\n", name); + + return true; +} +#else +static bool __init reserve_mem_kho_revive(const char *name, phys_addr_t size, + phys_addr_t align) +{ + return false; +} +#endif /* CONFIG_KEXEC_HANDOVER */ + /* * Parse reserve_mem=nn:align:name */ @@ -2530,6 +2730,11 @@ static int __init reserve_mem(char *p) if (reserve_mem_find_by_name(name, &start, &tmp)) return -EBUSY; + /* Pick previous allocations up from KHO if available */ + if (reserve_mem_kho_revive(name, size, align)) + return 1; + + /* TODO: Allocation must be outside of scratch region */ start = memblock_phys_alloc(size, align); if (!start) return -ENOMEM; From patchwork Fri Apr 11 05:37:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047573 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 2F096C36010 for ; Fri, 11 Apr 2025 05:39:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D0556280165; Fri, 11 Apr 2025 01:38:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C8A9928015B; Fri, 11 Apr 2025 01:38:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C809280165; Fri, 11 Apr 2025 01:38:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7A3CD28015B for ; Fri, 11 Apr 2025 01:38:46 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 713691C97FB for ; Fri, 11 Apr 2025 05:38:47 +0000 (UTC) X-FDA: 83320658694.13.7EC3E5A Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) by imf16.hostedemail.com (Postfix) with ESMTP id BB53F180004 for ; Fri, 11 Apr 2025 05:38:45 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="WqBM/snt"; spf=pass (imf16.hostedemail.com: domain of 35Kr4ZwoKCGMDIBOHZVBOMHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--changyuanl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=35Kr4ZwoKCGMDIBOHZVBOMHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349925; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CqFmqYgU8jNG60wex9mXv1F8jl6vxfkkQY/br69m6a0=; b=lG+ydrOx2CXztF+hmfn3itfdOnByi8T9jhR3+lecQ1ualy58EIQuZwuBTKeqOP7TmBubzo nqJC8Y07RcBqKnugjlxiOmaNpUtEsU+q+TnWJg151zyq3Ak1taayjv1r5k4w5fyLAEB0gV gTWoqnrr/h3LxjZ2X/XFxDJMtoMfJGI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349925; a=rsa-sha256; cv=none; b=B9Q6G739PnT3+IhYmnDQsSPRiiFkQJI6LYv1mvQFA4EVdQguud5SYJsAGCtgyG5D6C00Ir +lirkT/jPRRGzT3crm0bTDrJJEdyJrhqiS4PjREfydeMA+rBzYNZ6n7zwozVMqWVNZkfFn OYUD5gCqAEV39tcJ6cfV/Q5gtpQ6ldI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="WqBM/snt"; spf=pass (imf16.hostedemail.com: domain of 35Kr4ZwoKCGMDIBOHZVBOMHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--changyuanl.bounces.google.com designates 209.85.214.201 as permitted sender) smtp.mailfrom=35Kr4ZwoKCGMDIBOHZVBOMHPPHMF.DPNMJOVY-NNLWBDL.PSH@flex--changyuanl.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2241e7e3addso14754125ad.1 for ; Thu, 10 Apr 2025 22:38:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349924; x=1744954724; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=CqFmqYgU8jNG60wex9mXv1F8jl6vxfkkQY/br69m6a0=; b=WqBM/sntha12Pf9n4ibgBAjpI77XULETo9Fgw1yTP90OfVNRzqsSuQ31PrhmpXRMAQ lot+v/+yCcaU1uT7SWQWsUfrhw82TWRXScu84NCa1DBycdOLS+/0dU652kyNyHrgqvQc Nc5WsOTO/01ZhVZCP5h65uJWgPCnrMtmaIFygCrD0nd6ykh3RDuIcw9QGygcf4vLxSr3 iB+lwmAIpruYoqarVCUXebH4utZ6zLbQcEXXWU7541tCj1Iom8jEFiLs6y4Mp34fhCNZ XqQeuDm96x0w4rp7nyCMyAIS5SZOvFGMgx9TnHugS4M7khNz76hXqhL1QjOL+qWEATvW WWGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349924; x=1744954724; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CqFmqYgU8jNG60wex9mXv1F8jl6vxfkkQY/br69m6a0=; b=BYTMwJ/fUni11akM5oeiSZHn2MyhgbGs7pqms5nkqWGAK0mlaP1S6rq4wFyA5gOeX+ /z2W0IgmZiytalGJB4pjKzQtq63VI21CAt9bcZPENr2e2CNsoQtf2Z00XmemJwLs4JdR lLe78TBnt7A/IOqcSQHk/o6pKpDY6VCPWWjkUATp+nEx2+9XvnP6VZfFiY72Tywyur1+ 62oSxwFazsQVVCMPbDQYbrhUd+FWdGJXlwKDFwa/1pNXQkTY/Jj7uFQzAl+ndBWyeZUA MlovFWhYWafBnVXCsTL3wONI7e2s0wslEjsu5DMtwatEPAZzTRpx4QcwQjcv4vrwvk1i p5yA== X-Forwarded-Encrypted: i=1; AJvYcCVBN4z4W/JMOpsi4fRvD5EnEAZcpRbgUX5YdO6c+1xBlasT37Ljwto/u9elcPh/ybwukk+fRCw2yg==@kvack.org X-Gm-Message-State: AOJu0YwV54LzXb+VWvRkjGrF8mXuGl6RnjfYZblstqmOGlbJIqcn/sqS BUSECcPhw0nK3If2y2Hefg5PUz6CRRaOY6bktyeRyxTAVw1zzMVE9LuH7UsYOdMfvPQtgtbxPic +tfx6+EiGUaKizS9R9w== X-Google-Smtp-Source: AGHT+IGHQRIqJTZd29fJK1GMwoJSYUl6e5/qw+kmGzdUeqmD1lQBT7+V1426ohon6WeDtCjL7G29+XAuWTl91y/q X-Received: from plblc7.prod.google.com ([2002:a17:902:fa87:b0:21f:40e5:a651]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:d54f:b0:224:18b0:86a0 with SMTP id d9443c01a7336-22bea4efabemr21168435ad.37.1744349924575; Thu, 10 Apr 2025 22:38:44 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:44 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-14-changyuanl@google.com> Subject: [PATCH v6 13/14] Documentation: add documentation for KHO From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Stat-Signature: s7b5ngggzzmry7u3n9cotxadzksbufhm X-Rspam-User: X-Rspamd-Queue-Id: BB53F180004 X-Rspamd-Server: rspam08 X-HE-Tag: 1744349925-223508 X-HE-Meta: U2FsdGVkX1+TSnlRl6kCyXHye3081WAMCFe0a1LWAKGZRVnP6vs0ADcmZtZBKv7+0yPAgNFvA4t+NFzUTZn+XOeMQucUEuELVG941p9XzmrzVnIJhaNkS6Mybd/j6EBaBQyuXtyiPr9WIN010qfS8ezkw+qQ74qbaP9rXv3nVoZuadQ/gKpYXYgGdi3FDq7xcZiLkiW8hYTutdfFNPZ9Ks5mQ3NqNTdkiG3ytkgWV4C7EJ9K3h3NV3MeTg2ZHFs/sDzoh8IZjC9cx8mBAqi6KrnE6vb/3DXa2n8cljsVShEJ0xEl5D+x0u6N7iPl0RtK1KTh/3BhnjWY7GvIUqN8LX8tlpiewjH7bGMx8p0y7bxJtNzZg/NbHQgy0Gohu8jd9TIZF++UcF1S9Jyzpw8bUk8/ocxxwdaUmOw2WoxKR4hBUYUCQRt++a4xAY9c2gi26RgX2zpQrFGpOAoANwzprYNJDxpF4Fa3T7CkpaXgbX1vXF+Nxdb7KBq5xloAutOPBU+dMKPMrSMpGU+typVIFWwPJBcIeZQMjsMTbpL1RkarLGptk+MDH5qKu92PdufZyH7xMlMWWrJ3/gtHM4u2rb9pgVsijDfFcQo3hZ0uOlLf6nuifuK2K0hGpE0cISUSXitYseyuRCqML2AFOMQdUrQSsqRF78WFmrJ0/bapAL3wnNMj1EIDvOsCR8UxI+XffVWaABLCLXeI8pvBYxx3XvqXDeXS373O/g2u+eUaQKZnk664BR/n2HYi07FIRf84PuGE/EXv7WU+i/eARZshOkWIIAGR7ZtDzd6P/vnX9kDNfcfJyizWSqxUlIht9OfKuoqsuKubBoGNfV35L69tqkhO6ZIjF6hBBb2CW2AWCt4Uc6nlTstlHj0Tfu8j9uP8sK3hndO79bfOX15OX/q3uLZMRSUEi51mqXYUGoP6kcvqirjTSe5HilVayHQRzVjcSq4vlAVNzHL4mCkaQGj usMvHGMU 4ouPtUipu2X5jby7MRah4vfH7urabEtFXqBU9HwER9/H6uA3AZ6bAxu2pIiPwzwBrIjlRfy5z9OqozbCqbjdboscKBZwVS9QGvlv5bItauJzHUBraSdGoMZuJCdQouMpaIUnNlGG6wZH5lDJ85ZSOVlarUo4fiZL2ajZLKZmvYMsprBYwfYnyYeyuBWHFu5Wywrc0s1ncposxtnp/ZhXs3dOAHmJQ+EU1a1mI4joT3PIvRH6ucjmaF/A9bbIQHyyWp3WDmhLVNJ9IzTIL92220wTYbAp2Muye03Ab 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: From: Alexander Graf With KHO in place, let's add documentation that describes what it is and how to use it. Signed-off-by: Alexander Graf Co-developed-by: Mike Rapoport (Microsoft) Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- .../admin-guide/kernel-parameters.txt | 25 ++++ Documentation/admin-guide/mm/index.rst | 1 + Documentation/admin-guide/mm/kho.rst | 120 ++++++++++++++++++ Documentation/core-api/index.rst | 1 + Documentation/core-api/kho/bindings/kho.yaml | 43 +++++++ .../core-api/kho/bindings/sub-fdt.yaml | 27 ++++ Documentation/core-api/kho/concepts.rst | 74 +++++++++++ Documentation/core-api/kho/fdt.rst | 80 ++++++++++++ Documentation/core-api/kho/index.rst | 13 ++ MAINTAINERS | 2 + 10 files changed, 386 insertions(+) create mode 100644 Documentation/admin-guide/mm/kho.rst create mode 100644 Documentation/core-api/kho/bindings/kho.yaml create mode 100644 Documentation/core-api/kho/bindings/sub-fdt.yaml create mode 100644 Documentation/core-api/kho/concepts.rst create mode 100644 Documentation/core-api/kho/fdt.rst create mode 100644 Documentation/core-api/kho/index.rst diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 76e538c77e316..b7868ad3179d7 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2728,6 +2728,31 @@ kgdbwait [KGDB,EARLY] Stop kernel execution and enter the kernel debugger at the earliest opportunity. + kho= [KEXEC,EARLY] + Format: { "0" | "1" | "off" | "on" | "y" | "n" } + Enables or disables Kexec HandOver. + "0" | "off" | "n" - kexec handover is disabled + "1" | "on" | "y" - kexec handover is enabled + + kho_scratch= [KEXEC,EARLY] + Format: ll[KMG],mm[KMG],nn[KMG] | nn% + Defines the size of the KHO scratch region. The KHO + scratch regions are physically contiguous memory + ranges that can only be used for non-kernel + allocations. That way, even when memory is heavily + fragmented with handed over memory, the kexeced + kernel will always have enough contiguous ranges to + bootstrap itself. + + It is possible to specify the exact amount of + memory in the form of "ll[KMG],mm[KMG],nn[KMG]" + where the first parameter defines the size of a low + memory scratch area, the second parameter defines + the size of a global scratch area and the third + parameter defines the size of additional per-node + scratch areas. The form "nn%" defines scale factor + (in percents) of memory that was used during boot. + kmac= [MIPS] Korina ethernet MAC address. Configure the RouterBoard 532 series on-chip Ethernet adapter MAC address. diff --git a/Documentation/admin-guide/mm/index.rst b/Documentation/admin-guide/mm/index.rst index 8b35795b664be..2d2f6c222308f 100644 --- a/Documentation/admin-guide/mm/index.rst +++ b/Documentation/admin-guide/mm/index.rst @@ -42,3 +42,4 @@ the Linux memory management. transhuge userfaultfd zswap + kho diff --git a/Documentation/admin-guide/mm/kho.rst b/Documentation/admin-guide/mm/kho.rst new file mode 100644 index 0000000000000..c64aa7aadb300 --- /dev/null +++ b/Documentation/admin-guide/mm/kho.rst @@ -0,0 +1,120 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +==================== +Kexec Handover Usage +==================== + +Kexec HandOver (KHO) is a mechanism that allows Linux to preserve memory +regions, which could contain serialized system states, across kexec. + +This document expects that you are familiar with the base KHO +:ref:`concepts `. If you have not read +them yet, please do so now. + +Prerequisites +============= + +KHO is available when the ``CONFIG_KEXEC_HANDOVER`` config option is set to y +at compile time. Every KHO producer may have its own config option that you +need to enable if you would like to preserve their respective state across +kexec. + +To use KHO, please boot the kernel with the ``kho=on`` command line +parameter. You may use ``kho_scratch`` parameter to define size of the +scratch regions. For example ``kho_scratch=16M,512M,256M`` will reserve a +16 MiB low memory scratch area, a 512 MiB global scratch region, and 256 MiB +per NUMA node scratch regions on boot. + +Perform a KHO kexec +=================== + +First, before you perform a KHO kexec, you need to move the system into +the :ref:`KHO finalization phase ` :: + + $ echo 1 > /sys/kernel/debug/kho/out/finalize + +After this command, the KHO FDT is available in +``/sys/kernel/debug/kho/out/fdt``. Other subsystems may also register +their own preserved sub FDTs under +``/sys/kernel/debug/kho/out/sub_fdts/``. + +Next, load the target payload and kexec into it. It is important that you +use the ``-s`` parameter to use the in-kernel kexec file loader, as user +space kexec tooling currently has no support for KHO with the user space +based file loader :: + + # kexec -l Image --initrd=initrd -s + # kexec -e + +The new kernel will boot up and contain some of the previous kernel's state. + +For example, if you used ``reserve_mem`` command line parameter to create +an early memory reservation, the new kernel will have that memory at the +same physical address as the old kernel. + +Abort a KHO exec +================ + +You can move the system out of KHO finalization phase again by calling :: + + $ echo 0 > /sys/kernel/debug/kho/out/active + +After this command, the KHO FDT is no longer available in +``/sys/kernel/debug/kho/out/fdt``. + +debugfs Interfaces +================== + +Currently KHO creates the following debugfs interfaces. Notice that these +interfaces may change in the future. They will be moved to sysfs once KHO is +stabilized. + +``/sys/kernel/debug/kho/out/finalize`` + Kexec HandOver (KHO) allows Linux to transition the state of + compatible drivers into the next kexec'ed kernel. To do so, + device drivers will instruct KHO to preserve memory regions, + which could contain serialized kernel state. + While the state is serialized, they are unable to perform + any modifications to state that was serialized, such as + handed over memory allocations. + + When this file contains "1", the system is in the transition + state. When contains "0", it is not. To switch between the + two states, echo the respective number into this file. + +``/sys/kernel/debug/kho/out/fdt`` + When KHO state tree is finalized, the kernel exposes the + flattened device tree blob that carries its current KHO + state in this file. Kexec user space tooling can use this + as input file for the KHO payload image. + +``/sys/kernel/debug/kho/out/scratch_len`` + To support continuous KHO kexecs, we need to reserve + physically contiguous memory regions that will always stay + available for future kexec allocations. This file describes + the length of these memory regions. Kexec user space tooling + can use this to determine where it should place its payload + images. + +``/sys/kernel/debug/kho/out/scratch_phys`` + To support continuous KHO kexecs, we need to reserve + physically contiguous memory regions that will always stay + available for future kexec allocations. This file describes + the physical location of these memory regions. Kexec user space + tooling can use this to determine where it should place its + payload images. + +``/sys/kernel/debug/kho/out/sub_fdts/`` + In the KHO finalization phase, KHO producers register their own + FDT blob under this directory. + +``/sys/kernel/debug/kho/in/fdt`` + When the kernel was booted with Kexec HandOver (KHO), + the state tree that carries metadata about the previous + kernel's state is in this file in the format of flattened + device tree. This file may disappear when all consumers of + it finished to interpret their metadata. + +``/sys/kernel/debug/kho/in/sub_fdts/`` + Similar to ``kho/out/sub_fdts/``, but contains sub FDT blobs + of KHO producers passed from the old kernel. diff --git a/Documentation/core-api/index.rst b/Documentation/core-api/index.rst index e9789bd381d80..7a4ca18ca6e2d 100644 --- a/Documentation/core-api/index.rst +++ b/Documentation/core-api/index.rst @@ -115,6 +115,7 @@ more memory-management documentation in Documentation/mm/index.rst. pin_user_pages boot-time-mm gfp_mask-from-fs-io + kho/index Interfaces for kernel debugging =============================== diff --git a/Documentation/core-api/kho/bindings/kho.yaml b/Documentation/core-api/kho/bindings/kho.yaml new file mode 100644 index 0000000000000..11e8ab7b219d9 --- /dev/null +++ b/Documentation/core-api/kho/bindings/kho.yaml @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +title: Kexec HandOver (KHO) root tree + +maintainers: + - Mike Rapoport + - Changyuan Lyu + +description: | + System memory preserved by KHO across kexec. + +properties: + compatible: + enum: + - kho-v1 + + preserved-memory-map: + description: | + physical address (u64) of an in-memory structure describing all preserved + folios and memory ranges. + +patternProperties: + "$[0-9a-f_]+^": + $ref: sub-fdt.yaml# + description: physical address of a KHO user's own FDT. + +required: + - compatible + - preserved-memory-map + +additionalProperties: false + +examples: + - | + kho { + compatible = "kho-v1"; + preserved-memory-map = <0xf0be16 0x1000000>; + + memblock { + fdt = <0x80cc16 0x1000000>; + }; + }; diff --git a/Documentation/core-api/kho/bindings/sub-fdt.yaml b/Documentation/core-api/kho/bindings/sub-fdt.yaml new file mode 100644 index 0000000000000..b9a3d2d248501 --- /dev/null +++ b/Documentation/core-api/kho/bindings/sub-fdt.yaml @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +title: KHO users' FDT address + +maintainers: + - Mike Rapoport + - Changyuan Lyu + +description: | + Physical address of an FDT blob registered by a KHO user. + +properties: + fdt: + description: | + physical address (u64) of an FDT blob. + +required: + - fdt + +additionalProperties: false + +examples: + - | + memblock { + fdt = <0x80cc16 0x1000000>; + }; diff --git a/Documentation/core-api/kho/concepts.rst b/Documentation/core-api/kho/concepts.rst new file mode 100644 index 0000000000000..f1826ac10da75 --- /dev/null +++ b/Documentation/core-api/kho/concepts.rst @@ -0,0 +1,74 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later +.. _concepts: + +======================= +Kexec Handover Concepts +======================= + +Kexec HandOver (KHO) is a mechanism that allows Linux to preserve memory +regions, which could contain serialized system states, across kexec. + +It introduces multiple concepts: + +KHO FDT +======= + +Every KHO kexec carries a KHO specific flattened device tree (FDT) blob +that describes preserved memory regions. These regions contain either +serialized subsystem states, or in-memory data that shall not be touched +across kexec. After KHO, subsystems can retrieve and restore preserved +memory regions from KHO FDT. + +KHO only uses the FDT container format and libfdt library, but does not +adhere to the same property semantics that normal device trees do: Properties +are passed in native endianness and standardized properties like ``regs`` and +``ranges`` do not exist, hence there are no ``#...-cells`` properties. + +KHO is still under development. The FDT schema is unstable and would change +in the future. + +Scratch Regions +=============== + +To boot into kexec, we need to have a physically contiguous memory range that +contains no handed over memory. Kexec then places the target kernel and initrd +into that region. The new kernel exclusively uses this region for memory +allocations before during boot up to the initialization of the page allocator. + +We guarantee that we always have such regions through the scratch regions: On +first boot KHO allocates several physically contiguous memory regions. Since +after kexec these regions will be used by early memory allocations, there is a +scratch region per NUMA node plus a scratch region to satisfy allocations +requests that do not require particular NUMA node assignment. +By default, size of the scratch region is calculated based on amount of memory +allocated during boot. The ``kho_scratch`` kernel command line option may be +used to explicitly define size of the scratch regions. +The scratch regions are declared as CMA when page allocator is initialized so +that their memory can be used during system lifetime. CMA gives us the +guarantee that no handover pages land in that region, because handover pages +must be at a static physical memory location and CMA enforces that only +movable pages can be located inside. + +After KHO kexec, we ignore the ``kho_scratch`` kernel command line option and +instead reuse the exact same region that was originally allocated. This allows +us to recursively execute any amount of KHO kexecs. Because we used this region +for boot memory allocations and as target memory for kexec blobs, some parts +of that memory region may be reserved. These reservations are irrelevant for +the next KHO, because kexec can overwrite even the original kernel. + +.. _finalization_phase: + +KHO finalization phase +====================== + +To enable user space based kexec file loader, the kernel needs to be able to +provide the FDT that describes the current kernel's state before +performing the actual kexec. The process of generating that FDT is +called serialization. When the FDT is generated, some properties +of the system may become immutable because they are already written down +in the FDT. That state is called the KHO finalization phase. + +Public API +========== +.. kernel-doc:: kernel/kexec_handover.c + :export: diff --git a/Documentation/core-api/kho/fdt.rst b/Documentation/core-api/kho/fdt.rst new file mode 100644 index 0000000000000..4a5d53c670d4b --- /dev/null +++ b/Documentation/core-api/kho/fdt.rst @@ -0,0 +1,80 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +======= +KHO FDT +======= + +KHO uses the flattened device tree (FDT) container format and libfdt +library to create and parse the data that is passed between the +kernels. The properties in KHO FDT are stored in native format. +It includes the physical address of an in-memory structure describing +all preserved memory regions, as well as physical addresses of KHO users' +own FDTs. Interpreting those sub FDTs is the responsibility of KHO users. + +KHO nodes and properties +======================== + +Property ``preserved-memory-map`` +--------------------------------- + +KHO saves a special property named ``preserved-memory-map`` under the root node. +This node contains the physical address of an in-memory structure for KHO to +preserve memory regions across kexec. + +Property ``compatible`` +----------------------- + +The ``compatible`` property determines compatibility between the kernel +that created the KHO FDT and the kernel that attempts to load it. +If the kernel that loads the KHO FDT is not compatible with it, the entire +KHO process will be bypassed. + +Property ``fdt`` +---------------- + +Generally, A KHO user serialize its state into its own FDT and instructs +KHO to preserve the underlying memory, such that after kexec, the new kernel +can recover its state from the preserved FDT. + +A KHO user thus can create a node in KHO root tree and save the physical address +of its own FDT in that node's property ``fdt`` . + +Examples +======== + +The following example demonstrates KHO FDT that preserves two memory +regions created with ``reserve_mem`` kernel command line parameter:: + + /dts-v1/; + + / { + compatible = "kho-v1"; + + preserved-memory-map = <0x40be16 0x1000000>; + + memblock { + fdt = <0x1517 0x1000000>; + }; + }; + +where the ``memblock`` node contains an FDT that is requested by the +subsystem memblock for preservation. The FDT contains the following +serialized data:: + + /dts-v1/; + + / { + compatible = "memblock-v1"; + + n1 { + compatible = "reserve-mem-v1"; + start = <0xc06b 0x4000000>; + size = <0x04 0x00>; + }; + + n2 { + compatible = "reserve-mem-v1"; + start = <0xc067 0x4000000>; + size = <0x04 0x00>; + }; + }; diff --git a/Documentation/core-api/kho/index.rst b/Documentation/core-api/kho/index.rst new file mode 100644 index 0000000000000..0c63b0c5c1436 --- /dev/null +++ b/Documentation/core-api/kho/index.rst @@ -0,0 +1,13 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +======================== +Kexec Handover Subsystem +======================== + +.. toctree:: + :maxdepth: 1 + + concepts + fdt + +.. only:: subproject and html diff --git a/MAINTAINERS b/MAINTAINERS index 5f33e18385cbc..b3be800e5ea46 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13123,6 +13123,8 @@ M: Mike Rapoport M: Changyuan Lyu L: kexec@lists.infradead.org S: Maintained +F: Documentation/admin-guide/mm/kho.rst +F: Documentation/core-api/kho/* F: include/linux/kexec_handover.h F: kernel/kexec_handover.c From patchwork Fri Apr 11 05:37:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047574 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 6879CC369A8 for ; Fri, 11 Apr 2025 05:39:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 082D8280166; Fri, 11 Apr 2025 01:38:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F245128015B; Fri, 11 Apr 2025 01:38:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D51FA280166; Fri, 11 Apr 2025 01:38:48 -0400 (EDT) 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 AE67B28015B for ; Fri, 11 Apr 2025 01:38:48 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A54F3161D82 for ; Fri, 11 Apr 2025 05:38:49 +0000 (UTC) X-FDA: 83320658778.16.CFB6D4D Received: from mail-oa1-f73.google.com (mail-oa1-f73.google.com [209.85.160.73]) by imf21.hostedemail.com (Postfix) with ESMTP id DD6A21C0004 for ; Fri, 11 Apr 2025 05:38:47 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=njZE9tM1; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf21.hostedemail.com: domain of 35qr4ZwoKCGUFKDQJbXDQOJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--changyuanl.bounces.google.com designates 209.85.160.73 as permitted sender) smtp.mailfrom=35qr4ZwoKCGUFKDQJbXDQOJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--changyuanl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349927; a=rsa-sha256; cv=none; b=ZbgaACHHShsCyr29tjXc0EPJP/dtOAlCn8NBcqhULMo1W0BLaRFZPdFBgYqrWW5AywcKG3 LOQolQ1P80TuaFgnM/sUYFyfa/T8clLtiTjs31ISkF2MaUFn/g6SSOxbPhIpnx0+1S7eCG B6PCe8ryYTyojG+ewov92QzCHGna6U0= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=njZE9tM1; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf21.hostedemail.com: domain of 35qr4ZwoKCGUFKDQJbXDQOJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--changyuanl.bounces.google.com designates 209.85.160.73 as permitted sender) smtp.mailfrom=35qr4ZwoKCGUFKDQJbXDQOJRRJOH.FRPOLQXa-PPNYDFN.RUJ@flex--changyuanl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349927; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=J3pOG049tN04I3gAeVWk6hcyObwRwUDj/yys8nKxPg8=; b=tHeG94scNO70Ed37xXiPcn0KSDS4dCYjV17gB8WDD6e1uVGEvI64qUjFo+W+PTjrHpRhSU O2hXK+asqq0l6xzWXeyMVI70iFoSeRdN2ffVEwed3NQ2+nlJj9ied5mFDR1qmta+stfBrd jwgzyGdLwGy7+psscsmIuLvGJr0zt1E= Received: by mail-oa1-f73.google.com with SMTP id 586e51a60fabf-2c2a9abc5b2so451335fac.1 for ; Thu, 10 Apr 2025 22:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349927; x=1744954727; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=J3pOG049tN04I3gAeVWk6hcyObwRwUDj/yys8nKxPg8=; b=njZE9tM1EPg6e21P251BdsjCsd17t6UHqyOPxvT9k05CBM8JrwaUs5Byx/1wxoNe/z p/Gsqh/jcYjKgR70+kCFvYjird7CPRqTEZP2LiJ9Wy0V1zDOtTF6P4RE9YtjNP1fl+uh /45R/kSt8JqCgBuBrnuq6cl8ykPD0q2ZLw5aT+9dzSAx1pCtPdWSboiaA2KezbVKCqUz GAzX5AEFCLUzR2Op9gHVd+qjiGCBHw4CvdZm+N8aE4OrX937yxq+iDbOL9fKyR8q+ZT2 jtKVkPXGwSGPp6CLVWJ0Cc++a9DY2UhwwDmW4+YtnCAx0fxKXP2pjzanqDDjMa7remh/ Fv6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349927; x=1744954727; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=J3pOG049tN04I3gAeVWk6hcyObwRwUDj/yys8nKxPg8=; b=tMhZiyIMLa5MnHDEJCyDP8VbnHdsF43WecUueYUIltdBZu2qZU3oSHtf329FDExZvF 8CeyDFm7H+GO8k9gcA0naCJDqrFD0aqvlpwV3WMNgnHI9iucA8xtkEdgF0Lpw1ZsFot5 LSJu5QMwI/Xehu5qn2oDB55wftVHLzS2tsbwzrr7JmJRRrUhim+20dLO4ytEQeNlC/Ua Wz51il1/5WvRuYUdYsbxw4orHMZhuuEAOAKhTIirhSB/EtwokFs9Yui0Hc/46LOoWKsj Tm1bS3rCzUUjJdJa5LEOEVNB6FK1TdJKetBS0eJhHFZLJOS8ltUBPumU5w5pKa/mb4FE PtYg== X-Forwarded-Encrypted: i=1; AJvYcCXKeJnN1c2q9GomTZ6JiLfyecIuck2xui2K2TUtkPG/oQXOBAdfQAdl6RmTNKhihmvOn1BWNtB19w==@kvack.org X-Gm-Message-State: AOJu0Yx1z/iQ80Ubc7NtbxqJiooeRFEo7h6m+9e65HkLSzys9xKpG79s Hc8BtxWpQT7HcJRkWq4MgVO6zKf7Xo9cgh3SiT9FU4QWvS0A0Wc0ft1kq43fBmTrpqxSWO5BT/Q JlWlb1B3nSAagXCBZ8w== X-Google-Smtp-Source: AGHT+IEJNpRI4+8yaXJk8414f64tfdUZ+FcyahilW3BlIEGi90JnnJd1CB5TgY9EhsFB2ykTGHq1Hj397rCuMwxE X-Received: from oabvp10.prod.google.com ([2002:a05:6871:a00a:b0:2c1:5f7a:eba8]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6871:4006:b0:29e:671b:6003 with SMTP id 586e51a60fabf-2d0d5f55d6emr854516fac.32.1744349926748; Thu, 10 Apr 2025 22:38:46 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:45 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-15-changyuanl@google.com> Subject: [PATCH v6 14/14] Documentation: KHO: Add memblock bindings From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Queue-Id: DD6A21C0004 X-Stat-Signature: zon46dw11u4maqh3ks6icd5spdz85e1x X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1744349927-218029 X-HE-Meta: U2FsdGVkX1/CavUsfZE4sVt9i+yAw22HYWgkcIfQ6Zitlciwg4Fe7DV0KaljXrvxY8QHBWscPgAfFf4tmrNO2DsqEJT/CYJswlj7Edzi1sYXKxtaGtWDOafUgvR3UmW/w89opRhW5x1Ubu5FCuP1cCurED3rK0rjPBJx4OYqfrehJw2l9QTmG5OL2Ys0XSPjdzfhjDE4dwdIooF620qaD5j94Xikl2+bE6iA1QLwOh5knJv37Dn+7VG5uLAQk6CQgQwSrmuT45I89O9y7ME1WNh3QYKFhXFnL4ZagERLy1tRQ2pSTGSCfASIGGEnuzAJSqLHFz1cTsikTEhVFqupn/iXbc+kU4uwUKUh/c96tM+uaIzj1Nw+EQ+ShPDzTNOOVcteWmGs+P3Z971MrYJO/ZzOu2smBFjT1VhGpKnJRfksBGZL8g/qq54fnobjMKdrCSRgqxSzS78cWIXLIC0Da3SBvRBQHpfB2RZwsf0p6c72TzWLyY/LUHbZ+iSs4Cnwi0QMxTNK4UZiClBcoQYprsJ1HxvV69thiL3Lzb6emBK/wKife0LyVcFRIaAI+g4yS1PB9twj4A3BDg3ctfyt99QSzxz1Jg6miU/vemsnMpvF6o799H88EohLiVBBU9QzY8N0PiSpPd7cPBZasv/haJcFCfKSC0+AtpvsFa67tm8w+tFhXP1tNTe0uAhWFaUIVuUlxxJLn8BlywkhRlvS/TlePlmq6XEfYydBGJIiRGwxEQp3QRwwsfyGjqVkZOxAIRXDg3xLe5Xujhck6dEbYuvpHyNtmLBLEhj6JwnaUY6+qhnhePYhfFbiyeyrGXRKxBS+yfDUpZD3Z1/gXBX67Liw4KxA0VqgSO9EVnFD5F0L5GhGLQmbidKIr+4xjQCufk2AHEM10k2xLyG1mmsSfFq6TRIZEY8utdP3Ohqzz2aGgqqC0tt2gI4M3T5/oq27efS5zO85LRiwoCrgfJW tOAYFxwy bJTZFa7LdkY6OB9P0d2IUwU1kfcKSt6tqm1Xep8S5cBNPBOQN4JzL+kKrXQYoqLsQmRCYsIq3fJFlJNcB+phKFjTh9s2spOU2lInEVeQ+jS2JimTTVBPyXwgDoTu3+CwZGQQfC+VkADbYltI3u4SWYqcxKbV14CCVFu87OPanbwpln3+Ec0MimZlKhZwoSpLbdbXJKWmjIL4f8zBgoSSvpQnXPQsrYdbUrAkmDBZy7CEAwgbouC+IC7kdsByYWMK8pLjGZUJKATA9T8ljut4+hjUI4ougKPaQSm6YdUKjOoQivx6xuy6irCLrxL4l5pH5qg/PsPc0HQ9GLu0DyK5mdcWBmM+DAbP6zp6yw1wZMrNylJs3AFTGRN3T37wCa8NJRIpRmjZdzG9bYj7CMhOrVuYlPAu7DH1AyaFf/KEk9beYI65Yazs/sb3UTYQBg+D6KkdEMDHxNML6MTOlBbnRMbVEmKiQFfhY6PQdlsdbaRLEa9KAgAeg9kXB/Mj7YUghLzXfZMKW7dcjU9JbPlLsTtYHHWveCHivJd3HGH1LHOdS9VR1iaQdzY4f0aoBjMuwnxulwPYXW8opiOkI3540Kb1LGJ1qHhQ3MEzPH4aMlhJxlu3tnN/wzD1NQbvOEYr05H0diPof0CSnpmazU/aaKuGzFnQ2KfEqpNZFQwzxG7ybZNJGH2V1D1DE6g== 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: From: "Mike Rapoport (Microsoft)" We introduced KHO into Linux: A framework that allows Linux to pass metadata and memory across kexec from Linux to Linux. KHO reuses fdt as file format and shares a lot of the same properties of firmware-to- Linux boot formats: It needs a stable, documented ABI that allows for forward and backward compatibility as well as versioning. As first user of KHO, we introduced memblock which can now preserve memory ranges reserved with reserve_mem command line options contents across kexec, so you can use the post-kexec kernel to read traces from the pre-kexec kernel. This patch adds memblock schemas similar to "device" device tree ones to a new kho bindings directory. This allows us to force contributors to document the data that moves across KHO kexecs and catch breaking change during review. Co-developed-by: Alexander Graf Signed-off-by: Alexander Graf Signed-off-by: Mike Rapoport (Microsoft) Signed-off-by: Changyuan Lyu --- .../kho/bindings/memblock/memblock.yaml | 39 ++++++++++++++++++ .../kho/bindings/memblock/reserve-mem.yaml | 40 +++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 80 insertions(+) create mode 100644 Documentation/core-api/kho/bindings/memblock/memblock.yaml create mode 100644 Documentation/core-api/kho/bindings/memblock/reserve-mem.yaml diff --git a/Documentation/core-api/kho/bindings/memblock/memblock.yaml b/Documentation/core-api/kho/bindings/memblock/memblock.yaml new file mode 100644 index 0000000000000..d388c28eb91d1 --- /dev/null +++ b/Documentation/core-api/kho/bindings/memblock/memblock.yaml @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +title: Memblock reserved memory + +maintainers: + - Mike Rapoport + +description: | + Memblock can serialize its current memory reservations created with + reserve_mem command line option across kexec through KHO. + The post-KHO kernel can then consume these reservations and they are + guaranteed to have the same physical address. + +properties: + compatible: + enum: + - reserve-mem-v1 + +patternProperties: + "$[0-9a-f_]+^": + $ref: reserve-mem.yaml# + description: reserved memory regions + +required: + - compatible + +additionalProperties: false + +examples: + - | + memblock { + compatible = "memblock-v1"; + n1 { + compatible = "reserve-mem-v1"; + start = <0xc06b 0x4000000>; + size = <0x04 0x00>; + }; + }; diff --git a/Documentation/core-api/kho/bindings/memblock/reserve-mem.yaml b/Documentation/core-api/kho/bindings/memblock/reserve-mem.yaml new file mode 100644 index 0000000000000..10282d3d1bcdc --- /dev/null +++ b/Documentation/core-api/kho/bindings/memblock/reserve-mem.yaml @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +title: Memblock reserved memory regions + +maintainers: + - Mike Rapoport + +description: | + Memblock can serialize its current memory reservations created with + reserve_mem command line option across kexec through KHO. + This object describes each such region. + +properties: + compatible: + enum: + - reserve-mem-v1 + + start: + description: | + physical address (u64) of the reserved memory region. + + size: + description: | + size (u64) of the reserved memory region. + +required: + - compatible + - start + - size + +additionalProperties: false + +examples: + - | + n1 { + compatible = "reserve-mem-v1"; + start = <0xc06b 0x4000000>; + size = <0x04 0x00>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index b3be800e5ea46..60e4093042e1b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15425,6 +15425,7 @@ M: Mike Rapoport L: linux-mm@kvack.org S: Maintained F: Documentation/core-api/boot-time-mm.rst +F: Documentation/core-api/kho/bindings/memblock/* F: include/linux/memblock.h F: mm/memblock.c F: mm/mm_init.c