From mboxrd@z Thu Jan 1 00:00:00 1970 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 01EFDC52D7C for ; Tue, 13 Aug 2024 06:51:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4731B6B0092; Tue, 13 Aug 2024 02:51:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 422DD6B0098; Tue, 13 Aug 2024 02:51:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 29C926B009A; Tue, 13 Aug 2024 02:51:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0C3476B0092 for ; Tue, 13 Aug 2024 02:51:36 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 66EA640697 for ; Tue, 13 Aug 2024 06:51:35 +0000 (UTC) X-FDA: 82446301350.23.7D87E2F Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2057.outbound.protection.outlook.com [40.107.117.57]) by imf19.hostedemail.com (Postfix) with ESMTP id 39DE91A0009 for ; Tue, 13 Aug 2024 06:51:31 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=oppo.com header.s=selector1 header.b=F+FUHMhL; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf19.hostedemail.com: domain of hailong.liu@oppo.com designates 40.107.117.57 as permitted sender) smtp.mailfrom=hailong.liu@oppo.com; dmarc=pass (policy=quarantine) header.from=oppo.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723531822; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+h2q6LRuC6T+SsGvNtNEgLFa5Q/PBALDTTZOEgbmvGk=; b=CL522HkT6JiSWJ1ogZ/FmtPfKdGwurJwTj5IFciUirdQ58gz8n+cC/9D4TRx7vsBxGij+A yqNBLqqe1mNuFbpxATaMQhLD1Giv7662NclkhcMds6dRGmrVL+EMJcMYibNunblcYAdr7E cLLaGNwg8BCgSXeVtpNCpU2+pfQyqaY= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1723531822; a=rsa-sha256; cv=pass; b=sd80Ycs9pg7E5KIYwDhXBalHI9JOhSwNJHuejClQXPxokd1o9qgASPdI4h1miEgJHil/3M 9DDUrgFW4dhBBZbZAZt5hmnwK9qKejbGn24+6Ylk8iTXPOldjgHv07mNW6ToFOI0IU38P2 4jA7l3adOngUn+fIDXZ9TMuHCW9YWvI= ARC-Authentication-Results: i=2; imf19.hostedemail.com; dkim=pass header.d=oppo.com header.s=selector1 header.b=F+FUHMhL; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf19.hostedemail.com: domain of hailong.liu@oppo.com designates 40.107.117.57 as permitted sender) smtp.mailfrom=hailong.liu@oppo.com; dmarc=pass (policy=quarantine) header.from=oppo.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=x6GTUxtrJXKubk+fRKgCah0Mz3lSeFdlPGlOn1Fm3wHgWAa1umwNpOdrf+UGMh84xkffczLj1vHibMH5wAy7P1ckHB572ftzXce516pD/DwKPNIMR5ej1qwZs5okgkHZxoZqrUCNLOeibjVjw/xSabG0MJi6EovmUCoTpuHYCgvAT1fdmTn+Dk8wgdQ2uLY/Fu+oEfM/3qmqHSYqHihVWGeDQb6KOpFHn0U9ZKQXWd7xMXg3YOehDXxjC6aJPHnBrsZIflMAOe374KNfQnbOcMHUy6V/MbueMFyhEmtykLRUyHP1EQ4l57iOd/6XEe17pL8BABu2j4AQfxuAuX/6bg== 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=+h2q6LRuC6T+SsGvNtNEgLFa5Q/PBALDTTZOEgbmvGk=; b=l9gb1c7/kOK2D74lA/kCD1csbr3FFIkk0zfkCmEb3ez2f/VFOOSLL46jy+BaKfZ/PrURiZEBXVvt5gfLtwPHdgr+BJzV6/2Dju4SZ5mPcpjYLswPV3cCECC6m5qxHWuxMoe+UE25xmwjmXtIJUAwpaaKW/F09kbleJm3SY0zBjTgBililriR++4jhFP67aZrMZsBGe4THnJyIHC8+YziscTXya4y4RCS9RqAFhnTLiv3uXVKf3pTYfJJ7Mu3jAu2gi9bAMWpd1IADAPZSJxea0ENLKuS2rwsKlh27zHopCWKEgWMkrtuMq6tUoPRdqICFoFceblIkykDii3WFzXTlQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 58.252.5.68) smtp.rcpttodomain=kernel.org smtp.mailfrom=oppo.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=oppo.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oppo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+h2q6LRuC6T+SsGvNtNEgLFa5Q/PBALDTTZOEgbmvGk=; b=F+FUHMhLUvy9ZtSaqrRPEvVyt5Whr5VkMLpKBmk6WGQLjcN89nl+rVqdqicXghxXSdnEHtIJSc3Q4Jf7w6Okas50O9HNGH3OdCbOf0klwbNQQocb2y+VT6Mb3pjAykHNTc+DE/QdYKSxyCrahLx65/3dTfhLrf6w03F7MTXdR9A= Received: from SI2PR01CA0046.apcprd01.prod.exchangelabs.com (2603:1096:4:193::18) by PUZPR02MB6099.apcprd02.prod.outlook.com (2603:1096:301:e5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Tue, 13 Aug 2024 06:51:26 +0000 Received: from SG1PEPF000082E5.apcprd02.prod.outlook.com (2603:1096:4:193:cafe::e4) by SI2PR01CA0046.outlook.office365.com (2603:1096:4:193::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Tue, 13 Aug 2024 06:51:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 58.252.5.68) smtp.mailfrom=oppo.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=oppo.com; Received-SPF: Pass (protection.outlook.com: domain of oppo.com designates 58.252.5.68 as permitted sender) receiver=protection.outlook.com; client-ip=58.252.5.68; helo=mail.oppo.com; pr=C Received: from mail.oppo.com (58.252.5.68) by SG1PEPF000082E5.mail.protection.outlook.com (10.167.240.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Tue, 13 Aug 2024 06:51:26 +0000 Received: from oppo.com (172.16.40.118) by mailappw31.adc.com (172.16.56.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 13 Aug 2024 14:51:25 +0800 Date: Tue, 13 Aug 2024 14:51:25 +0800 From: "Hailong . Liu" To: Will Deacon CC: , , Zhaoyang Huang , Uladzislau Rezki , Baoquan He , Christoph Hellwig , Lorenzo Stoakes , Thomas Gleixner , Andrew Morton , Subject: Re: [PATCH] mm: vmalloc: Ensure vmap_block is initialised before adding to queue Message-ID: <20240813065125.ymrzb4fdz26trovw@oppo.com> References: <20240812171606.17486-1-will@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20240812171606.17486-1-will@kernel.org> X-Originating-IP: [172.16.40.118] X-ClientProxiedBy: mailappw30.adc.com (172.16.56.197) To mailappw31.adc.com (172.16.56.198) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SG1PEPF000082E5:EE_|PUZPR02MB6099:EE_ X-MS-Office365-Filtering-Correlation-Id: 57130490-846c-493f-0f8f-08dcbb645a32 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uJp5I5xwUdxo5ogVbr7dxlcuIwaot5gUUG5tjWQhdoQVc0RVn/s1RTgXQu5o?= =?us-ascii?Q?GbAoHptzsJ1EMdU3t3Db/WhGD4WftphYM5bVFPeK7JJelWDf6tQO3nHy5XyZ?= =?us-ascii?Q?1dgz5iU6FK7aJZ31MW+rgTgjvOsEDvlWal+1M/u3OXhUswk5LKM62XdL83pU?= =?us-ascii?Q?vek4W1L03rEtBgejptTaZVaThnRIfg7/M4cMmCN9LKB7QPop3KMbjKOOCcEM?= =?us-ascii?Q?TGlMw4upKdsbFmHUh3QHNO6CkAbFpdFsypIVhsjPHlx9Qhlzq5mGkwLPIN41?= =?us-ascii?Q?9891o9JJjdwlE9wn/hK22forKOiAfyCAeRkXOR6InfBKO4O5tF+IWDIeE6bF?= =?us-ascii?Q?2FNKd6EyXW1QaYm6NqBp9Mek9AKxlqQILUWqfpf1cHabZqRZoTEvZ7UmJeVF?= =?us-ascii?Q?RWVAy7xiAqLu/Q89xegQhKoCNK9qU3HO0FysIZ1LA8RcchuxOfdwQwf3vchP?= =?us-ascii?Q?amVElB8TZe4jw76TE2shhpxPdR0VGqOdC5U8bCGlcJ2Kzu+GIs7hf4w6Rsbc?= =?us-ascii?Q?/h4GXifLqlqS+1K/ZaENR2PXoTTDw8vILrba31+w0GLmzyc8uX9UHIBxOEPt?= =?us-ascii?Q?4DWk9mkOlsSsAoFIee0RHrK+5oE03aIFpToaYPG7y0nsvOSNgVI7jZYM/kHm?= =?us-ascii?Q?lUSDNnONCGtCMf4hoz53+xJEIIXHedtTsHTUvqoZgzT5cDJaRe6ZlU6yLOn/?= =?us-ascii?Q?k3N7ITV+xEFn/P8JBtL/ZINq+lu5wWBEA5akWwTZfDFwAJMckm9/pL8Sm23S?= =?us-ascii?Q?De1EEs9+6dwwTGfTd+qnjYDZvPz+YSsmJqNBR8dxXlX7qhrCe4QjMHEWZ/nm?= =?us-ascii?Q?uS8LzX4x3mw3/86/CvnOASoYhWOKVJVJvkDJLs8Jo/2MSyV74jGGbUDjGb0J?= =?us-ascii?Q?p6aJUNUqHW9jzCTEZ5EJWUw3x8Ir0+DKlyWzFWh/mFdQ4Qwv6//5AvO43gLh?= =?us-ascii?Q?HXeN2qKytDFmHkWFKvwiG6QlCsvjBCU7WydGdA4ihm2n5QOyrcBbh2rkE/3h?= =?us-ascii?Q?IBdOw76+fZHPUKY8Fz6DiQqbtWUS9iDddzHJ0gXikl1htpsNiFMfWPdWlv8H?= =?us-ascii?Q?XYpk/i9x4imiSdYFoY6OWNDHdFc9qXhtPo/XnA+ihx8Cv1KttPradIuIa8zf?= =?us-ascii?Q?W5uC0jexxueXRPqStJ9RRq/KWl19Sep/qT3Q7QjJg/VIy7UEhTUvorZvbj7W?= =?us-ascii?Q?nR9c2ZyRCFrWa+6f8jNYV9ESWwPii5+IurNLKsqe6iRJmHQqwrWXXY6Af/6Z?= =?us-ascii?Q?0ZJEvdG7HSKcHy1JnVavrIYazPnnVL4qkWN8jrLsBX2v61atbm6v8f02i/A3?= =?us-ascii?Q?Se0lYHJlWgidA34zuB1q+Y+wh3H9W5u2NiaztGhsGCAoZguXSyVc15XTBFdj?= =?us-ascii?Q?CyTEiqxUod59NLIXUPZyxLvxkSVJj2jwpAsfIM+Q9pdYEcEQqQ=3D=3D?= X-Forefront-Antispam-Report: CIP:58.252.5.68;CTRY:CN;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.oppo.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: oppo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2024 06:51:26.2715 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57130490-846c-493f-0f8f-08dcbb645a32 X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f1905eb1-c353-41c5-9516-62b4a54b5ee6;Ip=[58.252.5.68];Helo=[mail.oppo.com] X-MS-Exchange-CrossTenant-AuthSource: SG1PEPF000082E5.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR02MB6099 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 39DE91A0009 X-Stat-Signature: xm3dykugxeuxathug3gr699iqx7arqmp X-HE-Tag: 1723531891-32865 X-HE-Meta: U2FsdGVkX1+f11hbmO2rSr1B3+TATBPQRuwn1T2WfEzNEtHyW9hWDTwc/rPlpoTOCmUNZ1upNGzp6V1/cCssZ2m/jtzUZIlcd9C+6AdZfc9C2dJ+8IgoGBYfYakdmYUihRH5a6iOmAO3x+GwGcOzd01bh9k+zIZzVc82fSRTcFXsR2crGzGG9/ClSQUZ5QqF2BBUqTAsiOj26PoVfNgGUPFqEC1EeZLDo/Fe8WX2IDFcSvMfi698rqnUGFNeHjXGql35xZJO2DjgPly4hajrJskLNmbSvC/yFgq2k/3hEG+jkr8RSPg5YbYSTD78jbqCKK+4/Bkh9Lft7ucCcJQIQRg8SZyLIMvIoXCg+wv9NnU8tNBmEn460uUQnpipUUow4GJerUdOeldjlsyxMqT2hLDr8Q6rKezgFLqtGgNWSSkLnHCOeEAYydLaAud0UQSJ74RbpWAbQHFrbok+CmR3D+E5BPck5cEzOA+LMjcEdbxf1h+vxLZrrEfDbfLRk8nbeczBNUF6m6TUrwiFosFMNRrqKM8Og4YVGCulp3M2G19wl/wQIA8VguNhOBYb4F2PGVhsZsQUh716UW8W0vmGPRo7ZjyIun/GaAkrwJzTio5NXsodbXz342e87iigNQ8vWLSrQD/odKra8SzyBYc6UlaYl99xRDTN7CUej5F+GMIxzkZi8eEMjIX/KMLvlOismCEr1mWIwchPVGX6x6goNSfbycgCCZeOXfiFMMkXKgQLHQ9KHLjDTDfgtF0RkBI/GGyf6RyZSDgCkVGneX4n6z8uetbXPoUzCchi8SixJXvsPkbzQ/QCvmi1Q8q6W/wmjVGgZCdx53nsI7NX6e5o16/PhVocdAxMO1WhWc56pFwlVDYaNEK/3XbcXfoJPzLoIPzlAlc86+BTJd/pTNwO5tK+Nz5+1p9ZfzrdLOLlQXc50zHFxOSTKS5+VNlnHBN+cJSQ5xAPm+N13rS75Yn aSAoLQSy Ureq7qGefyufYeQ9XjndkyLlo4mA9DHeBMgs0tm8sfLFhXpyAaoAY9fEe04iOG/KGkMveJJgTyukgA+27NS74KaZTqVLMcNMGpYxMAy0f1YUdKknA8/w+MYFJ6ny/RuVNxWneZQyHd7S3kgHl800kYbaImG5VzNvDFO/nTV4DluD05jP7lS0BcoKhda/X3bpeEQRVeYcnW3HgS6qv2JGVrz0P+IuLVlZAWMRgVNxOKLmJ7HURVJhm209iiNg+YdtLUOdTjLtWcccrKTiThuA4VBNO5v2LURfbuMn6TSa62RBZsDWdcReHeEQmn+NdWmCDVaqRmtYSziQOXdpUKUVrljm/rkJwdSZuXIT5Q9lUTT/+dtx3BcI9/tkagazKnqS7/EesGvUo2v5+Lei2oX/EpSSdMVt71HQHXn6a2y3NrEmDYgB9BB95qavIxtW3issQKQD7D9kZnTY8fJl+grhpShjfuAhxloNbhkiItUjW6lOKg3O0R1Ry1VUjLAUnTiORIeGSGDIwXw85ElwXScI/oXZKjjlMjykpfapmUXV+uSCv0qk9LrJs0GPiTn3xK+09s+A6XSsx4pvXeY1w9YZEH9HIdj+Prrkz3h+4lad/AgCBJRH63IS7Vqxc1RQQnhvtSgBQ9IyliPxDDLF4BSWxcISqeQX5hpOzteH3HWajSL0cGfL01E6K8zwtpd0sXZ5f+JbjN8S40dQ/caKG4z4PNR+GDxKshK3ANp/JAqV/Du4Om8wOPKd6LBN6HoMR9/P2TATB9uPmPMPSbjnU/25ONBKXYg0WtbUWaprEoUOBhJywMWw= 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: On Mon, 12. Aug 18:16, Will Deacon wrote: > Commit 8c61291fd850 ("mm: fix incorrect vbq reference in > purge_fragmented_block") extended the 'vmap_block' structure to contain > a 'cpu' field which is set at allocation time to the id of the > initialising CPU. > > When a new 'vmap_block' is being instantiated by new_vmap_block(), the > partially initialised structure is added to the local 'vmap_block_queue' > xarray before the 'cpu' field has been initialised. If another CPU is > concurrently walking the xarray (e.g. via vm_unmap_aliases()), then it > may perform an out-of-bounds access to the remote queue thanks to an > uninitialised index. > > This has been observed as UBSAN errors in Android: > > | Internal error: UBSAN: array index out of bounds: 00000000f2005512 [#1] PREEMPT SMP > | > | Call trace: > | purge_fragmented_block+0x204/0x21c > | _vm_unmap_aliases+0x170/0x378 > | vm_unmap_aliases+0x1c/0x28 > | change_memory_common+0x1dc/0x26c > | set_memory_ro+0x18/0x24 > | module_enable_ro+0x98/0x238 > | do_init_module+0x1b0/0x310 > > Move the initialisation of 'vb->cpu' in new_vmap_block() ahead of the > addition to the xarray. > > Cc: Zhaoyang Huang > Cc: Hailong.Liu > Cc: Uladzislau Rezki (Sony) > Cc: Baoquan He > Cc: Christoph Hellwig > Cc: Lorenzo Stoakes > Cc: Thomas Gleixner > Cc: Andrew Morton > Cc: > Fixes: 8c61291fd850 ("mm: fix incorrect vbq reference in purge_fragmented_block") > Signed-off-by: Will Deacon > --- > > I _think_ the insertion into the free list is ok, as the vb shouldn't be > considered for purging if it's clean. It would be great if somebody more > familiar with this code could confirm either way, however. > > mm/vmalloc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 6b783baf12a1..64c0a2c8a73c 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -2626,6 +2626,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) > vb->dirty_max = 0; > bitmap_set(vb->used_map, 0, (1UL << order)); > INIT_LIST_HEAD(&vb->free_list); > + vb->cpu = raw_smp_processor_id(); > > xa = addr_to_vb_xa(va->va_start); > vb_idx = addr_to_vb_idx(va->va_start); > @@ -2642,7 +2643,6 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) > * integrity together with list_for_each_rcu from read > * side. > */ > - vb->cpu = raw_smp_processor_id(); > vbq = per_cpu_ptr(&vmap_block_queue, vb->cpu); > spin_lock(&vbq->lock); > list_add_tail_rcu(&vb->free_list, &vbq->free); > -- > 2.46.0.76.ge559c4bf1a-goog > > Agree, actully I had comment in https://lore.kernel.org/lkml/20240604034945.tqwp2sxldpy6ido5@oppo.com/ myabe put this line in vb's initialization before xa_insert looks more reasonable for me. Thanks. -- help you, help me, Hailong.