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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EDAEBC55179 for ; Mon, 3 Aug 2026 11:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3WS6p2C4BmwdiRsncUpnqm0L7Z6/0c6U1cXqlGa6Rj0=; b=GsDXgEi/MFjcwKpOMrH3/lH59r n5Estt0pwHJcXxRNQNjCUMF4/ywdhk0VzoCqqdigJCI1/9Gx7EewzrzlKYjVeh+r8pdNuyCxoNcZm hVB+JMUuscJ9bmpBYe7RMb00t4VVrER8vKkXXci66xgjRC3quPUkEMktp9c5MJGOaZBAH+Qxb2ezU zwRWvbZAPWVkZJOuI5ZifT8zTdEoQvqHQf7m0x7Pf6atwEh58j8OdO4t6rDqEdUezg+JXCAsbtpJ1 JioVBgXz1at9t74L0tncEBWK/UROOh5g0fTiHWHotXuhFX7eZd+sACpiESlVTKOT7Zlb5HcwuDdqf 2t6yqtVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqr1Q-0000000GxTg-3ocO; Mon, 03 Aug 2026 11:39:56 +0000 Received: from mail-pl1-x648.google.com ([2607:f8b0:4864:20::648]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqr1O-0000000GxSD-0ngg for kexec@lists.infradead.org; Mon, 03 Aug 2026 11:39:55 +0000 Received: by mail-pl1-x648.google.com with SMTP id d9443c01a7336-2cfa4e4684bso90015285ad.2 for ; Mon, 03 Aug 2026 04:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785757193; x=1786361993; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=3WS6p2C4BmwdiRsncUpnqm0L7Z6/0c6U1cXqlGa6Rj0=; b=FCx5v0BAd+olT7TZPO4awT7/iZJ573DehLZYg6tEHjIjR4XluiINuli9AehoplKWYG 56B1fyxTSfPypDeKb4AonIly+O1lQg12HFVu1nYNRZaTOgOMz9FblM9vcWFurYuX27lO YK/App4XOltdoKJ4IxGuRa8/dR+mCt5sOgybuvLyeaJlMbbaZzKrFjjKlB7YhmXkjlTi QXG0h+TWmIZ+AkzmERXnQ2Hpy/gFwvSaj6/O3OrVYJtu6SBuX/zwZeJnmArIYbd2fEa5 pOdXnD5qy7SqcRFfjjWYveLU1cpwqDSLsiWgj6AhH6z7r77wHRKEuTf0yrQ0q98sEWTQ I/TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785757193; x=1786361993; h=content-type: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:content-type; bh=3WS6p2C4BmwdiRsncUpnqm0L7Z6/0c6U1cXqlGa6Rj0=; b=aRrtSTsl9Cqb3vPf8PnEGU5Eo74U8m6IIgh4NUhnVh4LBXHZfi1KS5VsUMP7W6MUmA K8U7phQXz0ZO+fwVYTBPnEP/xyiAMCjO4Afi1mTc7ST2YGlifIOgeNMnZbPSgC6Yb0ld iT5mutXo+EKmEWzhJBeaI3EvcEgMMxEeARklpUX9IPNJ0522boFphu6HzyjZEutNhQ+4 RuoO+z8Y1Gzd7b85Xlcm+eFwt6mE/+fFMM7kE9JXolMudQqfTzolruKXz5Sjo6MHIyAc uaRT+g8n/ZO8nKM/mNnVWvYFkC19nE3PsOCoZgREvYMvaquMjABxhG4q+QxQnt1ZcUnz k91g== X-Forwarded-Encrypted: i=1; AHgh+RrbpQk16lPn1XZ56pfnqRyrYhU8LSR8Zzj3GFWmJ1Q78qNCY6eFoYhVl3ZGX9M/3UoW7nXNAw==@lists.infradead.org X-Gm-Message-State: AOJu0YzHWqFA3tox+GlXf/K1CNhrM8IAL15iQj8Qhl+R+Bs8HmhPpl9H +ASk/aZOV2+UmnzR11Jr+X8llGVU4hhtti2Bj2eVaf4hhMwetT/5PnHgSmIs24SPB5abWcCFDZi W2A== X-Received: from pgno7.prod.google.com ([2002:a63:7e47:0:b0:ca2:10cf:5d95]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:710e:b0:3c3:6528:c87 with SMTP id adf61e73a8af0-3c92a519c67mr10067044637.1.1785757192568; Mon, 03 Aug 2026 04:39:52 -0700 (PDT) Date: Mon, 3 Aug 2026 11:39:43 +0000 In-Reply-To: <20260803113944.3694290-1-praan@google.com> Mime-Version: 1.0 References: <20260803113944.3694290-1-praan@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260803113944.3694290-3-praan@google.com> Subject: [PATCH v4 2/2] kho: Introduce preserve/restore APIs for high-order pages From: Pranjal Shrivastava To: Mike Rapoport , Pasha Tatashin , Pratyush Yadav Cc: Alexander Graf , Samiullah Khawaja , David Matlack , kexec@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Pranjal Shrivastava Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260803_043954_246180_913EC69C X-CRM114-Status: GOOD ( 20.74 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org The current KHO page preservation APIs (e.g. kho_preserve_pages) assume that multi-page blocks are split into independent 4KB pages during restoration. This is incompatible with high-order non-compound pages, such as DMA buffers, which must be restored with tail pages having a zero reference count. Introduce explicit preserve and restore APIs for high-order pages, which preserve and restore a high-order page block as a single unit, applying a refcount of 1 to the head page while leaving tail pages at 0. Rename the existing internal helper to __kho_restore_page() and consolidate the common restoration code into it. Signed-off-by: Pranjal Shrivastava --- include/linux/kexec_handover.h | 10 +++ kernel/liveupdate/kexec_handover.c | 98 ++++++++++++++++++++++++++---- 2 files changed, 96 insertions(+), 12 deletions(-) diff --git a/include/linux/kexec_handover.h b/include/linux/kexec_handover.h index 8968c56d2d73..6e2c75b16209 100644 --- a/include/linux/kexec_handover.h +++ b/include/linux/kexec_handover.h @@ -22,6 +22,8 @@ bool is_kho_boot(void); int kho_preserve_folio(struct folio *folio); void kho_unpreserve_folio(struct folio *folio); +int kho_preserve_page(struct page *page, unsigned int order); +void kho_unpreserve_page(struct page *page, unsigned int order); int kho_preserve_pages(struct page *page, unsigned long nr_pages); void kho_unpreserve_pages(struct page *page, unsigned long nr_pages); int kho_preserve_vmalloc(void *ptr, struct kho_vmalloc *preservation); @@ -30,6 +32,7 @@ void *kho_alloc_preserve(size_t size); void kho_unpreserve_free(void *mem); void kho_restore_free(void *mem); struct folio *kho_restore_folio(phys_addr_t phys); +struct page *kho_restore_page(phys_addr_t phys); struct page *kho_restore_pages(phys_addr_t phys, unsigned long nr_pages); void *kho_restore_vmalloc(const struct kho_vmalloc *preservation); int kho_add_subtree(const char *name, void *blob, size_t size); @@ -65,6 +68,13 @@ static inline int kho_preserve_pages(struct page *page, unsigned int nr_pages) static inline void kho_unpreserve_pages(struct page *page, unsigned int nr_pages) { } +static inline int kho_preserve_page(struct page *page, unsigned int order) +{ + return -EOPNOTSUPP; +} + +static inline void kho_unpreserve_page(struct page *page, unsigned int order) { } + static inline int kho_preserve_vmalloc(void *ptr, struct kho_vmalloc *preservation) { diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index e836efd98795..dd41d324c213 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -393,10 +393,9 @@ static void kho_init_folio(struct page *page, unsigned int order) prep_compound_page(page, order); } -static struct page *kho_restore_page(phys_addr_t phys, bool is_folio) +static struct page *__kho_restore_page(phys_addr_t phys, unsigned int *order) { struct page *page = pfn_to_online_page(PHYS_PFN(phys)); - unsigned long nr_pages; union kho_page_info info; if (!page) @@ -410,17 +409,14 @@ static struct page *kho_restore_page(phys_addr_t phys, bool is_folio) */ if (WARN_ON_ONCE(info.magic != KHO_PAGE_MAGIC)) return NULL; - nr_pages = (1 << info.order); /* Clear private to make sure later restores on this page error out. */ page->private = 0; + if (order) + *order = info.order; - if (is_folio) - kho_init_folio(page, info.order); - else - kho_init_pages(page, nr_pages); + adjust_managed_page_count(page, 1UL << info.order); - adjust_managed_page_count(page, nr_pages); return page; } @@ -432,12 +428,41 @@ static struct page *kho_restore_page(phys_addr_t phys, bool is_folio) */ struct folio *kho_restore_folio(phys_addr_t phys) { - struct page *page = kho_restore_page(phys, true); + unsigned int order; + struct page *page = __kho_restore_page(phys, &order); + + if (!page) + return NULL; + + kho_init_folio(page, order); - return page ? page_folio(page) : NULL; + return page_folio(page); } EXPORT_SYMBOL_GPL(kho_restore_folio); +/** + * kho_restore_page - restore a high-order page block. + * @phys: physical address of the first page. + * + * Restore a high-order page block that was preserved with + * kho_preserve_page(). + * + * Return: the head page on success, NULL on failure. + */ +struct page *kho_restore_page(phys_addr_t phys) +{ + unsigned int order; + struct page *page = __kho_restore_page(phys, &order); + + if (!page) + return NULL; + + kho_init_high_order_page(page, order); + + return page; +} +EXPORT_SYMBOL_GPL(kho_restore_page); + /** * kho_restore_pages - restore list of contiguous order 0 pages. * @phys: physical address of the first page. @@ -457,10 +482,13 @@ struct page *kho_restore_pages(phys_addr_t phys, unsigned long nr_pages) while (pfn < end_pfn) { const unsigned int order = min(count_trailing_zeros(pfn), ilog2(end_pfn - pfn)); - struct page *page = kho_restore_page(PFN_PHYS(pfn), false); + unsigned int info_order; + struct page *page = __kho_restore_page(PFN_PHYS(pfn), &info_order); if (!page) return NULL; + + kho_init_pages(page, 1UL << info_order); pfn += 1 << order; } @@ -890,6 +918,51 @@ void kho_unpreserve_folio(struct folio *folio) } EXPORT_SYMBOL_GPL(kho_unpreserve_folio); +/** + * kho_preserve_page - preserve a high-order page block. + * @page: head page of the block. + * @order: order of the allocation. + * + * Instructs KHO to preserve a high-order contiguous allocation (like a DMA + * buffer) as a single unit. It must be restored using kho_restore_page() to + * ensure the tail pages are correctly initialized with a zero refcount. + * + * If a driver needs to split a block that has been preserved with this + * function, it must first unpreserve the block using kho_unpreserve_page(), + * perform the split, and then re-preserve the individual pages using + * kho_preserve_pages(). + * + * Return: 0 on success, error code on failure + */ +int kho_preserve_page(struct page *page, unsigned int order) +{ + struct kho_radix_tree *tree = &kho_out.radix_tree; + const unsigned long pfn = page_to_pfn(page); + + if (WARN_ON(kho_scratch_overlap(pfn << PAGE_SHIFT, PAGE_SIZE << order))) + return -EINVAL; + + return kho_radix_add_page(tree, pfn, order); +} +EXPORT_SYMBOL_GPL(kho_preserve_page); + +/** + * kho_unpreserve_page - unpreserve a high-order page block. + * @page: head page of the block. + * @order: order of the allocation. + * + * Instructs KHO to unpreserve a high-order block that was preserved by + * kho_preserve_page() before. + */ +void kho_unpreserve_page(struct page *page, unsigned int order) +{ + struct kho_radix_tree *tree = &kho_out.radix_tree; + const unsigned long pfn = page_to_pfn(page); + + kho_radix_del_page(tree, pfn, order); +} +EXPORT_SYMBOL_GPL(kho_unpreserve_page); + static unsigned int __kho_preserve_pages_order(unsigned long start_pfn, unsigned long end_pfn) { @@ -927,7 +1000,8 @@ static void __kho_unpreserve(struct kho_radix_tree *tree, * @nr_pages: number of pages. * * Preserve a contiguous list of order 0 pages. Must be restored using - * kho_restore_pages() to ensure the pages are restored properly as order 0. + * kho_restore_pages() to ensure the pages are restored properly as order 0 + * with each page having a reference count of 1 (split). * * Return: 0 on success, error code on failure */ -- 2.55.0.508.g3f0d502094-goog