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 38/69] optee: remove vma linked list walk
Thread-Topic: [PATCH v11 38/69] optee: remove vma linked list walk
Thread-Index: AQHYmYd2+aLsK+TMHEO3WjT+LsCCwQ==
Date:   Sun, 17 Jul 2022 02:46:50 +0000
Message-ID: <20220717024615.2106835-39-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?OOONHetoYAxh3fAKLSqFxiNpbpNnIQfhQ7FdKueXXHb9cSOwT9WWvKqJnt?=
 =?iso-8859-1?Q?nI1Adgic8UAlD5Lmy8NipUSysz/lHjrSavWDC6BU22lqH0KgfV1lR6ABh3?=
 =?iso-8859-1?Q?FjBzljXmMUVQBG1lP8h4+akA/eFglL0FzFcnuCQG4qcauzwuJeccsL2VVF?=
 =?iso-8859-1?Q?Ngmy0LKhdjPp8Ao19cjRhjjctF7aXD2Xol6u3FlbRaR6SpQJdDfhtrSq3a?=
 =?iso-8859-1?Q?ZBTw8YvotAzR6HonpBBWJFzMlBNiZIfbn3htJ79MHuQHJZy13JG5nELs7P?=
 =?iso-8859-1?Q?utXzQzJCbUVT9Mh1pDI+PSMa5pnB6AGYW3M7hNj7JkCVu1hNpPVVKuWSAV?=
 =?iso-8859-1?Q?LGjeBYwe4X2GTiBXVhBOzsi500ZOD3b7JXV78AgsPvhCmNft4gmVRFCxYW?=
 =?iso-8859-1?Q?bOizNptBOJh6cds/AfARMhXISWp9F5xAQt+mQrVGteC1PL0wFE/SFLNY+R?=
 =?iso-8859-1?Q?g5+knLPBVwx/l5myQCAS+ZCfG+cg20EtAIW7X5ksnhg4kGO6K02MDG4DeZ?=
 =?iso-8859-1?Q?E9qVsUkvBvanrSrHjPmtagtg9nF7xf/TwKMToYQgtvtQtjjR21gI20lDcC?=
 =?iso-8859-1?Q?a71p7x0C8MTjqZFSB4fx++Ie8ihUabzelqrL8fwSKdx5yUudFC3Ryup0rY?=
 =?iso-8859-1?Q?IQjwyldvs0AOQqjtU76ZOqV0cg8IcYJCfIFsZhK7dZcFzSw9367TTy8abY?=
 =?iso-8859-1?Q?mwB8t0nkbwBy8gPhDJ4UNXKu2oXCAlNYlAKYWdpGs1bvhUWoRj2xc6LH0S?=
 =?iso-8859-1?Q?buHpdolV9RNXKENbpwLRfCCJcN/eN8gZnGJYPMeWKQsMbYP5z/o+GWI9Rw?=
 =?iso-8859-1?Q?qy4ARoZdQw0jUxzj9/sth2gJ4p8BhfgcqnStHoERD2tDRZE/odWrxPi6ny?=
 =?iso-8859-1?Q?xmhIp009udAEWJcKXzFMdK/smKm6fXhkbu/fRyVJV/xqWljn2iGRgy0EIk?=
 =?iso-8859-1?Q?bf8/J3+wjcWx06lMSjnfXcfD7UwrK5uWqQI85aQZlLo/dVLWuGDr/4wS4A?=
 =?iso-8859-1?Q?tGCoK9NKjt0uoFurqmukOe19Ijm0lWAecIc8m3j1VU3ca4TROfr0IgytXD?=
 =?iso-8859-1?Q?TbpU2I3gVaHcjyX4uF2ZDCZGrX+YMpR4NS3g6sQd4lFF52qjviXBaJOjg0?=
 =?iso-8859-1?Q?9VQefgVFEPp5KUqSLUX4yRV0QQwdaKKuUmp00OsMZs6bVQBmQgazQ3ZNqq?=
 =?iso-8859-1?Q?8k3DO1fjCsx1Po4XO7tjCyk4w6pRFZzM10SuU4jPjcJiyNZ7kqJDypwxeF?=
 =?iso-8859-1?Q?ghoPg0GX/63jraEhRuvuyq5QmGVw0P7nZ1G68S/a99jFBVa2V/pVKUD2tm?=
 =?iso-8859-1?Q?9SpL2CVFiBJvIdvJcVM6+rxUwy+dFoX68kQPUBkB76eY0N0OGWwpAmTJ/k?=
 =?iso-8859-1?Q?+oMPe6SY/l2/2WHwK2r+fsxI4Hz8R501BuGN44MDd5e+KXZzUA46+++LVN?=
 =?iso-8859-1?Q?gZVjw/OnL+YtxgWnb6w376ClSLPB19BZzFtB31ynDM+8S4ME6Ffsv8O6wC?=
 =?iso-8859-1?Q?qOhnhKa8l7loWlJ5e4/DQxHspUDV7iHjQODMvB2Gqh9QDvP9cgZoKPe3xU?=
 =?iso-8859-1?Q?BXit9oB518NmcDd1VzUhEG6BTVLaTzQKHDAPum/Tlyr6uVo6bU1OFZzWK2?=
 =?iso-8859-1?Q?c+bA5nF+qlKb+/iE7p1mlhmn6G5QT4C6r+IQSuyVEtzTfhszi3apyIzA?=
 =?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: 99d5b615-eac2-4710-f5e8-08da679eaf3b
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:50.1307
 (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: k5pfXQfzNtJ1YMBZB3LcSik2T7N7VVMFDoCZXYedJnhQCKYgfoUaZRgfpH+Kr+YuxNf7+ZGa7Cf3AtEBP+TJtQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2799
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 bulkscore=0 mlxscore=0 mlxlogscore=999
 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170010
X-Proofpoint-GUID: gjVSYBot5Ryrt7nfQPcKWEudEUKD3Clv
X-Proofpoint-ORIG-GUID: gjVSYBot5Ryrt7nfQPcKWEudEUKD3Clv
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>

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.

Link: https://lkml.kernel.org/r/20220504011345.662299-23-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-39-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/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