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 35/49] mm: Pass vma iterator through to __vma_adjust()
Date:   Fri, 20 Jan 2023 11:26:36 -0500
Message-Id: <20230120162650.984577-36-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?YQsGzM216EVy++T2Hs7HJem4KAzFGv+EsWIIDTqal17Jz9rwFZvHuhCG/d5y?=
 =?us-ascii?Q?Xxf2S1RrKW2b3Hg9wGh7tB6TNRjtYeBJ4AIFKeMZ+2Oyqln4k8hybQhFf3AX?=
 =?us-ascii?Q?9yljs3jXtankVQhXOIo03uw/gn0yNq29XmT3nXL/a+PXKFWo9IbB0BjgVC58?=
 =?us-ascii?Q?djJBSId9ml9+sxzm0sJaRZiss8zo8ZNlibYTqPv6Z/LR7YlI0YZbTb0VbpN8?=
 =?us-ascii?Q?1Umfgv9OrMOPIeLE5XxEtdDuhmWihqSb6auyrGfYALS+vlKkst/WjVVfO1YK?=
 =?us-ascii?Q?4qrGSXKB0z7NsBHKPH6gQojfSgf3gGnlrZsct+MFpXeQWVCJ+/LcvgIOQeqe?=
 =?us-ascii?Q?Dtg5cpZyoB6xo5gIx1EKXmnY/zCTXXjdoBNLxdtdxGRMVMlTz+o8cqzOC7Hh?=
 =?us-ascii?Q?sOz9UFnNG/fdH6jlEx2tkeis9F3oQ996JfXBamTpTDapq1BBNFdrO2uFmtzy?=
 =?us-ascii?Q?FDDKj/StC2pztPdoB1PlE5iRb1eG3V2QfljaaGQLu1DuIyMnQHG7IhRdOPIz?=
 =?us-ascii?Q?kx5Ah1C7QPwQiVFFD+fIog93q02vx1EF+2YdI1OihbBEic/tc5oWnQT+M9S4?=
 =?us-ascii?Q?oqt3IcPOb/cJDUcwtr5BObKYCRJl3mQTzbyAOrqN2kI/HA6YOhhhP4Di1Gpz?=
 =?us-ascii?Q?baardl0aG/KzAJJEi6zv5XYQW4bXSGNjeEUdIOl+F3PiVjddrf1g15cjfEaw?=
 =?us-ascii?Q?wcF3p+WzHmCRaID9Zhg57Qh1kUia+cdlMUJCySl1V6OQ8nhA3/Qwywpg8Ulx?=
 =?us-ascii?Q?iEJR43PvMUUxRZgCt1ZwnSHfQBbao8UXW7AGgkwjUtQMd8dT3tXohn0x4y95?=
 =?us-ascii?Q?eBVnKwzgPq/G5h7dZnFa0FOTDZy220H/6VaEAw7Ergag5OTMcQYogOUihTXO?=
 =?us-ascii?Q?apuUaEU/kAeyrPCQ+1LpIag4SUGhmNj1imBMygimQ6vTDg7KaQHJui98HyL9?=
 =?us-ascii?Q?y37nfyi+kZr7J2hlq/LgVGY8h7+r30qJ3+bixDDD+IeBo7d2iaXlDu9fo9uR?=
 =?us-ascii?Q?Qfn5/P/EDszbd0lDBETAgomY9wmEB5tSZDvK2zSMJvnm2qqMxDvSgmrv/S5g?=
 =?us-ascii?Q?Rfg/2s0Xka/sch8wvSpFn8Ox+MlrWSWMQYU4eW1uVLR54V80MEbsU86/ZV4X?=
 =?us-ascii?Q?1cdH0PQ2Hik8WQu2V/pg6S4Tx7UJAHKsNkaSMYsh5SMtvSZMs+lqbtOcHL98?=
 =?us-ascii?Q?Y0AGZuS/hav1E6U0dO74W1DDYqY+elbfiywVVZ2pVCzqlUWLq/jvg7cFJB/c?=
 =?us-ascii?Q?+LpQ1GrqZlurAC93BXvt86F13zw966NJspfG50ImG23X0jXPCtrJN0ZGD6lR?=
 =?us-ascii?Q?033pNqM3IGhlrEjQYgSfF3e1WqkyMEGRjwCDrMRorR9L1eLIPjeI2/1NIpuP?=
 =?us-ascii?Q?XfBbQoFm2tDedgqxbGzvRzRMvXqGO1NrQU9zvtJR3Nel/7FknadpcQ2CQ0xz?=
 =?us-ascii?Q?2Yewt5vpOwR9QrhY4SXVhugk0T2ffPosRJ5q5LORJ0H4awn5LuE6wE/rC+rl?=
 =?us-ascii?Q?kqC2fcd3TThdqjpdi2gGT935GQs5QbbPl6QqJnxjonxrQ5SroJagzw4CAfNQ?=
 =?us-ascii?Q?Rph1KwXZLbVGADKTt4O2qD2QuLK3h2rsRPIVRX6wNg7v3NupvLl9lUAIUqWh?=
 =?us-ascii?Q?Og=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mSHODp32Yp1fuEjV0QoWd3GRnO6HPKUy1IUtjN44JnvP6qhzZySIfrKKWOQi/ygzStBo1dZy6YbyaVf7JN113IgIu3Jpw3E3y4npBuAZMBtDijzNsqEvfYS7y4QAFqG9flf2QUc+YbQyv24BFQ8WgBynefrhRnGZCU/x9CdL1h8MVa6eqsCwopFRKxzn9KdNdpUDLQxmc9HVXpiD4IB3FAwp4T+MTbiznNtWg3nZx8p0I3vmaK7F8ZPNybr9jQ7gmkwUsNdY+t5QWD5Gt9KvgpuTWN8jHB5cAu+00heNnJdgwMlDqwHxMJEMC/FcktB0c5HYjdH3j2/sIzTUtThg0GAjyO6gahskNRQf1O3Oic+jgE10iCgRXXiNg/q7Y9sckNveRjq8sRpJYQVWlg/fbDMrs7LglvdYYK3x01d3pHO54Vq1ReapDZqwZgitJEJkSeHy6KcWdP40hu0yS9jqFab8N2nbAP1XIfufWxviXJXHTbg3C0EPqYU2q8zgNCCpAPJYQUPlBbhwCVcbLEV+dTWjtU977UEIGGObsAG5kFqL06iUqgW0sRhOZMAtxk0zYblGFpUY4eDMzCMKH6aN9/z5KGpj7y8782a17Za3NZPMAwH52upZxBhdwBQX+ROBZvsZwjGKa6tbpDeTasgS2pzXLwJPB1vjfN2MYODVjSJNeVl8qmkJ34y2m776W6i5NF2nLZkL1qKlcznbLOOAT0JaDPf0Dk6rVwrDfMrG4Eg2ATHoxldjZ/iSQ7HUnoX6xGOdR1c+def2DGIJd7HfTEoizrBRyANbZWykN+NQb93uk9RGjvXpHHuO8blD46AE4IoYxrhJc+dbne+9HF/gHEKitRZ6pl2XLGUEZJY+O7lmGfa83kQD8rWzqcgBoazLDXBhaIbNBxPoB4NIEaarJg==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ee354a16-acb3-47c1-187c-08dafb036539
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:42.8841
 (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: goQ90hcQOgUTeD46eVMH2wGxqFiZBZYJZeAFWlM7me76/Cspk/OBbSjuS1Rfdot4DRQWPAETW43T/IQLwdOzGA==
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-ORIG-GUID: TgrmUuWoXuS7wExi7mGq8FAlldkEyGWm
X-Proofpoint-GUID: TgrmUuWoXuS7wExi7mGq8FAlldkEyGWm
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>

Pass the iterator through to be used in __vma_adjust().  The state of
the iterator needs to be correct for the operation that will occur so
make the adjustments.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index 58b2187b447b..c7d72475ba6d 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -528,6 +528,10 @@ inline int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		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;
@@ -2167,13 +2171,13 @@ static void unmap_region(struct mm_struct *mm, struct maple_tree *mt,
 /*
  * __split_vma() bypasses sysctl_max_map_count checking.  We use this where it
  * has already been checked or doesn't make sense to fail.
+ * VMA Iterator will point to the end VMA.
  */
 int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		unsigned long addr, int new_below)
 {
 	struct vm_area_struct *new;
 	int err;
-	unsigned long end = vma->vm_end;
 
 	validate_mm_mt(vma->vm_mm);
 
@@ -2209,14 +2213,17 @@ int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		new->vm_ops->open(new);
 
 	if (new_below)
-		err = vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff +
-			((addr - new->vm_start) >> PAGE_SHIFT), new);
+		err = __vma_adjust(vmi, vma, addr, vma->vm_end,
+		   vma->vm_pgoff + ((addr - new->vm_start) >> PAGE_SHIFT),
+		   new, NULL);
 	else
-		err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
+		err = __vma_adjust(vmi, vma, vma->vm_start, addr, vma->vm_pgoff,
+				 new, NULL);
 
 	/* Success. */
 	if (!err) {
-		vma_iter_set(vmi, end);
+		if (new_below)
+			vma_next(vmi);
 		return 0;
 	}
 
@@ -2311,8 +2318,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		if (error)
 			goto start_split_failed;
 
-		vma_iter_set(vmi, start);
-		vma = vma_find(vmi, end);
+		vma = vma_iter_load(vmi);
 	}
 
 	prev = vma_prev(vmi);
@@ -2332,7 +2338,6 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
 			if (error)
 				goto end_split_failed;
 
-			vma_iter_set(vmi, end);
 			split = vma_prev(vmi);
 			error = munmap_sidetree(split, &mas_detach);
 			if (error)
@@ -2576,6 +2581,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 		goto unacct_error;
 	}
 
+	vma_iter_set(&vmi, addr);
 	vma->vm_start = addr;
 	vma->vm_end = end;
 	vma->vm_flags = vm_flags;
-- 
2.35.1