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 64/69] i915: use the VMA iterator
Thread-Topic: [PATCH v10 64/69] i915: use the VMA iterator
Thread-Index: AQHYhbAVkMuEfElzf0CM1Hfds6pmIg==
Date:   Tue, 21 Jun 2022 20:47:13 +0000
Message-ID: <20220621204632.3370049-65-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?NpYfbTxC191KEAh0n/0LEVYxfRflBi6o9fNZumPqHxWvc7E7RbfaqaXt6K?=
 =?iso-8859-1?Q?8urs9cBjiIzB4Rl7xeyAW3nRtCwrWAx6vz2FSd5RuDdPBR+pT9qHCZYLq9?=
 =?iso-8859-1?Q?VWDWcnm//FTB0F/KUPa5auNnF4auxOjdTgXpFce3kEVNRCOrY1YRaDpaQw?=
 =?iso-8859-1?Q?4G9V+UZmYZcIwAl/+6Hnqvsv/eeNAyjbQTQviwmPI/Sd7Nv2PmDSo72R1N?=
 =?iso-8859-1?Q?DcWSQENOeyreov/pOsGIpHYVVQpzx5gVDIsPFI9RNTa8/vJnT1KENKVuqu?=
 =?iso-8859-1?Q?cdTqrLWVOsUJYGyJW7akUmGXegi/NCbyTrz9FDVxcNPEXgn1JGhdyUGhOj?=
 =?iso-8859-1?Q?32+SgA2fvVbZTFo0VfFsJfFHNSINE7LbJBhDhALfip1HunMTJFb98dPnGQ?=
 =?iso-8859-1?Q?F3vBB0/K9cc4g7d3YjRMAWWKT8nc7NE7kzyjitO0tJ8dkjjNW9Vfj0BWPY?=
 =?iso-8859-1?Q?zrM87T08A3rr4HeEIaykCW9Cmh0GMejC3YVs8pR7I1sNyNMQw4K4QsuZGr?=
 =?iso-8859-1?Q?FDpkXRmJI6fl7uxdFA7WJr6Hm9hprTJtGt8d2JKbL3iqeb43FseqqyBB0M?=
 =?iso-8859-1?Q?hgLI222XyvuM0CE8SjBb1IlRGe8wIfMZjj7189loG9w69QbIndz6S/T4WH?=
 =?iso-8859-1?Q?mv0I3W9XJrndFuBD2oFAwkTnQf5YGtvEuXQTRs4ugVANsAcarL9BGXai3x?=
 =?iso-8859-1?Q?JbuHnGkF0CxymoLAyn7mGEfBcs8BHtBXl1HWnLUTml49LNPD1nvpALyEqx?=
 =?iso-8859-1?Q?znRu6NYTqgCFTZsRxipuDreJCxHVmmTy+aWcOf3UsLfEpPPIZXqYZEMSJe?=
 =?iso-8859-1?Q?ws/CayX/3YY+/iIMAL0JjsjtOplOkfHVb+s9aGow5UT0Sg4PXPy4Jqm1FN?=
 =?iso-8859-1?Q?S63OxT2R11WnWJX9E0kyZ8iAt5gzyQOrwkMxDixQ0pmXcMzYUFM7bcsL8j?=
 =?iso-8859-1?Q?HVoFCBBDfguY1obiMv+t9zNKzyy7b8fVQd+GibQ8nbI/CglFRXcgiKO6wv?=
 =?iso-8859-1?Q?Z3RhAW8D3pQrE1ZfRNICFpFFIVXojzDMZSLZ2Rf2C46zuGIVLchUyfv3y8?=
 =?iso-8859-1?Q?ueiDVWAc4Xqfla9X5U3Ustnyl8WSSupJ4tGM1esKxGt921651fBLPDtE5+?=
 =?iso-8859-1?Q?fwAUVYdS4Qj11TfFFQXOOiKlVvlGCHf7Aif7DgyVBA85ju7uQvrEOk+TiN?=
 =?iso-8859-1?Q?b0tYNXUyC8hQpoIncHZNAvGPAp5ZMmbTibu+kkkO5afmtInNMkvnqpFC7K?=
 =?iso-8859-1?Q?CrdF5eSL78tTkTvbNzXaHxeke89Zt6N6IkNBFjBFXibzLDzP0+q8ef8vIy?=
 =?iso-8859-1?Q?g3vYep6JppS2ygScfIWqj1lXTrqPK/my/dLUDGcutvkyIWMokxVRvJYQtR?=
 =?iso-8859-1?Q?RR3EEfgrexMszZVNV578B0YTAGg+Fhvc7m32AQ1pKW1S0rvdPM5hSSqGCL?=
 =?iso-8859-1?Q?TvsZTxFCOidqMRPXKlLEikVQ+cyBNY6QH5pbcm430YBLzbp25s+V3wSKQp?=
 =?iso-8859-1?Q?+ZFNrANp06kT+3eMoYGgEHccEXeCkHoB/41ksRwnOtrl2T+OSnloCjYcpx?=
 =?iso-8859-1?Q?kRSmGg0NFuX+VAt+OjtViYAYK6LPCKWab7kix3wbuIM1LQ1CAohoXPqulw?=
 =?iso-8859-1?Q?6xsSBR4Nml5pOJSoVnIcb0YfaSCxeChzuX4ullOhaPxO4SDdo/33peFjq9?=
 =?iso-8859-1?Q?+m37Rz5dzIU2dTfJySC9XxRTGuTcsWfRu4ie6qn69vXX/f7mvMbO9Sd3vX?=
 =?iso-8859-1?Q?nGncLW4JvpSa4LesuGOOCmnspiajZfVw4JFQrfXCb92KSuUjLc7cdWsnKm?=
 =?iso-8859-1?Q?ZjU1PGiWofStOs5Yo0q+HHgMsF091Ss=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: e9c89f02-c5ba-4213-30ce-08da53c76565
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jun 2022 20:47:13.3156
 (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: //XYYzPccR7HZ/Ap7mIYbHlubtrfT6N/Zh+TPUKCrEAFquGIg3m8wseW6BvBYjfMtDTMXIofi53QZFFNXBv6Dw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3869
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 spamscore=0 malwarescore=0
 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2206210087
X-Proofpoint-ORIG-GUID: 4zhq8A4z77VHiQZDS0Unx3FRsJ52ZOAZ
X-Proofpoint-GUID: 4zhq8A4z77VHiQZDS0Unx3FRsJ52ZOAZ
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: "Matthew Wilcox (Oracle)" <willy@infradead.org>

Replace the linked list in probe_range() with the VMA iterator.

Link: https://lkml.kernel.org/r/20220504011345.662299-49-Liam.Howlett@oracl=
e.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
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: 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>
---
 drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/=
i915/gem/i915_gem_userptr.c
index 094f06b4ce33..a509f7da104b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c
@@ -426,12 +426,11 @@ static const struct drm_i915_gem_object_ops i915_gem_=
userptr_ops =3D {
 static int
 probe_range(struct mm_struct *mm, unsigned long addr, unsigned long len)
 {
-	const unsigned long end =3D addr + len;
+	VMA_ITERATOR(vmi, mm, addr);
 	struct vm_area_struct *vma;
-	int ret =3D -EFAULT;
=20
 	mmap_read_lock(mm);
-	for (vma =3D find_vma(mm, addr); vma; vma =3D vma->vm_next) {
+	for_each_vma_range(vmi, vma, addr + len) {
 		/* Check for holes, note that we also update the addr below */
 		if (vma->vm_start > addr)
 			break;
@@ -439,16 +438,13 @@ probe_range(struct mm_struct *mm, unsigned long addr,=
 unsigned long len)
 		if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP))
 			break;
=20
-		if (vma->vm_end >=3D end) {
-			ret =3D 0;
-			break;
-		}
-
 		addr =3D vma->vm_end;
 	}
 	mmap_read_unlock(mm);
=20
-	return ret;
+	if (vma)
+		return -EFAULT;
+	return 0;
 }
=20
 /*
--=20
2.35.1