From patchwork Tue Nov 19 20:09:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 13880502 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5BDDBD6C290 for ; Tue, 19 Nov 2024 20:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-ID:Date:Subject:Cc:To:From:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=XyYmh25NfnRbNK5V0OBox36zmkdRcEDANamgeVO2zZA=; b=kR5kFx0hRjHljmeKaIYqTFFvuY opqUzRD7wiMt8pUh6EpC6FIwxyTugA+oQFHlUBPTMP5gWa4ybvGQex8VebdpHK7/HY4dMMr5kuWmA KREkjlYqNJvyN79ECfRtLkXd1cU5pD8hMvG/2rhyCP3exPhmtjfOrmiQoWL0VhA/98qbRl/M28Y1P UCc3pqLCAguGQMc8wlyd8ocnqYUqgc3O0e/9PTmMRX5zd6tfr+sFexOIdK+GgWfzP1/RmU5rPtwHL yjST62edUBfsq8GY9sp4CujmPWPnhHEVyoEYGss82O/SWcprMDFMxfXTbJmzUMn2+9lbUpN4x3duy pKPxzJCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tDUYZ-0000000DeNE-2FXz; Tue, 19 Nov 2024 20:10:39 +0000 Received: from mail-northcentralusazlp170100001.outbound.protection.outlook.com ([2a01:111:f403:c105::1] helo=CH1PR05CU001.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tDUXX-0000000DeAF-3Sc5 for linux-arm-kernel@lists.infradead.org; Tue, 19 Nov 2024 20:09:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Z9W9TvU6z8wfmwY1naF/PdWW8NyBSnrW4wmXz2c6K1ITF0nuax8wohgVCgyPEgJuTznBBKABkDxyWu9P29j0E0SChozOgMtVVCKUzhMg8AjsDOyHtVpGgdAyOhvjtbvGcUeWohK9Yo4mzxGfTJPPi+ISVU/D40pV15rZOrhPX+AyywTx7Ics30wJWAXXx+D+DN4g9Pmdf+UNprUBfGkdOkfMG+Kw+GfKl3VhPOBszr5j/lExyor/27vUmB1omc9eKhoHls+HTWzREHzqe/6/y1Yc6QKdPWtXSjeuoODzFyzcJRbqEYnY/rxuhiIu9JeU2uilELSsmuz46uCPNsnEdw== 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=XyYmh25NfnRbNK5V0OBox36zmkdRcEDANamgeVO2zZA=; b=xwJao7w1sxeXc4VCuv3GUfUDcZrmNT8nUB+9e5M4Sa4M3PeEEKDTBlk7jv1yNcn5lC9p8c5+/hcRMbwrE1yVSO22LfYikonOYrNOBD3EbtD0vnDm6te8JjPqhsTV10WftWGpSs5A8VFt4O5KqQtl1dgPVaMdyjf8oWpsqx9O+y1ky91U2C6G5N/QkfYnqL7DsbOh4PAVbPVrQtmpDXy0Do4NBkP/eaF+E0ePpRbEPHU6G/nLKqI/+dHJFmatWAJtbweQ1dA52BGh70FxBX1CgDK1BVTiQagK8kxRA3VDJrXbE2xgKsCt+Jyg1hN4hisKt5eSrbIswSEAG8m3C7Pyiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=os.amperecomputing.com; dmarc=pass action=none header.from=os.amperecomputing.com; dkim=pass header.d=os.amperecomputing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=os.amperecomputing.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XyYmh25NfnRbNK5V0OBox36zmkdRcEDANamgeVO2zZA=; b=b483+4Swq+mjN0GcYYLdjxjponEALyw2ky60yQ8CqsHcC1NZHxEG7RAX37FRaBbo2QzWkmXVww5Q1yGZEpxYI/SEBgp4DO73Gk5nCs7nKnqkAc/NygVOZ/Huk9317y1b1BTSMbXwDzWuhaULypydJttr2yzXwVUt0gP+vJydL68= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=os.amperecomputing.com; Received: from CH0PR01MB6873.prod.exchangelabs.com (2603:10b6:610:112::22) by DM8PR01MB6982.prod.exchangelabs.com (2603:10b6:8:17::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.13; Tue, 19 Nov 2024 20:09:28 +0000 Received: from CH0PR01MB6873.prod.exchangelabs.com ([fe80::3850:9112:f3bf:6460]) by CH0PR01MB6873.prod.exchangelabs.com ([fe80::3850:9112:f3bf:6460%4]) with mapi id 15.20.8182.013; Tue, 19 Nov 2024 20:09:27 +0000 From: Yang Shi To: catalin.marinas@arm.com, will@kernel.org Cc: yang@os.amperecomputing.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6.13-rc1] arm64: mte: set VM_MTE_ALLOWED for hugetlbfs at correct place Date: Tue, 19 Nov 2024 12:09:14 -0800 Message-ID: <20241119200914.1145249-1-yang@os.amperecomputing.com> X-Mailer: git-send-email 2.41.0 X-ClientProxiedBy: CH0PR03CA0063.namprd03.prod.outlook.com (2603:10b6:610:cc::8) To CH0PR01MB6873.prod.exchangelabs.com (2603:10b6:610:112::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR01MB6873:EE_|DM8PR01MB6982:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d353aa7-7755-4d38-57c6-08dd08d611fa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: QVcF46Byvz3krYZkXcfrpHjHlb7AT+wKn42jlQ+TVYS3AB5hENTOS/M6GmiUD/oUUsCxY/nJNm9Des4Hfap5GI+1YgqP9lZRVlxBSxFuCD+HOC/IVncjxqfdwSClfrTtCa0sXaTxgErHoYP6/MFy7v7XoLdW78eHxXHCnf1IjpshYdR438Bd9ot9VIx70AvWb7RFTmlWmlaN72Ye7mpzUtsOmCRkFkEYpC9alnYbJdofk74ZaUdfdyVvuSUHctg1OjYzK34aRBj7xyrxv7rhu20a+PtKQL2As8gc9SGrZEW0Fli9LC+ioHz76Yfp1FzRrYt+O4P9sZhVLkTeChYRcvwWF2yFICRGBnVN3ivm7qdiYF62x2Lwj0AxgWvP60wopL9R2qhWY5RsIsBzyLKDA2v02FRzKQjnT0eL/DTnur9QZ2OYoK+h7tz2HQSCMePcNdsY4XWY8b3jgIpRvvBpvxIMuWluuK7cdo4T4Wz63gbPd86a2zsM45UjFbh1nJG4XCoXPnN+OClOnXpdDuwx4DTDlhAMu6uzTyvrx4ejHbKlrQ9J+Apxpip/QqkvQyOVsOnQ4rayP3vsJ1jyHb6YO+JPufGoXrd08r67qG36xeGsbgegz706uhINY41KqLLTbR6tFDpGtvTaZzctU1S6OjtwRWbIhBfJOKNWpUt3nB7uFFeSF1isKtvbd95vkL0l2CFXmLG5pTj0o6VZhjMQd7wZxUFOmLBxfBkaq2dVcEf9fHYTLoE92g2P5ktltNi2xGwX5l7FqDRutAFI0O+StUEnQwTP/NL6ne7LPpkOMM9E6UzeP5sUuwvfR+Z4SFI0rcDCwwdrukzVtP9/T8cBr7/GIyUW5rZElrRkPkYqItZzkjXTeeldqTAh0JiKHBgYq1e32TZ9xxa4Sqk2fK2/GG1HZry4v14Ln55RtaDKR/0JislbXcB1My07j2yIeIcl6MjGep+oqedrgt5Zlz0nsVaz41lImVpzcmczQC2YHf1SUX0t5uUcdurQGOlLdmdrsoehhIB+qHlxPwinAA6st8ov6z3rAfyTyw9873SOJLUAQYDctoelkc8iBav1MHRS+lh2wYqGdBEhNLCBMlQtURhNQQ9qcTDwgeSdlUHxpNTA6irZOyEujGvfukQ/jk2ZF6AwYUnBUD2ixkU9i0LFODvHPQbNQugiH8ty4EcG7UQAo56+AgxHBFdSYk3eEf3CFQDq07DKvYw2JpQUz50RnfzF6/yweUiRusGrVui5uaCEUQ3w5e1rj1pgwSYzoOT2i+h7LJ1XF5rZn1EMTym72JdmFApDXaS3zvNvUo5+f2KNbQFXnoEckvtslq6fWu5QvdwBnThtEsqZge3EOe1aGxv3UK0M7zoziwdYj9Sqxn0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR01MB6873.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nhQYYCK1rMBNJ3xBZUCOQ3cZtqrGHkn0g2lCfCV7DMUQIlcBHckzACZUjB1ynbQylxEvg8VmdP/g1T6sBLOf/I5M5zVB5iolv2+ghkeR4cmrXYPaBOxDscllMyoxes7MCUf60rA9EvFDrnygfP/seOQsyRQP/TeQ6CscuFeN895MC8rybxSRuZ9Sm9tzc4ihvZy0kwRavkDFcknSmVgpCGe7RRxjIlD/bT55gFrdGZAwXN9Y/wAxoY/+EDauukoEsS9j5x/wL62RfV3yXeRyV2ecXEyjP6AS73WzQRMHO4BlZNChu55h4ZAFQmTLfbz70bd/MhFCKO1Uzx9eWlRhcYiTkJPFyWgTtQPlzNalyYV90CWKXOpiafa+9v4FnolL7h0M0urXBJb3DZoclcvHDFhug0b1SLu4MDZfEYYV+9qFNMCKlWSPGKvP4+leVG7JSyQFfZ64E8e1LS6Iqvp6qUZTfttw1ZO6kzpS21jdwi2A2VytLimpWsn3MGN36bCkD/qbAG9Zvue7o29bnYejxgkaRF3s6jF6efhIaJZar98rEB6mlmhzhxOCzCeJzRAMGVy5hod51ZDPQFvWnr63jglVi1LswrfJ5ijWl5jLKlg0fRKttfhy90lw0PLR5JT5uCM/29OfNIQLggbMdBycJJmbwzGNLYODW3nAP8RLkxCX4xAwVEoq2X7U2bgPPMxy3aIQHWEzQzUQo1PEkIc2InyPfVWzIi2XepLwNxu1cCmNkElZQAbf8n6sj1u0dCzgXbB6uBINQ2UJRyHZAQBVm936di++zgalAci4ZKzU7RtWPVzTc2e5Y+lYw+D9V1RSwhgK4PLeGkScGe1ycdmxbtxr6OO0wlw5vMo1fI7+ZIoLbdpYwNQ3JGqB06M7965S2Do+QiIAHe2gonsvaj5QSq6LLZoA3uJLykKSmWPa1r2leCFSlcM0wcbJQeMsuoNHmJ4WurVMptFvvSNw80WXyn0MgoxCYXp9bZvammGwPliqOODQ9eUFHlJr2s+bBK/qYFZ+HU9hPoNps5Xxp0xborFd8eIk4n77+kS3faml63aeK/OWgEReZn+D+2/+d9HeKV2XJqHS6pAM9BTIfZOuU32qcejwr8YtK6HUbICxakA1bn9dIfWuQ6Wb0j4xoy2CCMpPtmemTtYXVdJMR0yC3kqo8FJ+GTnLw6Ie2X5eI7IwtHATrJbgVKzLS1kJilZFGFGmaDcAA7FFX/gCoetrpkGT9UlpVCoxfmZjSbvNKGGGqad8XxNs0S/g7kjnqAjoSKdhIARhe/BkOL4ViXmmw0o74Qw921lzRn4flGucOzmIELks8xjm9cqT8cO1c72zDppennrTsoYTtl04JaLm0zdTImzooxHGs5MAqeGhMnA7elmKqhYCxW3feoJcjLTmW8hhblOM29hR1qnoF1w4oE9tWI5KBLadB0GPvnD5CJiAlqIqw0JP7d3BAsHnS9McbPMOBzGdxzlYkXBoifiU2SBl2b5EOIkTtG7JD3V2uia8HQnsYvQnXNoQaV38csXJmeO40Hb2+a2PmceQAeuJZG0D+r4SRpcIf1kAe2h7aVz5NlUH/dj4XeOc8/WR85UpnFekvWO28+UxUpe5cBpwTw== X-OriginatorOrg: os.amperecomputing.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d353aa7-7755-4d38-57c6-08dd08d611fa X-MS-Exchange-CrossTenant-AuthSource: CH0PR01MB6873.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2024 20:09:27.6996 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ARdCuwl0L3ubguoduY0qyBlPlDbXkWcBj7VHyAsxXG0fuGoJV+MWfrcGVvtXI/0MzbfNSLJk4R4T8gY61Y/4bXZ7cgBcz0iZ62qxvqFfjUk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR01MB6982 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241119_120935_873113_C7BDA2A1 X-CRM114-Status: GOOD ( 12.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The commit 5de195060b2e ("mm: resolve faulty mmap_region() error path behaviour") moved vm flags validation before fop->mmap for file mappings. But when commit 25c17c4b55de ("hugetlb: arm64: add mte support") was rebased on top of it, the hugetlbfs part was missed. Mmapping hugetlbfs file may not have MAP_HUGETLB set. Fixes: 25c17c4b55de ("hugetlb: arm64: add mte support") Signed-off-by: Yang Shi --- arch/arm64/include/asm/mman.h | 3 ++- fs/hugetlbfs/inode.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/mman.h b/arch/arm64/include/asm/mman.h index 1d53022fc7e1..21df8bbd2668 100644 --- a/arch/arm64/include/asm/mman.h +++ b/arch/arm64/include/asm/mman.h @@ -7,6 +7,7 @@ #ifndef BUILD_VDSO #include #include +#include #include #include @@ -44,7 +45,7 @@ static inline unsigned long arch_calc_vm_flag_bits(struct file *file, if (system_supports_mte()) { if (flags & (MAP_ANONYMOUS | MAP_HUGETLB)) return VM_MTE_ALLOWED; - if (shmem_file(file)) + if (shmem_file(file) || is_file_hugepages(file)) return VM_MTE_ALLOWED; } diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 1bbf783b244a..2dea122e5b93 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -113,7 +113,7 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma) * way when do_mmap unwinds (may be important on powerpc * and ia64). */ - vm_flags_set(vma, VM_HUGETLB | VM_DONTEXPAND | VM_MTE_ALLOWED); + vm_flags_set(vma, VM_HUGETLB | VM_DONTEXPAND); vma->vm_ops = &hugetlb_vm_ops; ret = seal_check_write(info->seals, vma);