From 00ebd8ec699dbd539e5de208cf34e04e2b50a8f8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 20 Jul 2024 12:48:25 +0000 Subject: [PATCH] Revert "mm/hugetlb: fix missing hugetlb_lock for resv uncharge" This reverts commit 4c806333efea1000a2a9620926f560ad2e1ca7cc which is commit b76b46902c2d0395488c8412e1116c2486cdfcb2 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I134d1423c7d4a26b29dd043c5b5dae84d0e64fa5 Signed-off-by: Greg Kroah-Hartman --- mm/hugetlb.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 9333dd8e1521..5744129d53ff 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3189,12 +3189,9 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, rsv_adjust = hugepage_subpool_put_pages(spool, 1); hugetlb_acct_memory(h, -rsv_adjust); - if (deferred_reserve) { - spin_lock_irq(&hugetlb_lock); + if (deferred_reserve) hugetlb_cgroup_uncharge_folio_rsvd(hstate_index(h), pages_per_huge_page(h), folio); - spin_unlock_irq(&hugetlb_lock); - } } return page;