tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kho: replace kho_preserve_phys() with kho_preserve_pages()

to make it clear that KHO operates on pages rather than on a random
physical address.

The kho_preserve_pages() will be also used in upcoming support for vmalloc
preservation.

Link: https://lkml.kernel.org/r/20250921054458.4043761-3-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: Pratyush Yadav <pratyush@kernel.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Cc: Alexander Graf <graf@amazon.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Changyuan Lyu <changyuanl@google.com>
Cc: Chris Li <chrisl@kernel.org>
Cc: Pasha Tatashin <pasha.tatashin@soleen.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Mike Rapoport (Microsoft) and committed by
Andrew Morton 8375b765 469661d0

+18 -18
+3 -2
include/linux/kexec_handover.h
··· 18 18 19 19 struct folio; 20 20 struct notifier_block; 21 + struct page; 21 22 22 23 #define DECLARE_KHOSER_PTR(name, type) \ 23 24 union { \ ··· 44 43 bool is_kho_boot(void); 45 44 46 45 int kho_preserve_folio(struct folio *folio); 47 - int kho_preserve_phys(phys_addr_t phys, size_t size); 46 + int kho_preserve_pages(struct page *page, unsigned int nr_pages); 48 47 struct folio *kho_restore_folio(phys_addr_t phys); 49 48 int kho_add_subtree(struct kho_serialization *ser, const char *name, void *fdt); 50 49 int kho_retrieve_subtree(const char *name, phys_addr_t *phys); ··· 72 71 return -EOPNOTSUPP; 73 72 } 74 73 75 - static inline int kho_preserve_phys(phys_addr_t phys, size_t size) 74 + static inline int kho_preserve_pages(struct page *page, unsigned int nr_pages) 76 75 { 77 76 return -EOPNOTSUPP; 78 77 }
+12 -15
kernel/kexec_handover.c
··· 725 725 EXPORT_SYMBOL_GPL(kho_preserve_folio); 726 726 727 727 /** 728 - * kho_preserve_phys - preserve a physically contiguous range across kexec. 729 - * @phys: physical address of the range. 730 - * @size: size of the range. 728 + * kho_preserve_pages - preserve contiguous pages across kexec 729 + * @page: first page in the list. 730 + * @nr_pages: number of pages. 731 731 * 732 - * Instructs KHO to preserve the memory range from @phys to @phys + @size 733 - * across kexec. 732 + * Preserve a contiguous list of order 0 pages. Must be restored using 733 + * kho_restore_pages() to ensure the pages are restored properly as order 0. 734 734 * 735 735 * Return: 0 on success, error code on failure 736 736 */ 737 - int kho_preserve_phys(phys_addr_t phys, size_t size) 737 + int kho_preserve_pages(struct page *page, unsigned int nr_pages) 738 738 { 739 - unsigned long pfn = PHYS_PFN(phys); 740 - unsigned long failed_pfn = 0; 741 - const unsigned long start_pfn = pfn; 742 - const unsigned long end_pfn = PHYS_PFN(phys + size); 743 - int err = 0; 744 739 struct kho_mem_track *track = &kho_out.ser.track; 745 - 746 - if (!PAGE_ALIGNED(phys) || !PAGE_ALIGNED(size)) 747 - return -EINVAL; 740 + const unsigned long start_pfn = page_to_pfn(page); 741 + const unsigned long end_pfn = start_pfn + nr_pages; 742 + unsigned long pfn = start_pfn; 743 + unsigned long failed_pfn = 0; 744 + int err = 0; 748 745 749 746 while (pfn < end_pfn) { 750 747 const unsigned int order = ··· 761 764 762 765 return err; 763 766 } 764 - EXPORT_SYMBOL_GPL(kho_preserve_phys); 767 + EXPORT_SYMBOL_GPL(kho_preserve_pages); 765 768 766 769 /* Handling for debug/kho/out */ 767 770
+3 -1
mm/memblock.c
··· 2452 2452 2453 2453 for (i = 0; i < reserved_mem_count; i++) { 2454 2454 struct reserve_mem_table *map = &reserved_mem_table[i]; 2455 + struct page *page = phys_to_page(map->start); 2456 + unsigned int nr_pages = map->size >> PAGE_SHIFT; 2455 2457 2456 - err |= kho_preserve_phys(map->start, map->size); 2458 + err |= kho_preserve_pages(page, nr_pages); 2457 2459 } 2458 2460 2459 2461 err |= kho_preserve_folio(page_folio(kho_fdt));