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 42/49] mm/mmap: Introduce init_vma_prep() and init_multi_vma_prep()
Date:   Fri, 20 Jan 2023 11:26:43 -0500
Message-Id: <20230120162650.984577-43-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?UYg5PWSHWJAFuJB3g9qipH3UsKmL0gq3CJv9HKne6//YmQaXFmGgxGMHtAq6?=
 =?us-ascii?Q?h5HxVxx7jVUwDzlzWCZM/vEzzujI2i9M80+K5DcJqsnA3+OeIbBxUFmYTTAH?=
 =?us-ascii?Q?DqNE3B16cOcPFiz5zHKYPbjbDFkbAqoxvTbdmD9xsJHZhAQuR/VZw3Kp+aNX?=
 =?us-ascii?Q?HN/6ZDW7Aj3P9ya445cr15IfqgN+gPKNLT4q0fgTWDyxHtguiwehwDmnlP2a?=
 =?us-ascii?Q?cDxJJM6eiQMU0xNIICYI7NaGeVQKGMP1NuYuuPFAPtI/F2c+W43ZPh9mwxz6?=
 =?us-ascii?Q?SWi56yilpx78y26v44c7kBrdu7e+E/7T/91h3oRMafIKV7q/jLAS2PrWvP3s?=
 =?us-ascii?Q?y5gNcIJ5qLLvZcl1KHvLX0gjoyFpHZM27PIpJdAsSSro4Jv55Js0tYu134Np?=
 =?us-ascii?Q?225HiEnQeNn29PFom9Aot9Iq11LrSmZWzGjZ2Xhv9AbfKJbwfhL6Y7Gh+KzM?=
 =?us-ascii?Q?i+T1xUtbWcoi+lX++EoVQf6T2aXi6m1UhopdG/lR7YMlQXWGRcIkFLmQ/LwA?=
 =?us-ascii?Q?SeDwZtkPH7xik3GVQMKAb7ogprNk5Vh//NEKrzIvJaGdBGpfjE2G0ofSj3yw?=
 =?us-ascii?Q?DpE1j0RDjKDAB+cbl7fqRCvHt7TB9iJ5yOGWr9ryAVsWlgWF27IxlMHMCPFn?=
 =?us-ascii?Q?QA0V4/k7FSQt7Ttldx6mq/OhG3uOnsBUzFQKdmpaiM1PWoRxlN7sywywWqL1?=
 =?us-ascii?Q?lg6ErO9H0WjlCZOy22uGuOfD3qT8fjkDr3na4Jt+kjUkSyoACePWVj6WHZ8h?=
 =?us-ascii?Q?2LCYtbNmhWNv3KiPJSYCxSI/NgeBmyguJzIJRgfmTiBL8LmsWtNM07KAgf6j?=
 =?us-ascii?Q?YwgiaeWYVqGczg0YMAA+0GGBpnA5v4+9g+JiHwjXOc4+f+lrLVWrnEfGLMDk?=
 =?us-ascii?Q?J76QuMhOsjfw11YxbdFBpH/gk/hnlgK8mdixaulIkd4jVM6VPm16HrAg09Em?=
 =?us-ascii?Q?iADGCd36AqqFWwIq2bNwR23V99J0q6hZDisDTGCvDMVCna6FqEU5lwQ7polI?=
 =?us-ascii?Q?ib5jeFX9+KiFkNP37UJEtvaXfA6WbLR8UWiGO/S3SXU8ignKpzVDZSQoI1TS?=
 =?us-ascii?Q?mcCHXb+mOsr31heBHn58yqteK43UM/LTf3j8E5qsmpFDpnR05AeTTyxTwQMq?=
 =?us-ascii?Q?kLJwf751MXNtVNx7q0aXupoMWD6BSOsGL987MulZw0Ft6ALdBYSrEjkqQEO3?=
 =?us-ascii?Q?zTgUOe8O+eFz4eO+MUeLseNGJjsppCmKc6yyYxXg/maQ7/M6oN3zz5jXqHd7?=
 =?us-ascii?Q?KSpk1brnb0TspBDlBNXezWawsoHbkUdxjVWGKM4e9wP601ivgStxAFnaLk3d?=
 =?us-ascii?Q?Z83ZWUEfjsTRcILHb4dWYg0pukFX4F8h2A5D/oEIRLkiNeSWaJIBdvFLkakQ?=
 =?us-ascii?Q?xCJwEvRve+iI31bf3ncVgXIu3sCl9ZBBscBhDuld5ZwLehVHOwF5b9CGT8PP?=
 =?us-ascii?Q?g4Hqj1xgkh+iTVR7aphMtrBKCT9jADzxX0+8XmVJIzs+W1c5LI0mpd5vHo9x?=
 =?us-ascii?Q?lzFoW2d0cPvji4oZqWEDfh1S5NNmczhqizRK9dfSVHIDSPqlqGB0XNcQQaWn?=
 =?us-ascii?Q?lOb1uhgnzF/Q2HYycqg0m0n5i48Qn/ZcHKFChx0BwXIXXHUpd88XUAYEcxkY?=
 =?us-ascii?Q?cw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: tpXubT5r5+ZKDl2n7qNVzueiLc0G3Q7zqx8HeFuGBIBfoL2vOiQ8hu13bxjiSiiQFI9mlLTMiaEYpF3g+oczgEj1UKcFYq1DWt+zlF+UQgAA5QnyHZpJypzftXlmJx1I/c+j2vMgk2aZBwXldMfdxP8eeUqh01W32Zl495ALF/wqVX1e1zx0hMgh5yLgyLPk7KKo9qlL/8lCsHG12PFe6kCDm86ARAsdTsgIjTa06clRcSCaY1OEPMILMzwyYmcBWD2o426EL3dfwsPz8tKY3Gv+zuXPdcgs0QnPqITctE1+vBpAuOFlStOFJ/OEKUXmYOS53d8v7x7LRxuUDhOSyQPTNHZihIcqVOgpGxasyklf7NDU/V4aPyJMgeAZAoAQ/cHs7xLn8cpJEhLc+D81XlAanfZXGYiuLsl8dGdfWt9qfk3RwykBErmOAennhqj/gV7nACE9f/zsF+EW84Q2vZiB0llVJWCcK2pSz0LvUrsDyN9XfTFUO5YrtJKZPdl33dyEsRUp8o2eFDg7F+tnu0JeOWzJ12JqPGLBqRAgAFEdEMsT2yN6n1otIcx5+gBAH1s/tnHPfW/JVitWJkTPE4gybhHkbWUIui3fXs4m4RkOzvj+i/cGF6B/RUzfMTZGzAyvAUAeKEuiVp1sNFDhn7WtLt9nFPuE02cToNLHkAZotsQ+EwEjQ95ilGwbKbLrM8s3ALt8fgfjD7C4AsHIriW2kFmC592NzidIGS8u3AcvdZxlDZ3ssCkAatUC+4w1uL1CIwHPEjMoFnUNkord4UR50Xk8AcS7Y18+1ezP8QpY3apZDWG2OxTxpNdGXbT6menuLlhA8yLWrXaM5Ba6Y4wo3aaWTTFglRKxEyjenCLzfDUQ0RJUvcKhK6Lr8DgFZBjk08/D1bh4nGihvDM7AA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 315ad98b-703c-4c04-e253-08dafb036eac
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:58.9925
 (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: YOviOk3N7hR1BFYYMlI0nPzl0uNsn7MBS1GMsI8frHJsLdqYix18YnILHz7n+3DUwF/KwZFgTImL3aHiBBSE9A==
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 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-GUID: X9zMEY_xuXkXyi4MTc8_F2EQSDUDjJBr
X-Proofpoint-ORIG-GUID: X9zMEY_xuXkXyi4MTc8_F2EQSDUDjJBr
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>

Add init_vma_prep() and init_multi_vma_prep() to set up the struct
vma_prepare.  This is to abstract the locking when adjusting the VMAs.

Also change __vma_adjust() variable remove_next int in favour of a
pointer to the VMA to remove.  Rename next_next to remove2 since this
better reflects its use.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index a0883c23f948..7eb93c311d8d 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -460,6 +460,45 @@ static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma)
 	return 0;
 }
 
+/*
+ * init_multi_vma_prep() - Initializer for struct vma_prepare
+ * @vp: The vma_prepare struct
+ * @vma: The vma that will be altered once locked
+ * @next: The next vma if it is to be adjusted
+ * @remove: The first vma to be removed
+ * @remove2: The second vma to be removed
+ */
+static inline void init_multi_vma_prep(struct vma_prepare *vp,
+		struct vm_area_struct *vma, struct vm_area_struct *next,
+		struct vm_area_struct *remove, struct vm_area_struct *remove2)
+{
+	memset(vp, 0, sizeof(struct vma_prepare));
+	vp->vma = vma;
+	vp->anon_vma = vma->anon_vma;
+	vp->remove = remove;
+	vp->remove2 = remove2;
+	vp->adj_next = next;
+	if (!vp->anon_vma && next)
+		vp->anon_vma = next->anon_vma;
+
+	vp->file = vma->vm_file;
+	if (vp->file)
+		vp->mapping = vma->vm_file->f_mapping;
+
+}
+
+/*
+ * init_vma_prep() - Initializer wrapper for vma_prepare struct
+ * @vp: The vma_prepare struct
+ * @vma: The vma that will be altered once locked
+ */
+static inline void init_vma_prep(struct vma_prepare *vp,
+				 struct vm_area_struct *vma)
+{
+	init_multi_vma_prep(vp, vma, NULL, NULL, NULL);
+}
+
+
 /*
  * vma_prepare() - Helper function for handling locking VMAs prior to altering
  * @vp: The initialized vma_prepare struct
@@ -569,7 +608,7 @@ static inline void vma_complete(struct vma_prepare *vp,
 
 		/*
 		 * In mprotect's case 6 (see comments on vma_merge),
-		 * we must remove next_next too.
+		 * we must remove the one after next as well.
 		 */
 		if (vp->remove2) {
 			vp->remove = vp->remove2;
@@ -602,17 +641,14 @@ 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)
 {
+	bool remove_next = false;
 	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;
+		remove_next = true;
 		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)
@@ -620,6 +656,7 @@ inline int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		}
 	}
 
+	init_multi_vma_prep(&vp, vma, NULL, remove_next ? next : NULL, NULL);
 	/* Not merging but overwriting any part of next is not handled. */
 	VM_WARN_ON(next && !vp.remove &&
 		  next != vma && end > next->vm_start);
@@ -630,11 +667,6 @@ inline int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		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);
@@ -665,14 +697,13 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_area_struct *vma,
 	struct vm_area_struct *insert, struct vm_area_struct *expand)
 {
 	struct mm_struct *mm = vma->vm_mm;
-	struct vm_area_struct *next_next = NULL;	/* uninit var warning */
+	struct vm_area_struct *remove2 = NULL;
+	struct vm_area_struct *remove = NULL;
 	struct vm_area_struct *next = find_vma(mm, vma->vm_end);
 	struct vm_area_struct *orig_vma = vma;
-	struct anon_vma *anon_vma = NULL;
 	struct file *file = vma->vm_file;
 	bool vma_changed = false;
 	long adjust_next = 0;
-	int remove_next = 0;
 	struct vm_area_struct *exporter = NULL, *importer = NULL;
 	struct vma_prepare vma_prep;
 
@@ -691,25 +722,24 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_area_struct *vma,
 				 */
 				VM_WARN_ON(end != next->vm_end);
 				/*
-				 * remove_next == 3 means we're
-				 * removing "vma" and that to do so we
+				 * we're removing "vma" and that to do so we
 				 * swapped "vma" and "next".
 				 */
-				remove_next = 3;
 				VM_WARN_ON(file != next->vm_file);
 				swap(vma, next);
+				remove = next;
 			} else {
 				VM_WARN_ON(expand != vma);
 				/*
-				 * case 1, 6, 7, remove_next == 2 is case 6,
-				 * remove_next == 1 is case 1 or 7.
+				 * case 1, 6, 7, remove next.
+				 * case 6 also removes the one beyond next
 				 */
-				remove_next = 1 + (end > next->vm_end);
-				if (remove_next == 2)
-					next_next = find_vma(mm, next->vm_end);
+				remove = next;
+				if (end > next->vm_end)
+					remove2 = find_vma(mm, next->vm_end);
 
-				VM_WARN_ON(remove_next == 2 &&
-					   end != next_next->vm_end);
+				VM_WARN_ON(remove2 != NULL &&
+					   end != remove2->vm_end);
 			}
 
 			exporter = next;
@@ -719,8 +749,8 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_area_struct *vma,
 			 * If next doesn't have anon_vma, import from vma after
 			 * next, if the vma overlaps with it.
 			 */
-			if (remove_next == 2 && !next->anon_vma)
-				exporter = next_next;
+			if (remove2 != NULL && !next->anon_vma)
+				exporter = remove2;
 
 		} else if (end > next->vm_start) {
 			/*
@@ -761,30 +791,14 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_area_struct *vma,
 	if (vma_iter_prealloc(vmi))
 		return -ENOMEM;
 
-	anon_vma = vma->anon_vma;
-	if (!anon_vma && adjust_next)
-		anon_vma = next->anon_vma;
-
-	if (anon_vma)
-		VM_WARN_ON(adjust_next && next->anon_vma &&
-			   anon_vma != next->anon_vma);
-
 	vma_adjust_trans_huge(orig_vma, start, end, adjust_next);
 
-	memset(&vma_prep, 0, sizeof(vma_prep));
-	vma_prep.vma = vma;
-	vma_prep.anon_vma = anon_vma;
-	vma_prep.file = file;
-	if (adjust_next)
-		vma_prep.adj_next = next;
-	if (file)
-		vma_prep.mapping = file->f_mapping;
-	vma_prep.insert = insert;
-	if (remove_next) {
-		vma_prep.remove = next;
-		vma_prep.remove2 = next_next;
-	}
+	init_multi_vma_prep(&vma_prep, vma, adjust_next ? next : NULL, remove,
+			    remove2);
+	VM_WARN_ON(vma_prep.anon_vma && adjust_next && next->anon_vma &&
+		   vma_prep.anon_vma != next->anon_vma);
 
+	vma_prep.insert = insert;
 	vma_prepare(&vma_prep);
 
 	if (start != vma->vm_start) {
-- 
2.35.1