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>
CC:     Liam Howlett <liam.howlett@oracle.com>,
        Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH v13 59/70] mm/mremap: use vma_find_intersection() instead of
 vma linked list
Thread-Topic: [PATCH v13 59/70] mm/mremap: use vma_find_intersection() instead
 of vma linked list
Thread-Index: AQHYtjjCs53hc0z9jUuba+iCfNFRGA==
Date:   Mon, 22 Aug 2022 15:06:31 +0000
Message-ID: <20220822150128.1562046-60-Liam.Howlett@oracle.com>
References: <20220822150128.1562046-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220822150128.1562046-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?VIdU1+TZaMT/B355h+XDb68xJmvlRvU5fmf4hQSpm7Q13oH2l6KMnans4s?=
 =?iso-8859-1?Q?gbWmcQxXEqVb+M5PU5yqt0frmT78YRDgz6sOAVulx698WKG0QqnT9qpmc9?=
 =?iso-8859-1?Q?XTou8HkdIszeRtMIhUoBgKF2P1BjQXYPsItfnwPVR0/nXEdoz4FFY1YD8t?=
 =?iso-8859-1?Q?G/ulOrRaxgjSym53V5lym4vnlpNgd7Yy3+WGMuIFm6z2zrsgYLpWD1B2IR?=
 =?iso-8859-1?Q?h8Ofc9R7FLaPoQN1OUFrqaQL/VuYnGPZDYCcbo8rEs1Hp9ie25O6InPuHr?=
 =?iso-8859-1?Q?/+TC0hE6SHncY5llFqRMEqP1yBieoYBHl1/7iCCTLeE12XaJMKV/Nfa9jo?=
 =?iso-8859-1?Q?3LJuW0mGaEW1nZhUlxOsNwuxCDxKvpywrKxg63OT8cSDy86lf/xnobH7xq?=
 =?iso-8859-1?Q?eJh75/7bmJOxkwQslWizMUgM32q3/aoGLEwSkglISVFPpz/L4it0h1kmI4?=
 =?iso-8859-1?Q?uat5um8uLTLZTjwrTPEKdsemoXd1p7dG1ACZJFbHXIDwARz6xrmot9RbTB?=
 =?iso-8859-1?Q?Eg0mH4dgJO6aJYOg2KkZ7XM1vvwmxB4NmRzkOsUjhJKIscDD0rVZHjdYFJ?=
 =?iso-8859-1?Q?PdkNDtgwBBX3Hw3gqDZH92VNLunrh7vwmw4uSDQ4wrnGtjAMfwxVwGnai+?=
 =?iso-8859-1?Q?VQpl4DFa1I0SUpyOLasEGJmFA67nhMq+VT3i47anA4GQYzMorcaGeQg0F1?=
 =?iso-8859-1?Q?AsSJzFdMPF+lppyNyhD8Ml6t0kmyKCrW7hM6rQ7o35h9XAk5mTmXqcF4M3?=
 =?iso-8859-1?Q?c+tQV8fAu4Pt/uaMXGB2vrzBpnZKFz1p21RNJaNDgvKZRtB2OdvZUFJZ32?=
 =?iso-8859-1?Q?90mmo0NjzfhgiVhT4jsRxSg0Yr0ZIHG8otYcTH4w5zLHhqh69lo5jUXwE1?=
 =?iso-8859-1?Q?vHzQKtMqHPTT2EV07WYItyfsknz6IyX730Wu82YgrSgspI6xi+W7kONsbD?=
 =?iso-8859-1?Q?CmUTXAnki8QqEZed2dbz4pTwral48k/PhppvCK11+fgwi26zq5uzUCSUNq?=
 =?iso-8859-1?Q?1LpwQXXNLwM+JFS55A8IY9D/95MUOgaRKr3CfXnIaz6bvVnv4HVWtwFvT4?=
 =?iso-8859-1?Q?W/5N0EkuucC1qTei+RYk/9ETylbQEr/KNrXgvkRTpYQN0oJAsrO1MZS0YD?=
 =?iso-8859-1?Q?o0xOhahY2kpavZDYbzIrDLExdJyG9d5lHq025NKd2Z9TEnu+6XrJg61Me5?=
 =?iso-8859-1?Q?cME4yrxV/Rs+ICasQ21IYfwpK1lxqLodgMHnE5wmbzFAyJRwA2g3TtUkh4?=
 =?iso-8859-1?Q?8Dd8cDjsDLB9COnhznbpPnW9cCQiD+VtncvVKgkI+lk0VKDxheHKgkfSNL?=
 =?iso-8859-1?Q?LF8ek6ImXsSqYS2lqz28jpvhZuZuGV0/BwpaRd/I4njWHluxePbLOu05xl?=
 =?iso-8859-1?Q?L7DvihqUm9OnwGN9ZLly2qZ1/k+GXjxTxNaKQHU2cqvf3hlLlFxHayInV0?=
 =?iso-8859-1?Q?HAm2rgOBECJXzl4qsYnotryoaJCKAJI8xB4zL0kzBXRH4p5t7HzoYHhEGx?=
 =?iso-8859-1?Q?OqUQsqdv0oiFg7E2/6PUcSjxlFBhDlf/jgUjxgcm78B5IUqWOKlRVk7y8L?=
 =?iso-8859-1?Q?2GGv2iOjn3lPLfYA/y2vHsrLaohZzR26MbscKLrYYh3oJzNi5ACN3Fkykd?=
 =?iso-8859-1?Q?qjkdTP3Lt5ujxArWo1xf4w4NqIPgUJNEZG6JMgXyxFYSwmvLV/DdFQTg?=
 =?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: fbdd6af5-5521-4c06-4631-08da844fe79c
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2022 15:06:31.1753
 (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: qa94Yc8KFeAMUc11E0EOlTrQ1kd3ocUm82JP8ZEFUuuBwwjwyC+Um3bb54A10fCq+sMYkrMcC0i46taQqkB3Mw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR10MB1433
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-22_09,2022-08-22_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0
 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2207270000 definitions=main-2208220065
X-Proofpoint-ORIG-GUID: ycOd0Iu3NNreDEWHaVPEgtTaSeiB-7yN
X-Proofpoint-GUID: ycOd0Iu3NNreDEWHaVPEgtTaSeiB-7yN
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>

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
---
 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