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>,
        Yu Zhao <yuzhao@google.com>, Hugh Dickins <hughd@google.com>
Subject: [PATCH v11 59/69] mm/mremap: use vma_find_intersection() instead of
 vma linked list
Thread-Topic: [PATCH v11 59/69] mm/mremap: use vma_find_intersection() instead
 of vma linked list
Thread-Index: AQHYmYd6x9qOdX7cNEm9S3+J30Bsug==
Date:   Sun, 17 Jul 2022 02:46:56 +0000
Message-ID: <20220717024615.2106835-60-Liam.Howlett@oracle.com>
References: <20220717024615.2106835-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220717024615.2106835-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?Xh4GOklukEE2IZaoFA04O3ENNlbRYp+6nVYOz9LjbRjSOY6pthb5S123xE?=
 =?iso-8859-1?Q?wCZze9Cc1ZIPm/VmbiqCZmAl3qc/BHSRboxYtlKfyay1O+imF6YBM8mcN9?=
 =?iso-8859-1?Q?jzZWno7yi8pS7uFUFf8OmGODcmxIdim2cNEcC6f6qMZ/IyHyINbMAYbYOW?=
 =?iso-8859-1?Q?oR/J4HKGmoYFWYS0moC5aFGfnsOEJDaL4I0ZOnQB9cMJRhF7uASRiksdVw?=
 =?iso-8859-1?Q?KPCSmplSiuuPLRUhBGdlJXuoOj3ufgUYG0I1EZxOzc+sjs4uFSU1QGDHLN?=
 =?iso-8859-1?Q?hRoIi2rPpw1+ZaoyTacjquzNBqQnl0cTBTMg8qAMIq4LaH1vTODhSgqOjD?=
 =?iso-8859-1?Q?rY2/I8KP+/i05p/jzbCk9nhktxXUthaiGsRVDCQyZrKQAYEoq6Wqc+B5lC?=
 =?iso-8859-1?Q?uKgPcaRMTAGVRQGu1NdRdEfJhSBEwKRB8nP3gcFW+JgdZtUSYwxqk6yq7r?=
 =?iso-8859-1?Q?sEpWwwreyXbl89BngERmQtKxcvGNNbSk5UBVrccUqi44IRqLYiOYbmaU3h?=
 =?iso-8859-1?Q?c2Kg8QW+0BwwmzSdVUDQk5JuxXemJa6G0BD4j2pxiEEWetbqBHqZRWam2f?=
 =?iso-8859-1?Q?E8w46/GusKJdERiFpY2XfLCmGmY22UoPIjPuI+azZlUnVQ9DzAGxPPeOLA?=
 =?iso-8859-1?Q?AWMKXlEWLyqAXuxY6yoRJBAu/m/eHq0OzKxdqEaQv0TX333OHjGO5kLkHC?=
 =?iso-8859-1?Q?DgxHk7OCUd3eK1KiJwCD7xhqKDQVZfWrVMmbP8lhUQiY4L/bIjD6SkW8Gp?=
 =?iso-8859-1?Q?mivlf93V8puim2XFHIfm4yHPxT5gBbf2IGSG8eLVnPGO7mtysYlo0ULp2/?=
 =?iso-8859-1?Q?4TPdPDh4etuUycZ54qVcTUWTXpgPqveqSSAY8H+1GU6taF05Wmv0gUbquR?=
 =?iso-8859-1?Q?PHwNOyY5Ac5Gd2R9nRqzI5/HskyscHZMb6fPcCj2bu63zxQVtI3SAylwk2?=
 =?iso-8859-1?Q?6uZ9exJkinPHIHjXHyghjSKKMpjHdS9J0WyHV1xLpZskpWYqgVjfZGBw5j?=
 =?iso-8859-1?Q?oSAZkGZeB6JCfPce7jwKbezIZk16IxmgHc1dryhsCqn4XsqxsCNVIUVH64?=
 =?iso-8859-1?Q?aAmcSZELGI7zcgSOTTsc2PhiTt8XbYn9nGEr0pj6SZKrfv6zAv0SLMXdZX?=
 =?iso-8859-1?Q?79D6D4wVz/5/fNkkOpA7ifs8a27v3e6C3d3FFiUOo+CPzy++cn/gE7Q35f?=
 =?iso-8859-1?Q?R46K0gWFvqR/IU5tRKVNlU/k+3EeQRmNJs3vNDHISkSaNEhYAX4E5hZFE8?=
 =?iso-8859-1?Q?urJAVsyfSwYk94kDFiG4NDBZotJZintAIu0sAaDX+cecHmaBzVysPLWMlM?=
 =?iso-8859-1?Q?pbULots+GTevhSx0+nQ0sakf+XtefZTcJI1J++wZa1TyH1nre1ks0nJyUu?=
 =?iso-8859-1?Q?3IRUiWl0Qvp5xXXw5324Mi/1UuRIcznja3qL92jm/3B8kgz7n4Jb0pho7T?=
 =?iso-8859-1?Q?HYCMlkTocssiDJQYILZ+0R9X4cjgtIwRlZ7N0SHz3M2qGwOt5ERMkMKJyL?=
 =?iso-8859-1?Q?6ro90Dg8b495ECBViAgyF2upILoKfyMLF3+nsr81J0imdCFC4jstpdwxGi?=
 =?iso-8859-1?Q?TdN74pLFC59/+ArIkFoAHsjBLauPCqMfiOjgNXP6vuyf+FvxaPBU3QkbiO?=
 =?iso-8859-1?Q?uIx9volzUFQCo6f/JBS108byI4vd4zlZcPgDg0CRzWJoPxiMurO0kG0A?=
 =?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: 2c2a94c4-bdd5-4c51-3e6b-08da679eb344
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:56.4115
 (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: tyeQJVI2p4Re+lZvkf4zrKpHaQb5vtKba+TX1odLpL5v1GfyQdUPscd66R/60atihU4lfzJ8I/AHYB6zQv4OrA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4504
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-17_01,2022-07-15_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 mlxlogscore=999
 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170010
X-Proofpoint-GUID: qV8NZs9_Wt0fjxeju9D2HZzgNsDpNZ_g
X-Proofpoint-ORIG-GUID: qV8NZs9_Wt0fjxeju9D2HZzgNsDpNZ_g
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