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 64/69] i915: use the VMA iterator
Thread-Topic: [PATCH v11 64/69] i915: use the VMA iterator
Thread-Index: AQHYmYd7Afncxn91iU2pHjLwR48LZA==
Date:   Sun, 17 Jul 2022 02:46:57 +0000
Message-ID: <20220717024615.2106835-65-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?OfJ7o9jKhJEperaELavXNVplPd+ek9dBS0YOgufiKVLiGBXL8C99nop3ZF?=
 =?iso-8859-1?Q?uqYVGEPdQm54Yrw+XYuWCwhjcG+J5mmYZUq7XWGgpezhIxHjlLj3HAuHyb?=
 =?iso-8859-1?Q?WJQypM5FsjZG69NOmhPwC5oYoPd91KbOnWBzNRam1Ru+jhO8bZqbGY+Frs?=
 =?iso-8859-1?Q?LdIrDorcyHprtdwJGewDH9TNLzorQy58G06pMXAq1fzF0Ln9sCQ9FWfhbN?=
 =?iso-8859-1?Q?4NhWUkJlOkz+5OeQRHxVV9M5WpbVIrB1Eh6jdmnDY/5tzG3ssYhtiulu6g?=
 =?iso-8859-1?Q?Y45P+rBFj2vg8xsY6QQiCIH02CTMjjSIDjMLgEV2+R3+n5gfe6C6SE++J2?=
 =?iso-8859-1?Q?C002lupRKxQurPk5MAe6O8PUfSVuSOMfqzy0PE0AsKXyxIr2DhglXwLqD6?=
 =?iso-8859-1?Q?HJz5kKinYvrtnPMj3OCVIdyn2fontpZMO0wbvbXbha6QgsJHo2vEFYznRV?=
 =?iso-8859-1?Q?zUmHXSkWeeGUunQqjHHYq7cH+EDWxj337/HJKt5yjuyKo6PuWdVdAfacJ1?=
 =?iso-8859-1?Q?8molTookzazYlUlPoZ8dfGBPAQzvGMR5A7MhZGe5PeFxTMhQ+vMRTNu2Gd?=
 =?iso-8859-1?Q?xmVK5TQ4kQ19NpMDv/cW6wR/22W/JWPEABxegUt9aL+RmveYVkWVvfIvmi?=
 =?iso-8859-1?Q?w1rMUwqNARL9/u8JuC2pevVxekPvdUVF4a8GA/R/a88a7/KeoCi+RkgO8g?=
 =?iso-8859-1?Q?sDE/G9W9+OaaxM/8U5HJyXHwStclbXdvc3c1hqz0MLUhRZkUrR4JO5YBtj?=
 =?iso-8859-1?Q?d7Iq8Bezj8Jd9cquUoPL1VXtxBwjsJrcISmMaEoRlWo0mWLn3n4t6PfISS?=
 =?iso-8859-1?Q?dkgdXutKCkCEtO5MT7G8TqmYUcsfL/fMM02w52ULlrzOTumjEPpw7Mno3a?=
 =?iso-8859-1?Q?taj3vvPYqpJR+ZxBQXQG2/izHLnyn23njk9yhC0MRVbOhdVx4GIeGWX4I/?=
 =?iso-8859-1?Q?S5R4rqkvk7KGr8kwqR1eB8xi7oBOp+QbEunvhkrBexUtrzOcmcKHOf1k+l?=
 =?iso-8859-1?Q?Io5rENWdRenxwzz8EPJ6DG71MbGY5AvbB6GOE0uicMO+v7cPnaUh70QR1W?=
 =?iso-8859-1?Q?UoCWiOHsjBke3GhSeQoNLl7tmCWkiB9Mwq7Isw5YZyQY1zojV/jTHYxJ81?=
 =?iso-8859-1?Q?ylISc973PezEwwRz96/YFN6jdOB5dzfN3HJktjC4/2WpGW6sAxmoGRWTII?=
 =?iso-8859-1?Q?hKnWF9oNzjcrwLLMmSz6P5m+ze70nbiJ+HQ+XtrrZVB2qRRkghJXUIF+cF?=
 =?iso-8859-1?Q?2N3VWkB+wHPYWcmz/0QWV5Nr7ypjqtvHBv/BELRt76YZ8rzCkjBWuI8ihh?=
 =?iso-8859-1?Q?DFnQOZIEgdFmOMqYY5tUG6aLgZcraOpTKl4SfD8et+/f+S53j7cNidEKHl?=
 =?iso-8859-1?Q?G/ecL9jsv7JCSM+HCesWB6PhSgmJ0Jntjqvo/FznGENAt9PnmRoBwb7x6d?=
 =?iso-8859-1?Q?G9PsDmJDmA7E1Zna1Yto+6vRq9GBahjc6tzwH1JsWeSXzsagliB3VWT23Q?=
 =?iso-8859-1?Q?tnH5jnUtRfHK1OLx3PRl6895sOPWWHZjjDXcqnyeTvvDiUHeqJg1uwQ3lO?=
 =?iso-8859-1?Q?UlboHSmclY+kknCvC0QLkUhQMR+CSFQBUGOO8xYpyyfLWWzwZ8zOAsUw53?=
 =?iso-8859-1?Q?dvWMhzUjofOE9NJiQoon7MnyYH9+eal1F6rFrAcU4BDqcIwO1Fp4fsRw?=
 =?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: 56b6acf8-1848-4283-80cc-08da679ec63c
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:57.8645
 (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: o7itmkvoYYUArTPToU5UiECgrWGkZI23jwh6l4UuNmBrV6xIyGinHnwcZ1ptwby25ewSkqPsbYMRhrLoVc1hMw==
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 mlxscore=0 adultscore=0 phishscore=0
 mlxlogscore=999 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170011
X-Proofpoint-ORIG-GUID: LK3X85ZKQ0rC3VBZ0In83aU6b3BmpJAs
X-Proofpoint-GUID: LK3X85ZKQ0rC3VBZ0In83aU6b3BmpJAs
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: "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
Link: https://lkml.kernel.org/r/20220621204632.3370049-65-Liam.Howlett@orac=
le.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