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 34/49] mm: Remove unnecessary write to vma iterator in __vma_adjust()
Date:   Fri, 20 Jan 2023 11:26:35 -0500
Message-Id: <20230120162650.984577-35-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?r7apehFTaIKa1So4gBVOVlaqSbMz/AhjXF2FHEaedxeAzunfkMZtyBtOtY21?=
 =?us-ascii?Q?eQ92Sk5et+KuyQugQ6F6m97IsLQZSqGwkKF9BlfKqWaF//mGfdvzQmytR9U1?=
 =?us-ascii?Q?iZZ9CD545wPU6s73GgCArF65IJS7qHzmSOmkgFTvDVdAI7SaDiqTx38k+m3k?=
 =?us-ascii?Q?2gUsCjhkPLGiwjz0L1jFP3SdXkvv+TLxHpdNy2L3lFuFOgyuPV+EMJDFn5dv?=
 =?us-ascii?Q?7TTxzaSJgVKH4hv5RS6dj8AS0S0evNoa8beAWw36VmmXxGjVB7YUMCTjnJz4?=
 =?us-ascii?Q?LAtv932FO9CfhXnfAZPSeRkjoeAeY3BcgUpxbcah5osGe2sgt4xgTijqVExY?=
 =?us-ascii?Q?Uz3qSkfkmD0NaAL5kP5usxm2Aa2BocYRoBGrE8S6khcavWnbeZ8O/O/QH3TA?=
 =?us-ascii?Q?bV14EXYCJbSmGfhm4sayutuCyrwikE08vZ7RKfhMQkk5hWOKiGSFbKBfP+dg?=
 =?us-ascii?Q?heG8VhYM9S8ebo7WPGd/HC+Kl4BD2oAZkwxZ3wT826yqz+3loi9aJluClMN6?=
 =?us-ascii?Q?IO4X9QtZH54ZbMKhsLFhf9/Aew6IukEkdMpTGsb/SUYbThHg6CToq7Oa19Qm?=
 =?us-ascii?Q?GmCDV8VeFkBcOvZfE4PPfDxbpgs0F8YQmZcz0yMwlynOllGKdQock/wGjKAT?=
 =?us-ascii?Q?yu592QVtPPWoCaCiZ67CCYEbLQTOxALEsijEw5qCxFLSWrKoEnE180AaaFE6?=
 =?us-ascii?Q?/Ln0Oi7yqG2Y8yXIWB3hqlbbzyUJviXvJdt8NV6p3kK9fQ6Cglq+3uKx7Qi4?=
 =?us-ascii?Q?9HJw1AADQjYWiJ3lLPP4PRYtop1nWeX5VjKR5kiiA8TdxbjrDpuW+IWsj5pR?=
 =?us-ascii?Q?/5uB9XFcoh8ZknKuG1juuUsAVLQkaBZB+BvL6Xt/CV/9ATvYfl+F68h1E9/r?=
 =?us-ascii?Q?6onZzxasI30cDclYFLnMh8rgzatOj2JmcChUFJfVJJhgwpqCj1v8vqZi8QZQ?=
 =?us-ascii?Q?czCT8o26Nz0EOahsjdWAa3ZzdBDmSIstpgHoU7MilZwG04WwpihUePPTo0FR?=
 =?us-ascii?Q?Wx2lv9TCYyBmCBhoH99+Ew4fKL/gJLaKXvFsi+KKLyL/TwoyDD+KNrKDn472?=
 =?us-ascii?Q?fanSMqHHLQf+V2UhmiuKcShxHezb2gmeymxzfzt8BfggC4YFUmcbxYXmqmes?=
 =?us-ascii?Q?HGhX3kNyLvrQGkhBbfKhDz9yr0KT2FzCASiF0Jdeo84X5xVGSUoOBAPXt1bU?=
 =?us-ascii?Q?vnyv1+M7vPTnUv48ZRyDso7Z4hJtCer8tK6ggV02kMGnSqlydm4w98C4SyxI?=
 =?us-ascii?Q?qXdkhR0wKbkMCHhFRVru7BePYQJRfNOfRg5Pf5p8o15QWZ6QYBAMSn3EXpsw?=
 =?us-ascii?Q?aDC8pvePF1+SCDBIqxBFO+HVxvYe7knwdRgvaCuBuWdUvaVB7u4k4TbFYPvM?=
 =?us-ascii?Q?QY6CQT/zV3xGBURZO0FW9sdxkHaaQ/bQe+syS4buQQFbvCx0EdPxzu3njreg?=
 =?us-ascii?Q?Jg8zTp1HzPqAxX95WDlHpI35Ep8sFheNEZgsoaj6mHIgapUizhYf5oBYdQ8y?=
 =?us-ascii?Q?K7RZQPhHOYfZszT+2tltFV/sIZmnUXp5LVU8LhwyuLWgZLDaxszdgOGFOAT5?=
 =?us-ascii?Q?uucOShQ5J2y3iVysW7Fjjksf6ogXacYhzd4yl4CQJRZx6DA/oaDyn5E791v+?=
 =?us-ascii?Q?BA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ADSNNl/gZvWOFbfuMGCa+MeOa2mLkz1XL0W+5NlFSGPGeFH151Q1CgRAXn2EbNH+bmR7SOMfv1RuQQ1JTiYGAg4xwVLFOTTlhTZCi1bJQ7OpYrPsKalWjayqmGDc6VZgDfDmQAZkGv/4N2G51m5m+OR6MbsRk9ZM3slXKyQeCpz+VP5V6Qj3rwwxWxrQz/ZPX9xyb5a7ZfzA+Kft275JeOZE2I1xaOzlX7Wbg+kk/gPJRjAJAYiRmORIA9jWvL/xP9BQ8QlyEOZAcKVR6S3sGi7obR0lHUwEfle3I0+KJTHC6Fi3jWh26/sUaOMYMcxpQkfFhHOHdVo4NHyM3nHH9DUsJITIB9K6t/cPw/jKJFBo9t62V9PgexvMk4ndlGaHefzwgFac1c2HG1q4cqqNJgni9+C0k00OufXycY5wiRT0Dicto1dJBVQD6OiWz1OYDG1CyvbPz3ZE2K1qGDdbe1gnfmdK/k1X/PqCn0ErmeIOs9S8NEukvTQz+KStlJyJz6rv570uYn0QWoImNk/ltgUxgzM9AoZ2v4r+XKCG4Dpb+/GDKL9Xg18LUd9ARsqrOXaMJ1FP/2NPIk0DXim8KBruPPl+RSy9cXEGHsPoI7S5zxNvkmk6Tlm18xGZgBEDT9i21q3Cnan4AaIQ7etkSefGA0gLwdeUzaH8g1hG+OYzlxElXFizRRiG+PTwYzQRLSJBKSk6/fdlg/GiRDAXzcl/t1tHaYT42Ta9pYxmLrAlR0kNFOVWAqdayfDyAseJPDkgHNoo0LdTWkUNkpVTl+elkezhd+sQKtPFYUzM1OO64fJeBhY+UaeoqFHoB0U6tBhIjH2Olj1Y6krUlblbLr4o7NYwRpSgCJz31bVkPUb4ncOpz1aSPjnYxcHk51MfYVlG7r3xw4MyR2bHdRh2gA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2325895d-02dc-4c36-db58-08dafb0362e9
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:40.7905
 (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: DUHJi9WlzOE+lyd2NdA4/HPiYJAutGvEE9sOOwE46VNOiXPrI011+ZboVYEhDoEWy37UjcJo9BgSQDFlrid+OQ==
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: ylG8RIj9HBc5xosU5AvMROWcvNnsZ4hw
X-Proofpoint-GUID: ylG8RIj9HBc5xosU5AvMROWcvNnsZ4hw
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>

If the vma start address is going to change due to an insert, then it is
safe to not write the vma to the tree.  The write of the insert vma will
alter the tree as necessary.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index 5f03c8f3f407..58b2187b447b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -722,10 +722,12 @@ int __vma_adjust(struct vma_iterator *vmi, struct vm_area_struct *vma,
 	}
 
 	if (start != vma->vm_start) {
-		if ((vma->vm_start < start) &&
-		    (!insert || (insert->vm_end != start))) {
-			vma_iter_clear(vmi, vma->vm_start, start);
-			VM_WARN_ON(insert && insert->vm_start > vma->vm_start);
+		if (vma->vm_start < start) {
+			if (!insert || (insert->vm_end != start)) {
+				vma_iter_clear(vmi, vma->vm_start, start);
+				vma_iter_set(vmi, start);
+				VM_WARN_ON(insert && insert->vm_start > vma->vm_start);
+			}
 		} else {
 			vma_changed = true;
 		}
-- 
2.35.1