From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 38C71CA0FED for ; Fri, 5 Sep 2025 13:13:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 460F18E0003; Fri, 5 Sep 2025 09:13:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 43EF06B000D; Fri, 5 Sep 2025 09:13:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34F178E0003; Fri, 5 Sep 2025 09:13:16 -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 243166B000C for ; Fri, 5 Sep 2025 09:13:16 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B68EBB6D0D for ; Fri, 5 Sep 2025 13:13:15 +0000 (UTC) X-FDA: 83855237550.18.2D9DC52 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf28.hostedemail.com (Postfix) with ESMTP id 2E718C001E for ; Fri, 5 Sep 2025 13:13:14 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=NVpLCAJ8; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf28.hostedemail.com: domain of rppt@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1757077994; a=rsa-sha256; cv=none; b=KWCgXag1+VWSrv0T0BiHiWQbfj74BuurOl4pBOkkbI9RG575UfAwL7qpJ0iubr0m8rF9UO 8/tadV+saBkrVTJ9mTtlmnWXbBwc18/GeQeXAhVtmdzT9yPsvA57IozZTWovc0mE7FRdM2 T5BgoF013akSYeSokqQiuaKpWVLSiSA= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=NVpLCAJ8; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf28.hostedemail.com: domain of rppt@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1757077994; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0wnOGZbPA+pJ6E43mrAV34hs4thPz+wgGsrrH/lPENw=; b=sCfOV3rZZQVEmcLCJhpX+0gY8bOKRKtfn9b/YI8sFoFS1i9/JcM1+BaiWoAuLfJHMP7DE8 AMAcQx7quPCD2jr62ET0U+k8j0WZpxJ/gzEjZaOZI81+HzhMwEYL3+NUXhYNZUmpMYhb22 CW7gkniUZASMkWGgKykIAdRnu9b7AE8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 5A97660284; Fri, 5 Sep 2025 13:13:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F22ACC4CEF1; Fri, 5 Sep 2025 13:13:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757077993; bh=7kJZgdLvlkty1R/matrNEswbE0YZDCA8+y+K2Ilbxag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NVpLCAJ8xfJYqVtWDOSSFcEW5T7c61P25NCNCDAvR7Sh54Xb76Jr7PjQhYyiPEf8B 3r1IgApgMOUPNHbKd7lseuGCxfyDFEMVqId5rRkJ2E3W4gLEs2fqP712Hew6Rgs8vD yeTs4ClufsIXST2Kkr9iZt0GURKERvzsmRA2oh59pgQueGMIb5xkNckyuMdfl0DsXs Ol8+1earXXq9y7XhArBMb9WYCRIzQXnFFEMZ+uuRzArh7rjv02WtGR5EeV/9EK/BYM tiDRb10dxNg87kHLjgSfnW0TcNegxXI3IJd1XqFnvrW1PSyq5Hl5yOtW7mKIGq83kt 0IKGT9qJVQySw== From: Mike Rapoport To: Andrew Morton Cc: Alexander Graf , Baoquan He , Changyuan Lyu , Chris Li , Jason Gunthorpe , Mike Rapoport , Pasha Tatashin , Pratyush Yadav , kexec@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] kho: add support for preserving vmalloc allocations Date: Fri, 5 Sep 2025 16:13:01 +0300 Message-ID: <20250905131302.3595582-2-rppt@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250905131302.3595582-1-rppt@kernel.org> References: <20250905131302.3595582-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2E718C001E X-Stat-Signature: jiosy4pqd79njmupmr9jap6bnj46d5gn X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1757077993-461959 X-HE-Meta: U2FsdGVkX1+gfxQ6As566qNsjNcPW5ylvhyLCbw19uHneMKZXYnV4OTT8pSNueeTWgnZuR2gkRSRNW81M3Q+Iufk1L5tFkl0F89a5whomgUA5YQDFSCx7Eky4K9nRsk+7yba7d5LYcrBbguz1p11bYw3QLth0+Meo1pddaAyXpq4n3U4uMOe3jaN+kGOL1PsXk3gPNYB0v7MQ2+cWPmz/1gRtaAwUoqXR81O8rk8ksvP/ewxgp4kLhig3dNE1QCKGY6hDec/nrnt/1zHhpz/GxA4yKXd7Ua7op7YfgHY1zp0pTZb+xqgldgUDwqh0lBogRYUMWyqF6QwUbJN8+/Tj+c+0cg+AvjaGsG2wa0sSWhvOxpe3/7ywkVj76JMKS29MXLWYUD/WJlfmkaiHgIZQtXMnla+siSeObqBJVX8IvBBxR6HiYgsvbmBvVqV73/GwJWvpz6T+bZbmqNAHHg3I0PR6zqu3X82BP5NbNzSmgxyMJQptZoJq69FhddBEEzXA97NpgBfUBt5RIDCn7S55olh+2r1tYK9/yRA7zAmbXYyf1PuBYYNLjg3hNWNHF5SCkafqgzoRGmjYKFE50fyB1HhG9/hZGuEVSth8lMDaiwiWs9sn+b6PJrIhbTsQb740DB52ebGKweskd8RwiTnNy22cneSM+oVqg2Mq032ZOdb6IdlhQHbxNXNNGREIYlAzI+eKzpQofGkx2LhFcLWFgXrIhlJWFBxAyRxBhJSLDVAwYDmNVOSE7ZB+sg7W9UBAIfPP2oVu8LwDQ2mPAFRFojuQ1EUVdWJ3SoWT1Wthd7F5fzbNMbcZKf8aqnqqyi7LekdwH7YIGoKigUazRBBDz5I6aHqB7E5nlawDiK3XAI9LmdYftLVxzyte1j7HAq4/DtHbMH2+KU/KRw01qBT0vsQxcivD+i7PXN/+3tR4KpPYC8lzIPUr26MKvXwNnkPWvAAy5eNAqrspSz8c1m ylLgJiXG W9rX2dj3F9SRCvKQP34aRJ0t34hTnjI352EmjOO4tIHIS9nGX+TX5btZjc5tiufYWaLY9NEreT+bfvbP5KPdZEqJ5VLgernPBkBqjY8pZbiYnQMeZuVPCp57MURD2rdCYaSXG7sEbQ7Cjlfgm62JbYwxmpBOlQclIIVMhy5FmQc0tKPEHpq0F2B/SGMMmJwDlUrjKpZJmugK6e0RwcbNw8wGAgAr713GfLTtl3VpVd03sPm8J6y92KbTTkkKkjzZHj1g4G5Nw1jCGOL4= 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)" A vmalloc allocation is preserved using binary structure similar to global KHO memory tracker. It's a linked list of pages where each page is an array of physical address of pages in vmalloc area. kho_preserve_vmalloc() hands out the physical address of the head page to the caller. This address is used as the argument to kho_vmalloc_restore() to restore the mapping in the vmalloc address space and populate it with the preserved pages. Signed-off-by: Mike Rapoport (Microsoft) --- include/linux/kexec_handover.h | 12 ++ kernel/kexec_handover.c | 200 +++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+) diff --git a/include/linux/kexec_handover.h b/include/linux/kexec_handover.h index 348844cffb13..b7bf3bf11019 100644 --- a/include/linux/kexec_handover.h +++ b/include/linux/kexec_handover.h @@ -42,8 +42,10 @@ struct kho_serialization; bool kho_is_enabled(void); int kho_preserve_folio(struct folio *folio); +int kho_preserve_vmalloc(void *ptr, phys_addr_t *preservation); int kho_preserve_phys(phys_addr_t phys, size_t size); struct folio *kho_restore_folio(phys_addr_t phys); +void *kho_restore_vmalloc(phys_addr_t preservation); int kho_add_subtree(struct kho_serialization *ser, const char *name, void *fdt); int kho_retrieve_subtree(const char *name, phys_addr_t *phys); @@ -70,11 +72,21 @@ static inline int kho_preserve_phys(phys_addr_t phys, size_t size) return -EOPNOTSUPP; } +static inline int kho_preserve_vmalloc(void *ptr, phys_addr_t *preservation) +{ + return -EOPNOTSUPP; +} + static inline struct folio *kho_restore_folio(phys_addr_t phys) { return NULL; } +static inline void *kho_restore_vmalloc(phys_addr_t preservation) +{ + 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 ecd1ac210dbd..c4560ff9b1fc 100644 --- a/kernel/kexec_handover.c +++ b/kernel/kexec_handover.c @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -733,6 +734,205 @@ int kho_preserve_phys(phys_addr_t phys, size_t size) } EXPORT_SYMBOL_GPL(kho_preserve_phys); +struct kho_vmalloc_chunk; + +struct kho_vmalloc_hdr { + DECLARE_KHOSER_PTR(next, struct kho_vmalloc_chunk *); + unsigned int total_pages; /* only valid in the first chunk */ + unsigned int flags; /* only valid in the first chunk */ + unsigned short order; /* only valid in the first chunk */ + unsigned short num_elms; +}; + +#define KHO_VMALLOC_SIZE \ + ((PAGE_SIZE - sizeof(struct kho_vmalloc_hdr)) / \ + sizeof(phys_addr_t)) + +struct kho_vmalloc_chunk { + struct kho_vmalloc_hdr hdr; + phys_addr_t phys[KHO_VMALLOC_SIZE]; +}; + +static_assert(sizeof(struct kho_vmalloc_chunk) == PAGE_SIZE); + +#define KHO_VMALLOC_FLAGS_MASK (VM_ALLOC | VM_ALLOW_HUGE_VMAP) + +static struct kho_vmalloc_chunk *new_vmalloc_chunk(struct kho_vmalloc_chunk *cur) +{ + struct kho_vmalloc_chunk *chunk; + int err; + + chunk = kzalloc(PAGE_SIZE, GFP_KERNEL); + if (!chunk) + return NULL; + + err = kho_preserve_phys(virt_to_phys(chunk), PAGE_SIZE); + if (err) + goto err_free; + if (cur) + KHOSER_STORE_PTR(cur->hdr.next, chunk); + return chunk; + +err_free: + kfree(chunk); + return NULL; +} + +static void kho_vmalloc_free_chunks(struct kho_vmalloc_chunk *first_chunk) +{ + struct kho_mem_track *track = &kho_out.ser.track; + struct kho_vmalloc_chunk *chunk = first_chunk; + + while (chunk) { + unsigned long pfn = PHYS_PFN(virt_to_phys(chunk)); + struct kho_vmalloc_chunk *tmp = chunk; + + __kho_unpreserve(track, pfn, pfn + 1); + + chunk = KHOSER_LOAD_PTR(chunk->hdr.next); + kfree(tmp); + } +} + +/** + * kho_preserve_vmalloc - preserve memory allocated with vmalloc() across kexec + * @ptr: pointer to the area in vmalloc address space + * @preservation: returned physical address of preservation metadata + * + * Instructs KHO to preserve the area in vmalloc address space at @ptr. The + * physical pages mapped at @ptr will be preserved and on successful return + * @preservation will hold the physical address of a structure that describes + * the preservation. + * + * NOTE: The memory allocated with vmalloc_node() variants cannot be reliably + * restored on the same node + * + * Return: 0 on success, error code on failure + */ +int kho_preserve_vmalloc(void *ptr, phys_addr_t *preservation) +{ + struct kho_mem_track *track = &kho_out.ser.track; + struct kho_vmalloc_chunk *chunk, *first_chunk; + struct vm_struct *vm = find_vm_area(ptr); + unsigned int order, flags; + int err; + + if (!vm) + return -EINVAL; + + if (vm->flags & ~KHO_VMALLOC_FLAGS_MASK) + return -EOPNOTSUPP; + + flags = vm->flags & KHO_VMALLOC_FLAGS_MASK; + order = get_vm_area_page_order(vm); + + chunk = new_vmalloc_chunk(NULL); + if (!chunk) + return -ENOMEM; + first_chunk = chunk; + first_chunk->hdr.total_pages = vm->nr_pages; + first_chunk->hdr.flags = flags; + first_chunk->hdr.order = order; + + for (int i = 0; i < vm->nr_pages; i += (1 << order)) { + phys_addr_t phys = page_to_phys(vm->pages[i]); + + err = __kho_preserve_order(track, PHYS_PFN(phys), order); + if (err) + goto err_free; + + chunk->phys[chunk->hdr.num_elms] = phys; + chunk->hdr.num_elms++; + if (chunk->hdr.num_elms == ARRAY_SIZE(chunk->phys)) { + chunk = new_vmalloc_chunk(chunk); + if (!chunk) + goto err_free; + } + } + + *preservation = virt_to_phys(first_chunk); + return 0; + +err_free: + kho_vmalloc_free_chunks(first_chunk); + return err; +} +EXPORT_SYMBOL_GPL(kho_preserve_vmalloc); + +/** + * kho_restore_vmalloc - recreates and populates an area in vmalloc address + * space from the preserved memory. + * @preservation: physical address of the preservation metadata. + * + * Recreates an area in vmalloc address space and populates it with memory that + * was preserved using kho_preserve_vmalloc(). + * + * Return: pointer to the area in the vmalloc address space, NULL on failure. + */ +void *kho_restore_vmalloc(phys_addr_t preservation) +{ + struct kho_vmalloc_chunk *chunk = phys_to_virt(preservation); + unsigned int align, order, shift, flags; + unsigned int idx = 0, nr; + unsigned long addr, size; + struct vm_struct *area; + struct page **pages; + int err; + + flags = chunk->hdr.flags; + if (flags & ~KHO_VMALLOC_FLAGS_MASK) + return NULL; + + nr = chunk->hdr.total_pages; + pages = kvmalloc_array(nr, sizeof(*pages), GFP_KERNEL); + if (!pages) + return NULL; + order = chunk->hdr.order; + shift = PAGE_SHIFT + order; + align = 1 << shift; + + while (chunk) { + struct page *page; + + for (int i = 0; i < chunk->hdr.num_elms; i++) { + phys_addr_t phys = chunk->phys[i]; + + for (int j = 0; j < (1 << order); j++) { + page = phys_to_page(phys); + kho_restore_page(page, 0); + pages[idx++] = page; + phys += PAGE_SIZE; + } + } + + page = virt_to_page(chunk); + chunk = KHOSER_LOAD_PTR(chunk->hdr.next); + kho_restore_page(page, 0); + __free_page(page); + } + + area = __get_vm_area_node(nr * PAGE_SIZE, align, shift, flags, + VMALLOC_START, VMALLOC_END, NUMA_NO_NODE, + GFP_KERNEL, __builtin_return_address(0)); + if (!area) + goto err_free_pages_array; + + addr = (unsigned long)area->addr; + size = get_vm_area_size(area); + err = vmap_pages_range(addr, addr + size, PAGE_KERNEL, pages, shift); + if (err) + goto err_free_vm_area; + + return area->addr; + +err_free_vm_area: + free_vm_area(area); +err_free_pages_array: + kvfree(pages); + return NULL; +} +EXPORT_SYMBOL_GPL(kho_restore_vmalloc); + /* Handling for debug/kho/out */ static struct dentry *debugfs_root; -- 2.50.1