From: Miaohe Lin <linmiaohe@huawei.com>
Date: Thu, 14 Apr 2022 06:07:06 +0000 (-0700)
Subject: mm/mmap.c: use helper mlock_future_check()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b71a1b551d7a317ead6421e9df32671f7cfe5dad;p=users%2Fjedix%2Flinux-maple.git

mm/mmap.c: use helper mlock_future_check()

Use helper mlock_future_check() to check whether it's safe to enlarge the
locked_vm to simplify the code.  Minor readability improvement.

Link: https://lkml.kernel.org/r/20220402032231.64974-1-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/mmap.c b/mm/mmap.c
index 493f151ae840..3ab5cc5a8cdb 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2362,15 +2362,8 @@ static int acct_stack_growth(struct vm_area_struct *vma,
 		return -ENOMEM;
 
 	/* mlock limit tests */
-	if (vma->vm_flags & VM_LOCKED) {
-		unsigned long locked;
-		unsigned long limit;
-		locked = mm->locked_vm + grow;
-		limit = rlimit(RLIMIT_MEMLOCK);
-		limit >>= PAGE_SHIFT;
-		if (locked > limit && !capable(CAP_IPC_LOCK))
-			return -ENOMEM;
-	}
+	if (mlock_future_check(mm, vma->vm_flags, grow << PAGE_SHIFT))
+		return -ENOMEM;
 
 	/* Check to ensure the stack will not grow into a hugetlb-only region */
 	new_start = (vma->vm_flags & VM_GROWSUP) ? vma->vm_start :