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>,
        Hugh Dickins <hughd@google.com>
CC:     Yu Zhao <yuzhao@google.com>
Subject: [PATCH v12 64/69] i915: use the VMA iterator
Thread-Topic: [PATCH v12 64/69] i915: use the VMA iterator
Thread-Index: AQHYm97wpreMuMDJwk6gxAl42FrBKA==
Date:   Wed, 20 Jul 2022 02:18:03 +0000
Message-ID: <20220720021727.17018-65-Liam.Howlett@oracle.com>
References: <20220720021727.17018-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220720021727.17018-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?jRTVB782x09PWz+KTXScJIII75BS5VaUVoR53RtjuweAMRvkxwakLiUlyF?=
 =?iso-8859-1?Q?PBQn5I+sJM9zt1DhlscAzkVzEgzPTHtN4AqxkUIZuD1RRO+n8iMy9iah0+?=
 =?iso-8859-1?Q?RGEXc/MFN3Xegmpeatn2UqIKb5fkNX6DuRTOT9FhE4cfz6brxR1pA775Wa?=
 =?iso-8859-1?Q?68pek6MKUcUmguE+BydWUbtHH89rjMo4cWZhlwE2wrliYJFuvlA5ealWVn?=
 =?iso-8859-1?Q?7lOQ5aPWWssfjx2SsNzmdghNvlxVzTGM/ANQEOS+gJtREKCO2+iMw9Yscd?=
 =?iso-8859-1?Q?XCSTPbiJ2ukyF62MWbuAqdk0ed5xCdhroDzo1JGy/8ZWqPhT8qg0DweNfm?=
 =?iso-8859-1?Q?GVcRdR+MN3s0e1WCHm1L10n+u/XoxsR8+eK9Ti8v0NJnXO7MtighCtDwXB?=
 =?iso-8859-1?Q?Ce+V1cMHZrRnJ/Fo/aQ4b/4JpZIsjpNPNzyoKBtNWViUI8JDNyc+J+ZlMs?=
 =?iso-8859-1?Q?4V2sGB+AmxdPfdrYaeEfRFzn+zIggkunvfPICztyjNgeA4Y2j7TKgcmcAr?=
 =?iso-8859-1?Q?tUa5Svm/lO2mU8N5PGOG4rOpYaAXleMkselpOaIog7SMqrofyXOVNxcw9R?=
 =?iso-8859-1?Q?doV+w8KBQfNlD8v4/hLtnl4Rbfnt0mB5HDVQvHLSfQlAb/BbanCsO3AYBQ?=
 =?iso-8859-1?Q?yFEgwbRTjoo7kX3QiPAQ4bAA2VpJ7FYHLQETp1pgR/WO5JFAQMQAIHbyX2?=
 =?iso-8859-1?Q?iY3riPgMJLWv1yD30cqSx9Y1p3dThTsnJrA+tchebp4KdiaEQR1lzGluDC?=
 =?iso-8859-1?Q?7dMNmBvOzK6Fe0/eO82mEgM6b4mDOra5ImrYqAnleQokPlqRD3LiUiBo72?=
 =?iso-8859-1?Q?47ETt30M9aSV6+6j5kqFmcV7IhSeB+N4mFQ+cnGnUKDnv2E3mChbP+rSQB?=
 =?iso-8859-1?Q?364JUbLN3kyvlQCgbiM8wSs2SfxtBiHKNYv0zkamzVl5wS6TjqM8UG8OgB?=
 =?iso-8859-1?Q?6LsZ7wTSp0FplqvZHN36cwr7/XNz4lICy0cqfzMNxcngJmcHY5BQMUTf18?=
 =?iso-8859-1?Q?87OBJ53onGWaR4hjwkEnLFrQ9lffcL/eVenH4GeYE21it+HMcFkTt65Mey?=
 =?iso-8859-1?Q?6EEpvfshafUiVGJQqfzxZeFFANUs8wbAcZ2/U4XQxD45zHV59dhr6ToaeH?=
 =?iso-8859-1?Q?fXfCfpSNluUzTYGjPjjgcJ3ftcZFdjhsnc3Zr/SUlYTgFjbhHma6hPH0hj?=
 =?iso-8859-1?Q?nrhZ33Dz32gRmfM3KrWoHIpDv+DVWsmPzRj/vO90MdTmgqzc62jpWmryaW?=
 =?iso-8859-1?Q?6N58EeKROS3pxa4neYExDAxTVQZkVwcyGa+yij4g+HixbIiLhSUSCnHqBn?=
 =?iso-8859-1?Q?93F8pC4emiGSb/0I4rKRDXgQIhJB3kRUQBuvrj+DZtZlyJvBfN2oRqHzUF?=
 =?iso-8859-1?Q?uDWMdvxeBt5XxcMjcHWFN4o+zd1fqCL4WICydnj85ehLifC1pn9xLfwrqJ?=
 =?iso-8859-1?Q?fJxciLhip9VJbAQ7MESyujMdgfcV7PzSarw61/Qhp3ghwTtHPn6sBvn9do?=
 =?iso-8859-1?Q?OdpN3v3goUlh/7weflQ6JOD6yW1+5CJ4ojw2o4tW7XpCFvtp58Cs3yC8qB?=
 =?iso-8859-1?Q?4hH+htHxDGmEExnafOHr8gZeEBrnoG+i0LnE5fyI2iasKljCar/+viZatX?=
 =?iso-8859-1?Q?rVqnrVHCTGSP7MY5htdETp52JoXhrhvLa19EkI97kONXobWlbO6bLGAA?=
 =?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: cdc009ee-5ced-4b1c-c820-08da69f63f29
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:18:03.4611
 (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: nssSWXhzIenwd7Ijq0OWmnZQ+F+X3gOenqJaJLLjQXJa/jvol6UsO7J6gCX6SYufqADBfBi0Z4rOucjjPeWnaQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB3797
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-19_10,2022-07-19_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-2207200008
X-Proofpoint-ORIG-GUID: 2eteuPRmzkTe-rXmc1jUy3g2yNRpCPkG
X-Proofpoint-GUID: 2eteuPRmzkTe-rXmc1jUy3g2yNRpCPkG
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