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>
Subject: [PATCH v5 60/70] mm/mremap: Use vma_find_intersection() instead of
 vma linked list
Thread-Topic: [PATCH v5 60/70] mm/mremap: Use vma_find_intersection() instead
 of vma linked list
Thread-Index: AQHYF96BCSrlLxZ990WKYiwfNw1u1g==
Date:   Wed, 2 Feb 2022 02:42:22 +0000
Message-ID: <20220202024137.2516438-61-Liam.Howlett@oracle.com>
References: <20220202024137.2516438-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220202024137.2516438-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?312Cdg3c83uAksriKyTEzmLMO1to/zkMG4ZOU4ExAZ6ocsLrFJ2NswBBZu?=
 =?iso-8859-1?Q?fUs2d58IfI0qdjlg01bGhprY9iHE0G+lBqblDG8bWg7XFj0MIz1z4+juOM?=
 =?iso-8859-1?Q?ckMkr4DzFIzqBZbDWNLHMe9UjBvHOUlj6ZQidnnF7R8kXO79CQxwSRNuAW?=
 =?iso-8859-1?Q?+/OQilGz3qOjF2rVoesk8mDfLEbw3XUIvoUhK/cpgzSGYcfhzSlqqe253a?=
 =?iso-8859-1?Q?D9MVBMU37SkEzHGaU4AGtJSFwgHBvFVumWUyLt17kvQABk0OzKS4VC+Uqt?=
 =?iso-8859-1?Q?yT5HetemD2HV43L5eas0hDl9dqJqu7jieaFkeUMMBIUF32jAM6T/Db42BM?=
 =?iso-8859-1?Q?9iRGWa0cfxMvpaJkcZX1FbBw9nsuVzTxfU/i2HrRU6Gy7bdH2YeD4Z/onJ?=
 =?iso-8859-1?Q?XLHRISyd1Re/IgfHau6AC4Mn9LE4szCwQbbdqLFJ5/Zaz9M3vagcUeEyU7?=
 =?iso-8859-1?Q?ha8njtVMa94Ko5EnOiLCB/StVcT9AQ8zgQiMExW8smi2iAiWtUiTpGt0nE?=
 =?iso-8859-1?Q?e14CdLIIVxczg4xD6E69zrlC3rv0HFm0MzjY6C4POnLIa8L1FHFOwS9gf4?=
 =?iso-8859-1?Q?1CfNXTaIUCoM7NrVgM1tVNheLDPl7g34b8lO5RvKzyYjfTlZfjLMV05a2R?=
 =?iso-8859-1?Q?hhSQ2gD8Q6hVXx9e836NkRtfzcpprwoZ+Xk198FnsaM2gKLUrXy4gzKSsD?=
 =?iso-8859-1?Q?+QwgMlPZ1DELfkkptbFEj0mOzZYRlqhC7p2JEKQTiT+WYwdDv7UN7K9Ena?=
 =?iso-8859-1?Q?Pfp18IxW5V0lUGuijZPRAkPkl5hPM3hQpOMl+8A6Q2SSc0qlWB/bAiqCyz?=
 =?iso-8859-1?Q?Hr0tnlrACD1UGMe26e9MjMpXI9e+vXJgqKtHe395XtVyntxIojbqNs404x?=
 =?iso-8859-1?Q?FeMFwOVyv6CZKaN3gJwb30/ItFxC/sn2DskJ850gfLcWUeK+QUwO9TpERt?=
 =?iso-8859-1?Q?bb+jDFTyko77E7vJubihP7wV6pszGdQoRCGTDhX65vG6d6Xs63FyBZz48e?=
 =?iso-8859-1?Q?HSk67DkGMHaPR1cZgq3XX30ugKSSGcOB/hodMa56lx6aHkrIrjVlsYsV6p?=
 =?iso-8859-1?Q?hz32t5i4/vSTzdP4jdaZ4qI6Ppw9AqiEqJZ5pm/vJZxlkbj78QGRPaF558?=
 =?iso-8859-1?Q?5RwlIjLxJe/67WVu4QaMqFKVUEEF3qiULC71qH/3ord+xKtdahKuVisKlT?=
 =?iso-8859-1?Q?P2tgs7sWqVDRm7JeG3FOhxjnsHyLyxYAKl0KnMx2qUyk5ymRIiVw9K00D1?=
 =?iso-8859-1?Q?zZkZb/NyLblTr9Qhrr/3iKtJcKQ+93ZyN7AGPE3898kStbr0enU7pvZbke?=
 =?iso-8859-1?Q?arOTEBMMsaSeoYgs0SYl293vitZBGrIXIN23TfiVrfUm3alcCG5NVxXIBj?=
 =?iso-8859-1?Q?21ocwGldqD3hiY93E9luLKB8sZ/2RC1iCs5IKAMY9e6qLN73eRmf/RE5Hf?=
 =?iso-8859-1?Q?JIeioGf9ZQVC9QgvypZZ4434/TtjsS/LYk6Ph+IOtYXGcvt7lmgcPoZgZR?=
 =?iso-8859-1?Q?MvS8myCn+RhxTo3Klkgk6HYTUodvUyrxsxZv5clQngR0A5JRJH9fZHKXNQ?=
 =?iso-8859-1?Q?MntF53qhzbfmuyKymrcxm+KzXvJTZYCqaeFdFTxkqg00/WLq3LMHOTfSSu?=
 =?iso-8859-1?Q?9Xrm5xiPVDRuB1mqnNkO5iR/RtddVPzTcg3VbQF21SAZ0vf0+/n9u/UEw6?=
 =?iso-8859-1?Q?SnyifBpL4lWLp27vp2w=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: 8719195f-b9af-416f-6658-08d9e5f5cae0
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 02:42:22.8600
 (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: oRpvFog2Rf8+jQUfVXKzCzVKhVLcqjKoE6L2VN21S+FQ1lsH+QC0OwGuiOftbkp9TUWQrMh0nr0jNUpyc3mQig==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5865
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2201110000 definitions=main-2202020010
X-Proofpoint-GUID: 7JkD6NFREiyr6R2hHGDlAsVmAyZoTmoU
X-Proofpoint-ORIG-GUID: 7JkD6NFREiyr6R2hHGDlAsVmAyZoTmoU
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 ccf8f4fe6f5f..fc7b8c88474a 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -713,7 +713,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;
@@ -869,9 +869,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.34.1