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>,
        Hugh Dickins <hughd@google.com>
CC:     Yu Zhao <yuzhao@google.com>
Subject: [PATCH v12 59/69] mm/mremap: use vma_find_intersection() instead of
 vma linked list
Thread-Topic: [PATCH v12 59/69] mm/mremap: use vma_find_intersection() instead
 of vma linked list
Thread-Index: AQHYm97wAgt3MfHFtUeLCDGDfqMpTw==
Date:   Wed, 20 Jul 2022 02:18:02 +0000
Message-ID: <20220720021727.17018-60-Liam.Howlett@oracle.com>
References: <20220720021727.17018-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220720021727.17018-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?UJP2ahOi+9ves3/BfZche7MfXPxNumVxZKnASkSwuYectytKn3Ua0f9x0U?=
 =?iso-8859-1?Q?a7BhGaSXZrczonkX7KEpIyVx5Tv6R8SLqLH9Dbxd5R+6njszf0cPoFVCsX?=
 =?iso-8859-1?Q?YiQ0uiJfa4fJ+QweoHip+pNQ6/T/uBCEKzgXRFJLD7JxOWK37iJqXF27Kt?=
 =?iso-8859-1?Q?VVjJ/Pa+RnikIuMn46OrwkyWKNvHaFgZx2llU62kM3nTVdvGd2qsRdeCrh?=
 =?iso-8859-1?Q?tfiLwkI8EUPWz1meXLpTCPtjR7fJ3AY9TRkd+OHSo1jf0qmMsjzsQ5xQBe?=
 =?iso-8859-1?Q?2X/Y6hcHcVstTsxMj0tpdMhPYHhjG9bX26wY8KH0z+T5DSdrJNeCCpCzQp?=
 =?iso-8859-1?Q?xvomVmhJIHSgQT+raHPTZGta6222JG4HkEcdcxddb39palMjUd7NTJgT2z?=
 =?iso-8859-1?Q?xt64BM2HHb0pBrn9/lBIOi9OX+gbx/tKWVwysWTjTgWZ2KOElZcUVOQS65?=
 =?iso-8859-1?Q?6NzyrjEsvzCkyHdEh2B7wIJixVfZt/gMvdBJ9qRKipGLYJZzNanWa731tU?=
 =?iso-8859-1?Q?nZIiOAS45yWcxcvXHvTbFoo7MM1gX1goIe80U2T7H1apGI4GBtNY663IPX?=
 =?iso-8859-1?Q?+4dB1KMPtFalBA1gb9rU61PoKhyIaOD3jBQmc7/3UxlqGQOnqVYqgdhQLd?=
 =?iso-8859-1?Q?0fSwOlsQ2okfgTNBtZYovhhRb6cHcNHoqYWkCaz+V+/bH4qdbry37tcykl?=
 =?iso-8859-1?Q?PmU4D8aF0ahVpcpTj5BVO74mZgLQogpak6+dVryfN7+Uhbv9kYgoCsu/7p?=
 =?iso-8859-1?Q?Rzs/pmjindbU3pYp+CJN1sIqwIVRwT0Au1O6ap9hekYjsNiruHaxgxJ+Ou?=
 =?iso-8859-1?Q?2pvddiRo0WIjOIjiK2vY+1MTiHxUMZEseoj92SvPzhs+ETZukvVADuOYfq?=
 =?iso-8859-1?Q?FJmzMwU5sJiUA08manTF7EWBV5oDdgtUOo2DjRFQ/BiFWzY2erPJpKsXHh?=
 =?iso-8859-1?Q?iIoXolEuXQ58sns2CVuLXf7+n3XjU+8jgijrxP25Eu1y7zrJC99F7kUYeg?=
 =?iso-8859-1?Q?vgru9ql9ODLZjorb//MRMTC73A6Nv2zZZVhqDEWnOMUeiWUg9WuHPTtMQf?=
 =?iso-8859-1?Q?seY2VV0pNV3HFPaunT7UnhDkkaAp5xN7hfSiQhIxfidns/wUy2llDO7eNb?=
 =?iso-8859-1?Q?HMKuzjwAykVNobT7zg/iY0FkR0KkWpL10qBYSctp8bBxxISQDTo9oOl/Gr?=
 =?iso-8859-1?Q?RQXGlcAXNBFrMebKJ3Pxsa1yvLL8cfxiCU/dKgrLngLFEZmbiJ/AQfPuNb?=
 =?iso-8859-1?Q?9kdkzo4u+Z1+Kbel8UnGAf07X+jfGNSk4hrYUTaqiquBqc4r5+LLYgqc+l?=
 =?iso-8859-1?Q?YUCgq78HxjrQ5CncHb/AXIqLeARxYlxoMCfwO9oh8OAy8YcPNl6pmGh+jp?=
 =?iso-8859-1?Q?DUQyK2HBc1TZSQm15Cn/bcHKHIyMnVGyw8Ym9HQdfXKIcE8b/5Kgv3ADqk?=
 =?iso-8859-1?Q?1SpZRtTB72YiF9/plinjE/wemATl2vqrJaQ9wDF+YRYDRx9mTd7wFRQd5j?=
 =?iso-8859-1?Q?PBXMuCc+hKNq7koi9FOtOve/WMLToa8Wls5xFRscJxKVw4vakFy/QOxX81?=
 =?iso-8859-1?Q?cGJpkkQNo92Bd54aYCXl2Br0BtG2acSr9KZakFKnc7gr7sBi/s54N7vIRz?=
 =?iso-8859-1?Q?PY48kw90XdEnouOieU4wgKQ0cx28ReDII+O6556c2VuARQGfnlOJmqjQ?=
 =?iso-8859-1?Q?=3D=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: ae98776b-8d20-4a1c-ce59-08da69f62bbc
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:18:02.1018
 (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: 8u3uWx4jVOXfiuXevdkQ4FEZqhoPzeTBYvLncZsWyqBegh6OlUWdVGU+JVy97SP2Fexj6yiYu7HeopZU7ZxzNg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6233
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-19_10,2022-07-19_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0
 mlxlogscore=999 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207200008
X-Proofpoint-GUID: qDVWGwxzAX-7_bMTVJTXE98caE1c72V0
X-Proofpoint-ORIG-GUID: qDVWGwxzAX-7_bMTVJTXE98caE1c72V0
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>

Link: https://lkml.kernel.org/r/20220504011345.662299-44-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-60-Liam.Howlett@orac=
le.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