]> git.baikalelectronics.ru Git - kernel.git/commit
mm,hugetlb: take hugetlb_lock before decrementing h->resv_huge_pages
authorRik van Riel <riel@surriel.com>
Tue, 18 Oct 2022 00:25:05 +0000 (20:25 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Nov 2022 14:56:54 +0000 (23:56 +0900)
commita99cbc85338e5936bd61c4a5cb91383c5e4970fa
tree2cc954ff447bb477d2c6aeb370cd2cae6a93a937
parentb200d39b98dba76595da9bd7997f46cd39068f31
mm,hugetlb: take hugetlb_lock before decrementing h->resv_huge_pages

commit 9dc4a3616a11ed1746a7e772e53b838bb4f73cd5 upstream.

The h->*_huge_pages counters are protected by the hugetlb_lock, but
alloc_huge_page has a corner case where it can decrement the counter
outside of the lock.

This could lead to a corrupted value of h->resv_huge_pages, which we have
observed on our systems.

Take the hugetlb_lock before decrementing h->resv_huge_pages to avoid a
potential race.

Link: https://lkml.kernel.org/r/20221017202505.0e6a4fcd@imladris.surriel.com
Fixes: 9aae034e7741 ("mm: hugetlb: fix hugepage memory leak caused by wrong reserve count")
Signed-off-by: Rik van Riel <riel@surriel.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Glen McCready <gkmccready@meta.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mm/hugetlb.c