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 v9 64/69] i915: use the VMA iterator
Thread-Topic: [PATCH v9 64/69] i915: use the VMA iterator
Thread-Index: AQHYX1RARWarpS6vBEWTZSCRH8obcA==
Date:   Wed, 4 May 2022 01:14:06 +0000
Message-ID: <20220504011345.662299-49-Liam.Howlett@oracle.com>
References: <20220504002554.654642-1-Liam.Howlett@oracle.com>
 <20220504011345.662299-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220504011345.662299-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?18516OYbxtfWL9aOaKYjO3uTOc12A5B4cMi6mgz7ZQOET/V8itDaWDuCBG?=
 =?iso-8859-1?Q?M8YlIUM2+N5j3CQziSUWfBpYVPQ/kguHJ7Hrl4I1k4D5qh0cskhmEZTBEt?=
 =?iso-8859-1?Q?oXBJqqXOoTu8ND4AkvAo+Cx/igsy0F62+ivkLrsRid2SRp8cryl2KBVrYh?=
 =?iso-8859-1?Q?L5dc4T/GO6ggfIAbnHFfqvKF1mkf8m/AzFYOPRTmK8GX6NoTY2AjAIksKR?=
 =?iso-8859-1?Q?ry1HW4r5uQRMeEDMLJ7gOyclsXs8/ySTeM/XMgwOoGto1C3Kk5owR2Ph59?=
 =?iso-8859-1?Q?zr9Slhc70E2g55ATqeYQplaTYWSnY4sKG35QQdn8c+1TL60GJCuPoj8WHH?=
 =?iso-8859-1?Q?n0hJZ3g8zNdSR0d+QsRieeN5D4vHoq3NiEMHk84MpTYbwcv9uwwPJi8eC8?=
 =?iso-8859-1?Q?phNcalEtGdeUkUyXDoaUw1DlJDYWPAFsfQBXMMtq9GdBOBsK23ORS4ybI4?=
 =?iso-8859-1?Q?XcPisXgiE4YUjqzSdadskYt69Ae9qN9GRz1oTf0W4DIirSCm8OjLJgjr7e?=
 =?iso-8859-1?Q?nrloQ9no+ka0kq+++7OxjAvKc/cSk5HqUWO0yRE6ABwazrJFPJ3eHnk96U?=
 =?iso-8859-1?Q?fKbhzmoVTw6nlE8GJN+OHa176elDl9+x8Y8PVGNCBg42/pCN8NV11t3eG3?=
 =?iso-8859-1?Q?DvfkQdDo0V7VvOGiM2vFnw1JqC/HDVx5ayXOFejajHjgUAyPfd0y5rlRs5?=
 =?iso-8859-1?Q?xd+pWwmRTJ6jMkueew+t61mb9VgJBdONgrlnfxe3VivjN8LumfOfhmrOPd?=
 =?iso-8859-1?Q?frgwGnquLZdMpLjlRDNy+7D8Yv5AHpEgteCwpHrSMbUqkHOFBUnZKkDA2A?=
 =?iso-8859-1?Q?gr/zvS5uvjabTbIlqBoBh7cERROFzSpNtyBRk8Y9SSOwTvPJEnqiKCddP8?=
 =?iso-8859-1?Q?Dms/jyEgMh3X+UEATtjn6VsLF0boTn4giGqUffglQbiSp/jefPjPgcW19c?=
 =?iso-8859-1?Q?cvhEcHs95uqC4yz18wSN735gukBK9M59bY3ig58szT0+l7WCuk2pyV+UvM?=
 =?iso-8859-1?Q?PI9i6ltNrGI7TbZoc640WZIN/Jpw/3VwvRv3eZxuGFfaOCJusmECcz34Gm?=
 =?iso-8859-1?Q?c2vS6B8JrtsTA8j6/Kv9lfLl3vnx3Z0RCf1QdewhdAbCaf8ImuXgcPmNqV?=
 =?iso-8859-1?Q?1W+Z5u+CUUvXtYkKgpPcKbdye+kEqFf8TxJf3i/c3mHWNXsAMTtP/rtkEs?=
 =?iso-8859-1?Q?HpvaQlxUoapZn9sHMpjoo+1uJLpdWk8qV+jcsuH5RDbtWObGj6BnNUzELq?=
 =?iso-8859-1?Q?yUXyAptZQmOS+BfLBb6Kt15pXs41z61ZR5KQwOtyHSoEeFLAMLfh95/Dhv?=
 =?iso-8859-1?Q?eSIBbpQ4BZpvtluREdf0PFFfvV2f2ob6T6ewEG+QZwFnyudOaVYKgjtctd?=
 =?iso-8859-1?Q?nWJ8ekM4GBpZtLQzmO25NBGkF2i6I/DZ3wI/zjUoZMQx1UCRON0Ruk/bXc?=
 =?iso-8859-1?Q?sB9v4kSsgBKv3audb3icbTsZCxIN028vzYkaLfodqdi6fO0lSQUoVS52Fu?=
 =?iso-8859-1?Q?FQq4vhKQ8mjPnx9aJBd02Wn6GyW2sOjEqARHTid9d+6Sb93BO9D3+SqlNK?=
 =?iso-8859-1?Q?ytvp8ov6NjVEmAIKEJD5dVUUpDUtDMizQ3AdjZkJO9v2jABUjkosHSMQOp?=
 =?iso-8859-1?Q?TCN7iEL6uIW2wxAmZd6Ki/uCDh587O+udmKRafuO5RI4NC5pZYJoVWLDs+?=
 =?iso-8859-1?Q?5HaZ4amXrsgqyRJgID6BCl1NLSOTC65oVAl4lEyvAAj81ArSS+N6ZttOPP?=
 =?iso-8859-1?Q?CbPrzLCQ5TFS7tisM4CIN8tjy7mVPN2J094+W8u/hOrUR8OZn8GTVoUcl1?=
 =?iso-8859-1?Q?pasFgCaVzYJj5PG2dJOtAkDK5LllnCM=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: c042cb39-844b-452d-ddaf-08da2d6b775d
X-MS-Exchange-CrossTenant-originalarrivaltime: 04 May 2022 01:14:06.3291
 (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: wQkpboWXLop6sf8FMC/mlKSQlr4GWgAL9ry3cCPSQyCRnOh48Xk24kpL3s+U60p0WebnAFRxGoGDYaZFOUXGkw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2688
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-05-03_10:2022-05-02,2022-05-03 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 spamscore=0
 malwarescore=0 adultscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2205040006
X-Proofpoint-GUID: Jmcwu5beoskNrmGLARtBR3arhQGDCPS6
X-Proofpoint-ORIG-GUID: Jmcwu5beoskNrmGLARtBR3arhQGDCPS6
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,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.

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>
---
 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 6d1a71d6404c..e20ee4b611fd 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