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 Howlett <liam.howlett@oracle.com>
To:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        "damon @ lists . linux . dev" <damon@lists.linux.dev>,
        SeongJae Park <sj@kernel.org>,
        David Hildenbrand <david@redhat.com>
Subject: [PATCH v10 59/69] mm/mremap: use vma_find_intersection() instead of
 vma linked list
Thread-Topic: [PATCH v10 59/69] mm/mremap: use vma_find_intersection() instead
 of vma linked list
Thread-Index: AQHYhbAUmkAJjxrL+UeUWHrPJGAscA==
Date:   Tue, 21 Jun 2022 20:47:11 +0000
Message-ID: <20220621204632.3370049-60-Liam.Howlett@oracle.com>
References: <20220621204632.3370049-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220621204632.3370049-1-Liam.Howlett@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?galYUIAR9um36F1kRjUeUS9m8BALNctgWn6nha1YlhhA19cWCN3/pgb+KE?=
 =?iso-8859-1?Q?T1aL9TxqF8h/Fg7vAbCMAgEyDVOGrxb1cME0lQz8zU9LLhuTqyHlaTDe3c?=
 =?iso-8859-1?Q?7w5Qo3m+kUptOJBhjVi51uW1T480+w4mJX6xelr9JBtq4OUrivx9ydQ6rc?=
 =?iso-8859-1?Q?XFGLERNAZI0/p/hlhixNyErQfkQqDPr9nARSB9R61cdnor1cNeqfAGAw8W?=
 =?iso-8859-1?Q?UDvqPjcWW9KKnqpRFdLB2UdRavOhKDzXw7Elh2suvzrdL8dpJDkUvv/FCz?=
 =?iso-8859-1?Q?KEDQZpCTIVvUccMWE0/fQ+yv69nHMWeTBciSmjBEF16emCreRTTCLYyfkz?=
 =?iso-8859-1?Q?zcGc4/xgykk30lQKGR7EPcTdzogksj+shQQZI1UngCtWxt/8vxlY98U65l?=
 =?iso-8859-1?Q?na6GMjilkfGp0n3btnwFwFA5Fu0tL2usrj1uDWTT10fqlAWxOV+TlbULP6?=
 =?iso-8859-1?Q?XhWFlr5/4Ap5khqz3WqO+YYDu8oRuxugG7ydWsnXVJO9NF6asUP2nyhOQi?=
 =?iso-8859-1?Q?I1wtie7FiKnUy49KOlEleiXr7fRBejVsHuwDR6utlHl9JN8qEPHyDtKKsg?=
 =?iso-8859-1?Q?kyzBe9wTrge5dhej9UTtkBxAqQtzEasynG0FQu0NPVtEFL2H9FSjdvQ6wc?=
 =?iso-8859-1?Q?ILCUz7mhAbIM0ScgCEJR+K7Wy6WcuQp9rGyesVwTfN5nW7ftNf/xFQKgZw?=
 =?iso-8859-1?Q?urrmRnqTfLV3qF8ekstod09VCU78e7y9idkYAmI0l94P32ldKPlQNdG6UR?=
 =?iso-8859-1?Q?vHEjh86H6Vif6lBYL8Nr4GbOicGrFZpTSlkVe79QeVUvQlIidvpEDfxrKE?=
 =?iso-8859-1?Q?sRNqqBKvFxn+LkH+0t3L0kWFyUygxMOtFMBRfSeJlf3vkgfAICe2el9J/h?=
 =?iso-8859-1?Q?SPldgaqrhhiTjiON31NoqRrVTv85onbfcd3Mwujq7OCKQdKUMvP2V0/U/P?=
 =?iso-8859-1?Q?WlttpZctaENTmY1846uo/zxgBKOSLLNwSLrcz0BWPX3HpqMLsLOPrZCuQO?=
 =?iso-8859-1?Q?tT7g/T5VvPEPCJn2vzU8KVEbIuSjqcoTE5wHoRRFuD5nBwCj69Cr/hIjO9?=
 =?iso-8859-1?Q?uQQarXqVYmGaNJIBJXtG5WRh+Y8SMWbl7g19SKT7EgocNI/8NutNpHkWKY?=
 =?iso-8859-1?Q?8djB7qkLoRCJ7NkpxgZKZc7usDS0tsp+mRorpGU19K3gRoN5S39QXjIket?=
 =?iso-8859-1?Q?2nzMHnmsQod69IeoR0JmKM2NND8HhuM3Otl2BTwQYdc908UoEUwqc8ookx?=
 =?iso-8859-1?Q?FoY+O4EXq6KbETfIQ1qXi5KfFBJjuGgrvClmkZH9GV/3BFr506bL4/jU/u?=
 =?iso-8859-1?Q?0/4SjyK+OJhjCHPDB981++lpE8YX19akgrBtcu0fa8tjI8/HkqpLlKuH0d?=
 =?iso-8859-1?Q?IvJi/w3ueveKNDENf3u2QpXtRaCanFXpqh/3SNHH0tvijjPfp0OszqO5CF?=
 =?iso-8859-1?Q?EqBqcZpNSW42N3re8smNrkvO+yXdLr7fK7PMw9WlGGPcY64eaULFHafYTL?=
 =?iso-8859-1?Q?8fy21mDkx/TIhh/tHoBTeZ9VZaw3yEn+103EWn1RQ4CNQVTBqJ5mk5SaqU?=
 =?iso-8859-1?Q?ZZ+72BkxzAg4lPFq5b/YgV9UKHXIHwTjeqTzPhel2dAW7soqVoqI1bPgSr?=
 =?iso-8859-1?Q?sk9ORonc2siMABy1Ra9bcm184WYOogAdZYs9DDeM65Y16Di5jjjjQJ4VFx?=
 =?iso-8859-1?Q?ZufrXd/ecP7lcKwcd+nXy0FcwyyMRVPASgUfth3C7KVTntcuhO07iqBXdV?=
 =?iso-8859-1?Q?l/SXo8ynaWMPedpDQAOGI3Pd7fzS88bZXk+vpV4ducW4u3N6rJ6aKPoRCB?=
 =?iso-8859-1?Q?qIblLgRkJnP16s/bqXaew54dqyl68LE=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4d3fe584-13ec-4162-5a2c-08da53c751d4
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jun 2022 20:47:11.9407
 (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: lror46rX08ForfhFuh9PrIyouhB0xPXwWm0yS+hDyRXGkZ1ummZFYx52YPcKdFF3vyu5Hfjl1pIvB9psc0NeCA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5392
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-21_09:2022-06-21,2022-06-21 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0
 mlxlogscore=999 bulkscore=0 phishscore=0 suspectscore=0 spamscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2206210087
X-Proofpoint-GUID: rCmY43jOwMhm0ZsZU4sixT5irxL4_oJB
X-Proofpoint-ORIG-GUID: rCmY43jOwMhm0ZsZU4sixT5irxL4_oJB
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

From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

Link: https://lkml.kernel.org/r/20220504011345.662299-44-Liam.Howlett@oracl=
e.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: SeongJae Park <sj@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 mm/mremap.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mm/mremap.c b/mm/mremap.c
index e0fba9004246..8644ff278f02 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -716,7 +716,7 @@ static unsigned long move_vma(struct vm_area_struct *vm=
a,
 	if (excess) {
 		vma->vm_flags |=3D VM_ACCOUNT;
 		if (split)
-			vma->vm_next->vm_flags |=3D VM_ACCOUNT;
+			find_vma(mm, vma->vm_end)->vm_flags |=3D VM_ACCOUNT;
 	}
=20
 	return new_addr;
@@ -866,9 +866,10 @@ static unsigned long mremap_to(unsigned long addr, uns=
igned long old_len,
 static int vma_expandable(struct vm_area_struct *vma, unsigned long delta)
 {
 	unsigned long end =3D vma->vm_end + delta;
+
 	if (end < vma->vm_end) /* overflow */
 		return 0;
-	if (vma->vm_next && vma->vm_next->vm_start < end) /* intersection */
+	if (find_vma_intersection(vma->vm_mm, vma->vm_end, end))
 		return 0;
 	if (get_unmapped_area(NULL, vma->vm_start, end - vma->vm_start,
 			      0, MAP_FIXED) & ~PAGE_MASK)
--=20
2.35.1