From patchwork Sun Jul 17 02:46:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12920372 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4D3AC43334 for ; Sun, 17 Jul 2022 02:47:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 94AA6940018; Sat, 16 Jul 2022 22:47:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F34F940015; Sat, 16 Jul 2022 22:47:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6352E940018; Sat, 16 Jul 2022 22:47:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4C43A940015 for ; Sat, 16 Jul 2022 22:47:32 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2F44F33F9F for ; Sun, 17 Jul 2022 02:47:32 +0000 (UTC) X-FDA: 79695055944.23.4439517 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf19.hostedemail.com (Postfix) with ESMTP id A76B71A0042 for ; Sun, 17 Jul 2022 02:47:31 +0000 (UTC) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26GJ8glW009607; Sun, 17 Jul 2022 02:47:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2022-7-12; bh=jEwSgLQTZcZTeoMs8f4vND+DNkMImNDsd8CCWIy917Q=; b=pY0nXY637isz2sTxGQnxaL+iInGtrtcZJ4juX6pR8sXKyK/LFI6xMzpRR16ztBreQGfo r+sB7Dc498TtUkjaAy6XOeCGy7xo+LMHyyfrQXqfeHsfPDaLDlazO/a08mufUDrlFOzD 4gk5OTPoaR0ItW4kRk3v4TrlycssJg8f485SvrCiLMwXBjiuAC+g/aIRQvaJNSWwEfmk pKc8y2ROE57+AqGnmMNhlnbE4fSETetR0JdAB1IjL0Kl9y6HTDWfGsUiGYxd6j/NFjXe LxBdeSH3rwFiQQTmgLASav8ZZScFryyb9t9mlwvwJ+k0T5mm6Ugp+fhcgDHOHyzt95iE mA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbkrc0yna-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Jul 2022 02:47:29 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26GMYISL036113; Sun, 17 Jul 2022 02:47:28 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1ejp6a8-9 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Jul 2022 02:47:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g/zHBGkhgSzrj7sJcXC14RSEP2mGTfPuVNLmUxjX5L3tJmNnkj0ynnnBigVKLowNYHij61d0JhDEbi6xc6vm9SciyNEqG2u4ClW5JPCnWtoihn/lsuqu/29f5zPo3H0T/gIzNsmPg3EjlOka3jxlk5lv/LNUaHOLaQvgjOXnLczv0u70fdnwsubaVHLZpavIOeuAn0zE91dKEAANyz0Pp2Kg23RLyxsNeDiJOHe+NdScZgTlmvltLNTpPewIuSmtri0v9B1EStrLLphnCEONk202N8an2mt8M6wNEWEybyIyx13KNBY+M7cvLZyexP8JBsEJ5NPLZl46zuKrqTBF/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jEwSgLQTZcZTeoMs8f4vND+DNkMImNDsd8CCWIy917Q=; b=KgGvrTm+ylH5Q66AyXxD0nb4YzTij+9ZDtlfk7Q9eeki/8TboA0ZwYFaLcc2EQK8tMM55kmFWyl5RlA7CgzLxCpMz8udxQoMaqwUbo9wxMg8FFRk2F/RR052kynAHcxbjczY1icbP+DyKdRmiDwfBcSoGe1q+6ETyzoUxXr09jQ7RJgSvqf/RkSlnn+P5vCnDssjnZarvjn0DH0IXOf5X2HqLZIP8RkAGK2xOl8r69X+vpkQbI2f43BqjRRKEgS3A0FOoHdhzMv3Qjqgi7rPU/AoW8cy8WvqCV6ChWmxdkpbyr5zv1GdX2je+1rvZASdOVcQQJnS+cWgULkzhRwEhQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jEwSgLQTZcZTeoMs8f4vND+DNkMImNDsd8CCWIy917Q=; b=CjvWXDwCppxLJc5CKd21oU/pIoEuasovF80T+PD5nUcXt0q86kYYt18cNNg0UhI4VhInpXxeeu8YP+qEQ25Vtrfx1vJfDbPwicttYEh0r+acTG7u/SmBo5OxWMU+znuii0uUO5U/QEOAx2b/AHm/VxptMjfFR5c39zUTEjGHqx4= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by SN6PR10MB2799.namprd10.prod.outlook.com (2603:10b6:805:d9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.20; Sun, 17 Jul 2022 02:47:26 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d1:edc3:7d21:7c68]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d1:edc3:7d21:7c68%6]) with mapi id 15.20.5438.020; Sun, 17 Jul 2022 02:47:26 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , Yu Zhao , Hugh Dickins 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-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 99d5b615-eac2-4710-f5e8-08da679eaf3b x-ms-traffictypediagnostic: SN6PR10MB2799:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9mzj+QFPV8CNEQiZ9kGxizx+kXAsj0jenCXvw8RVe0epUzlngdYFV0I7KlVyrHIecOxOSxYp5HeuBsO0rPwo1PUOe2jwUYNkKf7ZIcv3b6Jcue8egyXzWVwyI1cONl0eCHgQ8jTwsRuZuofC/0vD1DDQ+ojKVi79KobneSpPE/108BYnOqda+IMgpD8G5cgEGPoGLd4oCzA+JRyf5XMuWNrnuZyELIPvFW9T9iN16b8sXYUB8nV92FioBi6SDJ58641YA0LNXszLES2aGbJCmdi6yuNq+b+G4iD7TJrl6wXhAw++cGyv8AYOYoztTMpNxSNLkubT60a2d7Z/6mgzJ8f2nehUR/U+usbicaZRKc4eVzQhovaUQXrrrKb1Sl0qWf2igqY/1g5qeJb6kbdZvuylYa+3p8ytFKBatgHeQRIbxHfabSqYP+w4lM1OjsBjJRZ9NvrTqlKOqU7XdRo++8GG3aCOUHhuJdTVmGPJANBwtZL0THsojRhhSnwoPURJGLea9Y4J558CyLvA8bIoVpP9tVom1Zd5JF9bCh5FIG8fz3gVnIURRUWiFpNK3WOdI6WTUOA4NlO+xy9bh5ePdyqEIJHW4OigKZ33Gv4gvOdsHNdT2NNXTU0Br/vEwB8fQmRT6jiJNk5UyWZIhBI+s9vqzz/pTkEtyK8BKbMeYGzRFuN00xrqkdq/uOkEr3s4WMSN/IltrljzLyrmXWL0df30qKtqQHRri9TuVemtmXMWjyry0QaMjMI+LOIY9nScbzDdDQqH1r20kZnVwklPF/8Dv6cgioONAcFkSGNwGEu0tiVhkZsd1VLVjEqzfgnPAhRz7zvrirMaH8ZdsGjNj17UBF+DJIkAQCbpogNnJO7RGrdQyRfzLKgfdG/vQwxr x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(376002)(346002)(396003)(136003)(366004)(83380400001)(66446008)(66556008)(64756008)(66946007)(8676002)(122000001)(1076003)(2616005)(66476007)(186003)(38100700002)(91956017)(38070700005)(478600001)(6486002)(8936002)(5660300002)(44832011)(26005)(6666004)(41300700001)(6512007)(71200400001)(966005)(6506007)(316002)(110136005)(36756003)(2906002)(76116006)(86362001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?OOONHetoYAxh3fAKLSqFxiN?= =?iso-8859-1?q?pbpNnIQfhQ7FdKueXXHb9cSOwT9WWvKqJntnI1Adgic8UAlD5Lmy8NipUSys?= =?iso-8859-1?q?z/lHjrSavWDC6BU22lqH0KgfV1lR6ABh3FjBzljXmMUVQBG1lP8h4+akA/eF?= =?iso-8859-1?q?glL0FzFcnuCQG4qcauzwuJeccsL2VVFNgmy0LKhdjPp8Ao19cjRhjjctF7aX?= =?iso-8859-1?q?D2Xol6u3FlbRaR6SpQJdDfhtrSq3aZBTw8YvotAzR6HonpBBWJFzMlBNiZIf?= =?iso-8859-1?q?bn3htJ79MHuQHJZy13JG5nELs7PutXzQzJCbUVT9Mh1pDI+PSMa5pnB6AGYW?= =?iso-8859-1?q?3M7hNj7JkCVu1hNpPVVKuWSAVLGjeBYwe4X2GTiBXVhBOzsi500ZOD3b7JXV?= =?iso-8859-1?q?78AgsPvhCmNft4gmVRFCxYWbOizNptBOJh6cds/AfARMhXISWp9F5xAQt+mQ?= =?iso-8859-1?q?rVGteC1PL0wFE/SFLNY+Rg5+knLPBVwx/l5myQCAS+ZCfG+cg20EtAIW7X5k?= =?iso-8859-1?q?snhg4kGO6K02MDG4DeZE9qVsUkvBvanrSrHjPmtagtg9nF7xf/TwKMToYQgt?= =?iso-8859-1?q?vtQtjjR21gI20lDcCa71p7x0C8MTjqZFSB4fx++Ie8ihUabzelqrL8fwSKdx?= =?iso-8859-1?q?5yUudFC3Ryup0rYIQjwyldvs0AOQqjtU76ZOqV0cg8IcYJCfIFsZhK7dZcFz?= =?iso-8859-1?q?Sw9367TTy8abYmwB8t0nkbwBy8gPhDJ4UNXKu2oXCAlNYlAKYWdpGs1bvhUW?= =?iso-8859-1?q?oRj2xc6LH0SbuHpdolV9RNXKENbpwLRfCCJcN/eN8gZnGJYPMeWKQsMbYP5z?= =?iso-8859-1?q?/o+GWI9Rwqy4ARoZdQw0jUxzj9/sth2gJ4p8BhfgcqnStHoERD2tDRZE/odW?= =?iso-8859-1?q?rxPi6nyxmhIp009udAEWJcKXzFMdK/smKm6fXhkbu/fRyVJV/xqWljn2iGRg?= =?iso-8859-1?q?y0EIkbf8/J3+wjcWx06lMSjnfXcfD7UwrK5uWqQI85aQZlLo/dVLWuGDr/4w?= =?iso-8859-1?q?S4AtGCoK9NKjt0uoFurqmukOe19Ijm0lWAecIc8m3j1VU3ca4TROfr0IgytX?= =?iso-8859-1?q?DTbpU2I3gVaHcjyX4uF2ZDCZGrX+YMpR4NS3g6sQd4lFF52qjviXBaJOjg09?= =?iso-8859-1?q?VQefgVFEPp5KUqSLUX4yRV0QQwdaKKuUmp00OsMZs6bVQBmQgazQ3ZNqq8k3?= =?iso-8859-1?q?DO1fjCsx1Po4XO7tjCyk4w6pRFZzM10SuU4jPjcJiyNZ7kqJDypwxeFghoPg?= =?iso-8859-1?q?0GX/63jraEhRuvuyq5QmGVw0P7nZ1G68S/a99jFBVa2V/pVKUD2tm9SpL2CV?= =?iso-8859-1?q?FiBJvIdvJcVM6+rxUwy+dFoX68kQPUBkB76eY0N0OGWwpAmTJ/k+oMPe6SY/?= =?iso-8859-1?q?l2/2WHwK2r+fsxI4Hz8R501BuGN44MDd5e+KXZzUA46+++LVNgZVjw/OnL+Y?= =?iso-8859-1?q?txgWnb6w376ClSLPB19BZzFtB31ynDM+8S4ME6Ffsv8O6wCqOhnhKa8l7loW?= =?iso-8859-1?q?lJ5e4/DQxHspUDV7iHjQODMvB2Gqh9QDvP9cgZoKPe3xUBXit9oB518NmcDd?= =?iso-8859-1?q?1VzUhEG6BTVLaTzQKHDAPum/Tlyr6uVo6bU1OFZzWK2c+bA5nF+qlKb+/iE7?= =?iso-8859-1?q?p1mlhmn6G5QT4C6r+IQSuyVEtzTfhszi3apyIzA=3D=3D?= 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 ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658026051; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jEwSgLQTZcZTeoMs8f4vND+DNkMImNDsd8CCWIy917Q=; b=wlpa0cis6H6/JxCBqkGiwoF4DH1a7WIZHbbVhda00Xc9HUvbg8fVWxjZsKa7XimydO9RX2 66MdDFqZYLyIGx/DzzOEFH1H3WYPPUIplRMAQ6LWDzvS10D8sEUC9W+ZpR3NPm1DN5FV3i mjr4MXV+9B1cYw9xBMB2gIJwv4l54l8= ARC-Authentication-Results: i=2; imf19.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=pY0nXY63; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=CjvWXDwC; spf=none (imf19.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1658026051; a=rsa-sha256; cv=pass; b=PpPuGC6QEKbpJ0nQtjgnevEN68CXuxGnMZcdiJ8oAfmXnTmSt3FGCucOKhZO0hwuZO4P3y /UqUX7twfEq1PA4SE2RKyZjyq5DRqf24ZGalc9/iDmkAHRnsQTiPq5LObOiErI9NfosOvm v4/kc61I72yjJD/KGXKJHe1RCljYksY= X-Stat-Signature: fxdgd9dw9qnjohi8ox7s4sxab3je1unq X-Rspamd-Queue-Id: A76B71A0042 X-Rspamd-Server: rspam02 X-Rspam-User: Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=pY0nXY63; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=CjvWXDwC; spf=none (imf19.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") X-HE-Tag: 1658026051-129297 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Matthew Wilcox (Oracle)" 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@oracle.com Link: https://lkml.kernel.org/r/20220621204632.3370049-39-Liam.Howlett@oracle.com Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Liam R. Howlett Acked-by: Vlastimil Babka Cc: Catalin Marinas Cc: David Howells Cc: SeongJae Park Cc: Will Deacon Cc: Davidlohr Bueso Signed-off-by: Andrew Morton --- 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 } -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 >= end) - return 0; - vma = 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; } - return -EINVAL; + return 0; } 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 num_pages) return 0; mmap_read_lock(mm); - rc = __check_mem_type(find_vma(mm, start), - start + num_pages * PAGE_SIZE); + rc = __check_mem_type(mm, start, start + num_pages * PAGE_SIZE); mmap_read_unlock(mm); return rc;