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 v5 38/70] optee: Remove vma linked list walk
Thread-Topic: [PATCH v5 38/70] optee: Remove vma linked list walk
Thread-Index: AQHYF958c2jsoacebU2eJj+2FwwhPw==
Date:   Wed, 2 Feb 2022 02:42:14 +0000
Message-ID: <20220202024137.2516438-39-Liam.Howlett@oracle.com>
References: <20220202024137.2516438-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220202024137.2516438-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?1HZgCpimLd3cUS9XSbzeKK/Vqh/DGFQGXhzrprgEyc3jYmRMqcBMKqpyTG?=
 =?iso-8859-1?Q?wAbiWddi6yO2Y8frtvspHGCZjBrSscjTn7eH9LwlHcgBoBogoB3yPWaE0k?=
 =?iso-8859-1?Q?fwtivIQvgVt1ZzoKuIf97gkp4+CcGvJ+gf0QuxExr0DwbbpjaUvf6eZP9P?=
 =?iso-8859-1?Q?OdwrrzDp64tWrkEzljQjwTFA4gAWeHceDafSU+ylqnymhQUepOOnXYvPcX?=
 =?iso-8859-1?Q?kqkNfzaKdusdYq+1L9ZySldW5bm80o+OpHTEirUxT/QSAJQcSNkfv3ezg4?=
 =?iso-8859-1?Q?uuTBvoSNA5sPTeBu48Bi3j09DjNxMmKa7lHHXoA7/Ju+E8Q1PbrnQNHKud?=
 =?iso-8859-1?Q?ODSRtF16p8A0hQTOchQJXVLYwCctqLY6gLHmNAFEU7NJQQZxMBMmJtGz4+?=
 =?iso-8859-1?Q?h4V+Myl+e1OTAKPzDohZBsPLorOmhXKFR1lplP4yhP5mGyawpaBDLcvSWt?=
 =?iso-8859-1?Q?IR6GqZnJ29CpUjznh79b4H737/bkZ+Mh4oBY4IM4mbh3LZsMRlLz7KdFfn?=
 =?iso-8859-1?Q?fp4r5HW7M3y8ExzcRSZueg4vX46SJOq68lXUQawktWz8ZgzqjcU3l2vRXo?=
 =?iso-8859-1?Q?/ZCmSGYPp/KGeqRZIIggwxFCBGLYzXDT2xp/67N6LCIqY0rlrYIw86YtbP?=
 =?iso-8859-1?Q?5yiBvxIRA+TmrjM0Ouk1dCzSMQARfJi9A+EykGpBY72PlDj06ZELJku/S5?=
 =?iso-8859-1?Q?K+zkIXv1bHaGT8/Xl8vY7isTxfeWGC4puLZKSKSKvpQCI6BTldP1UnpGBj?=
 =?iso-8859-1?Q?XlGbwRHR3pZZphyhQ7DYceXrgnd/gPwmZufodAW/k2A6mErnwRbxUjliv6?=
 =?iso-8859-1?Q?HZmD2A6kiQwMZzsR1RJB3G9q4NgaeQC4f2MQYvCBcZV94gt/nUnAZOK8Sd?=
 =?iso-8859-1?Q?ps8TZ1AnfY2E65tOPdJgMf7kaLH6kJ6EX4jQjFCjN69Kw286M/jVI5s0kI?=
 =?iso-8859-1?Q?6I0vn2xSCQdbpx8z0S7hFc6gP8tzIVQOiAiaQhAxiYcOOufYAsUICG1Xpj?=
 =?iso-8859-1?Q?hSFR9/bPAU/j7Qmr5GYiGH99wg0t+riGqBPY7UrSgbtRj63rGgj9fNDr4/?=
 =?iso-8859-1?Q?X76mVkDOfXM9R0/rUwB9WL8qm2AVhWIVie5cTtQTXIZchsGKmj6o2ikQLZ?=
 =?iso-8859-1?Q?z36qMa5zQo2uXU3VP9Vkxp3gzudtqv2b57Exa86M75F/DwFuf8j7ywzya/?=
 =?iso-8859-1?Q?b+uqSBF+E9syt3YMBTbXbxYjmTRfMRSILfdIran72NOsAKELBLd1QHlqlF?=
 =?iso-8859-1?Q?x6kVoSGvoGPU3Y8Ttkba6KYvYjioMOlXACGvPydN+YJ5LAHxoWZYvjyftO?=
 =?iso-8859-1?Q?BkXqDsoCdHkQAq080TkbtkDm/nc4pjbJ7Hjs3rn0CbeZmqlJliQjBjrT7A?=
 =?iso-8859-1?Q?cHK7KcM2SCuVOR4K0JL706oHCGaVXLjkYHVWYWxPccn07c+qt9wpDDWHHT?=
 =?iso-8859-1?Q?GW9amY59Xuc4Dl4fVhIrsgbz0hnlx0v/dig686wxsWho4Ojazx4hiIuPXz?=
 =?iso-8859-1?Q?VUaCw1SvxCAmfRSU4sP7YznvpytsybT5VoSWldgmdubv/OAHm2Vd1HON9s?=
 =?iso-8859-1?Q?8OWCQ4aMynfSdc1opnZIBft4668MXFLgG3+QlSdGehM0P0kJ6y0ny9z6+o?=
 =?iso-8859-1?Q?rbp7CoBh4kgv0xaGJGEJOdP11xfX935ocWkZbAve5wGXigW/w6gRG9AqBy?=
 =?iso-8859-1?Q?6EpZRTZr2SBNyAv5R4Y=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: bc853fe6-7dac-40d0-6253-08d9e5f5b2de
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 02:42:14.3450
 (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: M6m4FrDVgPGKe0XjvGm6E0kf71CtUyw9t8oxNSQ6IROJvPFTOwNpMfPLsZjDtrHx1OSmwgX7+KTi45NvNrKFew==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4129
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 phishscore=0
 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202020010
X-Proofpoint-GUID: rHi56rsiBMBfzG4leL-YUX17cg_H6gye
X-Proofpoint-ORIG-GUID: rHi56rsiBMBfzG4leL-YUX17cg_H6gye
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 the VMA iterator instead.  Change the calling convention of
__check_mem_type() to pass in the mm instead of the first vma in the
range.

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/tee/optee/call.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c
index b25cc1fac945..177575c445de 100644
--- a/drivers/tee/optee/call.c
+++ b/drivers/tee/optee/call.c
@@ -342,15 +342,18 @@ static bool is_normal_memory(pgprot_t p)
 #endif
 }
=20
-static int __check_mem_type(struct vm_area_struct *vma, unsigned long end)
+static int __check_mem_type(struct mm_struct *mm, unsigned long start,
+				unsigned long end)
 {
-	while (vma && is_normal_memory(vma->vm_page_prot)) {
-		if (vma->vm_end >=3D end)
-			return 0;
-		vma =3D vma->vm_next;
+	struct vm_area_struct *vma;
+	VMA_ITERATOR(vmi, mm, start);
+
+	for_each_vma_range(vmi, vma, end) {
+		if (!is_normal_memory(vma->vm_page_prot))
+			return -EINVAL;
 	}
=20
-	return -EINVAL;
+	return 0;
 }
=20
 int optee_check_mem_type(unsigned long start, size_t num_pages)
@@ -366,8 +369,7 @@ int optee_check_mem_type(unsigned long start, size_t nu=
m_pages)
 		return 0;
=20
 	mmap_read_lock(mm);
-	rc =3D __check_mem_type(find_vma(mm, start),
-			      start + num_pages * PAGE_SIZE);
+	rc =3D __check_mem_type(mm, start, start + num_pages * PAGE_SIZE);
 	mmap_read_unlock(mm);
=20
 	return rc;
--=20
2.34.1