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 14/49] mm: Add temporary vma iterator versions of vma_merge(), split_vma(), and __split_vma()
Date:   Fri, 20 Jan 2023 11:26:15 -0500
Message-Id: <20230120162650.984577-15-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?JgTpiTMV5E3/wkM3wAyJfjSzruksIib0hh1hCAjJ/99o9lBHWqknuIVBR2D3?=
 =?us-ascii?Q?Xo0wMghUOkSGsWR4AArYmpaJPtSHCP4kS/wBsuLDXgMhuD3YFD8Zhb7ix1Dq?=
 =?us-ascii?Q?3Xg7Ktvpgf0R6GhGN59n5WnJK2gnq2P3JcXuZ5FPkf5R9nDQ7XMIAwrM8aGa?=
 =?us-ascii?Q?ju6IQ86Hv5zypmNqCMt9pQzqueodWqAItVB4UbSeA/RlOKFHRQSepBy56Zfp?=
 =?us-ascii?Q?r2NyTUAr2xbWm4J0feGx5J5JUyBb7GbfhLmWA0dJ4a5srZyXJyi6HOzrhsqz?=
 =?us-ascii?Q?kWZuCl1j8t48GRzBDan5AyeDrkTr5Ako40HHsfdNALmZe1l3/F2hARTYKvHk?=
 =?us-ascii?Q?H6j629ThnjVTVM1FHzRrYCPV+MgpiTdOUr6MfGXJmzJZHALkvoDtFnIN9Nw9?=
 =?us-ascii?Q?E7w8qRMlmUBaD/n5OzvgTkIhyqFPKicBdpqhirG6poMzqBM4RtHMQolJV3DM?=
 =?us-ascii?Q?/wGwKPt/N1kUKE+4IWGqYSB8pD0GjIzKkyAkgqn7dmYjzjYsTp5wEd6gjtQk?=
 =?us-ascii?Q?r2KN9KsLGQ51jCwFI9uqyZTMRmmQliNLM8LOQbfV85ylgmu+CFBDfjSm5SVu?=
 =?us-ascii?Q?8bMdqyNiI7KoDdyuapyT7HY3WYyUJC3xUhcgvc3lshtZ+EFhvU7h+J0ZFBVo?=
 =?us-ascii?Q?Kqx+ppjcToZeFhEX8IjX5vMPZwBWs4FIBanscOuhZlrmeROvBTHI+sa1TGLp?=
 =?us-ascii?Q?ROl5FBS5XgSkGaRL0k5Lj1kRh+9yizsCMNY6RstKVi9Cx7JBDwY00DJ3Wdmx?=
 =?us-ascii?Q?MeSwRnXYl4afki7aarR2QiECPevNl3eM6sDR7+HO0A9T6BLQOh3wZ/HetCVd?=
 =?us-ascii?Q?3EaIz1cd2L/hhhvUyZ3BzzE9DAQS+h4uT4i2O5CNKOjV4l2SfHp6l0XRD8Jv?=
 =?us-ascii?Q?H1dZz8UNMnSYzdVtBzvrncCsAJ7j/sgjeNn0vXt8BNU7rNtDeAiwcZAmt3Xx?=
 =?us-ascii?Q?POxBk5eE0BMbHxI+nBLTN3zdVPQz1HaDe93i8GXKdVNxVagzudSg4Y5v749K?=
 =?us-ascii?Q?lRDa4OYbOY56n0dBL/KAC3ecbqrQg4h+j+J5lCzqjJ5Rwt+Mtwgq6ajk5+tH?=
 =?us-ascii?Q?fTDg395Ef0iVCB1opaxLbHvaiF1iHpVNJnHjpJcqH6nUxQ/+UUlwMVyKgeu7?=
 =?us-ascii?Q?n+Ln0UmPYbBZCbkW75YzUfKuXrpvUYAYKgR5i/d/4BQYed0jW35XYBUXajqS?=
 =?us-ascii?Q?ezkndkj/ENcLJ6a1bbm7og49Y68GGC0VHD+8vONQiJ1Psl7nT9/Sb29ddJyK?=
 =?us-ascii?Q?R202jA9hoLl7OAxIGCQBSZU2VbT8Dn10B+lZn1BW/sojAR9EVxUcYQpD4VLB?=
 =?us-ascii?Q?f9lf345KdggsToXuQF2zFT95XzxHNatZR03JrENoSv6LxQBMCuxc9+wFMLWt?=
 =?us-ascii?Q?x0zofzPCQmorIVXsM44qZbuK3cwaaHi4C5WwUwy/vhbS1HHGJFke+y9y0XVl?=
 =?us-ascii?Q?6XZYnCH1xnJju/LQ7lyojbIrHe90UIysiL3j1+Ayhmjr2ImpSlkVh1yYO6zv?=
 =?us-ascii?Q?Ue93lDDb95onezd21E4ExxBmxnSVpZ9HsEYar5uPJWvFW8twVRl/fKrOevbK?=
 =?us-ascii?Q?gNk+RUID0q50mzgNLKTDJSGPJQrRURv1na4IxVZmOoW7TMASBCtU+1vF9mMf?=
 =?us-ascii?Q?Cw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: LHD2bO3QoYgkob+yf7Qyl9nBK4BI0qAgdteuIw9w1u+O6onSdO1tIDpBCfzirdWFIvUXeb4uX/kDEfq6wufolq5+LM77fNsmxWouYiq2glcbZ6+8lQIN1Dr8/c93NNgvJnEVT0OeIr+B0+o0/6i3YhfIDuVJpLikqZ0KFFZL/QiyshGlQnbADlPFyf3Lu50tx6ZDzvpKk3uD2YAL27ccZNbSAl6yFmLyDdD0HjPz62DMFxLF5ctM49PIFbD5gmsT1/B33sMT4TzLIFmc/Ff/UxxFNsoPY9vSvbPrlZyiff93z8+2XiYQcLm13DRqSOwqx6Coqv1GNFSSUWWmGlrHZq5No03jkYncZl5XlAatI2HsthQv0vCaucTO6n9PW845hBMuar3M65UaujC7cOh0+3mNw/KymG7XFm7GUPZCTq2kc8kax9R4ms1zFDQbYdz2q6F88/KjQQS2dy9f1pQmTKf/K64xpncPRIXbZkJ3YqAblRITyNQ44yAoMSHjNCUY5VGKqoDISKzSUaEGVPX/3MWZVjvMdTnwNRNhYsVm1IctDBAwMztuikFx/K9t0XKYcox9A2+4pIiGj236172teTd1pU4PmAnLBtK5dUrbNnubQBu4rWqAnNznQg20cXFpCdenK19VqsKebWpfbbWFTClkT2M4ouM6iRuspoMT7c++SkWcJi/oaootUh/2ShgO12Q1pK18XD94klzLnRPbWx287aSW1pSwJSyCtHNguowc+uu/Y0pgO7TwMymGnm8LS2nwUWOyAhYXCGfHUP+1QsUHpuPtlIJTS5gqNw+tapdYeGgWbWabdL+ziSMZNrJXQk2RXWlcxPaNjaRT+u4SCZ+gO01FlabyMnatHZwMxHqq6J0AUXZLT7kLKt7PGLyizC/f40IJhSxWiauc7NDxOA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e3f4a4db-5c04-4bdf-6aad-08dafb0342de
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:45.6536
 (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: e3w3eTvOFs8F0o0M/t+At7v5v1PEmyPm3ed0BrlvYFgvzuKltTRrWguVXK6hEWUu4HLOxwZpzDgNObxb4q5dfg==
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 phishscore=0 bulkscore=0 suspectscore=0
 spamscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301200157
X-Proofpoint-ORIG-GUID: oJiTum2dZVAtP2njHh6P48PelAvSrKnB
X-Proofpoint-GUID: oJiTum2dZVAtP2njHh6P48PelAvSrKnB
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>

These wrappers are short-lived in this patch set so that each user can
be converted on its own.  In the end, these functions are renamed in one
commit.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 include/linux/mm.h | 11 ++++++++++-
 mm/mmap.c          | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 152a1362b800..956025940053 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2843,11 +2843,20 @@ extern struct vm_area_struct *vma_merge(struct mm_struct *,
 	struct vm_area_struct *prev, unsigned long addr, unsigned long end,
 	unsigned long vm_flags, struct anon_vma *, struct file *, pgoff_t,
 	struct mempolicy *, struct vm_userfaultfd_ctx, struct anon_vma_name *);
+extern struct vm_area_struct *vmi_vma_merge(struct vma_iterator *vmi,
+	struct mm_struct *, struct vm_area_struct *prev, unsigned long addr,
+	unsigned long end, unsigned long vm_flags, struct anon_vma *,
+	struct file *, pgoff_t, struct mempolicy *, struct vm_userfaultfd_ctx,
+	struct anon_vma_name *);
 extern struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *);
 extern int __split_vma(struct mm_struct *, struct vm_area_struct *,
-	unsigned long addr, int new_below);
+			       unsigned long addr, int new_below);
+extern int vmi__split_vma(struct vma_iterator *vmi, struct mm_struct *,
+	struct vm_area_struct *, unsigned long addr, int new_below);
 extern int split_vma(struct mm_struct *, struct vm_area_struct *,
 	unsigned long addr, int new_below);
+extern int vmi_split_vma(struct vma_iterator *vmi, struct mm_struct *,
+		struct vm_area_struct *, unsigned long addr, int new_below);
 extern int insert_vm_struct(struct mm_struct *, struct vm_area_struct *);
 extern void unlink_file_vma(struct vm_area_struct *);
 extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
diff --git a/mm/mmap.c b/mm/mmap.c
index 2ec671a119c1..5092d0405883 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1091,6 +1091,25 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
 	return res;
 }
 
+struct vm_area_struct *vmi_vma_merge(struct vma_iterator *vmi,
+			struct mm_struct *mm,
+			struct vm_area_struct *prev, unsigned long addr,
+			unsigned long end, unsigned long vm_flags,
+			struct anon_vma *anon_vma, struct file *file,
+			pgoff_t pgoff, struct mempolicy *policy,
+			struct vm_userfaultfd_ctx vm_userfaultfd_ctx,
+			struct anon_vma_name *anon_name)
+{
+	struct vm_area_struct *tmp;
+
+	tmp = vma_merge(mm, prev, addr, end, vm_flags, anon_vma, file, pgoff,
+			policy, vm_userfaultfd_ctx, anon_name);
+	if (tmp)
+		vma_iter_set(vmi, end);
+
+	return tmp;
+}
+
 /*
  * Rough compatibility check to quickly see if it's even worth looking
  * at sharing an anon_vma.
@@ -2276,6 +2295,18 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
 	validate_mm_mt(mm);
 	return err;
 }
+int vmi__split_vma(struct vma_iterator *vmi, struct mm_struct *mm,
+		   struct vm_area_struct *vma, unsigned long addr, int new_below)
+{
+	int ret;
+	unsigned long end = vma->vm_end;
+
+	ret = __split_vma(mm, vma, addr, new_below);
+	if (!ret)
+		vma_iter_set(vmi, end);
+
+	return ret;
+}
 
 /*
  * Split a vma into two pieces at address 'addr', a new vma is allocated
@@ -2290,6 +2321,19 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
 	return __split_vma(mm, vma, addr, new_below);
 }
 
+int vmi_split_vma(struct vma_iterator *vmi, struct mm_struct *mm,
+		  struct vm_area_struct *vma, unsigned long addr, int new_below)
+{
+	int ret;
+	unsigned long end = vma->vm_end;
+
+	ret = split_vma(mm, vma, addr, new_below);
+	if (!ret)
+		vma_iter_set(vmi, end);
+
+	return ret;
+}
+
 static inline int munmap_sidetree(struct vm_area_struct *vma,
 				   struct ma_state *mas_detach)
 {
-- 
2.35.1