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 38/69] optee: remove vma linked list walk
Thread-Topic: [PATCH v12 38/69] optee: remove vma linked list walk
Thread-Index: AQHYm97sDs0BWfIrrkq8fxDJ3WE74A==
Date:   Wed, 20 Jul 2022 02:17:56 +0000
Message-ID: <20220720021727.17018-39-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?CyonYI1okYWcZCJnwQoObIBgFS2Rwp2VdJqyHn/XZmQ1MbH+ZWHD4f2BY9?=
 =?iso-8859-1?Q?PMpYK13eXhgbzBkY0o4miXRmbx1v4adhXqAqzvvi3G6m4MqwnPWcprR43d?=
 =?iso-8859-1?Q?ZFN+8QU2Q40VvAla71lwQnjwiMa2S6oQIzjHhKs39+mz3w3ZtdknQHcOz6?=
 =?iso-8859-1?Q?Lzs/KpOgxUXWbAFJnXaoKsqdTFw/lE9bCGTzwJGS6cpnWC+nnKzsWnyf4s?=
 =?iso-8859-1?Q?KmEt5V5GiTI8Wp72tvnZNNy5eZgX632IaMS4nwveQEWx8otxmz+a7LJDzQ?=
 =?iso-8859-1?Q?zmc1VHlUSQSII+d0BEuv+kZIrlWJWuYPpfH7XKB/sDCcMrdJvbQs3J+GCq?=
 =?iso-8859-1?Q?BGCPBkLwAjVLfn4XFnKIurOHOLNBDrbj4/bqX/6n7Jp1oiBIxVyVdduvA/?=
 =?iso-8859-1?Q?DDuaCYhMUKS4MUj+tHsGuBNFQTotvDZaYh/ytY7+/xAtUbCr8oL4m/jwn9?=
 =?iso-8859-1?Q?GtI1Ue/UfcRqY1YowyAkC7sDszft0H0OVbPY22zQPEbfEXGZxShcb+bpvF?=
 =?iso-8859-1?Q?JFK0MSRXdYyQGs3FSKtyV/aSeFzQx0YI742Tt7Xzgt4jP9DyJPdl5Qyk4+?=
 =?iso-8859-1?Q?+bFLGsber6aSnolqWnEuaeUG/WcE3DM/j0c0NLEBBA1VpsKOsqCTjCcef4?=
 =?iso-8859-1?Q?favJ6wlYP9rsxR+7kHZ8V/sUMQt3ZHRw5XdsBRo+WHDd/jrCFwQhD593ir?=
 =?iso-8859-1?Q?e30q8lDXkSt2OOD9P0f7hjoOCbRBxc3BsiDWxJfct/dnOg3UU2huSPlMcK?=
 =?iso-8859-1?Q?dNaF072hFMeOWKNeSnnbVGIExdyLaL5yxtEGjbJ4eDHboFAqiNvNy3Jmnu?=
 =?iso-8859-1?Q?QXrdkX3lwTa3F1hGQ5RLQM+TuVc4UrytuZegaiix+jaroML78G/hY0UkMo?=
 =?iso-8859-1?Q?W6X7r4+RIbwULwNbES95EC1AwPorTSdZeKStiWMUV+B/WWyE/vXqke+5Fv?=
 =?iso-8859-1?Q?LTm3HRR0t6Er8HQcKQfRi/ntjNkeovuy2JMfj89QZ+FHzeg50lQxKIuj+v?=
 =?iso-8859-1?Q?ndHI1mdNzZrQP0RhW9gK17eqRtf/GKnoVS28v7DnutWQY/e2XRrSeh0efZ?=
 =?iso-8859-1?Q?8IKy1eRhN3U7h/UePFVWLu0jSgAMJsg/zyU0s7CSl6UPHFcx5XW6KNQ/pS?=
 =?iso-8859-1?Q?VSdqd9HSg9kpfymvv8ZVvQYEMuM7IBhJzukR7zPH7Rky8jCQu+w2fpNopN?=
 =?iso-8859-1?Q?PdcY/MZCWLgzCFFvPHC2huzk5E844DaAt5X8JEYrJ2GNFnUGYq4iKIMmDU?=
 =?iso-8859-1?Q?5A2/ppq1VrjguRwb3OdJ0J37da8EuDs8864uuZbUqFmlawDv47pLMtn5kk?=
 =?iso-8859-1?Q?2EMw0gXVm6+7RVb3iIewirrqzJhbuoGChF9hhCDvXykvye9U7H2ZuPevyg?=
 =?iso-8859-1?Q?Eqpi+oU6laMecUJfkZFTHmz4VoGj6UXhzFdBGmA6II1DWESK3IJPSTe2n7?=
 =?iso-8859-1?Q?UyCwXTdBWosM5s3a97CGPJJWe9LlZ0PRdhSgFAdXLgoV6vG79FLs+3Lnkd?=
 =?iso-8859-1?Q?wpFrQPEic6RNe7lznuMPtm4249+zSLQvsZH6qAG+hrdenU4+mEmL2svOOI?=
 =?iso-8859-1?Q?k8pcD1gt/Lq85SxbSn+YIBkkuP8NazNR1rSQpKjrDeAqgeiIUUFKLowPI5?=
 =?iso-8859-1?Q?XZWVaCM56IKpFYTA9GN0s2SVT3Sg/PwC5rBXlBKr4GwrquFU2ELt6igA?=
 =?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: fd613f89-3403-471d-6f1b-08da69f624dd
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:17:56.3211
 (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: COY+11em74wRgcSSjH0PmtYGSg1vqOPJXOIDPr9EMqbbPpbI/5f+YuIkxmv0fRmOZokaQ3DI73xD0/dV0WnsHA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6316
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 malwarescore=0 bulkscore=0 phishscore=0
 suspectscore=0 mlxlogscore=999 adultscore=0 spamscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207200008
X-Proofpoint-GUID: 5pkvMCPSwbRXqMct5sPxbw4yt8nc2PrE
X-Proofpoint-ORIG-GUID: 5pkvMCPSwbRXqMct5sPxbw4yt8nc2PrE
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