Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
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>
Subject: [PATCH v8 39/70] optee: remove vma linked list walk
Thread-Topic: [PATCH v8 39/70] optee: remove vma linked list walk
Thread-Index: AQHYWX88AkFFE7snvUWnSOzIXJXYYA==
Date:   Tue, 26 Apr 2022 15:06:42 +0000
Message-ID: <20220426150616.3937571-40-Liam.Howlett@oracle.com>
References: <20220426150616.3937571-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220426150616.3937571-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?goOuZFUnCFeedgpjr9rOVAu43YXxza0P4Y8xo/tHICCJMoUQpi5X11Bcdf?=
 =?iso-8859-1?Q?JnoJU2o5RagZvbyLgFtSJKbjhDjzpvOsLwcbtqWu0fFg4pnqeSXjHCT7xT?=
 =?iso-8859-1?Q?+mzDg5n8cjsIlroel16NEVIfnJi8TV2mON3k9yF/HZtT5ZUW/ko2db1Dro?=
 =?iso-8859-1?Q?4rcTD8+ztVFcUK4cYnEctNQosFJdK6apvTYCg262BscgdeluokZGfMeqWx?=
 =?iso-8859-1?Q?hfvLYkRSy/MpE+BVpNeI8lAlTw/5fs6Xr+OGZLcD1nUtg9Lz+wtI1ax58g?=
 =?iso-8859-1?Q?XGJinMaYL5quLBD4yDmfvPxGgB4qrGEhcUd7qoiZ/ez4jogqb+SbIX9hFD?=
 =?iso-8859-1?Q?tyVfkTAscCYKqU5NchQQkkZe8n1J6LGGRWULze+LpVvIwSpb5XEjWs39IX?=
 =?iso-8859-1?Q?LBfYWlEcvtv/9/Sqnqlv6zr4IsI+rFfKTRkXLot2yYZumErvfUXZ840R66?=
 =?iso-8859-1?Q?uiJHZ6LVdaBAN5CSj7lccAQlcMXbeDv5Y/XnXnuG90Wvh0wyERapI41HBE?=
 =?iso-8859-1?Q?xsItX7AGl1BEAGE+p4e0jHKruQ/xAj1P0YTZ8LVaW8mL4mceInVOEI79Q8?=
 =?iso-8859-1?Q?JtfcbmutvTVdcB0VOW3ZBfj++m4gfArQp278oEl9p+/9KJL1L3I0JXqwXH?=
 =?iso-8859-1?Q?vkk0xjCq2lBSKYqGqsTCKL/663zwEMRNvQYZ3x9IrOMdd7SFCCa4unw7B7?=
 =?iso-8859-1?Q?Os2gRy1prMCJltwdT/mtoOG6ARIvFXXPlVBJQxJyy9zx8VlxVf1JMGwPuF?=
 =?iso-8859-1?Q?pECFPoM/6sX/hGC7y5vHQCNuo56OU1FTUa1S3+liQXQKlm9BnDE6qG1fDS?=
 =?iso-8859-1?Q?si8ta/hK+LqkfiabnxZi0swEZ52A1VY+5JYkBXq1+7T1aLfSpiNg/TXgUH?=
 =?iso-8859-1?Q?fuQY8I+91J8hEUIYskoyxfsMVBWLg2NSfHM/7FCBRblNfeBCSQUcMV5B5N?=
 =?iso-8859-1?Q?CWl2IxJdIubRISBPAXqEierxqM52qPo9mxy4jBSqIrspsm+Ht1gBd55bQI?=
 =?iso-8859-1?Q?Lv6KzmtXYiShQiQtchvJrUvuBur022EPdt9uP/JtpTIkYhrqoWIZiGrn3V?=
 =?iso-8859-1?Q?xpsb9i2sNeUDPkgNgPNJ6AnzkYH8lRpVA9ktf3dKdYqJK+AHJoI3BIwuqx?=
 =?iso-8859-1?Q?ezILn4xHDaY4KqasnwrJPiNAawyQ/VcvmHZB1+eK3EtqD5hsy1dQv1xfzR?=
 =?iso-8859-1?Q?YpeOeUtNzWauC61fx03qDEbaeVlZ6wox6Bg+QAcyeB0Xj+KIgbGW9VoIjp?=
 =?iso-8859-1?Q?Hu3MuA/OBfrA7kHE063n4rvceKP99anp4QTXE2mUs+gU4OvEBkybcEwm0T?=
 =?iso-8859-1?Q?rfEeDzMcUoFmRwSlozQPvEJkaaNrkTZ4/6S2Ej643vC+TIbya9QRq5J/pi?=
 =?iso-8859-1?Q?aFu8+m8U8wPUfKCEeitKfz+1Kio32Vzy7s+BuDCdz16wWMWUGGu8KUKS7Y?=
 =?iso-8859-1?Q?sx2UvOkWOAkPq9G56Jo0bHzKtmcuZXAOq5ubxQTq7ZC9B2rz57mTvqT6Nm?=
 =?iso-8859-1?Q?jMth3tNmXupiPRMqD7SESTHoFPkjSUAsb08VU8gQOh/L91tn+aOm7kmWSR?=
 =?iso-8859-1?Q?kmjsfl+r7YFxWVJ9P8aF3bCZnqh4dQLBv1EZIzDlBw5CACx5D3RNwd5sA3?=
 =?iso-8859-1?Q?HTFyzW4KT/qUQTV0P81lSDxEmUSOPT+CU3ljuYqyAlqQ5kuVPCI0kmcnEP?=
 =?iso-8859-1?Q?PmEIlxlRGhmA9ZI548VaOvCgPAlpzMCjb7Ic6u1dDoiFP/LMxbAmvrM2Ee?=
 =?iso-8859-1?Q?nhf9reO53psP7c22UsZLaYgY+3r6sPGBQYfuo4wXOS+Kqa7QitlQezG+p+?=
 =?iso-8859-1?Q?rMAOrLcG+aorccmv9oaet5V1UWlKHdk=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: 24494ca2-48f5-40ef-814a-08da279673bb
X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2022 15:06:42.3178
 (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: egFqbe3QgLclqMcbWd2gCFRgljhCZenu66kWnRVrHoxliMWpLlsCs7Nol3S95brqpRkmfYiY9W7y062ZLZT2rA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR10MB2929
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-04-26_04:2022-04-26,2022-04-26 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 mlxscore=0
 suspectscore=0 malwarescore=0 spamscore=0 adultscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2204260096
X-Proofpoint-ORIG-GUID: hmSbcVcIBYS0PLAY75WgxBDZeLLKc47H
X-Proofpoint-GUID: hmSbcVcIBYS0PLAY75WgxBDZeLLKc47H
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE autolearn=no
	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>

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 bd49ec934060..d8115dcae6e7 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.35.1