[PATCH] mm: hugetlb_vmemmap: simplify reset_struct_pages()

[PATCH] mm: hugetlb_vmemmap: simplify reset_struct_pages()

[Muchun Song]

We can choose to copy three contiguous tail pages' content to the first three pages
instead of copying one by one to simplify the code and reduce code size from 229 bytes
to 63 bytes. The BUILD_BUG_ON() aims to avoid out-of-bounds accesses.

Signed-off-by: Muchun Song <songmuchun@bytedance.com>
---
 mm/hugetlb_vmemmap.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c
index 76b2d03a0d8d..ba2a2596fb4e 100644
--- a/mm/hugetlb_vmemmap.c
+++ b/mm/hugetlb_vmemmap.c
@@ -265,11 +265,10 @@ static void vmemmap_remap_pte(pte_t *pte, unsigned long addr,
 
 static inline void reset_struct_pages(struct page *start)
 {
-	int i;
 	struct page *from = start + NR_RESET_STRUCT_PAGE;
 
-	for (i = 0; i < NR_RESET_STRUCT_PAGE; i++)
-		memcpy(start + i, from, sizeof(*from));
+	BUILD_BUG_ON(NR_RESET_STRUCT_PAGE * 2 > PAGE_SIZE / sizeof(struct page));
+	memcpy(start, from, sizeof(*from) * NR_RESET_STRUCT_PAGE);
 }
 
 static void vmemmap_restore_pte(pte_t *pte, unsigned long addr,
-- 
2.11.0

Re: [PATCH] mm: hugetlb_vmemmap: simplify reset_struct_pages()

[Miaohe Lin]

On 2022/8/19 11:55, Muchun Song wrote:
> We can choose to copy three contiguous tail pages' content to the first three pages
> instead of copying one by one to simplify the code and reduce code size from 229 bytes
> to 63 bytes. The BUILD_BUG_ON() aims to avoid out-of-bounds accesses.
> 
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>

LGTM. Thanks.

Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>

Thanks,
Miaohe Lin