Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Andrew Morton <akpm@linux-foundation.org>,
        maple-tree@lists.infradead.org
Cc:     "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
        "Liam R . Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v4 08/49] mm/mmap: convert brk to use vma iterator
Date:   Fri, 20 Jan 2023 11:26:09 -0500
Message-Id: <20230120162650.984577-9-Liam.Howlett@oracle.com>
In-Reply-To: <20230120162650.984577-1-Liam.Howlett@oracle.com>
References: <20230120162650.984577-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nl0P9UovOLC4amtzHCOIJPJXSZi5YoR7YXnbuJBtxpcQkWPBwiKyU7fTGlVH?=
 =?us-ascii?Q?OPEd1CE1VmA4YpdfpIYh6z+EQAhdXzYqqzPtV75X394PTVOxnHERd4brG//u?=
 =?us-ascii?Q?1pjcr3Q4Z3Kv4AcFvxRKN1DOE76oSlj+E1WsEhYIPd13TUKO7gkNc48QCbtm?=
 =?us-ascii?Q?kBteob9bcVJb5yjgQflVSgoVYsiy8SjVo0zeKhS4IcUBsx3SrvC/FK+FBYSz?=
 =?us-ascii?Q?RpboXZH6Gplc8xftjNROzbJvHaKc2lrWT9AZuxnB6llEJyDMbGbatbZpbf/I?=
 =?us-ascii?Q?B0qCnR6ieCWNC7Oho8uo6pac2qCWqop74/B9LvG04+4vQoSWPKc6mhLkY7E1?=
 =?us-ascii?Q?HEZWs3V5einkX1PYHAv9gFOwQ1jGEL2kdiMrAnlEB2iYwNMgoCOeHgUOwvTY?=
 =?us-ascii?Q?DkrJc5umRcdMDYdvPFmzRHggRqi8+NE3bTh+QmjyEj1H0NMbirVJClRMv6SV?=
 =?us-ascii?Q?VigcD1Cn+RTSDeYpT+KVXHje+gphw/aQMsJDVtNLLH1/buVqNuIyHLjexM69?=
 =?us-ascii?Q?ba52ce+A7U9bAkqDO74/CPbW++pNUqwRa23eVcx9FaMCNP1YUqrt51i4UHYj?=
 =?us-ascii?Q?Gm0An0wBuQu/Wl8qqkUxQVV6LFpVZ2CiSnEAVlZ720A03XUyTwXrwEjPuZ1u?=
 =?us-ascii?Q?/yKu/OfJ8SIPndkpHbmUCbKCZ+ZfLckTKDd7rfF/wu1eh4bvKGqPA83zXkcc?=
 =?us-ascii?Q?TFUALAB51bOGnraCJ8Hstuxg5Z0HRc74Fzj2Kzv6ieCz7Wahk5WPI7wBUJdf?=
 =?us-ascii?Q?RCkE91GNsCMNiUpTz7TEMYSmZVLzA7aRsYYPp+MOhww/gUKdgP+nRAk/NO9T?=
 =?us-ascii?Q?z3hWbqumeLbqI+En2rsA52LLGsp6LIzYgkeTy6v5iKU4dbkFgXDzPR3GA/ZQ?=
 =?us-ascii?Q?zmIyb+/JiUs5vStSP9zj3GbGnEP9UrjZbTkHk4vr5mU2QgEIP9LG7NWNJPPM?=
 =?us-ascii?Q?VjM8UoCh3l3/iHf/VIHEI5p8Pqn4ql4qPL8OVEf9SmhUXdRH0KfImlS3WDgd?=
 =?us-ascii?Q?hsmQ6m5SwRkUxfFpK7xNgHMIj/eJukj6Z0nccUEfYhFeZlIQph9b9lw7W/UG?=
 =?us-ascii?Q?IUt7QDvhTEubYNdK9E96fH54zPKyHyPtXLu2DrvSBXoSEGdPRzsmxc7H+z5b?=
 =?us-ascii?Q?KJot3AkzK8QWOzhBITxZtl+YL0k+4SRzNI94QsO903fZwchp0V1EvTdo+UTJ?=
 =?us-ascii?Q?9jxrH+W0VV3h8j0CWXpvtrQ1bgcn16LRcfZVnKkzZqCh/cS9+ifmSBTt0/ty?=
 =?us-ascii?Q?FFIPcAQqEy/k9ZdvQYYy9+f1P5K1NKyMjUExY/JvPBqWTIZljE6b7TRFOEdj?=
 =?us-ascii?Q?WASnIMfg+uSab1RkB5LepQxPIbIgYu3RE6T1iMJZnz5JeQbaZ+P845I5jrmn?=
 =?us-ascii?Q?BZdr+6h+HVd7c5Uq8pgyMviahTsx1BB0cns/AoFCaXrqZdxX0dsSGXOyCJTg?=
 =?us-ascii?Q?5n2dyb+4vfyW0GgkhqMBWiGteLdnc7aL9AmXKyLo7m2EjR3MkLSnssotlKBc?=
 =?us-ascii?Q?yukfAw5S58/JCyIIGN7S/6S3ach34bNW/5athvVF3EUNExoYW3/R2YMSIC4t?=
 =?us-ascii?Q?0i99kpmom7mrdevIV50fleGgpLjq6zSsW5G6HNaf3MJipYIAso5hCBoDhOCH?=
 =?us-ascii?Q?Vg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: JBYXemFkIeCKQ85iuD2n6Q8WXn0TdFUlW7ltIMrt1dI72S4AtpYw/OK9ymWBz/MeWq7lecRDkhF8VY/4FhbncxT7w2mUQqgi2sRIoV3c1CJTcEd08d55IOKShlaI+WeTunTokNzf38z53BogevkL5qBlRPogyPUz5CPITZFK53Mk0LsKKXgIVFhp5WZmdfpprFasWD9vpbkeFH34CPCTjsdmNjkYfYUZQBomUx08UoQOGcW1FQ2bZCUz1EPvj5GS6MoywgaK3qErZS1QUc5DdfBAIuTuQphE2DLVHFgFoezNRs1WrHTEV+L/diUR+lsZUGecy6tZogdmD+X4wARRHH8AKd9XDe0YfUl7NwnWTkPpDbVehzIFV7cB5Jc0MTHAtPfQJje/fVRkgrPN0yuiKTdlFZbf0/cr+Op/z1hdGmlbYIvdCTk6QsV2OCaI0GNoj4FfEohNe90ac/ifr82QDwRQE3ricQHUntWgZRyUtK6LZy6fSwJQvdIja7qWs1H82GdIeMxB/7usB9a/JnCC1w5/rPLA2YCoapYzecdzdldos80u3K7uzEdschnE/ESdrNwUtijleomtIfVSkFWkzWT6rW18yxDRTNUBJrleUFrpX6zsBYs9+wTnAHe3Cg4lFgLCdPUzMvsf6p2oS3p/a3lOC66Q0DX2Cx0sQCzPvvNC+9dkmEkR5VhfDIBJSMCDkhmGGUgU+CnzliTdDLvzu4NJ0568ljbk2OH2ckFYt0HRT62jRAorMaW9HzsiPiT2aS8Dcwi+RF3Ket4PZfFB2rE4sfWiT94PkYU20/6hMIdllJX06jrB0tBn1aNfVGRFLls2O7RTQi5dX3VTd8/Y8MiG2vpiiVYlLcgzvCR4w8VG32pAvwytbuq2wl4e98gAkaxNL/hBw273y1pI+o8+vg==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 17ae89fe-bcdd-4fe9-9ac7-08dafb0339c7
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 16:27:30.9514
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5/i56ZZPbrM/UKq9ayPA+0t5Hy8umE9NAjJQz7Su/eX3wOS1oTnsnc436yWnfOrPe1jW1c8JTfFy0yTZQNOSWw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6619
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-20_09,2023-01-20_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxlogscore=999
 malwarescore=0 mlxscore=0 phishscore=0 suspectscore=0 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301200157
X-Proofpoint-ORIG-GUID: 0CbemzNU7bPB5xvjYMJD8GXu9tM3tYgS
X-Proofpoint-GUID: 0CbemzNU7bPB5xvjYMJD8GXu9tM3tYgS
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

Use the vma iterator API for the brk() system call.  This will provide
type safety at compile time.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/mmap.c | 48 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 253a7490fae3..e2ba9b094cad 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -180,10 +180,10 @@ static int check_brk_limits(unsigned long addr, unsigned long len)
 
 	return mlock_future_check(current->mm, current->mm->def_flags, len);
 }
-static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma,
+static int do_brk_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
 			 unsigned long newbrk, unsigned long oldbrk,
 			 struct list_head *uf);
-static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *brkvma,
+static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *brkvma,
 		unsigned long addr, unsigned long request, unsigned long flags);
 SYSCALL_DEFINE1(brk, unsigned long, brk)
 {
@@ -194,7 +194,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
 	bool populate;
 	bool downgraded = false;
 	LIST_HEAD(uf);
-	MA_STATE(mas, &mm->mm_mt, 0, 0);
+	struct vma_iterator vmi;
 
 	if (mmap_write_lock_killable(mm))
 		return -EINTR;
@@ -242,8 +242,8 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
 		int ret;
 
 		/* Search one past newbrk */
-		mas_set(&mas, newbrk);
-		brkvma = mas_find(&mas, oldbrk);
+		vma_iter_init(&vmi, mm, newbrk);
+		brkvma = vma_find(&vmi, oldbrk);
 		if (!brkvma || brkvma->vm_start >= oldbrk)
 			goto out; /* mapping intersects with an existing non-brk vma. */
 		/*
@@ -252,7 +252,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
 		 * before calling do_brk_munmap().
 		 */
 		mm->brk = brk;
-		ret = do_brk_munmap(&mas, brkvma, newbrk, oldbrk, &uf);
+		ret = do_brk_munmap(&vmi, brkvma, newbrk, oldbrk, &uf);
 		if (ret == 1)  {
 			downgraded = true;
 			goto success;
@@ -270,14 +270,14 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
 	 * Only check if the next VMA is within the stack_guard_gap of the
 	 * expansion area
 	 */
-	mas_set(&mas, oldbrk);
-	next = mas_find(&mas, newbrk - 1 + PAGE_SIZE + stack_guard_gap);
+	vma_iter_init(&vmi, mm, oldbrk);
+	next = vma_find(&vmi, newbrk + PAGE_SIZE + stack_guard_gap);
 	if (next && newbrk + PAGE_SIZE > vm_start_gap(next))
 		goto out;
 
-	brkvma = mas_prev(&mas, mm->start_brk);
+	brkvma = vma_prev_limit(&vmi, mm->start_brk);
 	/* Ok, looks good - let it rip. */
-	if (do_brk_flags(&mas, brkvma, oldbrk, newbrk - oldbrk, 0) < 0)
+	if (do_brk_flags(&vmi, brkvma, oldbrk, newbrk - oldbrk, 0) < 0)
 		goto out;
 
 	mm->brk = brk;
@@ -2907,8 +2907,8 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
 }
 
 /*
- * brk_munmap() - Unmap a partial vma.
- * @mas: The maple tree state.
+ * brk_munmap() - Unmap a full or partial vma.
+ * @vmi: The vma iterator
  * @vma: The vma to be modified
  * @newbrk: the start of the address to unmap
  * @oldbrk: The end of the address to unmap
@@ -2918,7 +2918,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  * unmaps a partial VMA mapping.  Does not handle alignment, downgrades lock if
  * possible.
  */
-static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma,
+static int do_brk_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
 			 unsigned long newbrk, unsigned long oldbrk,
 			 struct list_head *uf)
 {
@@ -2926,14 +2926,14 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma,
 	int ret;
 
 	arch_unmap(mm, newbrk, oldbrk);
-	ret = do_mas_align_munmap(mas, vma, mm, newbrk, oldbrk, uf, true);
+	ret = do_mas_align_munmap(&vmi->mas, vma, mm, newbrk, oldbrk, uf, true);
 	validate_mm_mt(mm);
 	return ret;
 }
 
 /*
  * do_brk_flags() - Increase the brk vma if the flags match.
- * @mas: The maple tree state.
+ * @vmi: The vma iterator
  * @addr: The start address
  * @len: The length of the increase
  * @vma: The vma,
@@ -2943,7 +2943,7 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma,
  * do not match then create a new anonymous VMA.  Eventually we may be able to
  * do some brk-specific accounting here.
  */
-static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma,
+static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		unsigned long addr, unsigned long len, unsigned long flags)
 {
 	struct mm_struct *mm = current->mm;
@@ -2970,8 +2970,7 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma,
 	if (vma && vma->vm_end == addr && !vma_policy(vma) &&
 	    can_vma_merge_after(vma, flags, NULL, NULL,
 				addr >> PAGE_SHIFT, NULL_VM_UFFD_CTX, NULL)) {
-		mas_set_range(mas, vma->vm_start, addr + len - 1);
-		if (mas_preallocate(mas, GFP_KERNEL))
+		if (vma_iter_prealloc(vmi))
 			goto unacct_fail;
 
 		vma_adjust_trans_huge(vma, vma->vm_start, addr + len, 0);
@@ -2981,7 +2980,7 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma,
 		}
 		vma->vm_end = addr + len;
 		vma->vm_flags |= VM_SOFTDIRTY;
-		mas_store_prealloc(mas, vma);
+		vma_iter_store(vmi, vma);
 
 		if (vma->anon_vma) {
 			anon_vma_interval_tree_post_update_vma(vma);
@@ -3002,8 +3001,7 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma,
 	vma->vm_pgoff = addr >> PAGE_SHIFT;
 	vma->vm_flags = flags;
 	vma->vm_page_prot = vm_get_page_prot(flags);
-	mas_set_range(mas, vma->vm_start, addr + len - 1);
-	if (mas_store_gfp(mas, vma, GFP_KERNEL))
+	if (vma_iter_store_gfp(vmi, vma, GFP_KERNEL))
 		goto mas_store_fail;
 
 	mm->map_count++;
@@ -3032,7 +3030,7 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags)
 	int ret;
 	bool populate;
 	LIST_HEAD(uf);
-	MA_STATE(mas, &mm->mm_mt, addr, addr);
+	VMA_ITERATOR(vmi, mm, addr);
 
 	len = PAGE_ALIGN(request);
 	if (len < request)
@@ -3051,12 +3049,12 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags)
 	if (ret)
 		goto limits_failed;
 
-	ret = do_mas_munmap(&mas, mm, addr, len, &uf, 0);
+	ret = do_mas_munmap(&vmi.mas, mm, addr, len, &uf, 0);
 	if (ret)
 		goto munmap_failed;
 
-	vma = mas_prev(&mas, 0);
-	ret = do_brk_flags(&mas, vma, addr, len, flags);
+	vma = vma_prev(&vmi);
+	ret = do_brk_flags(&vmi, vma, addr, len, flags);
 	populate = ((mm->def_flags & VM_LOCKED) != 0);
 	mmap_write_unlock(mm);
 	userfaultfd_unmap_complete(mm, &uf);
-- 
2.35.1