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 41/49] mm/mmap: Use vma_prepare() and vma_complete() in vma_expand()
Date:   Fri, 20 Jan 2023 11:26:42 -0500
Message-Id: <20230120162650.984577-42-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?e90EkxDh/5U4soCs+P8eWyhvQzTPPucdNyixRKdd5hSam+e/LRTA2QChS/kj?=
 =?us-ascii?Q?4DvxJY7TcobHNWI38WsFOGVFPN4r+nW4iJtn76cSbfNDJzAH1uwKhcQeCAKy?=
 =?us-ascii?Q?KUWZcv1Ag61gx68CT/gaHpIpBhyAmOvoJobolY+9eAN80/D0NpzSQhBhGMLg?=
 =?us-ascii?Q?iieff+JRd5TfR3RtBddvivUUgkFuzFImPbSXR9MOrCi2ANEfyh+9mS0YucJK?=
 =?us-ascii?Q?Qudaxgof1m4sAml/V/Z0qY1xrzSIcFyWZwX7ug28q9J5ff/81Iw6vzVi0BQv?=
 =?us-ascii?Q?OoW7h/Fr8C+UF3mRMTuU0VSvauFgXSZ/PirAeqgQjqLObZbulPH7sAjsGYPS?=
 =?us-ascii?Q?B4AvJ5AemP7ulbZsOY/hwEEzJT7NUUi5hEWDEvoQYhFBZQn3i82Z41aejjAa?=
 =?us-ascii?Q?rJ/xLlrsvBpeZ/zRAmq+xjO4ZwbLfvxXXu3Za/LAflF15uFzpfgKOrevzS0O?=
 =?us-ascii?Q?BCxX+9S6ylgIohcy0I1Gf0VA0LKXS0fvAyS83TGUw8wtSKNDVVfYytX5saw1?=
 =?us-ascii?Q?RLS2WevFWFuGgXHMUxsDG3fGuDF4ZAW/NgIlVMUjI50lN4zTuFe5s30/frKa?=
 =?us-ascii?Q?2Edre4a70LBoxfA8MofD2pg2XIEIUfQYdlS84ZtIBLa9y5EG+37PNFEwnofd?=
 =?us-ascii?Q?6N7jy7hMehVyuaA/whglsHntapzfNhCplP+42B0KfsrMmFrT2Xgr+GYGHyjB?=
 =?us-ascii?Q?ZrmUlSCOEyQdZOnG3l/azbXrrVdFbPg2km/sHYr63+yAP0NtP0PuRWOVUaNw?=
 =?us-ascii?Q?jEDP7M4oUPAs2Fi2YvBiyvzfMSRcuOK1vw+OOMZFIuzrQrV+8i6KEB3t/Eg2?=
 =?us-ascii?Q?6PYn3zEK/sPgZMatVdh6pEyPLJLY8kyXPmkbYyCV5FTa3I65GuZdj9WxYjq7?=
 =?us-ascii?Q?dTVrZgcAofWhFsGOHmNl6XJWhlMsL33n7Kbn9ZrG+8ztP/kvCNbrG4+5eZoG?=
 =?us-ascii?Q?1ptvBCC8j5i914dJ+h/Wnfo720tdNsmKPWCd7sZZTjHw4ChU1DXbfHG3C8ZJ?=
 =?us-ascii?Q?xDdtk1vcJDTS87vryuSyoTkYY+lSxp9NTeiWikBlxuf3Mm95i1DO5bfi8X/z?=
 =?us-ascii?Q?HiKclQSQZ+Kzd4BXZym1OvW3YF5f8vxVbk7PgAhNjouER1hzFjH1s01vHyw+?=
 =?us-ascii?Q?CCCLdpY+FrP+cBXrsCr+xDEzniWJMyixzM3Rw0c2p8jurqf+qcV05WUpy0Ml?=
 =?us-ascii?Q?8GMfSUMe/jthQcqP07Na5yvLdFxO0AYj/AN5BJlJTVjOI2RSd8f+HVnAX0z6?=
 =?us-ascii?Q?dI3h4SuRlATx4piYrm+oi+gM9iEh7ahVjacv+5wVbdyf3HfJSbzP6VC83wdR?=
 =?us-ascii?Q?lIXaIYtWfsrd1vDxZN8TT9PreC+mxUaRATn9Hi0UIePtunleUUrilXBTtkNX?=
 =?us-ascii?Q?EpURPi18DmPQ+r8vJg1Id7pTqWlOLg5Puk5lqnjt4nkTIigcEK1vTxcG+DX5?=
 =?us-ascii?Q?nGowoleYNJUu2S961W9t9G4BpxBcxLd2xR9ugGTFAI8gVlH1Aix3j+p0N4gE?=
 =?us-ascii?Q?6/1vIpywTw0fOz+hQh7j8GPTVQERuweHrxvawOqkRXLoRLOAi3tjKHNsqyus?=
 =?us-ascii?Q?KYcMeLE0Y8J3PBfawvTkPMOIm5hUCMwCzJGRA0qAbzGINTnSi1g39xZvj4AQ?=
 =?us-ascii?Q?ag=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: hmNzmpcUR+UtH0OKKgzR87IekxunNgvLGGk8RpQGSqxKDNxFLF1HLUWR0bhRvXsmC8na/L0jF383oTsjrCZL6x/Q2F6I+4f154l3JToNXzAhwfX7rCedBeXyCswfdxIVmGeix9TjTY529gYtEgQ5qTFfNUd6ziInju65ZesuxJjna6Rge/jtoFDQbckEo573o/zHq8BMgWMBf3xEvy1pg44P+TizdAhCPb4koM+PluKoQB2em50e0LQn5jm9mIdN2Xx4i2C8AYhEd++JNMG0pOYfO611r8zaiN0OFyHYrcvxClVwYkkQukblCamOGxObTobWNlIDXcCNtS+IBJlcyJa3S8fXnugFJJQG0WlI96jvIVdYM1tap4op7G8MtFjDuo20QQ00T+2oVPJvG7w/VdP4LW0HGFC5GNiNZdmLhBdXqsXhKllgFf5Rs1yEwcdovlDMBDblbhyb5vTxMdIG0DVE4WloJRx5cmu7sI3TkcCgxNiMFyGzQCllVZkdlYUK1CXxYn5lAbE55lA89mHCq7zz2HKJGtBp+9n0MoMHHD+iYfrOOgPRgkDXBjOXbEFClqV24lE9dQZwKSccmVE0sWSGRn4Kb8r4vHE17eQm/NufMAK/GuXx+E0MYeJKPQ8B+USAWLv/mS9QPMXn66L1cAroaXwe4DR6yzce9MkiW7rh2+pQVxD7I1YzGqCsccjbzfnP830fyJYWjuSXrP7XQuPHGZ8XN80iQhMQrF/v9s/2NKjLCOJB1qJPvT1Byn0mKbVuuh4phayFlu1yKDcjOsIueI92Ud23m7VZ+1WUI92Sqk1gNqEveWPG6Ls/nRLZlyI/fScpSdRe5Fc/GEeK6VGoEAgUzBtb1GNTTG7ocNnqDjIhRgXyzF8qDQob01fVzZWjZZxQb/WG7Lmb8mfeww==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2ad99454-6e57-4bf7-6c8d-08dafb036d6d
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:28:56.6801
 (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: GTMLHZNxzAPNJ9tvwBYtLwV14dvVvMDrmoycnjM9SCS13D43d5xq98KO8aIiitTh/GACdmnikYZKNsiU2tPDiw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6381
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 suspectscore=0 phishscore=0 mlxscore=0
 malwarescore=0 spamscore=0 bulkscore=0 adultscore=0 mlxlogscore=997
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301200157
X-Proofpoint-GUID: hQ9cptZSOCRO8tYrQrGcrTEz-ZooiFPt
X-Proofpoint-ORIG-GUID: hQ9cptZSOCRO8tYrQrGcrTEz-ZooiFPt
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 new locking functions for vma_expand().  This reduces code
duplication.

At the same time change VM_BUG_ON() to VM_WARN_ON()

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

diff --git a/mm/mmap.c b/mm/mmap.c
index 9afaf05eb96b..a0883c23f948 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -460,122 +460,6 @@ static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma)
 	return 0;
 }
 
-/*
- * vma_expand - Expand an existing VMA
- *
- * @mas: The maple state
- * @vma: The vma to expand
- * @start: The start of the vma
- * @end: The exclusive end of the vma
- * @pgoff: The page offset of vma
- * @next: The current of next vma.
- *
- * Expand @vma to @start and @end.  Can expand off the start and end.  Will
- * expand over @next if it's different from @vma and @end == @next->vm_end.
- * Checking if the @vma can expand and merge with @next needs to be handled by
- * the caller.
- *
- * Returns: 0 on success
- */
-inline int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
-		      unsigned long start, unsigned long end, pgoff_t pgoff,
-		      struct vm_area_struct *next)
-{
-	struct mm_struct *mm = vma->vm_mm;
-	struct address_space *mapping = NULL;
-	struct rb_root_cached *root = NULL;
-	struct anon_vma *anon_vma = vma->anon_vma;
-	struct file *file = vma->vm_file;
-	bool remove_next = false;
-
-	if (next && (vma != next) && (end == next->vm_end)) {
-		remove_next = true;
-		if (next->anon_vma && !vma->anon_vma) {
-			int error;
-
-			anon_vma = next->anon_vma;
-			vma->anon_vma = anon_vma;
-			error = anon_vma_clone(vma, next);
-			if (error)
-				return error;
-		}
-	}
-
-	/* Not merging but overwriting any part of next is not handled. */
-	VM_BUG_ON(next && !remove_next && next != vma && end > next->vm_start);
-	/* Only handles expanding */
-	VM_BUG_ON(vma->vm_start < start || vma->vm_end > end);
-
-	if (vma_iter_prealloc(vmi))
-		goto nomem;
-
-	vma_adjust_trans_huge(vma, start, end, 0);
-
-	if (file) {
-		mapping = file->f_mapping;
-		root = &mapping->i_mmap;
-		uprobe_munmap(vma, vma->vm_start, vma->vm_end);
-		i_mmap_lock_write(mapping);
-	}
-
-	if (anon_vma) {
-		anon_vma_lock_write(anon_vma);
-		anon_vma_interval_tree_pre_update_vma(vma);
-	}
-
-	if (file) {
-		flush_dcache_mmap_lock(mapping);
-		vma_interval_tree_remove(vma, root);
-	}
-
-	/* VMA iterator points to previous, so set to start if necessary */
-	if (vma_iter_addr(vmi) != start)
-		vma_iter_set(vmi, start);
-
-	vma->vm_start = start;
-	vma->vm_end = end;
-	vma->vm_pgoff = pgoff;
-	vma_iter_store(vmi, vma);
-
-	if (file) {
-		vma_interval_tree_insert(vma, root);
-		flush_dcache_mmap_unlock(mapping);
-	}
-
-	/* Expanding over the next vma */
-	if (remove_next && file) {
-		__remove_shared_vm_struct(next, file, mapping);
-	}
-
-	if (anon_vma) {
-		anon_vma_interval_tree_post_update_vma(vma);
-		anon_vma_unlock_write(anon_vma);
-	}
-
-	if (file) {
-		i_mmap_unlock_write(mapping);
-		uprobe_mmap(vma);
-	}
-
-	if (remove_next) {
-		if (file) {
-			uprobe_munmap(next, next->vm_start, next->vm_end);
-			fput(file);
-		}
-		if (next->anon_vma)
-			anon_vma_merge(vma, next);
-		mm->map_count--;
-		mpol_put(vma_policy(next));
-		vm_area_free(next);
-	}
-
-	validate_mm(mm);
-	return 0;
-
-nomem:
-	return -ENOMEM;
-}
-
 /*
  * vma_prepare() - Helper function for handling locking VMAs prior to altering
  * @vp: The initialized vma_prepare struct
@@ -697,6 +581,78 @@ static inline void vma_complete(struct vma_prepare *vp,
 		uprobe_mmap(vp->insert);
 }
 
+/*
+ * vma_expand - Expand an existing VMA
+ *
+ * @vmi: The vma iterator
+ * @vma: The vma to expand
+ * @start: The start of the vma
+ * @end: The exclusive end of the vma
+ * @pgoff: The page offset of vma
+ * @next: The current of next vma.
+ *
+ * Expand @vma to @start and @end.  Can expand off the start and end.  Will
+ * expand over @next if it's different from @vma and @end == @next->vm_end.
+ * Checking if the @vma can expand and merge with @next needs to be handled by
+ * the caller.
+ *
+ * Returns: 0 on success
+ */
+inline int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
+		      unsigned long start, unsigned long end, pgoff_t pgoff,
+		      struct vm_area_struct *next)
+{
+	struct vma_prepare vp;
+
+	memset(&vp, 0, sizeof(vp));
+	vp.vma = vma;
+	vp.anon_vma = vma->anon_vma;
+	if (next && (vma != next) && (end == next->vm_end)) {
+		vp.remove = next;
+		if (next->anon_vma && !vma->anon_vma) {
+			int error;
+
+			vp.anon_vma = next->anon_vma;
+			vma->anon_vma = next->anon_vma;
+			error = anon_vma_clone(vma, next);
+			if (error)
+				return error;
+		}
+	}
+
+	/* Not merging but overwriting any part of next is not handled. */
+	VM_WARN_ON(next && !vp.remove &&
+		  next != vma && end > next->vm_start);
+	/* Only handles expanding */
+	VM_WARN_ON(vma->vm_start < start || vma->vm_end > end);
+
+	if (vma_iter_prealloc(vmi))
+		goto nomem;
+
+	vma_adjust_trans_huge(vma, start, end, 0);
+
+	vp.file = vma->vm_file;
+	if (vp.file)
+		vp.mapping = vp.file->f_mapping;
+
+	/* VMA iterator points to previous, so set to start if necessary */
+	if (vma_iter_addr(vmi) != start)
+		vma_iter_set(vmi, start);
+
+	vma_prepare(&vp);
+	vma->vm_start = start;
+	vma->vm_end = end;
+	vma->vm_pgoff = pgoff;
+	/* Note: mas must be pointing to the expanding VMA */
+	vma_iter_store(vmi, vma);
+
+	vma_complete(&vp, vmi, vma->vm_mm);
+	validate_mm(vma->vm_mm);
+	return 0;
+
+nomem:
+	return -ENOMEM;
+}
 /*
  * We cannot adjust vm_start, vm_end, vm_pgoff fields of a vma that
  * is already present in an i_mmap tree without adjusting the tree.
-- 
2.35.1