kho: simplify page initialization in kho_restore_page()
Subsystems (3)
Pratyush Yadav
maintainerPATCH 1/1 kho: simplify page initialization in kho_restore_page()
When restoring a page (from kho_restore_pages()) or folio (from kho_restore_folio()), KHO must initialize the struct page. The initialization differs slightly depending on if a folio is requested or a set of 0-order pages is requested.
Conceptually, it is quite simple to understand. When restoring 0-order pages, each page gets a refcount of 1 and that's it. When restoring a folio, head page gets a refcount of 1 and tail pages get 0.
kho_restore_page() tries to combine the two separate initialization flow into one piece of code. While it works fine, it is more complicated to read than it needs to be. Make the code simpler by splitting the two initalization paths into two separate functions. This improves readability by clearly showing how each type must be initialized.
---
Notes:
This patch is a follow up from
https://lore.kernel.org/linux-mm/[email protected]/
kernel/liveupdate/kexec_handover.c | 41 ++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 14 deletions(-)
kernel/liveupdate/kexec_handover.c +27 -14
@@ -219,11 +219,33 @@ static int __kho_preserve_order(struct kho_mem_track *track, unsigned long pfn,return 0 ; } +/* For physically contiguous 0-order pages. */ +static void kho_init_pages (struct page *page,unsigned int nr_pages) +{ +for (unsigned int i =0 ; i < nr_pages; i++) +set_page_count (page + i,1 ); +} + +static void kho_init_folio (struct page *page,unsigned int order) +{ +unsigned int nr_pages = (1 << order); + +/* Head page gets refcount of 1. */ +set_page_count (page,1 ); + +/* For higher order folios, tail pages get a page count of zero. */ +for (unsigned int i =1 ; i < nr_pages; i++) +set_page_count (page + i,0 ); + +if (order >0 ) +prep_compound_page (page, order); +} +static struct page *kho_restore_page (phys_addr_t phys,bool is_folio) {struct page *page =pfn_to_online_page (PHYS_PFN (phys)); -unsigned int nr_pages, ref_cnt;union kho_page_info info; +unsigned int nr_pages;if (!page)return NULL ;
@@ -240,20 +262,11 @@ static struct page *kho_restore_page(phys_addr_t phys, bool is_folio)/* Clear private to make sure later restores on this page error out. */ page->private =0 ; -/* Head page gets refcount of 1. */ -set_page_count (page,1 ); -/* -* For higher order folios, tail pages get a page count of zero. -* For physically contiguous order-0 pages every pages gets a page -* count of 1 -*/ - ref_cnt = is_folio ?0 :1 ; -for (unsigned int i =1 ; i < nr_pages; i++) -set_page_count (page + i, ref_cnt); - -if (is_folio && info.order) -prep_compound_page (page, info.order); +if (is_folio) +kho_init_folio (page, info.order); +else +kho_init_pages (page, nr_pages);adjust_managed_page_count (page, nr_pages);return page;
base-commit: 9f7b37a7c250baf3092719d4ebc9a8edaa79a7b4
Signature · 1 line
2.43.0
Pasha Tatashin
maintainerQuoted 31 lines · Pratyush Yadav
When restoring a page (from
kho_restore_pages()) or folio (fromkho_restore_folio()), KHO must initialize the struct page. The initialization differs slightly depending on if a folio is requested or a set of 0-order pages is requested.Conceptually, it is quite simple to understand. When restoring 0-order pages, each page gets a refcount of 1 and that's it. When restoring a folio, head page gets a refcount of 1 and tail pages get 0.
kho_restore_page()tries to combine the two separate initialization flow into one piece of code. While it works fine, it is more complicated to read than it needs to be. Make the code simpler by splitting the two initalization paths into two separate functions. This improves readability by clearly showing how each type must be initialized.Signed-off-by Pratyush Yadav <[email protected]>---
Notes:
This patch is a follow up from
https://lore.kernel.org/linux-mm/[email protected]/kernel/liveupdate/kexec_handover.c | 41 ++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 14 deletions(-)kernel/liveupdate/kexec_handover.c +0
-0
kernel/liveupdate/kexec_handover.c static int __kho_preserve_order(struct kho_mem_track *track, unsigned long pfn, · line 223
Quoted 5 lines
kernel/liveupdate/kexec_handover.c +2
-0@@ -219,11 +219,33 @@ static int __kho_preserve_order(struct kho_mem_track *track, unsigned long pfn,return 0 ; } +/* For physically contiguous 0-order pages. */ +static void kho_init_pages (struct page *page,unsigned int nr_pages)
Here and in other places below, it is better for nr_pages to be unsigned long. This is consistent with other places in mm, where we have gradually moved on from int/unsigned int to unsigned long for npages (see gup.c for example). Otherwise, LGTM.
Quoted 41 lines
kernel/liveupdate/kexec_handover.c +21
-8+{ +for (unsigned int i =0 ; i < nr_pages; i++) +set_page_count (page + i,1 ); +} + +static void kho_init_folio (struct page *page,unsigned int order) +{ +unsigned int nr_pages = (1 << order); + +/* Head page gets refcount of 1. */ +set_page_count (page,1 ); + +/* For higher order folios, tail pages get a page count of zero. */ +for (unsigned int i =1 ; i < nr_pages; i++) +set_page_count (page + i,0 ); + +if (order >0 ) +prep_compound_page (page, order); +} +static struct page *kho_restore_page (phys_addr_t phys,bool is_folio) {struct page *page =pfn_to_online_page (PHYS_PFN (phys)); -unsigned int nr_pages, ref_cnt;union kho_page_info info; +unsigned int nr_pages;if (!page)return NULL ;@@ -240,20 +262,11 @@ static struct page *kho_restore_page(phys_addr_t phys, bool is_folio)/* Clear private to make sure later restores on this page error out. */ page->private =0 ; -/* Head page gets refcount of 1. */ -set_page_count (page,1 ); -/* -* For higher order folios, tail pages get a page count of zero. -* For physically contiguous order-0 pages every pages gets a page -* count of 1 -*/
kernel/liveupdate/kexec_handover.c static struct page *kho_restore_page(phys_addr_t phys, bool is_folio) · line 269
Quoted 10 lines
kernel/liveupdate/kexec_handover.c +4
-6- ref_cnt = is_folio ?0 :1 ; -for (unsigned int i =1 ; i < nr_pages; i++) -set_page_count (page + i, ref_cnt); - -if (is_folio && info.order) -prep_compound_page (page, info.order); +if (is_folio) +kho_init_folio (page, info.order); +else +kho_init_pages (page, nr_pages);
Thanks,
Pasha
Pratyush Yadav
maintainerQuoted 35 lines · Pasha Tatashin
Quoted 34 lines · Pratyush Yadav
When restoring a page (from
kho_restore_pages()) or folio (fromkho_restore_folio()), KHO must initialize the struct page. The initialization differs slightly depending on if a folio is requested or a set of 0-order pages is requested.Conceptually, it is quite simple to understand. When restoring 0-order pages, each page gets a refcount of 1 and that's it. When restoring a folio, head page gets a refcount of 1 and tail pages get 0.
kho_restore_page()tries to combine the two separate initialization flow into one piece of code. While it works fine, it is more complicated to read than it needs to be. Make the code simpler by splitting the two initalization paths into two separate functions. This improves readability by clearly showing how each type must be initialized.Signed-off-by Pratyush Yadav <[email protected]>---
Notes:
This patch is a follow up from
https://lore.kernel.org/linux-mm/[email protected]/kernel/liveupdate/kexec_handover.c | 41 ++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 14 deletions(-)kernel/liveupdate/kexec_handover.c +0
-0@@ -219,11 +219,33 @@ static int __kho_preserve_order(struct kho_mem_track *track, unsigned long pfn,return 0 ; }
Quoted 7 lines
kernel/liveupdate/kexec_handover.c static int __kho_preserve_order(struct kho_mem_track *track, unsigned long pfn, · line 223
Quoted 2 lines
kernel/liveupdate/kexec_handover.c +2
-0+/* For physically contiguous 0-order pages. */ +static void kho_init_pages (struct page *page,unsigned int nr_pages)Here and in other places below, it is better for
nr_pagesto be unsigned long. This is consistent with other places in mm, where we have gradually moved on from int/unsigned int to unsigned long for npages (seegup.cfor example). Otherwise, LGTM.
Thanks. Will do.
[...]
Signature · 2 lines
Regards, Pratyush Yadav