On 11/16/20 5:33 AM, Oscar Salvador wrote: > On Fri, Nov 13, 2020 at 06:59:35PM +0800, Muchun Song wrote: >> +void __init hugetlb_vmemmap_init(struct hstate *h) >> +{ >> + unsigned int order = huge_page_order(h); >> + unsigned int vmemmap_pages; >> + >> + vmemmap_pages = ((1 << order) * sizeof(struct page)) >> PAGE_SHIFT; >> + /* >> + * The head page and the first tail page are not to be freed to buddy >> + * system, the others page will map to the first tail page. So there > "the remaining pages" might be more clear. > >> + * are (@vmemmap_pages - RESERVE_VMEMMAP_NR) pages can be freed. > "that can be freed" > >> + * >> + * Could RESERVE_VMEMMAP_NR be greater than @vmemmap_pages? This is >> + * not expected to happen unless the system is corrupted. So on the >> + * safe side, it is only a safety net. >> + */ >> + if (likely(vmemmap_pages > RESERVE_VMEMMAP_NR)) >> + h->nr_free_vmemmap_pages = vmemmap_pages - RESERVE_VMEMMAP_NR; >> + else >> + h->nr_free_vmemmap_pages = 0; > > This made think of something. > Since struct hstate hstates is global, all the fields should be defined to 0. > So, the following assignments in hugetlb_add_hstate: > > h->nr_huge_pages = 0; > h->free_huge_pages = 0; > > should not be needed. > Actually, we do not initialize other values like resv_huge_pages > or surplus_huge_pages. > > If that is the case, the "else" could go. > > Mike? Correct. Those assignments have been in the code for a very long time. > The changes itself look good to me. > I think that putting all the vemmap stuff into hugetlb-vmemmap.* was > the right choice. Agree! -- Mike Kravetz