The patch titled Subject: mm/hugetlb: narrow the hugetlb_lock protection area during preparing huge page has been added to the -mm tree. Its filename is mm-hugetlb-narrow-the-hugetlb_lock-protection-area-during-preparing-huge-page.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-hugetlb-narrow-the-hugetlb_lock-protection-area-during-preparing-huge-page.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-hugetlb-narrow-the-hugetlb_lock-protection-area-during-preparing-huge-page.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Wei Yang <richard.weiyang@xxxxxxxxxxxxxxxxx> Subject: mm/hugetlb: narrow the hugetlb_lock protection area during preparing huge page set_hugetlb_cgroup_[rsvd] just manipulate page local data, which is not necessary to be protected by hugetlb_lock. Let's take this out. Link: https://lkml.kernel.org/r/20200831022351.20916-7-richard.weiyang@xxxxxxxxxxxxxxxxx Signed-off-by: Wei Yang <richard.weiyang@xxxxxxxxxxxxxxxxx> Reviewed-by: Baoquan He <bhe@xxxxxxxxxx> Reviewed-by: Mike Kravetz <mike.kravetz@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/hugetlb.c~mm-hugetlb-narrow-the-hugetlb_lock-protection-area-during-preparing-huge-page +++ a/mm/hugetlb.c @@ -1500,9 +1500,9 @@ static void prep_new_huge_page(struct hs { INIT_LIST_HEAD(&page->lru); set_compound_page_dtor(page, HUGETLB_PAGE_DTOR); - spin_lock(&hugetlb_lock); set_hugetlb_cgroup(page, NULL); set_hugetlb_cgroup_rsvd(page, NULL); + spin_lock(&hugetlb_lock); h->nr_huge_pages++; h->nr_huge_pages_node[nid]++; spin_unlock(&hugetlb_lock); _ Patches currently in -mm which might be from richard.weiyang@xxxxxxxxxxxxxxxxx are mm-mmap-rename-__vma_unlink_common-to-__vma_unlink.patch mm-mmap-leverage-vma_rb_erase_ignore-to-implement-vma_rb_erase.patch mm-mmap-leave-adjust_next-as-virtual-address-instead-of-page-frame-number.patch mm-hugetlb-not-necessary-to-coalesce-regions-recursively.patch mm-hugetlb-remove-vm_bug_onnrg-in-get_file_region_entry_from_cache.patch mm-hugetlb-use-list_splice-to-merge-two-list-at-once.patch mm-hugetlb-count-file_region-to-be-added-when-regions_needed-=-null.patch mm-hugetlb-a-page-from-buddy-is-not-on-any-list.patch mm-hugetlb-narrow-the-hugetlb_lock-protection-area-during-preparing-huge-page.patch mm-hugetlb-take-the-free-hpage-during-the-iteration-directly.patch mm-page_reporting-drop-stale-list-head-check-in-page_reporting_cycle.patch bitops-simplify-get_count_order_long.patch bitops-use-the-same-mechanism-for-get_count_order.patch