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 51/69] mm/gup: use maple tree navigation instead of linked
 list
Thread-Topic: [PATCH v11 51/69] mm/gup: use maple tree navigation instead of
 linked list
Thread-Index: AQHYmYd5pv1StL3IFUOezJUKk0iyHQ==
Date:   Sun, 17 Jul 2022 02:46:54 +0000
Message-ID: <20220717024615.2106835-52-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?iJTrkiJ7X4DmEDHwHrH6vt3jacZYkVUv2PnN4N14L8Tm9Vh7L+NMUJQIdW?=
 =?iso-8859-1?Q?+CN22QAY5e9OxJd8NhFBqcm5QViTxKezFcPV+zy64Pz2LID2vIKCUc6GaW?=
 =?iso-8859-1?Q?abxRNcJhnhx3w3iAJO2V5ms/3MJkESytP38xigbFwzBlX40Um7UncSv5+4?=
 =?iso-8859-1?Q?iyiD5WnhGwda6ZAr3lu13EECmxcd64+ykID0cMSKmXUIUanCFPFMPmOTWt?=
 =?iso-8859-1?Q?/QsBipf0s5wdW+NHXmw/olfMkAfAxm3X095rTKYSGSsQk8PORHJoFRLbGF?=
 =?iso-8859-1?Q?Bga90ByIs7JSW/zhEWP7kbmXAnLFKpCvPtcERyDruIUar8rRvXwaJbOx45?=
 =?iso-8859-1?Q?LKcXKiUJPOsANqQR0PvZ2unYE6GCGK1JS1+a2On2nFK/OEwAfhWcM1GMZM?=
 =?iso-8859-1?Q?Bmzgaf7hDpYtmiiEiHD+iCnU9uAapF3HBFGnKce1KDokUe5oQG6vyxZiPz?=
 =?iso-8859-1?Q?+5FUmxXfT4rDo3sf4TewtARRR4WSJsGpZVSUR75HJD8JZRPOdusyARQccP?=
 =?iso-8859-1?Q?m9YT3NE6/DIJMoLDJIvePaeIBtNZRMCF/WjwDtoehKYlGNj+2TG0dUxbAy?=
 =?iso-8859-1?Q?k4WxkVKaRWwQho4OK8/C+5ItQ2HQWdVq+DoYrL8u2yoG80rPLw4M6QLrrv?=
 =?iso-8859-1?Q?BuFhBgN+Z0UTrqBDDT/DD/Pm20MAXHH1+7JAcg0gXyusDfJMBxTUkUdoJ+?=
 =?iso-8859-1?Q?hFuiko5J1Apw9jIbBDszmLOXsW/MSAKNksrfU8DN1/JTNG7GJ+VcQx8q/x?=
 =?iso-8859-1?Q?zh7gU1r+n5H1N46ULmvCNLPTMdDyur3a3vXTn7hEq8GL14T1r0NVJy+WVO?=
 =?iso-8859-1?Q?45d8g7nQ2ufQfAeoLcwlwgi3cMRPQmoiBMnSdahFghSKBNUAoRf3STENVz?=
 =?iso-8859-1?Q?y3x+TBneO/8gYQs4F7hItcbjZIy4jilojky2+Dmdc/Tj6HOtGksu9iStyH?=
 =?iso-8859-1?Q?JFKVENQjqUJ92J2rW/gEHdHpRKiscz7XKwfFpiJ7mRUlcokaiKjP6NhQZ8?=
 =?iso-8859-1?Q?LwrFRG1RztlYDcvcvfDLODnnAxYPM9/scELFrSLJ2X/M0Yfsv1kMM2QTpR?=
 =?iso-8859-1?Q?+HUgHyw6kdoeyLROg2mMFDyt0KhNS1m6FltZPLnRjk38FKR2+rMgHzh61Z?=
 =?iso-8859-1?Q?ndd2nxmohUpPbgaq9R8Cr5fTDray3jghqn/CdaUeuXBxp0eh1j/gNPGBqV?=
 =?iso-8859-1?Q?z8cfkDbgObcrIZO8x/1Xh2xIX3VTJ9tgrx8RdCbKPav8BKENR4QdLjQSeP?=
 =?iso-8859-1?Q?JTPtj0DE3FiN69hGdmlazo4fs5vPqwgNNKQ9TNnjB60Fs5eHgbMjZNWkO/?=
 =?iso-8859-1?Q?ClYOmy7J9GQYf36Wd6WfNJ1E930pfaOzPreCu6HtkS18I1aLCD83Fq4Pu+?=
 =?iso-8859-1?Q?QegQjqjVzFN19gC16DLS5sUDVKn94vepjhvkRER1tMZtP4n9gxCtBM7dXz?=
 =?iso-8859-1?Q?3YLh+Npxb+IfkgHpqFiDJvDf+esIvX1VccCuXxrWBAhSbo7QZPtQad4IwK?=
 =?iso-8859-1?Q?qWq5BEbEXv9BQj4LE/2IJPWn/LrVFwJhGtVjojrxeSNR3SnierjfInhp1E?=
 =?iso-8859-1?Q?08mDmnTqEvVDhygdy2SWfmLtNnT963OIH8WJ3L7AeTdEH8m645cy5HU515?=
 =?iso-8859-1?Q?ZEZPfcGz/y0CiHrG6a8J3Fh0fEn1HyCeZ4YnEIE8MhSB5rjBF4QSvI3Q?=
 =?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: d4871958-aa9e-4b34-0a07-08da679eb1a3
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:54.0210
 (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: 2EzcjdtXrjoVjq4VoKP5w7J/PI1lk/wuKvMBmu8ih1UfwZLMexuvk46rpw7eWlW0D+7v+3WuNZXRDmSpiWpcaA==
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-ORIG-GUID: kcfu1ZsESC_pDX6iWOqcYy7K3GwbFf8b
X-Proofpoint-GUID: kcfu1ZsESC_pDX6iWOqcYy7K3GwbFf8b
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>

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
Link: https://lkml.kernel.org/r/20220621204632.3370049-52-Liam.Howlett@orac=
le.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 407a81d5ca03..f0e5d68ea932 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1641,10 +1641,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