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>
CC:     "Matthew Wilcox (Oracle)" <willy@infradead.org>,
        Liam Howlett <liam.howlett@oracle.com>,
        Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH v13 38/70] optee: remove vma linked list walk
Thread-Topic: [PATCH v13 38/70] optee: remove vma linked list walk
Thread-Index: AQHYtji+UvtUKloglUiphYl4frxksg==
Date:   Mon, 22 Aug 2022 15:06:24 +0000
Message-ID: <20220822150128.1562046-39-Liam.Howlett@oracle.com>
References: <20220822150128.1562046-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220822150128.1562046-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?zoEmOKLjTKwtTeADsyhBY3kk+/677INwkDCHt1+eb18JfRPnUJthNhHv2K?=
 =?iso-8859-1?Q?1OJyF0nRmvXI8JbCB2yPkRMGEah2yLO6+khKoW3X3wtG58MDz94giOadCV?=
 =?iso-8859-1?Q?cV1daKqqCVFX0AgLb3lmIc9NVd+X+JT39SBXIco5keLoZ9Qu9kEE8qqIRY?=
 =?iso-8859-1?Q?tZ+htm0FM1DdWlMkk2/1Soe/2wmM7r+3IFv3KHmrv0sAW8rEuwFsZe4Tcc?=
 =?iso-8859-1?Q?hLlGcx3m2+x0gMwCi89zsKpBGhBWbIZx01Lb8IdRHBsol9V6gtMdHGYKKn?=
 =?iso-8859-1?Q?bQK4m1KGL5Ga0YlK9bMFDj1PRokhYyCWaF6yeT04YR7dj6AJvgxgzwD2W8?=
 =?iso-8859-1?Q?NmpcybN5KRPETq+33dFwr+iaZGZTyFVaQUEx4KZefx6WffZqUx7uq/JU+3?=
 =?iso-8859-1?Q?mD2+xwwIct/O+IuhEmibDemF2ZGBFtnwaJs4oa+RZJA91g44GJpyGqEbg9?=
 =?iso-8859-1?Q?YTAwPn+IolUX6faHMzb0jZtFOeOiDvlj8DJZ2PEt2qNmXJHtbVsFB+29Az?=
 =?iso-8859-1?Q?JaYvruCVa4wt+QmFVx34ugO3pk6E/ubU45kJKMCl+5+XqBoPBMK4JH2i3b?=
 =?iso-8859-1?Q?UQD4YpwcGlaJaIZ3rLiIk+7ubyx1iyzLY08KRL0VEmQIQhhOEwVgMWycbM?=
 =?iso-8859-1?Q?eqtiOMlcV+QVKV1RPoJywk1nzifiMZroAyW/9t5+rr7p7x9Zoqx83r9/3z?=
 =?iso-8859-1?Q?OyegwvIq/TwQ1CKfcOKXnLgo80Mqg9jtSO965fYe8ZA3zfe4NtSsuLOP5F?=
 =?iso-8859-1?Q?H1eG1yenVOEIAEeChJfMDr1DHjDsohPALmBDe0/qayChxlT70LuEAvA7qV?=
 =?iso-8859-1?Q?LYZdlHDc8S80jtdbEWbSJpFTtUMML5e0TE21udeyo2z55vx+jIOS2o/Xj5?=
 =?iso-8859-1?Q?SbVvY02d+3AfaS7Sq7coX8bgVu+a5UiqcWsOFXK/mDpKLs2Pm8PgMEbOct?=
 =?iso-8859-1?Q?C68ry8+EUm+s9wzYPQqgWf2DCUszTPiANn6YwiqKrOTRreYM4LYQ7fQ4I6?=
 =?iso-8859-1?Q?QOtla9LdXsRCya4r0OkjNE3KudjDkC7yjmCKX47TOobJBiMeF5k+tBJmX0?=
 =?iso-8859-1?Q?2z6B8N1O0N5efhrq9PwC4jPbxyAjp+mCtgu3XF199k8xw8FqArL1fUrCSq?=
 =?iso-8859-1?Q?QyCgo3GNTZpbrr50HGm9WrGL3xoz7NOPv1EruMPO1KlvCUAqxyXnZ6ulr3?=
 =?iso-8859-1?Q?zEk4zlGylKWnknGWd9AKnqICWDHwztttW3NpzAi115uqm/tUrq6huS15c1?=
 =?iso-8859-1?Q?FcdnN1tPuii0/k1+EK98z8tFYdyc+VkXiqSqweT3VTJB3YxEjFlY0QDWzS?=
 =?iso-8859-1?Q?o0ytiHMvBKe8pvvbYBThwx+lTU0ziuuBcGjqGGcJLYrRJYfDKfe+9QrJjV?=
 =?iso-8859-1?Q?7Kewk/SxEBzyS3I0qStoSodzswjXMcq/t+K5hLbfAx22LVeEetQ+1mFWGl?=
 =?iso-8859-1?Q?+PkI+MPK/dJAH83dS/doY0EdJI5sEXO37yTKHDGbVZmqtXviUP4T07qOrW?=
 =?iso-8859-1?Q?igeRmPf80KxsJNhrFdRqocFx4VZjHc7Ic43avudB/EnrIQtYlRicyHrzY4?=
 =?iso-8859-1?Q?lZ3kpEttpVY8d3cgrt4Bs2+Y9K7mufi/9fLedkgIvp/fo0D07nKXmqiD4c?=
 =?iso-8859-1?Q?Xos+8RszzEJ1nKV39B5siuPhP++BWfifw6nBXunIkKxHtDCyJu3ICOSg?=
 =?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: d02fd697-4ad1-4598-f4f3-08da844fe19c
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2022 15:06:24.6133
 (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: fAYH0Ope8/qzX8vuG5bIaJFOBCrdGuBtuciYHMMnuKZgszWiZlZkf++fjlVYw5/sw3xjadb2l8uu5cPyMF5xhA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5260
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-22_09,2022-08-22_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 adultscore=0
 spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000
 definitions=main-2208220065
X-Proofpoint-ORIG-GUID: bLLEYXGOIm5Zjr7dOTYzzGjVhTn_PNhd
X-Proofpoint-GUID: bLLEYXGOIm5Zjr7dOTYzzGjVhTn_PNhd
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,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>

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 28f87cd8b3ed..290b1bb0e9cd 100644
--- a/drivers/tee/optee/call.c
+++ b/drivers/tee/optee/call.c
@@ -492,15 +492,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)
@@ -516,8 +519,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