Received-SPF: pass (google.com: domain of linux-kernel+bounces-210393-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: "Liam R. Howlett" <Liam.Howlett@oracle.com>
To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Vlastimil Babka <vbabka@suse.cz>,
        Lorenzo Stoakes <lstoakes@gmail.com>,
        Suren Baghdasaryan <surenb@google.com>,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 7/8] mm/mmap: Extract validate_mm() from vma_complete()
Date: Tue, 11 Jun 2024 14:01:59 -0400
Message-ID: <20240611180200.711239-8-Liam.Howlett@oracle.com>
In-Reply-To: <20240611180200.711239-1-Liam.Howlett@oracle.com>
References: <20240611180200.711239-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?VNQ1vRrzmDRQ5I+BOLrqOrqSHqbMgYvB8WScX+YZq/Ebwf+Yw4yvfqlq6QX8?=
 =?us-ascii?Q?eJX3pz93g2epm/tfj3P9vN3O8j59VY/2U64nAv9rDVd8FNs5WAf+zYzGcG/6?=
 =?us-ascii?Q?0b8V/OqDje9rTDI8w9mWedMC0pmXRkRKv70PnbBnpR9DS0KEMMYub0tpRVqA?=
 =?us-ascii?Q?dArKOw7CShBl9TCqCtx0AgvmYXDgKOnQCa1yvGq2TJZXyHVFN7/nsmNktNI4?=
 =?us-ascii?Q?6F9BHPswA5RQpJbmJhsPyBBndfurizHGWbVU9eLuJqcgkxlukNulQ9cHMZVy?=
 =?us-ascii?Q?onCLPFW7VJvhHDgqrNZWdLdQozBjYA1ulhJCPwyUEbRMrBkpO1SSTFx+QYsC?=
 =?us-ascii?Q?3cgwPsSdKbGz19x/60n79pEAh1V03yrKLB7shChtbOAt5DstLKNgoVIhpzTf?=
 =?us-ascii?Q?q5v4GhiGOOfhQldwDvalqLuPSWMTWylNNmA3dY9V0K8pBk3ycD700GudjXtC?=
 =?us-ascii?Q?mh5AwYnNJtcuBQpCDcaMxcjeR/8HFhVDQYL/yzwHxmsMAivgUR/g/ixAqpdj?=
 =?us-ascii?Q?l4Y1/ZtfNYuY4kCj40YTSAowyAacA1s3dxQW/vul7zGhD6czJYFhKKejChZf?=
 =?us-ascii?Q?HJ3M/yA/nKbBpqTDU2M9OTdfhKcC6JQE+GveMTZX9gIS/vEMrnNuf2r4BTsJ?=
 =?us-ascii?Q?7PnKWW1vmZKyL8sZdvK8qv+OladGdLYczsVNPwNColgAfHUbTxExA6+1mf/D?=
 =?us-ascii?Q?G9nYIS6LXZF9tJwFaoach9lxgs0jL6J4lOIIHnze+3GHuaCk+VRr00n6A/ya?=
 =?us-ascii?Q?8YTvcOcM/s7wp12EX4y5WIYqOfBdIkp6Q7sGV3/K8JU1Q8DY4oWIyApHti4F?=
 =?us-ascii?Q?zIpocll800qn3ZfxSmiF3KnHM1AHuj//IkKxdCkB0duB9joMlExuwZ/lo5pc?=
 =?us-ascii?Q?7K47Mhff8bMmUGq/FdLr3a50LonooLxsIFUasJVqUM1vfmWfWIxEcB60LLd1?=
 =?us-ascii?Q?1QIqM8Sb84xIkyhGob5QC6dd0GOQYbwMprvaKKD+X7V/aGl77N/4O5Ry3oUp?=
 =?us-ascii?Q?lQfvGHZ62PRX9o20XAMU3EJzbGiIMX/n+pQUAcfhoi7B69OLIik08S5UcTiS?=
 =?us-ascii?Q?mJ3YPkpcbHkrjm0tar+xR59ZDJVt1aaIuVMBuUmKE2Dvmx8TZlFJ8AnW9tqP?=
 =?us-ascii?Q?VVmF80fyKDZrAwbcedDXu06hb2em3dlm2HC3IRG0S33GA/ocOE/SpCY83A3Z?=
 =?us-ascii?Q?v6uF43k7OcNU6M4p2rHv0NuwIta22lDwcGBTKuZw3LndNZoLtOVLa5Jdzb5x?=
 =?us-ascii?Q?D6gLOYUlHZ/YrAg2M3X8cQxm1JL8OXr1vXK2aBH4xfmQPw3simQnq+7V3Z8Y?=
 =?us-ascii?Q?Fn6VppVFJmaehTGMCW/TriN+6Der/lYQGQDSPGiEEJWASzcJzHVZcInRcv2S?=
 =?us-ascii?Q?NYNJt4caCSiQYu7AgNLdsVwawpwllvL89K14vnDYp6N9EZox6lRZzr1Z8MQY?=
 =?us-ascii?Q?eg/Bw5RDR6wiQjnHE/kj5Pf7w0901eDfAZLdvuH1dcqBKFno20X5Z1m2XkLF?=
 =?us-ascii?Q?ExMmBKcWtkVC38A1xRJfgWMPNREGm2v1PWKO6Y4fbwhiA1/W/AcxajW3BSVH?=
 =?us-ascii?Q?7diiWnsoN4kq51kHc2c2y27zJp2+R60ZPJ8OYxFar3Qm8lZWv8kuMIa93HCE?=
 =?us-ascii?Q?sg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	+aTpRKI4Be8pr+4jI4QJGAvqKugDsgk8TgdR4X2kmqMddjXldK1aiS6ldC2YHnRXYdpxYYgG/BUrHv+ilBduzF71LKDETDtLetHXtgyfya2gX5MUld6MqAohjpnVJepOMNz4vo1FfhlosPJJMaEmTws+RPtYizH4xWCE7Fdwch9pYpxXnrx3PFiIAq4Tospmnx8SpS7kEuRb8l49JvsZnIBFRya+cwtVFj7xZjgCf9MBR6lvNPMPAAKKVEB48r6X3a6i9OGltVUetdGYpKgQsL8yniQI6LE/xN4MycxltZxHR2vS2kl3oLLULmDnt1+XCg+cgtfF6gQsKWgYOTUo0HR2lGmEFWvHSCU9OYFjq8XSvGbfOCrT1VTX1ciM/6B7iB2EA1ja2L6jJDnEeJqsLtajDbgwZ8zx2j/kte2BIsDF5KsY3MY89zgnqvGUAzMo7Pv6xRM+TA4zVo2T1YuXpIZ21v3dZd2yx2rKrwgULjHTJyJlyBrz4fLIdoxs33UhoS0yv2nLosQj5GK9HvkkqKh3wv4sAw3yxOCS3b0/VTtzRAnRuNzIYYmtB8WlqJYWWy+oKHiCCZCq7RDLFtsCgJGKevNnAUbIdaWnn6S4WYg=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8378824b-18c7-4d01-6dd3-08dc8a40a63f
X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 18:02:25.2374
 (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: /0d3TzjGmzFbQ+5k2hRd2pg6/B1S6mBMf9n93T0B3tqEB/asqVaj7dU4Fu3xKs/no3KdX11FEwVKCFleyTRjXg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR10MB7817
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16
 definitions=2024-06-11_09,2024-06-11_01,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 phishscore=0 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2406110123
X-Proofpoint-ORIG-GUID: U_PXfPpToUWq1fxUhMUwCixk-rr7Ugv2
X-Proofpoint-GUID: U_PXfPpToUWq1fxUhMUwCixk-rr7Ugv2

vma_complete() will need to be called during an unsafe time to call
validate_mm().  Extract the call in all places now so that only one
location can be modified in the next change.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/mmap.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index ea3edfa8b22c..5334077964b9 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -605,7 +605,6 @@ static inline void vma_complete(struct vma_prepare *vp,
 	}
 	if (vp->insert && vp->file)
 		uprobe_mmap(vp->insert);
-	validate_mm(mm);
 }
 
 /*
@@ -693,6 +692,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
 	vma_iter_store(vmi, vma);
 
 	vma_complete(&vp, vmi, vma->vm_mm);
+	validate_mm(vma->vm_mm);
 	return 0;
 
 nomem:
@@ -734,6 +734,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma,
 	vma_iter_clear(vmi);
 	vma_set_range(vma, start, end, pgoff);
 	vma_complete(&vp, vmi, vma->vm_mm);
+	validate_mm(vma->vm_mm);
 	return 0;
 }
 
@@ -1062,6 +1063,7 @@ static struct vm_area_struct
 	}
 
 	vma_complete(&vp, vmi, mm);
+	validate_mm(mm);
 	khugepaged_enter_vma(res, vm_flags);
 	return res;
 
@@ -2440,6 +2442,7 @@ static int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
 
 	/* vma_complete stores the new vma */
 	vma_complete(&vp, vmi, vma->vm_mm);
+	validate_mm(vma->vm_mm);
 
 	/* Success. */
 	if (new_below)
@@ -3308,6 +3311,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		vma_iter_store(vmi, vma);
 
 		vma_complete(&vp, vmi, mm);
+		validate_mm(mm);
 		khugepaged_enter_vma(vma, flags);
 		goto out;
 	}
-- 
2.43.0