From patchwork Tue Mar 4 08:51:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piotr Jaroszynski X-Patchwork-Id: 14000192 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 DBB3FC282D0 for ; Tue, 4 Mar 2025 08:52:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 69C996B0082; Tue, 4 Mar 2025 03:52:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 64A966B0083; Tue, 4 Mar 2025 03:52:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 49E846B0085; Tue, 4 Mar 2025 03:52:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2B4C96B0082 for ; Tue, 4 Mar 2025 03:52:27 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A4C65A803F for ; Tue, 4 Mar 2025 08:52:26 +0000 (UTC) X-FDA: 83183252292.28.BFF610D Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2055.outbound.protection.outlook.com [40.107.93.55]) by imf12.hostedemail.com (Postfix) with ESMTP id C799040005 for ; Tue, 4 Mar 2025 08:52:23 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=c7psLGID; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf12.hostedemail.com: domain of pjaroszynski@nvidia.com designates 40.107.93.55 as permitted sender) smtp.mailfrom=pjaroszynski@nvidia.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1741078344; a=rsa-sha256; cv=pass; b=T6x+zV9e2s0xFiNEW+YLgbkpmwWZlRdqUsePfdt1viJcIfbTzAs+1OhFDFdgvEYnKZI9Lm bSM+mWQrzTSPzqycOD/mFVRopShQBJNbBilolPUYQwm6Ksp30wtQ8mypYp9BE4tCFw+j5n ZWgw8An+Htg0DujyMo9EbUe1FAy7iWE= ARC-Authentication-Results: i=2; imf12.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=c7psLGID; dmarc=pass (policy=reject) header.from=nvidia.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf12.hostedemail.com: domain of pjaroszynski@nvidia.com designates 40.107.93.55 as permitted sender) smtp.mailfrom=pjaroszynski@nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741078344; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=ZAe6L4zOkZIjune8IJ9KuwFvdUSyMTWrPfq2G5pA5WA=; b=oTkiEjdg3fB6rmVnQ3hehqeFaMW8kNmXXEmVMdBdgU0d5sXTLPj8XrOTy141r5JmDzTrtj aHD90pJrOGo4b1+wtJu0rImJgrnPsMD7Ts+D9d684qvncYCXcwM4gzWomIiBv/mKuLSO3A ZopxF7/kWac8ojrRX2ACTDqiIHODytc= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YVIxVkvvApEbBTANsiaBge51mhP0mLWhqDijt9W1R2Y4o++JXYQjdgww+tzZRHpukUCd26b8wRvGcVC9cF5N1Lk+otodtIpm/38cYYAD1+52vKPYPYtFV4s0x/wY843vYGsd/g/Ph4BXAg06mAgppxyibsZCpTunB4faX3w1UNfS4wYbQrgPptSCHzfIshELDVwfl8bEbmKYgF8ELO6pCgwp9cCpHMUSYhmWGPJIgb9zwglts9raRns3QW4sxb7m0nvJvZkx6C+FjMG1qe4Yln1MatnEl+oZ1yOcmPygT5jPIzOgcfmd43cFBx/4rNROe9NooIuIDJmh4HJKrw7ErQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=ZAe6L4zOkZIjune8IJ9KuwFvdUSyMTWrPfq2G5pA5WA=; b=mriJ2SCH95YWx5Oqjh26DJnlc5HaI0OXYSeGR6UQs7qbRCV2BfrNlbzYTT4KaS8lmAcMcfBn7QACt9l2W0Gt0kL8+qOOgNxz5yvqzplZECiNd/eEjBgaoLc6OMT32q+wLI5b6S3a17mmtCuTWi9aWKUK7fk3f1zX9PHWumXoB4r9jnSqQ2iUjsqNkCXNNjQMcuN7XCd9AoQmfW9tgIn4lyrCIg7Nlozd1ZRhTbe/gc24f5eJgKfzWVT4J0X1pa6LavB5eieUhLDtJH576rKXOCXpQXkpTVbhHkeCx9QnpmZvod77ZmBvV3aMVDm3BaFRMZXZNHwhShVc5zcAntq12g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZAe6L4zOkZIjune8IJ9KuwFvdUSyMTWrPfq2G5pA5WA=; b=c7psLGID46h5D7Ad5njuBLy/wJO0KZCvz4FD4iwpQwjqWjVfjFlkMDTFalLlpBuW93A+koXJztej+Lv9E9nPhCKiTWMMQavv5PnVGPmIop4wmUlfb0HurFnXDh6sKvUvocwy0mHDM5rL3xGvqG0rZplMp8dNRRMVFo8spUDMu7nIvPjyCR/nsd+QgB+navGhd3l/qxf6XMSmHshnfDAn7QJMd5EM8loBbReop8pozz9grro8zmWw7vSU8qZ4JDTkMiCdV3L/jz87fyDNj9qv9pKiXvZGWLqP6+caKvb4NU7ZEbdgXgxtbjWdHJoOAwtTFty/Lv/67bUa+FcL4Z56eg== Received: from PH7PR12MB5806.namprd12.prod.outlook.com (2603:10b6:510:1d2::10) by LV8PR12MB9084.namprd12.prod.outlook.com (2603:10b6:408:18e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.29; Tue, 4 Mar 2025 08:52:20 +0000 Received: from PH7PR12MB5806.namprd12.prod.outlook.com ([fe80::8c4f:2ac9:74da:dca6]) by PH7PR12MB5806.namprd12.prod.outlook.com ([fe80::8c4f:2ac9:74da:dca6%4]) with mapi id 15.20.8489.025; Tue, 4 Mar 2025 08:52:20 +0000 From: Piotr Jaroszynski To: Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Cc: Piotr Jaroszynski , Robin Murphy , Alistair Popple , Raghavendra Rao Ananta , SeongJae Park , Jason Gunthorpe , John Hubbard , Nicolin Chen , iommu@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] [arm64/tlb] Fix mmu notifiers for range-based invalidates Date: Tue, 4 Mar 2025 00:51:27 -0800 Message-Id: <20250304085127.2238030-1-pjaroszynski@nvidia.com> X-Mailer: git-send-email 2.22.1.7.gac84d6e93c.dirty X-NVConfidentiality: public X-ClientProxiedBy: BY3PR04CA0006.namprd04.prod.outlook.com (2603:10b6:a03:217::11) To PH7PR12MB5806.namprd12.prod.outlook.com (2603:10b6:510:1d2::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR12MB5806:EE_|LV8PR12MB9084:EE_ X-MS-Office365-Filtering-Correlation-Id: b5435643-a550-4bf6-1657-08dd5af9dfd1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|1800799024|376014|7053199007; X-Microsoft-Antispam-Message-Info: lj3621k4GI98mexXGF3neFexjM7brjK3oArDWOtqSzJIbNW4CJAlQjFhG0jsoI4nH5ZrDWidl21yys50mzon4qgXeFgnOTMkX7mRKO9zuZXlcQRFz3CZLTIWORXctWpbhPqncF8UdW+Xe6xctQVYupvjJvqXj3vV8MLEY7i4B23qefh+94wQYn+F+s78yjMZdbOgCiyTS2ZS9jurBRUBQuRob9YesMhEbhjNWB7Nxc8SAromjTkKa37m1DOB8HxYfAqvn/PSYIe0apf/9+HmUHkInV8eNhkncxLSbVqVYHJrm/zdLb3vfp6/umUXMHZebjkn9z3EgZpVryROppPM/PqFyoJxgKLaKTHC9HXd2m2xH7doCkaguJNhZuVkzHKIoWvTKJUmDtm6OV6v24T7k1xQHoxOLaRAL44p558T5RQAfYKH5FZq3Eu6J4Olfg4+ZN6CINw6PwDCbVbuAIVeKSiKIiVSzZpnM0Zv9TY3C06A2tuECXTb//xd+yAyZcZF2Ir0LGr2FBzVXCEVHM5ZOuvz257IrO/dxU61inyzfCVNxs9lpGer+Bxn2VcMJjfEoRruYmhY91iv7IdSIWZuelX60/UJuWJsafwgfGEzETFjC+feqX+r2EdkE9u/DwowsYYwt+KS1hKnyDDTriG0xlXaPZ3r7lrBcylfyMuKE+w+CH6aKetNjspAfbXKNwTHEsVsTkJr8DuBnW+OiQ95ZONfpRoOcUieK1EM/b8zgs7mJJNLfTemrdiE6xQVcqahApqTaXoCMrG6ChMnipyP1bq2PPUNm0s4zPXbY+H4Q+ge4CeSZYXPX8F7FEhHUPAA20ItB4hE4nqsXe5y/7b2X/jLFvQFsTT4uK/8PzK22/DBE/wXabiBDhJn0aHEH4Hhw1inkIghbZ/E4kRsKH8wZgg8vSGPMqehMFQOhHiqc6MU//C/OgudFLiQr5Ep8WyrFyl7Qa4Z+IEQ5ItHQJlu5jxx8ApJ2VLEui3timk8lT0x6HeCnnwbzY5u3ADhYT8hBsAo+jv+2K5i7E2UEIHaU1cENIrODaw8pLoXdA1FwL+t2/Afi0BTtb+nb7G8OR1stdhAIIkiQ5nIjJTpjAMnbnPgRqEEmU+C1dT3VYqM2X1puObIXhqSrlRJBO26zhSncUgoO5Eyms2pZTYjPGHo5YWEZSjs/yOqx6w/ZGUgBCpeg+bOE4YRJnjMvajcMUQqSWXSb9Z0CeWUk1rKb/svNcshB4TngHxReNwdHsS4s6dXG6ztvOOXPVoxx0rpEoAv22i5M1rauz2M4+6HKEZkH6MIc6+bQPwMgq0CMQb0ffGqI3FTeWExlzkDVydLFChc4fPQNo9RLw7FHYKgjVCFdnQJXtJEzON5PykSc+FQExOKvb1hUnm2fvMWgS/O3ddp X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR12MB5806.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(7416014)(1800799024)(376014)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3Pwpj2Y8pIgLVMwCtB3SLafijtTZqVaWTllOi7S3CV62vpHSl9WhK191KOKqjcn+SWdRpVnBG/fDGyV438Ws/2NYloTsJdTmQ7x0D1YRcaDrv+CtU/3NfFtlTtvB+VJrwd7pIGK7YdKW0HRhxkpDddnffaQOb6EkUXbNt3+BkCBlalMoezBG0geATPHSdtTD/vtNgsOqrpA0CRgi03jjq5Qo35NY91f8Wkun8unCSoNEmLzc8ATVqRwT/n9d72ylj53bPHBUK+pXJs0J44WMfmKF+DkDYIbj5RmymU08UbK+3HjohQiJ5QwN5QgXGDJXpmuquIMH/J27k4KQfEB0uj0Bi7s+pf5Bl6ozQYWcdRZdp4+tFUgcb4hOZqHoHCa8OvNjBq3QPdMiZwnyzyEwiEsXnOkClUZ71CTTjBIRM6I+POy7SiozyrDwsCKwmS17wA4oVTPHIEs6YDF7VnE/6DMfm9SHwGBMP35qAxVwqtfsinfnUKCdyLDMkoQPNSVZYM/VJ0bFAgXiByD0qjKN0kKNtXR0mNNLdZ3M7gDwQqizO846rpVOuzH2xZtRCZZrLljYhDKa3ylHxI23Hh1ZRYN5ZYowCgKAHyu4veMSncIcRj1oHxdSAdWvP2JhExgHqW0VE/GHEpLKVwjulorvsjN5HvxWAMKAne6cCIi//I9yW5IstsdM0a6s3NndUfwrnyz2PZMdPmTwvimAWBebgAa8hJYVPrGSG2aEuwnq265yj/sXue84qGdXuFus3eTOyJ41GO7qZoBZ9NoMH7CAca8V9b93CBpnBPHRcp2P39qBMVOF2YLJqGE2HGoaBtpLrP8Sx1IxFLpZ50rnBFKSSYxdey3FRmM8uk6zcR70uXiHx0dULo01DsVyctW+jwStjX1DsSEO1Z/KTutB9t/s81Ov+S374nfjLF+H48eDe5jLV7timAZTfgGwn85EoMjuREMN5XAvXvniSbZQw0w21yxVUmuIkmL25qh6cEvZWdCPXkMjYPx7vnald6dzJJ/0Geim58BwXqRlVKTlsgnQ7IDeDJhr4nKw1/rz7s+Et8IPgsCp/ybgYJfDXbzcMUzRDxc3TJZV7OPGtPJnwvM23oUpm8CF52cz+CJCSjN0vOdLAIAcX0s9s87zqS05NeLFowqF90mAum4UUZnCy0IN9KZEMF1vM2R2DFyi3ZwiofDpimOniImvenCObRdB8ONuzCUnGkI0GwBiCyq6BmAqOZARfTJL+O1mIeMu1e9U1k6B4fjuRH3gctVl1+m6WUz0a7qeRwGFWpVL6h2J4a11l33tTef/xcHCZKzR0iORtPBL0JLCuEr0AttMoc4fvcuGtAxA5ZI0e20At0Xepo0xa7UDGhngwr8wVVwzc4x3zN0g6g2O5Cz/zm2G4A0iQwd9zUEhDru6hIfC17PgkaWl8UUR88OEqo9QSU+o46LkjI5hanwTlXwgRuKaGrl7Jc/5dWxRG+Qx3NMUzlarv/7CkZxiuQTh4OBM8g9Sf6nRz5DQKk/hKxn0N5D/Oc+bkz0XpIyTVa55I/JcDifCMYcr/ApEEGAykZ1xrFOfQL5rXoPhBk6pWgj40iVYFS78kJBIyVGMlqOWuckzIfmqAAmi/A== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5435643-a550-4bf6-1657-08dd5af9dfd1 X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB5806.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 08:52:20.6235 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: q0iF9Pks1s3DYFxh+YpzVF/MD8+aQvjnpTkeUsoSzb1uuUnZ3UsbFb2yAbolWelCPhU/bFhevkcoV8ANA8EuiA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9084 X-Rspamd-Queue-Id: C799040005 X-Stat-Signature: 1mbi7459gxsr53gsbtc5yko6dxmjr4fr X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1741078343-528762 X-HE-Meta: U2FsdGVkX1/448xgOpeCkI+1YMbEWYC9snKKTflLWrRm/k2ki+naHXcaEVKl7JiCFGemgLKcwQsfJxUfFh4RQL7KkJdw2N8GJWGA3lCp7rPTtjwPfxds2Bo0bjVwgkUuuv00DWqDB7CwKNfolUkM2dBmLiYaPsM4pi0Pa2e9A0zfs9BFX454Pw3jNRsJHgZ/ZLsxScvkHLQ62BCyvV46WnysU+RpD6MsFS8GVhbsIpj4gHHtas7eNeUL9YgF3PPJaxhb2Pzg0PCluJGu/6nYjLRytl56WDGA5raldax3SliSGwVYIvOJQGgB348NMGQgYFjl6/DDhGndzasL7PTD2gBEemI+IZxo1yNr2q/Ac5JrWf0g4BcnQsckvHXFDIlG91RLosKC5H0Q5nqH1QRkHrUhElYr1d/V3tmOpf8QFzJ2m5raw+JeaQBfGn1kaodGZ0MNMYYWfo9zXLoOOrRc4tq4VYsI594CvUT30YxBY2m+feGm/7jMMJS3AOQrTMd+riTfX5OkkpliBcAJ9y0EWkic6IT01OmU9AByMTXJa3n2xzIxEO9foW8VYIHWfzlDl7aqAEcNnO5Q/6rZXjv/yEOpudKBrlvtUCluwJdVivfMO9ClB1ZlUnDgr07pc/kd8vtqFEIbepQB2A/mrZl2+BiNrIaYsPi0mFEkcpALhILj6sep3fVNUN4/3QSrf/g+WKDUc/Mn4LM8SViFiqKFeE1ASmxqQicjxYvHWGrkH8EMpdqnVDw19uKoMoN8UR5FtA3kgOpMdQbnk7foJidNh8JH5C0YFWasnH47DZlCBggrDYL9UpCT//Mp+g1Th0WY5er96bWCHIJhis1Vzvt4XlD1D+wBRBaa65vEoPS8w6buOjUAmCPF//qwYaakmBIn9Qs4pdKtNpNBXMLvZospo9vLrh/Qbr/hWVDqaI6H6a0Hg92+MEjqMMaYXAshT99ayWtY371D3lQo3NfaEMA SJ6Tj/6X VCeb1BrBc9+Mt0dpMxjMwtLy50GegkX+gvH3Q6BoeWRPev6zKf+9XroqtHOx+jvxy0ZT8A4rGqji4pPeOnefMhuqRcoT9MjQ4q4Lh9BJPvlCyOccXOIMyGX43r98MJJ8ZPGfIY+NpivYv2vXb/CqldYIjVPewyTNU9AjJk5RpMzTMEwNfRn03Lsw6/i5KLVd83TAKKnBqbDP7BpdGqq2EPSNJzXAuXKq0VTq8ZNOaGbsGNYb0sZVdtZCSiga/TgOM0AFGUZnC0yZzs1wUK7676hvZKSrHjfGio64Q5Wcn1uq2TqKkkRlTAgJwEFXaA2TbYgYTsbNEAQN9LMyVtvOlkugJwETO7GGyhDWj+Jv+11Dmxbfsc1ITeYXsLE5YmpzflXChIHWzH21Mxf33o/+UfkCqA7thZcEwG2wUCec2uxpP5+zGRvj1RDJg75xeu/v6dz55Zr4W3XocEpuEL/Ap7b+wnKePbAcAGqGVpukjWI081zFH42vMH+iX4CJQeGiulF1X9P+fvjO7FbBvkHYK/6XwDGMxUaB/FD7wNW4PDfIfMT8DvCxOSc/5NbNthEuhfOJ91SO1hjWh/2rxJio9xcuggyD/V6PjpIXZGZG7ykvmUtU= 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: List-Subscribe: List-Unsubscribe: Update the __flush_tlb_range_op macro not to modify its parameters as these are unexepcted semantics. In practice, this fixes the call to mmu_notifier_arch_invalidate_secondary_tlbs() in __flush_tlb_range_nosync() to use the correct range instead of an empty range with start=end. The empty range was (un)lucky as it results in taking the invalidate-all path that doesn't cause correctness issues, but can certainly result in suboptimal perf. This has been broken since commit 6bbd42e2df8f ("mmu_notifiers: call invalidate_range() when invalidating TLBs") when the call to the notifiers was added to __flush_tlb_range(). It predates the addition of the __flush_tlb_range_op() macro from commit 360839027a6e ("arm64: tlb: Refactor the core flush algorithm of __flush_tlb_range") that made the bug hard to spot. Fixes: 6bbd42e2df8f ("mmu_notifiers: call invalidate_range() when invalidating TLBs") Signed-off-by: Piotr Jaroszynski Cc: Catalin Marinas Cc: Will Deacon Cc: Robin Murphy Cc: Alistair Popple Cc: Raghavendra Rao Ananta Cc: SeongJae Park Cc: Jason Gunthorpe Cc: John Hubbard Cc: Nicolin Chen Cc: linux-arm-kernel@lists.infradead.org Cc: iommu@lists.linux.dev Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org --- arch/arm64/include/asm/tlbflush.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) base-commit: 99fa936e8e4f117d62f229003c9799686f74cebc diff --git a/arch/arm64/include/asm/tlbflush.h b/arch/arm64/include/asm/tlbflush.h index bc94e036a26b..8104aee4f9a0 100644 --- a/arch/arm64/include/asm/tlbflush.h +++ b/arch/arm64/include/asm/tlbflush.h @@ -396,33 +396,35 @@ static inline void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch) #define __flush_tlb_range_op(op, start, pages, stride, \ asid, tlb_level, tlbi_user, lpa2) \ do { \ + typeof(start) __flush_start = start; \ + typeof(pages) __flush_pages = pages; \ int num = 0; \ int scale = 3; \ int shift = lpa2 ? 16 : PAGE_SHIFT; \ unsigned long addr; \ \ - while (pages > 0) { \ + while (__flush_pages > 0) { \ if (!system_supports_tlb_range() || \ - pages == 1 || \ - (lpa2 && start != ALIGN(start, SZ_64K))) { \ - addr = __TLBI_VADDR(start, asid); \ + __flush_pages == 1 || \ + (lpa2 && __flush_start != ALIGN(__flush_start, SZ_64K))) { \ + addr = __TLBI_VADDR(__flush_start, asid); \ __tlbi_level(op, addr, tlb_level); \ if (tlbi_user) \ __tlbi_user_level(op, addr, tlb_level); \ - start += stride; \ - pages -= stride >> PAGE_SHIFT; \ + __flush_start += stride; \ + __flush_pages -= stride >> PAGE_SHIFT; \ continue; \ } \ \ - num = __TLBI_RANGE_NUM(pages, scale); \ + num = __TLBI_RANGE_NUM(__flush_pages, scale); \ if (num >= 0) { \ - addr = __TLBI_VADDR_RANGE(start >> shift, asid, \ + addr = __TLBI_VADDR_RANGE(__flush_start >> shift, asid, \ scale, num, tlb_level); \ __tlbi(r##op, addr); \ if (tlbi_user) \ __tlbi_user(r##op, addr); \ - start += __TLBI_RANGE_PAGES(num, scale) << PAGE_SHIFT; \ - pages -= __TLBI_RANGE_PAGES(num, scale); \ + __flush_start += __TLBI_RANGE_PAGES(num, scale) << PAGE_SHIFT; \ + __flush_pages -= __TLBI_RANGE_PAGES(num, scale);\ } \ scale--; \ } \