From nobody Tue Feb 10 12:43:13 2026 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2DF0253F3D for ; Sat, 18 Oct 2025 17:18:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760807886; cv=none; b=LxIY3z0P+IT93aDo9ZDlvPs6DHo8PaYuYT+nj1nb4EXHztUq280mPlwE2Faz69SyyOoSGn/Pf6+e6aECBD5o6W4D51xkzcSekl79pHBSRy7xvZcT+2gXj+HZxujo9gKcYw2nDBrK2Tn+0t0UgNDkaOw/j9he8Ll6DQc3FEYb+i8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760807886; c=relaxed/simple; bh=UfAjUKOmtRahZzYSzroX9h10xJO3sdQqYWdEbTdGpjU=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ENzsldxFeFmormtPJLiJWPxZedyoXtqxR2X2OnllU9ceP9gYsyxRb0Mh/mBDBdDoBojRlDfFY0xWY9s04OPuUcJ3MuoQNTS1P8HCNY9PLb6URvV0+llMImWFkohS0NIMtQBUqQGn6OpEKFw4A9DzQjL+oLEP16O6wCHLZMOfepo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com; spf=pass smtp.mailfrom=soleen.com; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b=HtRAWs/Z; arc=none smtp.client-ip=209.85.219.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=soleen.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=soleen.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="HtRAWs/Z" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-87c0ea50881so63674676d6.2 for ; Sat, 18 Oct 2025 10:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; t=1760807884; x=1761412684; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=e5WHxfW3SzIizo02A/UzhAYaawAGGPcI6431h04qDCk=; b=HtRAWs/ZmlLfwWURKigzWitdugmxD0ORBrwivOZsE9pzooMmsm9WsQCzGZAbb4F5wR w7WzHYBrAzMqP4Yj5xPx4Ir/XLjGLKPanEiMQtLQBZYUUA6P1xtfOYYpKULu16LxEc2+ uSUOqvtCqpyYR1MZ2LyuGDnl6kPoj+0IX8mDDlX9cqHMAO6utwXDJXHRdWVIJmeVWRUz spwcQ8tQloP0C4KCsMsr/gSVBaxMTlhJUl/v7Lqh7aeMQ/bNzME6rZXvoKId3CmmRedS DIJ0mIxj7bmzEqh5X9X1h3SwB1YXpeM8wCByIF1LqSIICBTpSc2f1hil2RKKU/NA4q5W FXfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760807884; x=1761412684; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e5WHxfW3SzIizo02A/UzhAYaawAGGPcI6431h04qDCk=; b=nniPO0yKal7LmpkltkOuAUMWBlxG/REL8ffUhRzN/SSzT+tLSNgyt87SkxY9VALHeu LY3jKNr50NJLPFaWI2urPCgBWHlIK1uUXKmPebhhd8ynn84YgH+aBlaJQNgnrxn7ZqD7 sO6VDDEVHbyCz/O+M+YkA2g1xlV6VqMRBMEVwwPwypsEDXe2HLUfFy/WRDiQm8HyluDO h7Me3ssbLGCVNpWz7FIcD1Y5yU7DFLZRgzRuCyLQleZZaXUcQgSHq8S1zvTRUid6ni05 KmwJUwGjELnKT/N5QnGyiT/OiGY87qka3gBx89mMFiZ+xeJKKnK/jKUsrRxHCTo3C3f3 dT4Q== X-Forwarded-Encrypted: i=1; AJvYcCX7JhiLUHMRN3KQsWuPtGAuSUWbceGhSzfK9a5iAsC1GbSXlLTrRp8J4zibV7b72HkeCc8VSyZ8m4Cs62g=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5M0EvrL2J280WiX6998dVEi5YVFCrEasIfWap4k401WxgI16c gkw1F7f+12DXwIQ1jd1fwhRfHAA2FJky9x5IQ+WUPVTHV9v7+lM1oBuZLYeNBLIc6Fq7nvs4+HT YNdy8 X-Gm-Gg: ASbGnctaEu6a+h4kXM3XahIJdtFtEPjdsQAeh2BjEFnkUbtDTAGUdgGGsG0jvJcLmuC PDn0fgSc5jpUxr6QhGJd6QvBNlhhvoy3OtCiPfPT+Hru1XkPCBk6lMQ81HgzLiwoLnBB7lzR1Xf Lqk2+mLkZ5PfAGWs/vD1yXEOq5aFgmVZA8+fxaKyGiI9mh5VJjMCzRDQ/VauA5IszjD4zdwxAS2 yf/dz47HMhH5e7AHKi6Yg5zdY0XcDYOOMgnLfxqX/ORQ1m42VTYVxk2RogT5ygofByvrffqnINj IQwVsDNm7ejUeVF9KOTEdiVDrQ3ywzAcrGUFRpOThm6VifCmj6HpNWaCwUoaL8XG6SLCiKvnTBu w8w9a1Ng3GedvTbiSYHDiHTcS2K9NMyg/Xkb+/HGZXaaMfs/jJ47gZtfZVqR05JJmjHI9iUgp5i inm8O9zbpUpgga/brUbl/BD7R4yjVxTS6lYdW59kJQXficE/JWYlOrqFpUwH6HYIfyuCWdJ9uSR /dwcdax7hISyw1Xy+ALLw== X-Google-Smtp-Source: AGHT+IG0KpOyqwiHpmU8fcJJ9o2guHulcSg9jALnJeFdUCRHHRENhNr850M5g3dIeP0VTEoRasLhkQ== X-Received: by 2002:a05:6214:d04:b0:87d:cabd:d4a3 with SMTP id 6a1803df08f44-87dcabdd615mr25975966d6.49.1760807883659; Sat, 18 Oct 2025 10:18:03 -0700 (PDT) Received: from soleen.us-east4-b.c.cloudtop-prod-us-east.internal (53.47.86.34.bc.googleusercontent.com. [34.86.47.53]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-87d02d8e909sm18478116d6.62.2025.10.18.10.18.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Oct 2025 10:18:03 -0700 (PDT) From: Pasha Tatashin To: akpm@linux-foundation.org, brauner@kernel.org, corbet@lwn.net, graf@amazon.com, jgg@ziepe.ca, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, masahiroy@kernel.org, ojeda@kernel.org, pasha.tatashin@soleen.com, pratyush@kernel.org, rdunlap@infradead.org, rppt@kernel.org, tj@kernel.org, jasonmiu@google.com, dmatlack@google.com, skhawaja@google.com Subject: [PATCH v6 04/10] kho: add interfaces to unpreserve folios and page ranes Date: Sat, 18 Oct 2025 13:17:50 -0400 Message-ID: <20251018171756.1724191-5-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.51.0.915.g61a8936c21-goog In-Reply-To: <20251018171756.1724191-1-pasha.tatashin@soleen.com> References: <20251018171756.1724191-1-pasha.tatashin@soleen.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Allow users of KHO to cancel the previous preservation by adding the necessary interfaces to unpreserve folio and pages. Signed-off-by: Pasha Tatashin --- include/linux/kexec_handover.h | 12 +++++ kernel/kexec_handover.c | 85 ++++++++++++++++++++++++++++------ 2 files changed, 84 insertions(+), 13 deletions(-) diff --git a/include/linux/kexec_handover.h b/include/linux/kexec_handover.h index 2faf290803ce..4ba145713838 100644 --- a/include/linux/kexec_handover.h +++ b/include/linux/kexec_handover.h @@ -43,7 +43,9 @@ bool kho_is_enabled(void); bool is_kho_boot(void); =20 int kho_preserve_folio(struct folio *folio); +int kho_unpreserve_folio(struct folio *folio); int kho_preserve_pages(struct page *page, unsigned int nr_pages); +int kho_unpreserve_pages(struct page *page, unsigned int nr_pages); int kho_preserve_vmalloc(void *ptr, struct kho_vmalloc *preservation); struct folio *kho_restore_folio(phys_addr_t phys); struct page *kho_restore_pages(phys_addr_t phys, unsigned int nr_pages); @@ -76,11 +78,21 @@ static inline int kho_preserve_folio(struct folio *foli= o) return -EOPNOTSUPP; } =20 +static inline int kho_unpreserve_folio(struct folio *folio) +{ + return -EOPNOTSUPP; +} + static inline int kho_preserve_pages(struct page *page, unsigned int nr_pa= ges) { return -EOPNOTSUPP; } =20 +static inline int kho_unpreserve_pages(struct page *page, unsigned int nr_= pages) +{ + return -EOPNOTSUPP; +} + static inline int kho_preserve_vmalloc(void *ptr, struct kho_vmalloc *preservation) { diff --git a/kernel/kexec_handover.c b/kernel/kexec_handover.c index e6890fe6a171..78acaa218c12 100644 --- a/kernel/kexec_handover.c +++ b/kernel/kexec_handover.c @@ -153,26 +153,33 @@ static void *xa_load_or_alloc(struct xarray *xa, unsi= gned long index, size_t sz) return elm; } =20 -static void __kho_unpreserve(struct kho_mem_track *track, unsigned long pf= n, - unsigned long end_pfn) +static void __kho_unpreserve_order(struct kho_mem_track *track, unsigned l= ong pfn, + unsigned int order) { struct kho_mem_phys_bits *bits; struct kho_mem_phys *physxa; + const unsigned long pfn_high =3D pfn >> order; =20 - while (pfn < end_pfn) { - const unsigned int order =3D - min(count_trailing_zeros(pfn), ilog2(end_pfn - pfn)); - const unsigned long pfn_high =3D pfn >> order; + physxa =3D xa_load(&track->orders, order); + if (!physxa) + return; + + bits =3D xa_load(&physxa->phys_bits, pfn_high / PRESERVE_BITS); + if (!bits) + return; =20 - physxa =3D xa_load(&track->orders, order); - if (!physxa) - continue; + clear_bit(pfn_high % PRESERVE_BITS, bits->preserve); +} + +static void __kho_unpreserve(struct kho_mem_track *track, unsigned long pf= n, + unsigned long end_pfn) +{ + unsigned int order; =20 - bits =3D xa_load(&physxa->phys_bits, pfn_high / PRESERVE_BITS); - if (!bits) - continue; + while (pfn < end_pfn) { + order =3D min(count_trailing_zeros(pfn), ilog2(end_pfn - pfn)); =20 - clear_bit(pfn_high % PRESERVE_BITS, bits->preserve); + __kho_unpreserve_order(track, pfn, order); =20 pfn +=3D 1 << order; } @@ -734,6 +741,30 @@ int kho_preserve_folio(struct folio *folio) } EXPORT_SYMBOL_GPL(kho_preserve_folio); =20 +/** + * kho_unpreserve_folio - unpreserve a folio. + * @folio: folio to unpreserve. + * + * Instructs KHO to unpreserve a folio that was preserved by + * kho_preserve_folio() before. The provided @folio (pfn and order) + * must exactly match a previously preserved folio. + * + * Return: 0 on success, error code on failure + */ +int kho_unpreserve_folio(struct folio *folio) +{ + const unsigned long pfn =3D folio_pfn(folio); + const unsigned int order =3D folio_order(folio); + struct kho_mem_track *track =3D &kho_out.track; + + if (kho_out.finalized) + return -EBUSY; + + __kho_unpreserve_order(track, pfn, order); + return 0; +} +EXPORT_SYMBOL_GPL(kho_unpreserve_folio); + /** * kho_preserve_pages - preserve contiguous pages across kexec * @page: first page in the list. @@ -773,6 +804,34 @@ int kho_preserve_pages(struct page *page, unsigned int= nr_pages) } EXPORT_SYMBOL_GPL(kho_preserve_pages); =20 +/** + * kho_unpreserve_pages - unpreserve contiguous pages. + * @page: first page in the list. + * @nr_pages: number of pages. + * + * Instructs KHO to unpreserve @nr_pages contigious pages starting from @= page. + * This call must exactly match a granularity at which memory was original= ly + * preserved by kho_preserve_pages, call with the same @page and + * @nr_pages). Unpreserving arbitrary sub-ranges of larger preserved block= s is + * not supported. + * + * Return: 0 on success, error code on failure + */ +int kho_unpreserve_pages(struct page *page, unsigned int nr_pages) +{ + struct kho_mem_track *track =3D &kho_out.track; + const unsigned long start_pfn =3D page_to_pfn(page); + const unsigned long end_pfn =3D start_pfn + nr_pages; + + if (kho_out.finalized) + return -EBUSY; + + __kho_unpreserve(track, start_pfn, end_pfn); + + return 0; +} +EXPORT_SYMBOL_GPL(kho_unpreserve_pages); + struct kho_vmalloc_hdr { DECLARE_KHOSER_PTR(next, struct kho_vmalloc_chunk *); }; --=20 2.51.0.915.g61a8936c21-goog