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:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v2 35/36] mm: Avoid rewalk in mmap_region
Date:   Fri,  5 May 2023 13:42:03 -0400
Message-Id: <20230505174204.2665599-36-Liam.Howlett@oracle.com>
In-Reply-To: <20230505174204.2665599-1-Liam.Howlett@oracle.com>
References: <20230505174204.2665599-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?K0W0bMN9Hvu3dRa9sKpvMLCm8zuL7eudMrQSSivwHjzUBUqlwvTYLndjjAg1?=
 =?us-ascii?Q?dkIsYUU+KMfKWUff6hM2U1l0k3hG4v+roHun6aEIYOXRmLeFVNNKiidiUPDk?=
 =?us-ascii?Q?qabGDQKt3LOO45lW/kJJIxTD4XqjUC1ogpRjG9P0JXXkO6HaZi/k4PI0qQOq?=
 =?us-ascii?Q?ucppnUG5kB1BKthImL9qnie7GW6SMnzlkmKFgUdEWxCzuex9D6XnFrfnWY4o?=
 =?us-ascii?Q?BzmejAUAFOZLB7qK8iXMXaPeCYPMGuWcLdCU7i8Mu6s2C3Yf6dY4vdjDWhGK?=
 =?us-ascii?Q?KkAMqSz8xu4KL2LD0kxvE6sHATjuUtny7JjMAY4nkDgUYQrpDsmg+V9jo7iP?=
 =?us-ascii?Q?SA9uE8alsjyGYZnpt0K9/ObCjes9Y269QBCpEX2JW0q60pe6Hg+HWN0niGaK?=
 =?us-ascii?Q?X9LN/onQZHKupEgbA4SFHh3HEg/0rO+CJjvdJ1RMrVPsQX1dU16CDLfy824n?=
 =?us-ascii?Q?lG3pOA4bMIZkaxSwVoIGZQwRQujwnbgVIA3BFbj05ivYQ4ZwCFt+LhlftJgT?=
 =?us-ascii?Q?MsoLj+AxnWGlw2xtK90Yz1iPvZKJckPbjQ1WKwZCr22KT4sJtTyojEXRReCX?=
 =?us-ascii?Q?4tvtq7Irvnd7E+yo77A8ya+/sxLITpPjEhPUl22kpL/NjVXEk4UbWckjRZ5E?=
 =?us-ascii?Q?W/S//mcf1lBS1scNAOntxtOLOO6kZ3KCa8Xg7GLNfMYGEXbPv/2LxKT8CGPY?=
 =?us-ascii?Q?5greN9UD1byt418aWT1hC0VpSfcPrCKChaXdPhv7FdtQMQeIjWzMUvkJcVYk?=
 =?us-ascii?Q?/g5TrqSSfaBxuceTur0TndFoRK/Zv3Gt7GLGRPNiyf9o+DbcDTMvbLrus5MH?=
 =?us-ascii?Q?xHi1n3FQzBAhclJ1NlXvWbErnCTISAPmn7N0ZAXVSWPLlBf8JcCMd1YxIzFV?=
 =?us-ascii?Q?FVljxHHHsqQ4HYoiy84Qfg8iQVHCp+lV7YpuIKLXNcYtRxs/rfPHoRCjgJO2?=
 =?us-ascii?Q?qgfTwoEHYNMMib6Xe5zgQQMOWqpIoehk7CPwkWyupx//Kr7pMNGNhhcH0OWa?=
 =?us-ascii?Q?5l2QBy97FYo+whw/+VfZVwd3dLgb7yC9PekQaJBpLusUHfoaSYoLjBnOMYTO?=
 =?us-ascii?Q?Xfv+oFvx3XPVCmDeIgcJvQk+TCp3jfC9edDN5K0ZsglfFP2vj/AzWjP2HONl?=
 =?us-ascii?Q?qkt/pRsjMSiBuEQ5hsJbvfEBf3WwFwwr2maL04YwUXfx12cspnLtz8CWo0nf?=
 =?us-ascii?Q?imZZ3/9AfVjjqFp3LLwvk2/GAjFe9OWaM1q0EPW/AQkIpErh2d8+wFWVtLeN?=
 =?us-ascii?Q?H8VPBhIMmfhVcUmzSbekvLzeXybddTncblWCa/VX99Tnald4xjikoy7rNSwv?=
 =?us-ascii?Q?FWGtBfVeR8pZ6oXjKnSx7TfjYtGCczhN6BhAFLWxNLPnPjHFJwh9EHmiHifF?=
 =?us-ascii?Q?jRxzk3DFFhq02ALz8YPmP69jcbKMh7CIknjitiIRmgwitf2Mkduqm27P1rJW?=
 =?us-ascii?Q?RdIcFgdqrJLD4s3EHQBNkoCVxoyN/qg2stKsqqDJQ4D5bnL3krW4AaIyNbVj?=
 =?us-ascii?Q?IB3wLGzEwbZUlLtOVmcOiK4TdXUjnoJrJyUs4TgxfbCULG1eaYNdc1uHgCZN?=
 =?us-ascii?Q?DZvm26uoQGV+k3kFOoBaBpTWKkum5BNFcpgltms89edS/3o7bDWmCaeITp6X?=
 =?us-ascii?Q?uQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: KniLLsFqxbmz4RRNoBSqGH2GiTDmkgh1WJecUrUVX61I64BXxHb6bNbRUU8fzKLf7wZ4bfrYVHkpBee2bamENbkDsZZHWUpW1Wg/mB8CuW6nkzBZn1VWNFrGgJqFOCSuRkMngV/gt4utLODKedqLo30XzlWXO/Nma/tAbxgZ9CJdTKzMK6Q0XVUm2L6o7dzmrqLW4dzWbjqDSHJIQxP8GaomVewLR2A4dNnFrhzCGUonRA/jURsYhohvX7pFDtmqdyADWq7IOvGFmCkRoZ2SCp/g4yVC/dGlozefpaXNlqWgDNcZ/+PT5M4wIrlJ1bkuo7AktFSImNYRoYYkdayTpV6QeOmZf958j0Hfgl7/374H85X/6viZnGkdGnVGmZVKJpPYtO0Dfw9igP8dC89A/mrPFCg3k8j6KVoKbvCt2mbNxHILWSqEskwoJOfwFciw454gTfo5EPuzj0h4gEetxc+iEMFcupdb/4hmw9Y+ldaY5SoMVAXPa060hBtMs88G+GHLrJVjd1uoYMYdKSF6z/MA45NqVSd8YrwuMYNcNmNEYXLgXzcydZhMpbQIFa9B1cbkwRguMpCkztjHKiP3MEaGZc4txquUrfciJJoOJQ6OhIkabnHPYJ12vjztF76kAlPy9AqstG7iLcCc2C6zGL2wPA4j+q2skdkh/2hXNIJkt5kE1ODlF80sSB6IfBzm3Sx1c7Nwjp+8TCaZgxaOBG3Pr3thODT/JVorOfVJtmyF9Cm4USObNNoitr5M1NnmoQPoYlB8PAbYgiDU8JkWmPKCfRJx1U6XJuAAYXbote+nRXdM4+eppK91rFaQ0SK2u0FaomE4IhldT+xUtZ1SX/RLS6zhBrbQbDEBIdoQDnT8yBzWQl0vmcBkD9bFKAnLqXGnjtEcfJ0zHG/kZUm3aQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 90d52c6f-f213-4703-2630-08db4d90750b
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 17:45:03.8633
 (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: JRClgog24OKVIgUIw1SH6RKc9vZsdle0y+U/69l6hd3PJp82tecUa1D08sTDIqjMy6N1vJ08piuEjHOJ+5VuFg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6895
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-05_24,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 spamscore=0
 mlxlogscore=999 phishscore=0 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2305050146
X-Proofpoint-GUID: h5WrWaYfPzxYfDORltX47ft6PN3He3lk
X-Proofpoint-ORIG-GUID: h5WrWaYfPzxYfDORltX47ft6PN3He3lk
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,T_SCC_BODY_TEXT_LINE
        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

If the iterator has moved to the previous entry, then step forward one
range, back to the gap.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index 1602c854133a4..71733953ff836 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2636,6 +2636,9 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 	}
 
 cannot_expand:
+	if (prev)
+		vma_iter_next_range(&vmi);
+
 	/*
 	 * Determine the object being mapped and call the appropriate
 	 * specific mapper. the address has already been validated, but
-- 
2.39.2