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 51/69] mm/gup: use maple tree navigation instead of linked
 list
Thread-Topic: [PATCH v10 51/69] mm/gup: use maple tree navigation instead of
 linked list
Thread-Index: AQHYhbATc7O48YXCZkOvTgxYbcO79Q==
Date:   Tue, 21 Jun 2022 20:47:09 +0000
Message-ID: <20220621204632.3370049-52-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?sbPZUq+hjoSrsofI1pG1qldzksICYNFZp2FjFMUcrx8UMMKnRHBlIzX2zi?=
 =?iso-8859-1?Q?akWQmQCMmxEggn5zRdmFRVH5aUHlQvZMQfhyJ5b3wzfwSEEWI0uz5bpL/z?=
 =?iso-8859-1?Q?D252Xht2Dk6eTyBjlQmzpOEO8wGEVirD2IPwbOzRlw/woq9VvX+3AIbVCz?=
 =?iso-8859-1?Q?EargYv3LS61v0A7rgWJfdeOz/y116bW01SOem1+bjjxgtIOCGe0AsAWX3n?=
 =?iso-8859-1?Q?gFP1pxDQr45DwZdo4utVpxry/bgMrsQ3ppwiJBjcTfPrIam/ViqTKdQmwT?=
 =?iso-8859-1?Q?+RSiZYGg2ZFZsDNR2QWBnclIZBgfxhI3WvIXx8gxEadrM+G9JBKrZOFv7g?=
 =?iso-8859-1?Q?D2+DvEp7CqqbgZamnEOesLLQZHdGMqerDKY2H8Pk3W4C4k2CDEObdRBsPO?=
 =?iso-8859-1?Q?UrXsReA2k6Eo+jsoJztCh+HMpFgpq3AlJzycyGbE/CZFrv6Z0P4KPOgi7V?=
 =?iso-8859-1?Q?8xxHcBjzgnWvz5vSgYLt4JFtj6662jwA6+qkhpWwn/3GuVEYUOw2V5z9co?=
 =?iso-8859-1?Q?5a3U9ZorNPQThx6xCiKw024Ra2s0Qu2QUqlx+aDEoELXoQF4PCJ6gW+toO?=
 =?iso-8859-1?Q?Vyp1+JOhGq0GRZ8C4lMKkz10G/6xiRl2/kpyeVFwr6atf2DFLXARTDUtLd?=
 =?iso-8859-1?Q?+85Jy3CV4a48gDMyA3iwTV2xshz1MvWo90uwo0y4XWHiZvrYAWZnZ4aoGu?=
 =?iso-8859-1?Q?70SryJJgW1Nuo/8wN6HvwgAhzar75Ex35BuTYFGvga8pRIEQn7ZakQqPrw?=
 =?iso-8859-1?Q?TNFZ2aUdr3CG1u6BagKx5oOU2YAra0TcJuPLmuU6ZPhSbri23kYfvKIH2f?=
 =?iso-8859-1?Q?DnCzeU34J7SH23I2ToDcECIh0EGJzM6sypzpiVu1ZislfgFad2rfdRLc/y?=
 =?iso-8859-1?Q?X6YFNEicb2ctOMDQXPT4od7Jrqn3OfUHU2PQPqdOlIa7GHWSvJUk5rxwzF?=
 =?iso-8859-1?Q?kzgN4CWSa+1vAZBnPptKjdyYr8erj2wYd3nWVBIO5ZV80HgjMz+7ethvVn?=
 =?iso-8859-1?Q?GXhzpxPeveWWf4UhIQKjj2NiWcBjVgPny4sDTsDDBD1HTw0lcOaL2eFS8e?=
 =?iso-8859-1?Q?L1hLxK+GOWAptXLRalD5yEIoPZEwV0/olZ1XntHCpELPN5g0giWWDXh2xt?=
 =?iso-8859-1?Q?OaHrV+GXjcq1y7EZ6SP15FatKq7yi/amzsosN0ZE2fy/e29KYHgBYGnBGO?=
 =?iso-8859-1?Q?evjvoTyV52RvGe/6aoIUXh8fOqB7C7X6kGFRnciURxGvWJRcZ1sSE65qaV?=
 =?iso-8859-1?Q?asFL53GRG+kavb2Eiv4AkcpRPCHn61StVEHM9wl7ireTK2oH0Q1xMyJttb?=
 =?iso-8859-1?Q?XJkw2FkGDZO6HdlLVEcyYXKrKfGvnIStEWFv4PDukLKetihZ8EyFWUr1O+?=
 =?iso-8859-1?Q?HiPhLnA3RjAOJbU5RwDl4RJsI/4Su7x/TlXnwsEv+FhO/StxxUmhnAtBz6?=
 =?iso-8859-1?Q?kvgGpu5kSTGW0aCQTTzM2LCxAhoESXI9+Lp7dyx8wjQvQdGErWcxvhQqyO?=
 =?iso-8859-1?Q?g1YuDvrNksN1tumHxCC6remM0ntCOrSKElpWxuW8fDDtIOCf9oaeEJGXf/?=
 =?iso-8859-1?Q?wdO+zw4It/LGFCepdI/g0VGEPNp7KvQQTurINl6sq/aGstlSbS6V5czAY7?=
 =?iso-8859-1?Q?iLOJ9at1y4U+udj7db/rAtxYdBNcj1MZ2xQywjfB1qfLyQyNgEMiQsQgvu?=
 =?iso-8859-1?Q?ksa+bvXUajTH+cOK9EqtK1hydZvq6ARMXSniD59eQksK3XdchpH5EO02lE?=
 =?iso-8859-1?Q?WaXvwIg1GYzYZq/mfmUbFKGuaIRr4/tWxte7LmqhZygiJDHLTu/oVHfm1W?=
 =?iso-8859-1?Q?c++fyiWXI7v0G6T8Jk/C4gJ1aTl7FKY=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: dc5b3e27-b8e3-4a3c-c76e-08da53c74ff2
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jun 2022 20:47:09.5815
 (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: JOQlD37U1Fi+SV970swxDUWVRk6B0NYcyd5jdEm8nDvFPgYnoaY4NHKWpYaYFTVgN1NxuYbkQ3OnW4E8HOH7Qg==
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 bulkscore=0 phishscore=0
 mlxlogscore=999 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2206210087
X-Proofpoint-GUID: Bkbc7qo0JcuhX2h22lrTz8Xlu1RsjDRv
X-Proofpoint-ORIG-GUID: Bkbc7qo0JcuhX2h22lrTz8Xlu1RsjDRv
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>

Use find_vma_intersection() to locate the VMAs in __mm_populate() instead
of using find_vma() and the linked list.

Link: https://lkml.kernel.org/r/20220504011345.662299-36-Liam.Howlett@oracl=
e.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
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: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 mm/gup.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index 551264407624..3c1eeadf58a3 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1609,10 +1609,11 @@ int __mm_populate(unsigned long start, unsigned lon=
g len, int ignore_errors)
 		if (!locked) {
 			locked =3D 1;
 			mmap_read_lock(mm);
-			vma =3D find_vma(mm, nstart);
+			vma =3D find_vma_intersection(mm, nstart, end);
 		} else if (nstart >=3D vma->vm_end)
-			vma =3D vma->vm_next;
-		if (!vma || vma->vm_start >=3D end)
+			vma =3D find_vma_intersection(mm, vma->vm_end, end);
+
+		if (!vma)
 			break;
 		/*
 		 * Set [nstart; nend) to intersection of desired address
--=20
2.35.1