From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 722AB14A0BD for ; Tue, 4 Jun 2024 17:42:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522946; cv=fail; b=jhpWLhCJUMsRa0tuEa2RtbVzmBq86Tv/aIO9gQ/SsH9ZxXt079b7TVGKMVoxOZyluYcm8RU9bbL78lnFKZVVducJoZvXqOFLwx33JVjvY84dRzo3xwlIJtAufk0EigHYDzKgG2x+C44dWxs9apJWZ3RmBL4Q9qyQ71OhqBnnl58= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522946; c=relaxed/simple; bh=K8jSRp+bYXzeK8tlxbNNrxeSl4ZXh/6Ruj5M8cyfWIk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=W9yBVYqnN4zk5wQq9b9dZWjeWO9AO5ZCkpSgDiESPjTiX0XwxJGbgVp8R1ZuSg0RWfUm6xkaXy36dKMlK04i5lWM+waBGoA3W2/VCozOVntLyksIGVkQN3UtRaybLAgFwHKZ0HxYHRd+qZQPq340TuqHZKkS7DONhZ30qdnUqug= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454Bnw2E024630; Tue, 4 Jun 2024 17:42:02 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DD2Ttdv4jO/M0NZvyd6x11j417E8vjm6zIIzfz5tzgbI=3D;_b?= =?UTF-8?Q?=3DLaXKDs2Giq9Yuc54as2jVLDEDupf9e/TZPD5XbNIm/1HoTOSyGiQGLLHz5J/?= =?UTF-8?Q?KVDnymwS_YNFJbepAWHnV441MCr4orQWnbNMfdb5Q1eQPONXzmJjF7JnW5WQ0r+?= =?UTF-8?Q?srbgcZhKiriLUk_NAfuNQsQml6KRM0qY6rI0fMN1vk4Q2m7wEql4XHDd7B0gRo9?= =?UTF-8?Q?hwVuV5urBVd1nbvhBiVX_C12O6mXr7ORBZ2HpdQo/IWeFE+xmbHDA/2qQwCFo4z?= =?UTF-8?Q?eD/8A+Uz69E+yoxzhoVsFLN4zX_xYOM1xB5vWSGgHFnmo2QjdZN6wicqgKCIwlA?= =?UTF-8?Q?PwOn3nPquxeSbDdUvDERiouWFhVVEXc9_sQ=3D=3D_?= Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv3nwhwr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:01 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HAhWd016185; Tue, 4 Jun 2024 17:41:59 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2042.outbound.protection.outlook.com [104.47.55.42]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrsaf2q2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:41:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nMkfEYE1dVmdukxOxeJpBxKntOgXm36vdKJG1Z65mWrS1jNts1+f2qRgkUE0YK+18m+XqpUYxN4h2iQHjeAzB7yuTyet2pNZBt+I3mnUvSaE1N57hdFFGl4J3KgwEoPewdQN5JanfoBNAd/JBWrLvcnpO1xpwSrHbQgp7+IOQlNe4YH9xFkhGQlTgJj3ATtLsVsSYk7lSTMUp2V9YNzw8LZXlErRDy8YpIGPe/9Kv+cLJQuDqHWuO/B6P78vi4FqcrATLoGkUK3bgpFDeXkUUBXamNU9hrzoKTjur4MIRcTRqa8VAZUBf4t+zWYBKr3YiwczNU/3BCGQbmJfCiNOrA== 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=D2Ttdv4jO/M0NZvyd6x11j417E8vjm6zIIzfz5tzgbI=; b=VcAzZimpBVO5OEOJAou8uGkEDPI7apVmiIGl0KJDVq+/euHB0o5+3qghpty1U7fGtsJ6u40PbKqueq8FJu8RYS5JRu/tcSwQsO6XKRaz8rn7UUw1NIRQGh6Otf+wDeRjnJSAbHVsDquk4Jq7ADw+4E1G87+RZ4jdjs1PbuD/7Hty+H1cuYXRHlnDCvBKr9NMYwfdCvwH7JngW4ynXUCqz17Z+ObRmFI4AheE5ATzLvS3aMKmD1NIItNwauyWgi9iWGVBQrl84236cyfKW9539GPwbdpN+VBW41q4uUpmbjNl/HYts0+o+j/j/HEwc92hUxt4A3TvPdfqn+3flqFPUw== 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=D2Ttdv4jO/M0NZvyd6x11j417E8vjm6zIIzfz5tzgbI=; b=w7O+KYjZKmU9BOtLQ6aE67KqLjJEHv9OQZBTR6zcxCF+EL8DfS8m5JxRq8Yp0KkMBDtGGdB/Q+9CcHp6vMz3FyloxJ62/10GId6fyxEvWGR2uJOReV1JjBOhUwhYBkMkPqOVKaPXcKULCG5PR2mrUVrrD9Y/zPN2z65KzXrMJb4= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by DS0PR10MB7269.namprd10.prod.outlook.com (2603:10b6:8:f3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.21; Tue, 4 Jun 2024 17:41:56 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:41:56 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 01/18] maple_tree: introduce store_type enum Date: Tue, 4 Jun 2024 10:41:28 -0700 Message-ID: <20240604174145.563900-2-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR03CA0024.namprd03.prod.outlook.com (2603:10b6:a02:a8::37) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|DS0PR10MB7269:EE_ X-MS-Office365-Filtering-Correlation-Id: 73949498-f61c-4c93-d49d-08dc84bda0f2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|1800799015|376005|366007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DOh0i3nkhKHNXBwirOQlS2weKyPNNHxgKECB0ZP5WoPgZsq83ftclstqtOSX?= =?us-ascii?Q?ZxPGdgyFH0ul1PzJriGw/ZOHiAVz9HiWV5GuPtLzb9e5LKqdWAz+cjBuBYo/?= =?us-ascii?Q?+43KGwr8PjSOjdHDzCUD4YcGSD1OfYu+WX9AgWfmZS/0jBkzNeEJNkkQsEs9?= =?us-ascii?Q?GYtX3dr4ES2SxjG4tyaWc15KQf9mz7Y1gPCco1SUCAP/7gp+XBzpgeZ9bsR6?= =?us-ascii?Q?nsxbKRARPeXJ6ajdMXIgwPUKDBZ0ac2D9gKGnR7tcNQ34oIgUBUrNYWfp++u?= =?us-ascii?Q?gaw1rJRp1l/z7UX9rBBNo0PPOBCP3547lQa7BJa9WksJaYPW1bn+QfA3IJY0?= =?us-ascii?Q?ArJ0cvGr1p+RgsNNV03QxTDbEPkf4KzwAJjq+TNftu1aVm3H57JSq7qVhZkQ?= =?us-ascii?Q?Js7w3rt6b1PbYjDGdWSc4KG1SJnIe3bjbwmP34y4H84micMwETrCaW7broJZ?= =?us-ascii?Q?Uju1dgapLH/WotfZmEcIesTv7kaz+g5QgbbL5RG1LdWIBKdFoThs2srtZo6w?= =?us-ascii?Q?Mox4HO/t3K3bH8rmU/1Ljcwl2IJJk69lrYpXja05jTN/7YITNfDHRyX8o8t8?= =?us-ascii?Q?vqBofwWzDxO/b7R3X3WgPhYjdzcFJAdQoLmS0vV7utpjm3U0VWS74/JUCGMA?= =?us-ascii?Q?PlInVePvDbXJdq7RHVvc/NHSPp0f7EANdITmQjplAXwDMNGcEjxc0QXpNniT?= =?us-ascii?Q?WiMrQeMP11ILCJ+R8OmIjthVapXVS7Yta/V+A8CWL+KpEWXz1Kl7MjitwEy0?= =?us-ascii?Q?FMiy6Ucjg6wc1mz7b8H2guhzavDr5v6HS505+mUkQtTFmSGZ3CyDepe5SN6N?= =?us-ascii?Q?RpW+zNl4Zo7UpetjdWASxiiORKUe45v9yn1ED0QmSzRIS6pmuEqiXhKNtvne?= =?us-ascii?Q?78M3FT6GAwdpIhKX8Zkn1VXsMnYAeHwoS+fM7hzHioHpzCMGe+jeDjtbBaJD?= =?us-ascii?Q?6gR8lZ0/ouXMCFAswJInpbgX4FB6nZCcDSP/yphXAP0LtgYZK5+/YDA5P4xZ?= =?us-ascii?Q?e9Zli3A13+Zu67tgm0Wf4RhDGfiRwHkgTxZnl6ZJqji3A43Ujp+XIODjkupn?= =?us-ascii?Q?KfJwprf2ePkJqaEVjdb/tej2e9kiQgHS1YRHtGUG89KGVFS4fZMIATEgqAKS?= =?us-ascii?Q?zzPFjzN2YSG2+0kWXhHyTMVugTmew8ZuX5XZzOdCbmSRZgTa2pZ1WQFD1rTk?= =?us-ascii?Q?bX9rCT3+vZn0dAkXvAYAMGDABPFnfEi0+z4Hj0W6v5h+f68SWhhS+57aWwN5?= =?us-ascii?Q?kvJs6tbJ5favp0dgHeVaa8ApP37vluTd4VIzX7w+zV5n+hz9dIWFcxN07c8D?= =?us-ascii?Q?4op9dbBURNFXR0SvYraixLqX?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(376005)(366007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mfEgvLeG/1oPtY+xqD6EAimGt02rAaprEZN0BdHjrgfTd1a/pkJJ96i3wenS?= =?us-ascii?Q?T7nXEdtz3sb35ZKGzhZb3mQqrQzyDHEh6vpKCtSFNuNrm9j6XCad7iIGW5DT?= =?us-ascii?Q?2YTDqBbld/zFqULMxxbdT++YBqgWH0bx04RmPPlLR2P1NfvRa2nd0/QJhM3t?= =?us-ascii?Q?MODVil756UPAZ6ZpB8heiR36UYth513CeFPiWxUFUr+Ui+ctTyckTfdkSmt0?= =?us-ascii?Q?UmCr5HuwMGEJ5DRK+/Worn6e8tN/6GHVRGdLDieODbYTcwJBJkzLYFzBAG+T?= =?us-ascii?Q?tJbd5J3RrkXEH0DaeqICKE6DiZXqW/Q3D5wVI73+Wgki/5uxj5SQAlUV+I2a?= =?us-ascii?Q?quL6blNOMN4DF2l5sJ9Lpmg4FCSBGg4TkWw0Hyd8rNaD+ViYx3b0OIne98nK?= =?us-ascii?Q?E689oAJIBBQdXrmNFXQOgeagi5j5eHLW6yMx2Yo/94V3g1g7cu2/nzetIFY2?= =?us-ascii?Q?IXt0M3u6vGPJ1HwlRw+ALwz02USJwLNazXUKaDnyx0yl0HHdeKPH6pLDHbPn?= =?us-ascii?Q?cGf0TCmShsc+N4G2bmcZF+6EFyjGo2eQWzUSJCm21v0BS9/7IsZ0ZKArFHO/?= =?us-ascii?Q?IMPjAf3Xp3qFfYmP/TM+EoeGcGYh33NUXAMU54Xy7+3A4RzrQxiDwmKG8jSS?= =?us-ascii?Q?NtAdfhN2B0fNpvjvYuiB7m0vf8AUIDQNHDY3ypgmUFkS5w6AUSAVVdn28aH0?= =?us-ascii?Q?Vs9qNV+hhNanTrfpoHG9fzbP45LVKduUzPiwOg6y2eYcM6niq8TK+4qxPVzE?= =?us-ascii?Q?0G7uLlu5MRuIL+3WfL3YDo9TG/sgfXTFk797L/yAjgPu1GhqhKMWCHAOhT7H?= =?us-ascii?Q?gFkJ2WXhToA9B6YiiofLj11A40y1ApeRQ+6lRwIU5K2g+GS0ne0aHNb2M85K?= =?us-ascii?Q?I0w5B6ACao5jA1M2s/uy4u+KUy3BQ208K2OMT02+sClpRhPb/i1stgBMGl7A?= =?us-ascii?Q?KjhVCn5rg/v4UxFWTHs+YarLzgsA2bAWY2LUDdRAZPtyWxObwjFBC3h5BPGM?= =?us-ascii?Q?645aT3bKRIHVgjSZ/K77qXO4XoKm/rVxCVNTFCjD3z2JwHmvM0Q7inNWDzEg?= =?us-ascii?Q?TWdfWZ887b0ca/ioaDudXkCHP+fIWacI2cevR0eEje3fA2qaYkT/fF4CwW7T?= =?us-ascii?Q?myli35YECLU9KxU3y4YaYF7Jf1nMzw79N4visAV1p9LQoHzOXQXGYYWm7Qh9?= =?us-ascii?Q?DeRJd7pD6XwwkDk0Lgg7Ci56jU3h2Gj3d9ZycLL+EeNk5kamqNNmsHxEYf+4?= =?us-ascii?Q?sbOSFSTObSXbpHosXUkSPvEiYCe9PTOZfCdOQ1Ady0BOAm80AxEpKpfrT/1z?= =?us-ascii?Q?uib7lkq1s85BY2QQ3C+6ybiVXu9wak+LkTz7I427DmQaLQNn5jEDFP280mS5?= =?us-ascii?Q?jRZe+LXlym4Me5XQIyNyeGRqZK6vimtM1gdcWuK8/3dXSHfeKJDAF/7NWBSA?= =?us-ascii?Q?890o0GTN1J26PDlM+DVPAuoL3MpbxYulYj9Z8of1DO3z196ESojipEoy3e+v?= =?us-ascii?Q?ZmWUV7a23fXCst9q928eO73tF/CLqoLn7zdKbTBj9csCyNXPyMojfkMHM5wC?= =?us-ascii?Q?Vb5aRlKs+rWEdUvM3JtjXD9G3mrjoUAVImldN4wZbikVK2GsP5IBSzgTrTKs?= =?us-ascii?Q?ROSIuuGprLneViz+slLNIVg=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: UZX1VP1sHP22WiCgfsZW7EWDveHV64WGyfyjMuZEKGZTqY7UThYmefIVj52C2Ou6/N9XfW93qUMGolb1cwlfhWR6dnVNX9Jj7CgdyDlw80vhsQudJ2u+fJwwBDIO/T72Dgkz6oQpeNUN23MjAoxCrQHZDEpfXfJQ5Hip0M1nknwhgftcZ3ePh7//4I0uNgi6J7jecIY6Bhp81fZZYwV9yhbIPItYkiEfV0e5SxTu5scyNo94NMqyPXcg1hpp1BcuZ+lGDaib5p2/V8hjSiJOAGHeMZxLXnqQjBnBneFBVt4mFHx+bHviHbJ2b+EHbvPm1ReagAI9Mvv/j3H8fC3CyKIESY/KY5B1O2U9OLfSAvajFPeZzDd0zij/8qdkUj7wl1PKjQCsmiDC6hU6WuropS1Yygk0kRqptQbrgjMCZYGmylrZMhCm8NWBU+xQ3JzTdKY2wh6leEFBBckWtS7e3YHMCx6YbUdwnNiEhofgVxYX5KECsWCZcIme025fDvjjtrZqchdg0Bwhug3adsL0YdlkDaeFb5J/vT2gEvrKEqjceMctcSWZenTw4FXcRpZomgklyLm9IvRXPPSMmHU8McR2uSeKdR3Q80/PtcZXx+k= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73949498-f61c-4c93-d49d-08dc84bda0f2 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:41:56.5411 (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: 1fW4a8/G3qg/B8UPQi9+8g6yfvdFPuIRlwlEuTq+B0cBnL2hBn2PTKhcG3NbEtt8G+o0+EJ7V0L5NheVIf8IlA7zYcSP40NRUeb5jzfMnss= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7269 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 phishscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-ORIG-GUID: sGOGTHmQ6zz-9d67wTFsxTze1WxafwcJ X-Proofpoint-GUID: sGOGTHmQ6zz-9d67wTFsxTze1WxafwcJ Content-Type: text/plain; charset="utf-8" Add a store_type enum that is stored in ma_state. This will be used to keep track of partial walks of the tree so that subsequent walks can pick up where a previous walk left off. Signed-off-by: Sidhartha Kumar --- include/linux/maple_tree.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index a53ad4dabd7e..2a2abda9eb32 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -148,6 +148,19 @@ enum maple_type { maple_arange_64, }; =20 +enum store_type { + wr_invalid, + wr_new_root, + wr_store_root, + wr_exact_fit, + wr_spanning_store, + wr_split_store, + wr_rebalance, + wr_append, + wr_node_store, + wr_slot_store, + wr_bnode +}; =20 /** * DOC: Maple tree flags @@ -436,6 +449,7 @@ struct ma_state { unsigned char offset; unsigned char mas_flags; unsigned char end; /* The end of the node */ + enum store_type store_type; /* The type of store needed for this operatio= n */ }; =20 struct ma_wr_state { @@ -477,6 +491,7 @@ struct ma_wr_state { .max =3D ULONG_MAX, \ .alloc =3D NULL, \ .mas_flags =3D 0, \ + .store_type =3D wr_invalid, \ } =20 #define MA_WR_STATE(name, ma_state, wr_entry) \ --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D00695F860 for ; Tue, 4 Jun 2024 17:42:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522946; cv=fail; b=UO1ijaKBcSv8UgTYasiKXOOY28ui+i3yh0wOo8997skznsggFF18QTjRg3XMfIYp4d1/jtfnQUXwHl+N/wBrg4GtSuDquCJBe6JTV6QHMMoRKK+cOZZ37JEznvn4N6MZYPJF+33Hy6mmjE2uuJSQclyLs1ax4IJ41JqUbfVj7tc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522946; c=relaxed/simple; bh=ERtIrYFeqm/Ne4Y0wrpSHj1zV2OoLy4etf7dtdzkA3M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=qjx/oz2NaI5Sj9sBQ2kFhX5R3vpHs586qyUV4JfX8z6g9eYT3YQZdnBpC5VKbp6APJoygrUBxXcP6OGZX8Xw5x4sa1smqECg3K99kV8vF03Qu+QiWUozYSnagVzZbKX014KKHIk6UG9ebrC2bXN2DQiZYbZcmF20Zl/0xpm+VK4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnWuW032255; Tue, 4 Jun 2024 17:42:04 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DJ2czIooQkE/g6w6qgk9SmtCs+2RK3cL0MxygBDJoS24=3D;_b?= =?UTF-8?Q?=3DTFj6PSl5ia9dSPD43pquTRwxDNVFUN1Fh/7n+SM44iPwcssTfS61W3nfXjM7?= =?UTF-8?Q?M0bFvMIh_YsnwEDmtm2B5/verpvAfyv8wGpMFMSjWwtBaXw/b24vIU8QjInAOg6?= =?UTF-8?Q?fejMTd8RMfcNLT_Ppu2AJ0eFC7aCmgxggK/CrPPeHfCYbfRp4sR+YrtVnRMck2f?= =?UTF-8?Q?uOa/vVg9rg+XU691pluG_l4jwDklxD3LrdarnuXANzb3F4QQHtjJVIIcM+L2/VO?= =?UTF-8?Q?WCR98LskK1MFvwX/erPJflaX6B_t4qelcJr5JRCZI60pQh7zk02aw8U4CShDbc6?= =?UTF-8?Q?dOLZxiF2XCk/pbqh5671xbHFAQsaBA7m_yg=3D=3D_?= Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv6u5jg6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:03 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HL73d016288; Tue, 4 Jun 2024 17:42:02 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2048.outbound.protection.outlook.com [104.47.55.48]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrsaf2s6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=imMNGlxodska4MKW+/c/GVXdCwTy1wscKfpLgWFogRWuFKkVdih4JcYWNt1luxDeStziLVXwreyonO0y5qhh0KSdD4CeHGl40761v0I2oIv+0adA2rnTcc8qM0l7gAi0TVKaHzwcoAAMS4Cnrx0+Gbd2srqtecuO4Klcdi3UeRAtGnT59QbCiqmFYEP8XFh7ABMNN/1wZqW6micajYHk8SkmfQ+ZTW2r48Jrr3Du42ZImJL/RUJ7FmV+SANKVydv69s/rGMIWVjGjxCw+hCSUHan+NfosP5YzdifFKCfSaOQT4CcNWTLwxgseE4ikVyCIvVbBiKdx9ijDh3nGOSkDA== 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=J2czIooQkE/g6w6qgk9SmtCs+2RK3cL0MxygBDJoS24=; b=D1IP5T/GJPREGxrXj2sANkBlS4LN2V0XCgmDo+MaAubzIyYrorOxh5PJqZllD70x1M1ajlH/upZl2PsRdvL70w3Y/Uisdyk9d5DYnJOra9fMTTxpnsRo36M4jp3U0/ztUwIRAghV56BOJA8tnHkqocL31rGOgZZG+XfMTvHdQe2POY7usdDpF+TxlebxIJx/NfTeZjvmjeJb8z9nJ+xn2x1itFo282DTVdd93M455N5uRB6zjcy+50G6u/I7ZFVkBm6u26QJJn+Tizt9p9c5hEcTk6DVQ4cNd5dfUGvI5ects1HJOCWYdRl8qft8HNmo1N4dRIOlxNRWIB9vrNEv8g== 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=J2czIooQkE/g6w6qgk9SmtCs+2RK3cL0MxygBDJoS24=; b=KzoQK3E7GSgCxaF4ojeYk8Rfk1h4/KZ++KrFezraO+Y6Ze9VUUCz/LpxdW8UZQNemae8h2+6Wzznw59khKo9+k6xaHtn51JrayYJfDeiMYV4r7GtbnVMPfdJWIwLIANIwS4c54K/vQTIGmIkx2E53ivYYG9H6l4kMhAOQ1IrzJI= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by DS0PR10MB7269.namprd10.prod.outlook.com (2603:10b6:8:f3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.21; Tue, 4 Jun 2024 17:41:58 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:41:58 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 02/18] maple_tree: introduce mas_wr_prealloc_setup() Date: Tue, 4 Jun 2024 10:41:29 -0700 Message-ID: <20240604174145.563900-3-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR03CA0012.namprd03.prod.outlook.com (2603:10b6:a02:a8::25) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|DS0PR10MB7269:EE_ X-MS-Office365-Filtering-Correlation-Id: 93d3113e-246c-4ebd-3752-08dc84bda21d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|1800799015|376005|366007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?iXDGFoBW/C25LblL/Bvqk1yv4kP+n+uR8Co1U9FDUM6Cdn98ecVADQxeWfA9?= =?us-ascii?Q?0fNo6aTtOUd26bVpJdk3miF/DOtzWDob6LsHNsXfd/nV1yQoPk1OFPZHMB+U?= =?us-ascii?Q?9iJGtCOqdPVIfLGkCtuakHyBg8qY3KelLWbAUdYlbsX1uHmrIPdJSEnuSjJU?= =?us-ascii?Q?OPnCkH8yMxID4jO3PlIZ5vTQGFFvxTQMb2dWb/FGmW8GSpvDI4pN4i44O7l9?= =?us-ascii?Q?sijl0p1FXfwcgG94Bl6E93v7GTw38I4xu2WVyOxjXL8d6M+tzGhDC0D/RA+J?= =?us-ascii?Q?tILT/6MAp1Ie3pQM2HtE1QXFWhWMhfCHt2yJ+D9Nq/Uf7dXISEGLDZTA0B1c?= =?us-ascii?Q?MU81KGuQcWR3OnqPJe1xVbzrgCGdE0rK4AvaEo0jVnn8ROWLfmwKOKu8SDW7?= =?us-ascii?Q?mugw8RLHu3CHjN8yA3+Oe6g/qKt/NAjfzuIZhmTxFFww2C5H+iTtRKvmE65T?= =?us-ascii?Q?Xu67/zz6RCW0QPRDArmiOIekATcv33tuPnspIouHTVBNLNquz70xX0JQtmS1?= =?us-ascii?Q?UAIoadocf3kEp5UdJGGGIZFXQSbzXypAlxgWe4sEpJIujiUlRkkxvO7AMhEA?= =?us-ascii?Q?Egc4u6ERXU425YhzKVa13S2svuA54wxgn8mXSGCev2Jqdx26MVyskGJzXOV2?= =?us-ascii?Q?XJNC2q939PqlS2/rDAVLxH6aixhO9smNGb2vaIyzXwmlK2IuEegnRF8n8RgX?= =?us-ascii?Q?LuL1o/f4cOm/P5LQzO32q4EkDt8bHYQigIRUbPQFAAVrfEnz6qSVfPsru+7e?= =?us-ascii?Q?0Bx3V62peud3HZFsc7tLjoSspAV5oLYUqwpCCPPHV5lCgMgbtelMOoubzRfn?= =?us-ascii?Q?nfnIw94iI+SOgQ/YiZ7At3m7j35JIZYYoZMkq4JbN3WWojy4gzvLCmYMkpu0?= =?us-ascii?Q?AyWM5tVU6iW3axcW0y5HyWYZrU8oPWZ11rNwviDMOFvlJfC5SraT264FbIGP?= =?us-ascii?Q?4qXhNW3QI5cBAQiULYAwIWO+pjFrT+UrrIrHZI59BfpBExA+AGAXhsLEV6HX?= =?us-ascii?Q?VCYahNzeS6enusb0KGj4zHIGSsNgDi8KEIKhoLWvDKN2WDh6jXOiUkOzw18U?= =?us-ascii?Q?JQAfLkyW2htmSednks2Y0PlCmuAflmQezWrRaTlS612x2QHijGWoh9aDihFx?= =?us-ascii?Q?NNs73Ck9n6Q722Inov6wvTQi3DpMcsjUQvd4+wnwGV5Kp3JgMTX+gqjIGRXl?= =?us-ascii?Q?WcZbYQPIBi9EdrZOx0yMLBxrS9O21U6wdE0pXVKJrxfNvprEqrZTs2FLmCdh?= =?us-ascii?Q?kkfaEGSmsY9dHCODyN9g/AtviZRicUTzzxuk/kWsFEc1aJR5zO5vy7QxtkNR?= =?us-ascii?Q?NPax2oSJMJYxcz8b23/8UBcG?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(376005)(366007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LIg/uQLUtEsQmWItXVqxiCjE/HZbRTndHGrxJf+iQkPHdb6xuaoRvNICOXHp?= =?us-ascii?Q?UIIp0osRE+Lpa1+EPzKnYlcEnMkcbtvcEY8H7FJu4qWivbKlL2MMYMV8bVCk?= =?us-ascii?Q?hB5XeqHITXP2p7+ICTzIzxC81WvXtEqTrWNUxwBo+j1waDUB4Vg5p6+mGwnE?= =?us-ascii?Q?kiZDiCcd8i3TXfEglgokqO/PniQxIAstbw1px3N+DA+Tzj0aQhRGMsqQ7oTM?= =?us-ascii?Q?EW4WAzhqvuJeWcYfcKeya0hpcxkpLkzFLD3dCutPBVsMasQB5bn0UXvwc1UK?= =?us-ascii?Q?sDilJ7PHMVlfvCE3E/NZjIKz4NwCzZYdK2v+RJpKLb3rRY6sY6c80aJpfbzI?= =?us-ascii?Q?4A8S1t7JiJ+MkKLtgpD29abFENSTwvEq8wMxDAVP96JZx0F6Y1bBxTgc6Z1S?= =?us-ascii?Q?BpR2KdQxp3RXWix9c7uN+AhiFblEWzprcjfEYlLwplpkFHTbQdFft2Dh+p3N?= =?us-ascii?Q?wjy4b1CYLVRIsV6P24dyi2irKUxLI1JTQdRcjOxYa6vNj0c2Irpi05wbipaJ?= =?us-ascii?Q?vXaW6cN/wV9InsPam8XsS8rr3fr/icwjunIBtPHOlftHkyYUHuNuT9FYFdaq?= =?us-ascii?Q?iN2IEAhACdAIwNt4NmkqYjXHiBcpwAZ5rNcAdVPHuMzcG0TD+N9Wqo4d6yhL?= =?us-ascii?Q?WTRUvbRvhujz9vNvMVh9IwLIC4koW4U/GLz6nnp0p6/xkXVmg0mvVDNnEUgG?= =?us-ascii?Q?x4W2U6xQhdtw1KtZjqZDiCS1cZS/llxnclaxXeGaN5D6rZPepa4R+7k7Ica+?= =?us-ascii?Q?33geF2UmKy3sTtcc9/x+lrV0tuYPTT+gognBFZ/WtMUC6X2MRxbZytyg2rZ8?= =?us-ascii?Q?AiSCLyOizvOLxPxoFhP2QstekHhiR7z32cq+gmp2gB/O669sFDjnbscw2lNS?= =?us-ascii?Q?fNq//Ui70+CG7VWYuKxpRDSWZZJPvukKkJMGyf7p1z442jsv/TvZmfRUZYPx?= =?us-ascii?Q?msJyL6xcmaHc48kaLSaALriFZeBAyTC+Vrcz47jlm8ni2oJISYtAB5VdL9jR?= =?us-ascii?Q?bOP+9Iz3WkauWCaXHRia+Mkd2yHyyd/FQ3mD1TWZn+LAHI3hvtCCQZJJp7lr?= =?us-ascii?Q?XINoGL9Zc6NThrxepijsNQnBeZ3wmsVK4IxM2g5m2rSruPzt+Kk6eacsdIY+?= =?us-ascii?Q?3AgyApLhCAf1lGCq4XGtTvYG+K9ghKOxx48nB/KbhDftpmlUJ9OUb8RNryxH?= =?us-ascii?Q?jCxUqw9jPyiW5MLIyh5+eJD6T3zhVkYtRE2XnJa7/vpYV/FuziuDfZHLy09c?= =?us-ascii?Q?LKxIvwHf41T+rpnZPhHKG+TSP1lFJ/uCLuAJykgVhUMyl+VUHONeY9wUDh2V?= =?us-ascii?Q?2sklrNrWAQHBIC6STtmPqsHoRcGjBiH9dKhDNjqRPdBPbXKx/lucSg8oUzLn?= =?us-ascii?Q?IoE8zougPzxytscHEWswmc4y1fjTezdBLB9DhOz/7gIW+zTenRktV06xHLhu?= =?us-ascii?Q?D4qp02gDPIA1RbWm73QwHhdb0fY4xr/s4TRcAF7grXqo2ZHmfMpoMNAVV8z6?= =?us-ascii?Q?IFWgpwBj3mpoUKjasGO12zRgJ1eAmpoO2w5MsfBfYMpDbHN5YVNXJUFn48lM?= =?us-ascii?Q?H0UCB1Lp9lyiSOhxrymI8JqDpKgJ7qwO6nRFou7eHAaYxVeY9xGrNOXsjrBe?= =?us-ascii?Q?poIFn4z7zOVRgEM3oDq70vg=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: bSKb+f8WdJN5s5kXb85jfPsOKNg3wHGKnpEQeXY86vJPSR55PVf+LPfh1HpV72pPpLVwIJAI+QXfP+8BcpsXKM1Bc/eTlfqYC4Uww3tMPPcPSzfspW3vF8f6WXgGG9F+ST/5YRJs7J5iuKUqhOffCxF6J5ATDezhIUJ2fxEO1jtrXicpmqbdAEtJ8Ltnka342ladJGSAchD1FoG5kcdbHN0hfAH/+rNS8n9ULCfPEp/0Og9Uruzhvena2FOnH+RM1+Nj5P7q584r0tJktJig95Yac7LMS5JnNiWXofUpOT1DJaHZY+TstUatHHX6F6nD1ewe9b8UWwL7hryOkdemOGY8z+sFTpHBZyS2nB1o71BWZorHpJzch8KflPW+zApnzxM7rrE7Bb+gtMWxd2XYius8MBGg9vQEj/7t7fbIUmsK4qM5j/gf6RV8TuaKPmCh32QD3MKyFnxjBdZMaKQWCLxT7FBb6554FtjG1VeaFVaCJ2J23tHfPy2/eGk9BYjykIO0KVDCdTzcAwgLmGzVlrZY+DeV/4j4Qy7EhG9ucPgAHdzs0wqbLLNuir6KkJjoYmY/Fn3Zo6sQ/QxTb0OpMIoMYj1gEj8UOrpLNtFpJ7Q= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93d3113e-246c-4ebd-3752-08dc84bda21d X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:41:58.4517 (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: 2e/tUSeSe91+pI5CP5Uk9gX109exqPNIg3EjDQOlALS5TNGXhwBQUBWr0/PvHl7FoDsKqs5N0Ffkg/DowowSAPZ26CxJSPh6MRSrtaoXqMo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7269 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 phishscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-ORIG-GUID: shO83HU9eRyOQbTsTHd4u37qy0g0M-R7 X-Proofpoint-GUID: shO83HU9eRyOQbTsTHd4u37qy0g0M-R7 Content-Type: text/plain; charset="utf-8" Introduce a helper function, mas_wr_prealoc_setup(), that will set up a maple write state in order to start a walk of a maple tree. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 2d7d27e6ae3c..ccbec0f66562 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5402,6 +5402,13 @@ static void mas_wr_store_setup(struct ma_wr_state *w= r_mas) mas_reset(wr_mas->mas); } =20 +static inline void mas_wr_prealloc_setup(struct ma_wr_state *wr_mas) +{ + struct ma_state *mas =3D wr_mas->mas; + + mas_wr_store_setup(wr_mas); + wr_mas->content =3D mas_start(mas); +} /* Interface */ =20 /** @@ -5507,8 +5514,7 @@ int mas_preallocate(struct ma_state *mas, void *entry= , gfp_t gfp) if (unlikely(!mas->index && mas->last =3D=3D ULONG_MAX)) goto ask_now; =20 - mas_wr_store_setup(&wr_mas); - wr_mas.content =3D mas_start(mas); + mas_wr_prealloc_setup(&wr_mas); /* Root expand */ if (unlikely(mas_is_none(mas) || mas_is_ptr(mas))) goto ask_now; --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25D8A14A09D for ; Tue, 4 Jun 2024 17:42:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522944; cv=fail; b=u5jh9TaSrnA0sWRC3A2toQ7QEqu5DOBYwIIf6uweeNpDXTzzsQ5fYWbGxyeyekSTD3fTnUBdN3HjdxDo7mKRbE7xPyf5cx2bov9gx9qFRig44PgvnG+4SVWmlzWWwA9biwRWez8YKyYL8lBzOEP79q0Jg3qnKtmOkQAVNpVhFhE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522944; c=relaxed/simple; bh=jDPxcSHhXuUpaixrzhhwLoqIuF5PHG+jA1YdXTGxgwc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=B91kzI4/3UlM2YkFtJOgVLM/91zzpYvG7xqZ1MFQFb7T90XtnhMdpOY7OkVQtdgvKi0C4YICMwdMXcLKiI4ERmgj+4O1J9QRIK6ujUWNjlefhVATUrQ9kBHdjmuHBjOu6juC5vnGZkeJgQVB8wxP4yBiBZxU20b8ud4S/Ns/ebQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BoOW2000986; Tue, 4 Jun 2024 17:42:04 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DIFa12ztC6344mQoKk7BmgG7Jc7jYdExwlXq1ZppxlRg=3D;_b?= =?UTF-8?Q?=3DVRHgwHDUnOlAdjcyamNN7L4J37enDUziA0fG6GG9MHExQ5Y+GXnBKfCV306d?= =?UTF-8?Q?LVDxUcTd_KZwcMYqUUBwudfAzmSWmVkC4FLXvMIam4wINlNqEdu9Xsg7BrS9/J4?= =?UTF-8?Q?XCd9Okrh/aX4Wg_9coEiXr2p97FbFu4JIHYE4tuQGjKdBRzCEpqNY2VP+EzVSim?= =?UTF-8?Q?/3istU1abApznMkPuYTc_ewhZwaqwn5DFYZvYrPZTDJ4GXv1xJAMOYnEPIXHoWE?= =?UTF-8?Q?YWHf9H1y2YoQ9iCGPUyU4M9Amn_JxOXot1m2sa4d3CzORoMjlvv7hKR/j5pIxeb?= =?UTF-8?Q?05RiVMjbmxbsAV/s4h4YILp2bKgzreXi_Dg=3D=3D_?= Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv6u5jg8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:04 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HL73e016288; Tue, 4 Jun 2024 17:42:03 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2048.outbound.protection.outlook.com [104.47.55.48]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrsaf2s6-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bkNDAv1AlDySpzbUPJZs6BXFzH04AuO6GiTScyYhJovGCIWFcHRAOadzAbg5+EhAIBWur0/tTLgp7fWt0NT2lFg4LXy1gKeRHQzgGmLevoQg3/4q1ymjAeRMGDo8teWl54M945LI/xrUiiXMHhpzy+Us6qQPAAdxG7crXohnm6yXADAeU59OlK7NIEflWIFQ0xvDSaJO+28QiY5dTvMQCTgEQT/B+AITUXwpJeb0hwM7WlSTkfLFUR/IF5Nb/3BjK7F2+pPHgOGtuPQo3CKsHRyMCwr2qzW5erpeqt8jvTWzu5uAllb9hJK7ivLGJDnQ4cRKmEVSIpa/k3SCRH+XYw== 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=IFa12ztC6344mQoKk7BmgG7Jc7jYdExwlXq1ZppxlRg=; b=KArCMdJ9k1kT3mHnrVm3k21H0Q8xrkLybCYA57Z+JzkLMriwLUf9qw36Z7SoUagkWJT9+kwy++OXNDnC01UxuWXnLz3B6XLQKr0pjp1x8m/l+UIw4n7ImAxSvKFpwuOCba5FuGBZNhaiDIKXVknYhQX0fSpgKmfBZyGZ4c6u7at2RAUJXrETPgwQ4Fv+CPksrrOmpAY+6uUg9tKSA+OEnZMUTVoeXvm/qD8oGF35HbkIJ1aZokeUemHQF6hEjqlJUIPV2nuViBPNwz2S97VTe4O7KOapgfiq7TSf5tJl64zfuQRpQYavg2uWrVUlULcPF2Bs621bXlquPw/o3TQFOw== 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=IFa12ztC6344mQoKk7BmgG7Jc7jYdExwlXq1ZppxlRg=; b=XakMCM3AfyljSSwFBE8EYUmgdHdX51t0FwxKu3GenjdAh56c1Gt1AUBY6fw4yan7IUhA7wH9w1V67dro7M1e3kDIAi7+8HlltCNoUZiGMzUxyMox+0mKC+ihRqaTA7I6pmg0CR1dF13FyntH2VDrPLgG3vtGP4rYbZutiPyc/tw= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by DS0PR10MB7269.namprd10.prod.outlook.com (2603:10b6:8:f3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.21; Tue, 4 Jun 2024 17:42:00 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:00 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 03/18] maple_tree: move up mas_wr_store_setup() and mas_wr_prealloc_setup() Date: Tue, 4 Jun 2024 10:41:30 -0700 Message-ID: <20240604174145.563900-4-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR05CA0088.namprd05.prod.outlook.com (2603:10b6:a03:e0::29) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|DS0PR10MB7269:EE_ X-MS-Office365-Filtering-Correlation-Id: 189ec041-9209-413c-0d4f-08dc84bda311 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|1800799015|376005|366007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SPo9OZeyy2vibTrfnc1UJWiXBAXKYOOv6WP88bNYi1XrPY7HyoKT+2tdrmwD?= =?us-ascii?Q?/sddj09/sV77EvvqRSk90OgqAz+KO3elfxedluSZHY+SJjF35LIeuKALlXdT?= =?us-ascii?Q?86iNCnyULQgDvizej+nBJsDTEDH1/A6dX0rmWmnHRgSYyMnMTuW5zSrvoeFv?= =?us-ascii?Q?m6zN/Gzaa4S2AXo1ALSbx+D8wyqAvKRHTxYXTA47K8/0EtIbWayHFE3vSD50?= =?us-ascii?Q?TXQAjrQ+SAmo/8C8sp8RLX39BFA1iaMT0fKxQVLNvd2KeY5niQCaEVdwy/pL?= =?us-ascii?Q?HUhalON2WolT/FkvvXuhUqmylZsscFa0zwM6fHEQ8BaCFrbl8qCpEJnUDGsn?= =?us-ascii?Q?Y2GN2HP9fHgWokyGx9/3+RJe1gKpjZ5mNm29Sve5hnofkvAlSeCYo5uvNPE7?= =?us-ascii?Q?bqJ7Z4AaMGAf7f2sR3/HPnsafbUWIdBaW/K0C9OBhI2Vc47BNKM6cdxXqD70?= =?us-ascii?Q?Qppdmiy97L+PF6Vp6wY945qGXqxmFbZwE/bj8c6HL46oFRdjYKxgJMUG4JL0?= =?us-ascii?Q?CsrE4epQsMedujCfiod7T2V49beufJMc8owDpcDJvSTl8uI6afNP9k0Q++a3?= =?us-ascii?Q?Rz0JPFmg0G93gbje6H7igsQFy0ESZm3pUj5W8EOsMLx1e8iIz/h0DQuV5neQ?= =?us-ascii?Q?yu3+6fyZ4Wm6ONcbhikwPTiHLvnQr3mGESqoAds6xq1/pj0Qualvz6rAsJN5?= =?us-ascii?Q?O0UIyuLI3NdglPoLcyadxsVDayxpTghlhbBZ+rWNygWMzCFiK1lkAyWV+oty?= =?us-ascii?Q?ehHmCoPHsK2+Q2NEqOim1ZeN8mx3weIHHf9Xaq0SYnwACmOpLxxOyPWFmr5I?= =?us-ascii?Q?yvKl+Ow3a6+APWvAbZzshRKd0+NlRCkiyGwMD75pkquKOb20FxQRMD9DEmpo?= =?us-ascii?Q?2YeIB74Jn94cm4mJYDX1NJQG8VguA1A/xgPaSyk4OXvGLf+SWt5XEzHrVHtd?= =?us-ascii?Q?y43+XzHG346BsXc/3okiu54wKxf/FOCF+rgQ8BlBHIJtY5sZVFX7Vu8hc4MQ?= =?us-ascii?Q?LBXJXnqT/txhXSRX895pGTv4PWWWBu29FZSIQYnIfgOLMBM/JkA+bIddvGzg?= =?us-ascii?Q?WKmOPglCJW97MIlIQgKCKOiJVbhZCPyRqfDBDpOpLQRnUftz/gv74qKT3rWa?= =?us-ascii?Q?X48s1lEISzs1bO0URQZ03AvsU693axe3dUVVhqyV3RBeFm2uWNCvn2ql/YgS?= =?us-ascii?Q?6u5v/aiQqO7kmu1710fk7e9ZP7G+FQOFHuk+a3CnQzTeGDVKOiqsYjipwDvK?= =?us-ascii?Q?UtmV0xwMFvCmlN2KKjDtaskmzvna5SD5mau4fn9eXe4fyXkn1w5JSAS5HOSX?= =?us-ascii?Q?Ypo=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(376005)(366007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+R+Scbix0Vxmi1exU3+pZKvVrsInYeb7iDfLg7qIMIkGsLwySm/7eyGmZJHi?= =?us-ascii?Q?GAOGKmiAW9yqfDy2eO9gJqz3dqGkjGZy0qT0oKTYX15yPrwQXgA6oK/wFNJV?= =?us-ascii?Q?9bYIz/n1/vVqDJYhhmtxsgnS6VbCZV3Ma9xKcbCPzmxXgbN7HgzXqiLS+3/V?= =?us-ascii?Q?+++wXod/oX2RYY6LjZShDAsimqhjd8TX53oFOCCvcQc50KgnvK8JnPeBsADJ?= =?us-ascii?Q?Cz0/pWx8cnMKr4bRF4XxQUqjwcBXVCnw/6zqqNFPYZmQX6HxxZOQJtq/huVe?= =?us-ascii?Q?G9iyYbDj0jAD8IiP+4qyjEr5SrkXYwPIjNvEGtY7xFEJQQTr42fM40ORr363?= =?us-ascii?Q?SUsT5DWaz7CiExzXgSwCZfmnKTxzfPn/7PhBBWzs2rdM2ua6zVPlsyiHq4Ga?= =?us-ascii?Q?zyUon43u2F28N1oNUJywaF/oOG7AkayPQfhj9cc5Qlqi+rSxXbZBIh+UsgMH?= =?us-ascii?Q?3aN2ZSD2PeMO76AfY9wsvK+7njyqimD4lbVdwjGNJUn41cKT1VsGmyO2JsdB?= =?us-ascii?Q?G4tXDxwn4yEh5EtHj97YKWYSxAFREcPZTH3hfYuCcjNtMQtZKNc+eT+I+ri8?= =?us-ascii?Q?SYuozjKiPiSoCZA0wVW3N9cH8E14aFuIBzcCiqd1EPaJzAOU6bL65PmRPJRa?= =?us-ascii?Q?5fLvpba8Ir7cLGol7Ifnp/GRtp528TwGIuArT7FYaSgMWZU53Swfq2tKEJiS?= =?us-ascii?Q?ckUEStHj16bPIgHYFPK/6RqNfK6XOK7TANDe4BTStTncVnvc1Bmz6k1gWX1M?= =?us-ascii?Q?Wr1DMPn6nTWwtNx3ZPyNnQpONNKbNk4VIqSgv7GPjtmJkioh0rVhzIv38JrR?= =?us-ascii?Q?E82HVrFA3xVJ7Uzz/02IfQ2uA1FuPcpSxDqb2w77bEFPSVsaFzJ670qDKeFZ?= =?us-ascii?Q?/+g1DW/zTQC6G4g70TLSSyz+tpMxDzYpHff5kNQZpefsvxYrzLdNzZIGi1Gi?= =?us-ascii?Q?HZyTTLKwsJ9IQDtrwj5K3tpBhJGvvg0gM+ky+scpkCaU9rlIVz7pEb6i2Mjt?= =?us-ascii?Q?d6i9RlCoQnxd6EDKQvnViMfbaWs3x4LNrRlEZGiMmHDrw7OtrzoRUj2bKmDZ?= =?us-ascii?Q?KNLapTzas8SeaXNc+fb59P6DvoI0r2pomgpQvqntifVGS3EExsTar47eXAlH?= =?us-ascii?Q?V6HmWFheFsvq9R552IK0Pb84ulqBREV6whpxNkSBsncJWM0dweUUcSor3KJv?= =?us-ascii?Q?hm1Fiqo2Cf5wfuhPMQaPIQ0aODzHRyq+3Mlk3Y6qj1d13o2gaG7xZ8fN+YA6?= =?us-ascii?Q?Kyu2eMO6GFaQc9GMWpA/jUekQNkalZoLvF7ZSO+cUnqGNifePd/By9YIK9k2?= =?us-ascii?Q?/fX1pxmCU1mqQu4qe0wlDwgG2sKKxc2puLFP/RLxHM+Y1jift6b/7ktkJ+yi?= =?us-ascii?Q?bU0KF4WxyeyXpfmWpf+uMpW8z42zEh7G11dMM/zbMETSWGKTtgwFNxiv+OEH?= =?us-ascii?Q?OeUQKwyxSp6odaB+j85Ta7BUpVuNAlwrdNmuny8QdnOluOn+tRXfswL2lY/R?= =?us-ascii?Q?JAdOBihAAxL0waKGNbI5aBVkpU62S3TgJHbjarcGZBZdfky+b57mMQagr6K9?= =?us-ascii?Q?PgrFjQkaAxsEgHMgl49t5J6/4SkFAg0tZYjk0azI1DU3Jy1Mq6qWP8h+GrMA?= =?us-ascii?Q?OwJD0iBzuckBnd15HjPnuFM=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: IF6zp7jFyF3ex5Kipyg8YGJ911Zm6xn2UjNYWoUNWQB8pw/yu+9tUvvEPulddz9XTWrGVjzO08LbDchaa2lfso2N8icmedSD5G68tZEtzebpqj2HW2rE+FJxYUxzktQb+enefU32EL0iWBd5hG48f9+XNkNzKEmhLVTbUTY8eqHyh3MUiatCHt44e9QuO7ZJj0QLN5Vu0trFHlp1n1mmJtNRx3x4HJIXtFt5+LTQ+l6DZAapzMe3ta+Buixl2v4CPQPVqsb6NrKrnZ6ZiNO+33RatokRuY20KBYYySG5whbCDpt7KqzNMvT34l8rjXp7ulPuiJdOy218WMcggaTgz6EMosqHW/oZYAS/QrAQ3FD5mGscr6YqaPOKk3FGOaDHFIteUHGBGMZULYVKqCJ0GukJ15Kn6rl8t6BSX1BxVWHXP0C4LYe3tcovnmovMQpuCW+PjxA0geyTTkfAa/vix8sClUg2zdeCcjFxgsJq9ZGP1NirRugfrVbXy2F4RSkFsJ8i3mlxd0zsAnMp8xiyL91azNWzihIdPFrYV/ZtWolLFgCokShRAfKG/gsbt9poFbjgyQ9c9bd10cKp6Got2hRkTMLhRLjoTywzccE6re0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 189ec041-9209-413c-0d4f-08dc84bda311 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:00.1196 (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: od+GEj1D5yWLvI6cJ+bapcnSEOF/IM2uYF68lF2q1zsLWYThhsar5MQ7ix0NpZ7YXqeg2yQA4sRT3vKe/azmBQWJyvVsdSsqSaTa+Ma88P8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7269 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 phishscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-ORIG-GUID: imfhJuZMVcmblS4F39nelFij2xIZ3W1T X-Proofpoint-GUID: imfhJuZMVcmblS4F39nelFij2xIZ3W1T Content-Type: text/plain; charset="utf-8" Subsequent patches require these definitions to be higher, no functional changes intended. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 96 ++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index ccbec0f66562..2558d15bb748 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4230,6 +4230,54 @@ static inline void *mas_wr_store_entry(struct ma_wr_= state *wr_mas) return wr_mas->content; } =20 +static void mas_wr_store_setup(struct ma_wr_state *wr_mas) +{ + if (!mas_is_active(wr_mas->mas)) { + if (mas_is_start(wr_mas->mas)) + return; + + if (unlikely(mas_is_paused(wr_mas->mas))) + goto reset; + + if (unlikely(mas_is_none(wr_mas->mas))) + goto reset; + + if (unlikely(mas_is_overflow(wr_mas->mas))) + goto reset; + + if (unlikely(mas_is_underflow(wr_mas->mas))) + goto reset; + } + + /* + * A less strict version of mas_is_span_wr() where we allow spanning + * writes within this node. This is to stop partial walks in + * mas_prealloc() from being reset. + */ + if (wr_mas->mas->last > wr_mas->mas->max) + goto reset; + + if (wr_mas->entry) + return; + + if (mte_is_leaf(wr_mas->mas->node) && + wr_mas->mas->last =3D=3D wr_mas->mas->max) + goto reset; + + return; + +reset: + mas_reset(wr_mas->mas); +} + +static inline void mas_wr_prealloc_setup(struct ma_wr_state *wr_mas) +{ + struct ma_state *mas =3D wr_mas->mas; + + mas_wr_store_setup(wr_mas); + wr_mas->content =3D mas_start(mas); +} + /** * mas_insert() - Internal call to insert a value * @mas: The maple state @@ -5361,54 +5409,6 @@ static inline void mte_destroy_walk(struct maple_eno= de *enode, mt_destroy_walk(enode, mt, true); } } - -static void mas_wr_store_setup(struct ma_wr_state *wr_mas) -{ - if (!mas_is_active(wr_mas->mas)) { - if (mas_is_start(wr_mas->mas)) - return; - - if (unlikely(mas_is_paused(wr_mas->mas))) - goto reset; - - if (unlikely(mas_is_none(wr_mas->mas))) - goto reset; - - if (unlikely(mas_is_overflow(wr_mas->mas))) - goto reset; - - if (unlikely(mas_is_underflow(wr_mas->mas))) - goto reset; - } - - /* - * A less strict version of mas_is_span_wr() where we allow spanning - * writes within this node. This is to stop partial walks in - * mas_prealloc() from being reset. - */ - if (wr_mas->mas->last > wr_mas->mas->max) - goto reset; - - if (wr_mas->entry) - return; - - if (mte_is_leaf(wr_mas->mas->node) && - wr_mas->mas->last =3D=3D wr_mas->mas->max) - goto reset; - - return; - -reset: - mas_reset(wr_mas->mas); -} - -static inline void mas_wr_prealloc_setup(struct ma_wr_state *wr_mas) -{ - struct ma_state *mas =3D wr_mas->mas; - - mas_wr_store_setup(wr_mas); - wr_mas->content =3D mas_start(mas); -} /* Interface */ =20 /** --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6503614A4DB for ; Tue, 4 Jun 2024 17:42:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522948; cv=fail; b=NoehTyXLTpU/PNaF//4D+Wze1enWjN7cHOVxmxUnwGXlTjtjKllIvvtOup2soWhkj7pVTd0WgqVT6F5z7pCDLc6hpZ4eJc+8Q4Hmq8ll+a27BxP2e0Mpby8kWVKwcetzkbrdHr6oBHdwH7AQvduJbHdyZF11ET1qSRUHRBGUwpA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522948; c=relaxed/simple; bh=9tbJuIxM7aE8aP7x+iB8HTWUHuhJd8ou61xjmjnj03g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=FttII8CcwhyBCUwQfDrkJ1kcjpG9h/5mX0ZxwlSSfh/34SoFb/UIm4AYEVGfvhYE4rP/7hOjW/YEGpHfwK0Wt2ihd4qe6dSOEOUxxz1IXwT+cGfTRMa1r3A3gghfj6cVhLb6/fturhuja2Dhe9Fw+wSwZYYpk5nr21q+IuuKtfs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BmnYg004596; Tue, 4 Jun 2024 17:42:06 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DsxrYTRYvoigB/XkLSP2+ypvpJsb1vcDv+m8BGSQSO4g=3D;_b?= =?UTF-8?Q?=3DK9iVMb7/8bsugmfZETKm0cbXrbUuvJp9IaJYFs6qrddoucnDb1PtrhJ9Kwb5?= =?UTF-8?Q?83j6o67r_OIgakkIqNr6etshfVRorFV1Mv2YOAleZPYfRW3vENA4vTTwCLndXyF?= =?UTF-8?Q?OZ+Gn57ANyqKt1_I6uhsuaiUwhhLG7+eVgZMEFro5Z8K+fJ6kj8XzBaMk+T8g5K?= =?UTF-8?Q?18BpKZN3IC0oBfYaTt0J_YlLXlGXSyk3NEgtm4bEd/itYGHA3coyMjLixKYA1+B?= =?UTF-8?Q?7YXYjga6+t9I/zAx3R4H8ZOClS_GObyCRAc//IMQ2Y7rwCJB7ENISba0d6CMIA/?= =?UTF-8?Q?KsU0zj7rF2LOYc4rtkgirQLisYYCWdPS_Cw=3D=3D_?= Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv05dm6x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:05 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HZSFH020575; Tue, 4 Jun 2024 17:42:04 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2040.outbound.protection.outlook.com [104.47.55.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrj2bm4e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TIntDJ9AefBFwnVgkwPCeyeF85kBcEGH9s5nsgtKEKf/EJ8oyXe4znbVcq+113iePsEsnxQtKAtqEwJb+KivTDC8EIPimb46svE3v9cgY7L0EEek9avuuXayEAusOgyB5XLEBoIqeh4aQrapZD0lEnFYLmiVz6YaoifJrIrPk4Sug1IpTMmXT6LZKeRFXd3oiNaXKNSkmXhjjjSuBRFCJTnrFQaxK9/i1KO9jXdLysbIfBk1N7dsDkL0NMZAHXk2357nMr3L+r7TaH2DS8Gsq3SENkoIfBF9KJ91adfRGUC0A/S3q3FBMr1Z1Z9EkeXRz6uJ173sUql5athJC8q19Q== 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=sxrYTRYvoigB/XkLSP2+ypvpJsb1vcDv+m8BGSQSO4g=; b=XOAvCgeBw1Xvzv4S8Ed9PGHllPJ6OQB0BGJh7WmutkjsAwcVaE3gl/bkfjagKdyXfhat+5O2jlJEAhomh6g1IxVCPOnDOhFyJFZaKSlIU+LtBfd6Crf6FuMg878HNmctLZNR5eAVxdFo8zRDuk/E1F5arhFDdB923X/ebfx1hixZPwuOIg1gieSbu7xlCaEE3HpaEGL4YvQ7CTfDjPOYq5jJQH58kXfM2kEbaUqNv4I4y1Yj4BQNAQJL65bTHiNd9afsmQy0qy4sjX9gFy9dKdMUZ2FPtCEksdmqnh7oGTTGhH6lXT4fWT0V49sAbrts7Q0uW5yeR8qr1SInnKfhCA== 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=sxrYTRYvoigB/XkLSP2+ypvpJsb1vcDv+m8BGSQSO4g=; b=IO0Y+gKxTgSPwS2pbDvR0b5IXXKxHkAvdypkUy4iddaVkFvYqK5+uyv/JwNQy6VhRChf3Nqr2xJiC21JsvBVHQe6nQg5cdZjqiIFoHxJ78IsidI615QTaFO6IrHzR5AA3ozOmsQNu/KQKqCWKI3ZTtQoLdzwDTVcRNt5SegQRMw= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by DS0PR10MB7269.namprd10.prod.outlook.com (2603:10b6:8:f3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.21; Tue, 4 Jun 2024 17:42:02 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:02 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 04/18] maple_tree: introduce mas_wr_store_type() Date: Tue, 4 Jun 2024 10:41:31 -0700 Message-ID: <20240604174145.563900-5-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR01CA0027.prod.exchangelabs.com (2603:10b6:a02:80::40) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|DS0PR10MB7269:EE_ X-MS-Office365-Filtering-Correlation-Id: fc28ba54-eeee-4838-f824-08dc84bda424 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|1800799015|376005|366007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8rfWhw7tUH17U+tDmOxdT6Iz10FK+vgATom1Yk8KNgmdhRxydxN4XBly/0ox?= =?us-ascii?Q?CCH4bx8UjzYTZI1YzNOksEMGrbZulDO7lHTdhh2/2piXqBNw7j+NQUIBGR/K?= =?us-ascii?Q?MucSj8WP12DobV12maS5iF2Td7X1s2wTi8dSf8Hh/qMIXOV8wPhCCMsic4Aj?= =?us-ascii?Q?gluwKZorgMEfBjdyHsUViruUwleCaWwPjX2Ur+i/7qJqC2iG2y50MPupTyXm?= =?us-ascii?Q?Plo+0GsVMw9fL+XuN2/n/GEpC7mvSwCpHOsfmeLdPj2V+0NrNQMCkUHRxmXv?= =?us-ascii?Q?15c8bGaKsByU4JTCbbJXOshoKwLRk6CIuQI2WQxG+bS+KFQrZwF8zhp0YB2/?= =?us-ascii?Q?7cS80TQbYVMkE+oNqdDAKNnlyvABKl3NrH2R0CjxLs12s+GT9Zui2xvXmePW?= =?us-ascii?Q?cCmwCjqSJHQD3ydPPBUdEuqx9Wrutu2jehgYYlSQGGm5Q7Ekm7P/FSNBEQF3?= =?us-ascii?Q?IjVXAvGR/zQyZvL2LN+2/E4QgAUHNNkcTEOsuXyPKLy1DRt6i5aLYM2Yg5Cr?= =?us-ascii?Q?lbecpozif8Alv+CL3BKjFOrhAqkvgQowe0bZQLxV/2zZBaEsbEQYUhhJuGLM?= =?us-ascii?Q?eqgWRFuUN2F+v17dNQ+4nYWdMGnACVIKxHvyPZa8hjDJrPDFwn5BACOczmK9?= =?us-ascii?Q?AmxFEq5DVG70TNqvlYJa1WhP5JE/wWyxHSpkiwSLwWJhyTcpg2vmJVVqhc/w?= =?us-ascii?Q?MsjwTWTm8a+OWEmlRlisqvwNoUQAzCzhwh3Wywxjgv6CJRQbRBPVcVyQay9y?= =?us-ascii?Q?OCm4cS/1I5jPNwtWB2idTl7swmaJDCX6f5Ag5QtAVrT3X0qCbacgSi0dOKwx?= =?us-ascii?Q?Mk5AR+Fd+/lool03x+l5Fwq0tTksbNdci4tQQc/eXxjzjiZFLTvfekuDzHzl?= =?us-ascii?Q?s1JoLqSL6f766ISCnNDCPIUUflIMcQJ5sJ+XUPdrtDrfBeQsJ6Q106xdyyfc?= =?us-ascii?Q?1hfRBr+cdLuK7Crgh5/qgiC7MSVg71F37URHqo1flaTD37C9KAV+/3f5c4by?= =?us-ascii?Q?IqK7/q/d7CdYRy2q6kTfhMujHD/3LpTeAXnjXWQCTvVHGfdPmBTDQCzIW9P8?= =?us-ascii?Q?WKrpopniZDV/IbKqABoM5TigP76xyUudjTkQrx8wc2y0qqiVOGt0EGmJkTRr?= =?us-ascii?Q?4GSAoA44LCeob1bCZn845mW4fQVIPHGoYdE/1DIr5Qk6GnSlRzzBIAj5s6Ym?= =?us-ascii?Q?4JqxBqWLgUmYrTVoG3sGRr48YrUqVAe0Kvuu6d+4aDBglGd7WWbcTd7FAsSe?= =?us-ascii?Q?jCNOhbtmCNcRVq3JVScO1j1Zs0mn6paQsCdkNF1BjEiavrtInnAxcYuazoEX?= =?us-ascii?Q?Srra7aVRB9sS+5O0F78n9LiB?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(376005)(366007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?whU6QgvMljXOxjbgFfOqml0HuJoJYuYJEIRS7kh/K0lIm8lz58JLu6A0eUwt?= =?us-ascii?Q?nfFSH1COsDBfhKvsnIJPCQTYTljKZxwdCYTajV12FjCK8CKkUAL9Yrtx0ISh?= =?us-ascii?Q?dbui9UKE6sU3jdFnGqAaZpswLsbxcfOQqkxUD5MIaFmYuAIFT923/nq7V5UN?= =?us-ascii?Q?4wZhOUCltXDzh0UveWgIjhTUBbgLakq9uJFDCigD71JrIecS1KHpOSQuuMQv?= =?us-ascii?Q?c9VZTiEXxL27jW1jkzq58boyiHR+Ee4U1r0b7oqAfOucU9flIIt3kbhjPQ+u?= =?us-ascii?Q?ppXobh4n9uy+sGqxtCiJVoSRd0GirOmKtF5yysssV4VqOaDH1tX/VgG3emTO?= =?us-ascii?Q?hDxK7ED9N1UbUrHEGaY6bJgg5gRG6I+xH1jhXlknqleZvKQGXdDQHah1c17+?= =?us-ascii?Q?+rg+f9LCup42HrCCbyJW5cDoua3qn+C+K5BOZMQ73kF5kJ8M6LJteRHgVeLk?= =?us-ascii?Q?g0iu1Cb7wEa9gl3de8cbkSEM/POWsAEFObkMYxLhqPYdGMIwSuksO3OkkM5S?= =?us-ascii?Q?HHV4JDYBDCTNG+rIA+rwju0ve7B4wqLXfuZcuN9iUR7NJ33sCeKr7JJnCdSt?= =?us-ascii?Q?i5cD42YyZPkrNu2SVDx5TiojLFwKlxdMaMjYfEwiz4RBjMrySYKwIfgcn3X3?= =?us-ascii?Q?by1MNTFWs7BaMRnhir9OA+W4ypXP5U3pCJapTpQEZ2kXgI2hgbVLzKPPMHhn?= =?us-ascii?Q?qz0OAiBys/c3f5lIORs4L0EMjUS7repYhY6hcRdpM4Mpov8th9WCXSCAVFF5?= =?us-ascii?Q?ajVADiLERNTRWO84L/Mqi3zb8zRoLcGBoS7aQKJ40DZ+dj2/zIxXLpz6U0K0?= =?us-ascii?Q?XB2kB6x6EbTynDfmjQA9PNGHlLsSGpvL8Ov83K3kiBrb/eTwNWRTLxMphNgu?= =?us-ascii?Q?g8DB7c/fPTXlA6i3eo1KQDKZbF6oihc9MXhxZPQudqljrkUd0f2C62YhHUG4?= =?us-ascii?Q?ueL+e/wow4eDZBX0HOoM9ApkJEiDB8bBUXJ3EWLcg4/faBtqw94HiyQJeFSw?= =?us-ascii?Q?7VN/pVE7ae7jccalcuOgVlY3qNjiS/zeEIW/MRo96biegPDNyrkuYSSqMG0U?= =?us-ascii?Q?qa8bx4tNiYDRAmjW1PIH537wJEh+MJAjnfwR2STIOi0eFJzodwlne8/443Df?= =?us-ascii?Q?moPuGc7RU1VKQMz+iASxMjRwaiJxGUtHQxRkM0YptvTU84qBLU0/ikqa4JFy?= =?us-ascii?Q?emNakByAwkVEfyWYT96jsnCFBta3FcNaST5fPLacSxn7oQ3RHh84vbQxXRxY?= =?us-ascii?Q?2sUb6ZdzxipyTNraJbqKe4v+EulQ0rSWmCLutjECyTuP+23epCOwy9oHGvB7?= =?us-ascii?Q?pUh/oOWtubydmBFoZiHu+oqOwGilAEngeG/siT8plaeUSyrHqnnHOy2iiNNU?= =?us-ascii?Q?x0KxYjksVVuY2WNtjJpgZt/X84rFlULYjUluKFnLzWdB8RWDVOpRxqE5YfFg?= =?us-ascii?Q?Wtym/fhkzjpo3KytxEI5+HFQFknAudGTTLb07iPja+OPq/Co1q3HSzXeiyfM?= =?us-ascii?Q?3hqlw677qaqtHTB2jaTSh+BwLtVKINR/pb/IL4HOyj8edVFwD5La6SckFTJn?= =?us-ascii?Q?nlmuBQ+L2d0DNfi8JlbxdY3cbT9InPGLtAgC/fNW1GptMqX1shiUZ6vC6v1/?= =?us-ascii?Q?7nruF9WkHBxgN1g2A8fEEnw=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: PKmCBa6bXhPzIPNaYpJjYkhN1I+eGNpEFbECtU26nZ2VG9FX4HyYtRKsKKaEvBxvwuWuQB01qc7xqyvXDZwPfa7f91YfhhF9kO7ivKxi6ZUqdjb1xZmkAShn73jmHdWwJ4Fog4nedl3mgydgZlGH+TUuGjo6GdK1xiX+QCSHeH4POMGC4tEa5KQqYievM7moV4IsFii2HNQNamGNhD0+t0rIdWoSUJcpOu3RqsSFkHhQo837ab0WGX8HQLP2R++vCsf9WaGR3EHv180HSykPLGpCO/lOQlgB37OnVMJC2/KvwnU2krcgv0jecAKGj+qs96YCl1v69g2WLYGGJm9voNACgKsNx2wIMksjV8JI9J4rTR3I9sozTYlHQxTaIJ+EUMNOiWOx5CcdOGjFAra1YdAP4EIWBlLW3D49uFp5/5RqNztOXvkNIybxAOZ+BJiyhULmBCezx8H9L4rmsB5Z8Q4fxnxBNc1IEq9czB2EDJMXKJaws8LD1F4k93ofqV2t97yk3zcLDAa33p894bT2wYMirrcfoIlKb+xtiMNvTu5BbhWfaf7IhDQPiMSv3z86uucw9lvEvOsqgrYV7Mc4+55lE3G6294Us0HrIFZEspA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc28ba54-eeee-4838-f824-08dc84bda424 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:01.9247 (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: AnFpy5mhFD1h2bdkdlSEsFVGh+g9qCQSrklkNjo5PAOUUZ8VvaqXIhcEbVP6/vZQJxshVOEUtBUL/cxkHXCJBdAHRZtBFF2fjOEhhFptZ18= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7269 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 bulkscore=0 adultscore=0 spamscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-GUID: Jgkfsp6eopO60sV-NnsTncDGs413UkCW X-Proofpoint-ORIG-GUID: Jgkfsp6eopO60sV-NnsTncDGs413UkCW Content-Type: text/plain; charset="utf-8" Introduce mas_wr_store_type() which will set the correct store type based on a walk of the tree. mas_prealloc_calc() is also introduced to abstract the calculation used to determine the number of nodes needed for a store operation. Also, add a test case to validate the ordering for store type checks is correct. This test models a vma expanding and then shrinking which is part of the boot process. mas_wr_preallocate() is introduced as a wrapper function to set the store type and preallcoate enough nodes. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 210 ++++++++++++++++++++++--------- tools/testing/radix-tree/maple.c | 35 ++++++ 2 files changed, 186 insertions(+), 59 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 2558d15bb748..b37fa8690558 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4278,6 +4278,150 @@ static inline void mas_wr_prealloc_setup(struct ma_= wr_state *wr_mas) wr_mas->content =3D mas_start(mas); } =20 +/** + * mas_prealloc_calc() - Calculate number of nodes needed for a + * given store oepration + * @mas: The maple state. + * + * Return: Number of nodes required for preallocation. + */ +static inline int mas_prealloc_calc(struct ma_state *mas, void *entry) +{ + int ret =3D mas_mt_height(mas) * 3 + 1; + + switch (mas->store_type) { + case wr_invalid: + WARN_ON_ONCE(1); + break; + case wr_new_root: + ret =3D 1; + break; + case wr_store_root: + if (likely((mas->last !=3D 0) || (mas->index !=3D 0))) + ret =3D 1; + else if (((unsigned long) (entry) & 3) =3D=3D 2) + ret =3D 1; + else + ret =3D 0; + break; + case wr_spanning_store: + ret =3D mas_mt_height(mas) * 3 + 1; + break; + case wr_split_store: + ret =3D mas_mt_height(mas) * 2 + 1; + break; + case wr_rebalance: + ret =3D mas_mt_height(mas) * 2 - 1; + break; + case wr_node_store: + case wr_bnode: + ret =3D mt_in_rcu(mas->tree) ? 1 : 0; + break; + case wr_append: + case wr_exact_fit: + case wr_slot_store: + ret =3D 0; + } + + return ret; +} + +/* + * mas_wr_store_type() - Set the store type for a given + * store operation. + * @wr_mas: The maple write state + */ +static inline void mas_wr_store_type(struct ma_wr_state *wr_mas) +{ + struct ma_state *mas =3D wr_mas->mas; + unsigned char new_end; + + if (unlikely(mas_is_none(mas) || mas_is_ptr(mas))) { + mas->store_type =3D wr_store_root; + return; + } + + if (unlikely(!mas_wr_walk(wr_mas))) { + mas->store_type =3D wr_spanning_store; + return; + } + + /* At this point, we are at the leaf node that needs to be altered. */ + mas_wr_end_piv(wr_mas); + if (!wr_mas->entry) + mas_wr_extend_null(wr_mas); + + new_end =3D mas_wr_new_end(wr_mas); + if ((wr_mas->r_min =3D=3D mas->index) && (wr_mas->r_max =3D=3D mas->last)= ) { + mas->store_type =3D wr_exact_fit; + return; + } + + if (unlikely(!mas->index && mas->last =3D=3D ULONG_MAX)) { + mas->store_type =3D wr_new_root; + return; + } + + /* Potential spanning rebalance collapsing a node */ + if (new_end < mt_min_slots[wr_mas->type]) { + if (!mte_is_root(mas->node)) { + mas->store_type =3D wr_rebalance; + return; + } + mas->store_type =3D wr_node_store; + return; + } + + if (new_end >=3D mt_slots[wr_mas->type]) { + mas->store_type =3D wr_split_store; + return; + } + + if (!mt_in_rcu(mas->tree) && (mas->offset =3D=3D mas->end)) { + mas->store_type =3D wr_append; + return; + } + + if ((new_end =3D=3D mas->end) && (!mt_in_rcu(mas->tree) || + (wr_mas->offset_end - mas->offset =3D=3D 1))) { + mas->store_type =3D wr_slot_store; + return; + } + + if (mte_is_root(mas->node) || !(new_end <=3D mt_min_slots[wr_mas->type]) = || + (mas->mas_flags & MA_STATE_BULK)) { + mas->store_type =3D wr_node_store; + return; + } + + mas->store_type =3D wr_bnode; +} + +/** + * mas_wr_preallocate() - Preallocate enough nodes for a store operation + * @wr_mas: The maple write state + * @entry: The entry that will be stored + * @gfp: The GFP_FLAGS to use for allocations. + * + */ +static inline void mas_wr_preallocate(struct ma_wr_state *wr_mas, void *en= try, gfp_t gfp) +{ + struct ma_state *mas =3D wr_mas->mas; + int request; + + mas_wr_prealloc_setup(wr_mas); + mas_wr_store_type(wr_mas); + request =3D mas_prealloc_calc(mas, entry); + if (!request) + return; + + mas_node_count_gfp(mas, request, gfp); + if (likely(!mas_is_err(mas))) + return; + + mas_set_alloc_req(mas, 0); +} + /** * mas_insert() - Internal call to insert a value * @mas: The maple state @@ -5506,69 +5650,17 @@ EXPORT_SYMBOL_GPL(mas_store_prealloc); int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp) { MA_WR_STATE(wr_mas, mas, entry); - unsigned char node_size; - int request =3D 1; - int ret; - - - if (unlikely(!mas->index && mas->last =3D=3D ULONG_MAX)) - goto ask_now; - - mas_wr_prealloc_setup(&wr_mas); - /* Root expand */ - if (unlikely(mas_is_none(mas) || mas_is_ptr(mas))) - goto ask_now; - - if (unlikely(!mas_wr_walk(&wr_mas))) { - /* Spanning store, use worst case for now */ - request =3D 1 + mas_mt_height(mas) * 3; - goto ask_now; - } - - /* At this point, we are at the leaf node that needs to be altered. */ - /* Exact fit, no nodes needed. */ - if (wr_mas.r_min =3D=3D mas->index && wr_mas.r_max =3D=3D mas->last) - return 0; - - mas_wr_end_piv(&wr_mas); - node_size =3D mas_wr_new_end(&wr_mas); - - /* Slot store, does not require additional nodes */ - if (node_size =3D=3D mas->end) { - /* reuse node */ - if (!mt_in_rcu(mas->tree)) - return 0; - /* shifting boundary */ - if (wr_mas.offset_end - mas->offset =3D=3D 1) - return 0; - } + int ret =3D 0; =20 - if (node_size >=3D mt_slots[wr_mas.type]) { - /* Split, worst case for now. */ - request =3D 1 + mas_mt_height(mas) * 2; - goto ask_now; + mas_wr_preallocate(&wr_mas, entry, gfp); + if (mas_is_err(mas)) { + ret =3D xa_err(mas->node); + mas_destroy(mas); + mas_reset(mas); + return ret; } =20 - /* New root needs a single node */ - if (unlikely(mte_is_root(mas->node))) - goto ask_now; - - /* Potential spanning rebalance collapsing a node, use worst-case */ - if (node_size - 1 <=3D mt_min_slots[wr_mas.type]) - request =3D mas_mt_height(mas) * 2 - 1; - - /* node store, slot store needs one node */ -ask_now: - mas_node_count_gfp(mas, request, gfp); mas->mas_flags |=3D MA_STATE_PREALLOC; - if (likely(!mas_is_err(mas))) - return 0; - - mas_set_alloc_req(mas, 0); - ret =3D xa_err(mas->node); - mas_reset(mas); - mas_destroy(mas); - mas_reset(mas); return ret; } EXPORT_SYMBOL_GPL(mas_preallocate); diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/ma= ple.c index f1caf4bcf937..c57979de1576 100644 --- a/tools/testing/radix-tree/maple.c +++ b/tools/testing/radix-tree/maple.c @@ -36223,6 +36223,37 @@ static noinline void __init check_mtree_dup(struct= maple_tree *mt) =20 extern void test_kmem_cache_bulk(void); =20 + + /* test to simulate expanding a vma from [0x7fffffffe000, 0x7ffffffff000) + * to [0x7ffde4ca1000, 0x7ffffffff000) and then shrinking the vma to + * [0x7ffde4ca1000, 0x7ffde4ca2000) + */ +static inline int check_vma_modification(struct maple_tree *mt) +{ + MA_STATE(mas, mt, 0, 0); + + /* vma with old start and old end */ + __mas_set_range(&mas, 0x7fffffffe000, 0x7ffffffff000 - 1); + mas_preallocate(&mas, xa_mk_value(1), GFP_KERNEL); + mas_store_prealloc(&mas, xa_mk_value(1)); + + /* next write occurs partly in previous range [0, 0x7fffffffe000)*/ + mas_prev_range(&mas, 0); + /* expand vma to {0x7ffde4ca1000, 0x7ffffffff000) */ + __mas_set_range(&mas, 0x7ffde4ca1000, 0x7ffffffff000 - 1); + mas_preallocate(&mas, xa_mk_value(1), GFP_KERNEL); + mas_store_prealloc(&mas, xa_mk_value(1)); + + /* shrink vma to [0x7ffde4ca1000, 7ffde4ca2000) */ + __mas_set_range(&mas, 0x7ffde4ca2000, 0x7ffffffff000 - 1); + mas_preallocate(&mas, NULL, GFP_KERNEL); + mas_store_prealloc(&mas, NULL); + mt_dump(mt, mt_dump_hex); + + return 0; +} + + void farmer_tests(void) { struct maple_node *node; @@ -36230,6 +36261,10 @@ void farmer_tests(void) =20 mt_dump(&tree, mt_dump_dec); =20 + mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE | MT_FLAGS_LOCK_EXTERN | MT_FLA= GS_USE_RCU); + check_vma_modification(&tree); + mtree_destroy(&tree); + tree.ma_root =3D xa_mk_value(0); mt_dump(&tree, mt_dump_dec); =20 --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CDD714B96B for ; Tue, 4 Jun 2024 17:42:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522954; cv=fail; b=BO/JMJvMpiV/ZiKVftZX2Kg1EfxbfhwosfpL44XkVa9r8nITRs7tFqTBVyAGJk5Y/Ns8PH9D2glHxo91Yl+zAWS5QMapVBh1wr5u3gE6KfFp4HkjHzQH91IXyGGkxHCVENy8MbGITR7CcTIxdB157C/v8sVNdAOaDhacwyu1Zpk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522954; c=relaxed/simple; bh=HB7Sh1PeiJALq2jKcRlvwqE7ckLZhm3dW5Vb5poabfo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=hkK+j4LaClYA7sv4xJSXWZLg/d27TtAmvxV+dGpA6lnHL/nqzI6NugKB6E+GSwGMXEPsMHbiFW/7XB3D3EykbCO7fVNGi6IUBu4xrViVfpuOP5/kERTUcdCGlqYGHGCbPKe/XzfSEfytTNiU8dwijkjcr9+nzI2fdtc59kvgeUQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnHAU028058; Tue, 4 Jun 2024 17:42:09 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DhpxPtaHCdDpGoM+1JKTkz/eDuE9n6lt2SUfsNJBwVt4=3D;_b?= =?UTF-8?Q?=3Dh4l5LtgfYZj5B5hLfTjcutms/80uCorByqv76kE93qFfsjTK4NLGfvcExmtf?= =?UTF-8?Q?yS8LiAo/_qJrL+WY28iNVjIhROEg0hqXXjUot13w9xkphB1SZtdYQKpI5RA8PXb?= =?UTF-8?Q?FLOqZ/LRWSB0FZ_2XDsZuvIY2vzVArB69lra+A8VN9UPJIIK2U4/b6NjqrM+t1C?= =?UTF-8?Q?olB5/wugUxZuoueVK+Bn_LtIzLem8dkPbt1Sv54S8b9h+JVzVnLtW0wL23rZQqo?= =?UTF-8?Q?TXpuAiHBE1DJhw7EYeMaMJMmIg_2a16T/GmpRWXwTIZ+JiNq8E/9pC59jlfhTFQ?= =?UTF-8?Q?iVj1WWVY52Tc15V0yJVZfsGq4QvERyhr_MQ=3D=3D_?= Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv58dj9e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:08 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HNoQi025242; Tue, 4 Jun 2024 17:42:07 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrt8xx21-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LknQQZaBI1mNucTss9YmFc0h4gqVrCZkL3TU/5TLSDe+0mD4t3R9k6sji9gNyYiMMo9lidG2m7Ny803saGZAZH7CKZP+IwosxmoFpVZ2y9sveGzkDxjb+7mM6zawcxpAu5AaMG6SP6V7IstOKTJ/OO1kqZxlv923NayxeMVyA21RQv/cOVjBehyFxQAEOEEhOVtPsZwqLsdbkv7HUwGzNcVUpK6fDWPz8rW1U5+T2IUQACsBulkaZTJQrg5YlulGEVmuvhV9VVjpGe5bTRPEkbmizSQmcVwy11MA7kITlagq1lM8byEJ7qUg7TDHB6c4S20DxQKqJCHffT6O5i+Rdg== 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=hpxPtaHCdDpGoM+1JKTkz/eDuE9n6lt2SUfsNJBwVt4=; b=kIDR02RlnWuvRgpZKE1IRoYsKt58YP+LRmNRuDnSnJP5Po/DMu1Y1wYdhgbiQsL6zw57YLTdEiyDWqrQAxwF1LIO2hQ/sTT1e94leXQdLqiPe1/Y/A5VMuGHZjQYFZArXaRisMrr0lItWOzaVZX86nzOAgQjRrBKZ9dk+c6FKBv3+TLlbSGaq+VBSaEZeEScnDbGh3WXJ27ddPXoJ53d0FQyN4xuPV2e3KPL+/Pr4+nDy+B/hu/yLaMsKfojV9AC36+GO5epcPoJatf3y6nAdynp5zxsswTun/6Us9kK99paK7v5soVp7OFnArpqyGePNIFpkS0sIE2YZxxKx+CLRA== 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=hpxPtaHCdDpGoM+1JKTkz/eDuE9n6lt2SUfsNJBwVt4=; b=ax6mLaWgDp84sIGjyVuypjWaD8Xo3ca3IQDcLly6DF8uSTTS0QGnb6ibaaXYLsAjWKS9FHM6OgtzHfaacDFs1yb494pLEC4OA3i45RR0idOty6ZFgLnMOBMIj+vTiUIgJZ9nYepqD05csHRqKx9eDdFb0uYMGhqhjIa3Dqln+c0= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by SA1PR10MB7593.namprd10.prod.outlook.com (2603:10b6:806:385::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.22; Tue, 4 Jun 2024 17:42:03 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:03 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 05/18] maple_tree: set store type in mas_store_prealloc() Date: Tue, 4 Jun 2024 10:41:32 -0700 Message-ID: <20240604174145.563900-6-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BY5PR04CA0029.namprd04.prod.outlook.com (2603:10b6:a03:1d0::39) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|SA1PR10MB7593:EE_ X-MS-Office365-Filtering-Correlation-Id: 342384cc-040a-43fb-e110-08dc84bda522 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8Gea9MI95ITbr+/FvqHwP310XO2SmTZRJSj5hASsrZlhEgcksVmpP13nP8lU?= =?us-ascii?Q?G0HRy/O9vIhEKu9Gg8ry+3kC4dYyzWeM2/j6/MQCqxSuxgkHWfoITPaDUagB?= =?us-ascii?Q?t39phlGqSpsOvsK+ZASMGSDyaelfR5tl21OxDW8OT0Iupoa1n8biryCEQ3Y9?= =?us-ascii?Q?n68HOSWWtYNdSFrsU1N2cp3MC+c007ox1d2KyOtZI8K9BLHjxnZ9YX++/LPk?= =?us-ascii?Q?PHb6LJ7xLQb0JTseREI/CgFuohOFC5f43kgycQqSrXhxR6kC+fLH2K4GMeH/?= =?us-ascii?Q?y5C7/Rz6OTL6Tnevny+FRieyTVoj49H8xJjYK7UeAfm85mfflAw26JH/aDgp?= =?us-ascii?Q?ATTrAxjBI2YzuwvcXGQY2xpxD3DvdNDdBjmmRPe6no3IWzuDufcMZsdlxuhS?= =?us-ascii?Q?9vqFduMco7sFlqre6IFcE/OLrptePHYybsQNcWCZIbjI/aXq+BAIf6sqwH8z?= =?us-ascii?Q?8Ax1Ufm0zUgU7m5LPYZQ/NMDGmGSQksFPtqODLMyw38I0xJ2RtpOofS3VtnK?= =?us-ascii?Q?h27KVuhL2bP/eL5j9n44Tdgy52S8mDoWYWkxzXd3sMydDKYnFDQGgZx+Blxi?= =?us-ascii?Q?gkWY82sUqT3jXNbqrvoyxVlGJSKRrQ9X9vwbrl6ig/OiCpSscacjc68Am07f?= =?us-ascii?Q?v8fesmXt3W33/oQQ3albkdo2NO8DzCuW3cLpV5mKITkB3NMZfG7eykZczM5c?= =?us-ascii?Q?RQK1JB8yPBNpUiXxBbk0OBdVfG0Ft4OXgVPRA39Ib86s6DHdV1jl/n0ICqeA?= =?us-ascii?Q?MOd4/P9RG24iSGHd8QY8gT9TPH4QHsC5s51+9PkvSVxSf4Ui5NrLD1zRdHDO?= =?us-ascii?Q?r+BqytNtJOI58yOzPFvWHBvqPIhGa15tM7JEIMGTtp7DaCMrL+vC3jgdFf5+?= =?us-ascii?Q?pDaw8xn/Jvxu44jenxL1UIFHhEYg0692uZLzPnhOr19slDRiskI2K9YqX5rR?= =?us-ascii?Q?oDdyIyWAvSpm/PsepNdcUo1AnryNv6sQrWxIHQJy8+K43S25iqbsmy/lFjoD?= =?us-ascii?Q?DxZAvj46Ihal4xs2dl6oA5Po+jpdiDajINZqNwni7sVCd43+ZgCWLcZYF7Be?= =?us-ascii?Q?rD6YTuAy5CiR6/dtMMOUxYlLmauyK6SssZS+Yzmj9F2xtTYUhZ5KAMLy6s/a?= =?us-ascii?Q?XLvZu4qb/v/oBf7k3nZKU62GxEJQzIbSUrsU6FLc47IHA8bvlZZWaDeSb747?= =?us-ascii?Q?LZvkDyfEWIeHzYgFPbrF3xIUjnf26QFYafp23hn5Gc8O2YiA+fJEd/g8POwJ?= =?us-ascii?Q?1P7FU4MPDn985mo0sVduYfibNHydPGMcVF9o4xJR5Q=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4fXeiz7DXBr9HArSAusYXbeTFeiZPLkWam0K6Jqjw9GdD+b6NQgUapvuIOkO?= =?us-ascii?Q?/0vJwn4Uoo4x1dejQLPNDAzIXYduD6YnblBfRAz1czZjM6VNLIYM/rQVFXBL?= =?us-ascii?Q?/r/k7QpohzlbF1Db/8qIXTiGhDgQ7Z+ktMT5ld44kZvgR1MUTCFK9vcwH/9y?= =?us-ascii?Q?2K3ftQoxcbRUueG+f78ryCOoieIVV4DijFhBwuGgRu2TvEnS9CrKPK3ElR3l?= =?us-ascii?Q?lgumCvieqHeS2Q99NnroBU2QQWvTgnpKKP8iv6wDA2Zimyq051phs6MeMup4?= =?us-ascii?Q?7mbwQbQMNGBp6GElwioIgixg1orkh7w5N3b+bY5SCShIdZeQn3BdKukjQDMN?= =?us-ascii?Q?JQ5hEQteQCenJHsc1S6rj8SubhCf/yAXcM9TooxncHisSgLu3oxxHqv6GX7n?= =?us-ascii?Q?uT70A9HpFdWKFxmwclK5QqU3whpyhPDQhe4l9z6TO1t/aprBXLtMvwxL99ij?= =?us-ascii?Q?1TD75ZxI9RZmeddiYTgPjDHA8jZtJBqoPhyUKn9jgej1YyGkzLPZoXf7DSE6?= =?us-ascii?Q?6ZGeiNvPEXT59w4WmwVPRVFUTQ4lMB+QvdMS8MxUyty2WL6R0239fOnxyqBo?= =?us-ascii?Q?KuoIbVF58FYwafJH6wvp3skAbxfrwWZzvu9bFY77bHVHP2UVkGTudvGg02tS?= =?us-ascii?Q?UEWIaCSO16bIX0lV6ipm8zrqvKbx3Mt0BvYGQT+RPeMMeF9wpVcE3guzKDfd?= =?us-ascii?Q?TPByhaCV/K+6CEMuxQI2xfgSqL9mubqsESvRW3gpza+1mBP4AdCB8R5t4vdK?= =?us-ascii?Q?ITj0XQHwupf2i3ysmq3fUVxLNWc4xetIiZ7u5i86OGxX6H4iWXN2r7ol1Pa7?= =?us-ascii?Q?/GW7CFUQ6GLf1kilp1ryxRlg8LAgTdW9r0aYErYYU94IiMSdackf4FuLpl4r?= =?us-ascii?Q?/iLGLTTCLU3IFx7U7G2b9bA79W2cBxN9ONNTk8YA/Srf08sLCJJ8wY+506Jy?= =?us-ascii?Q?LZYA0CxsY5jx2wjJxaDjPDpiVWKP++SAgyjOnw1Bm1SVA9Cuh3lzI8hh5Uiv?= =?us-ascii?Q?RwJ0rOu8vaoFP+j5CwLMUKV4t1VPD6nmuBYduU11t29jmgU2anDwoX8SfaAp?= =?us-ascii?Q?PoMnjA05uuwJEzJPQALiuSFeq3j4/iR0PKJomJDXnghLitG0ba8gZn9Qu5Lk?= =?us-ascii?Q?0smlrZA9BTH4RwpSGMNrDOCCRtggwJdZB9NhOEoCY0b6fAPA9auCs49ZQmX1?= =?us-ascii?Q?P5nZ7mSHrCYD4o0RhcmEozyU4Shl2kZa80fkro0JYpq6kcOlaJcoICgvJ8ML?= =?us-ascii?Q?Veiq+42nDVqwrKgzuhyKn6HGwdyEiPiflfNg23CSiEgNFKv/8jypTX4od8tx?= =?us-ascii?Q?pN0BrIK2qi7kR0K8CszMRvnkpDRKvsA8A+PRnnKkGvJPsIFi46NoiRiO2oZ0?= =?us-ascii?Q?yXTBem3NIRsXWSp2YbdxKbf5Cg3Bo63RUKFfq0uoc4FbLf0edbBFQ6aHs/xD?= =?us-ascii?Q?51uziPVwCoWRBoswaxKpW5O2DIq+5oFlPYvWlGyf4UaNIzejjtTEyaKwLG7G?= =?us-ascii?Q?1KZvtT17hZKwHdMP/gn562swLYTyuxNRkuUs7DQGYou+grmWfUaqhMggK4l8?= =?us-ascii?Q?eWI1mK9Vq0CcoyacU8AzUeMn9kirH1I+0r9Mjp+1JKlflIDT8qd6GERWzj7/?= =?us-ascii?Q?iejkBrVWeXftP+/6PjDcmxI=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: x+rydlpwwFuEtsfOmCJOe7lv0aRto7mmUPhDYtz8JCE1HQ2Tj28y3UXnNDCorzqgqv59gRDjL32N6S8MRZyaK5bdktGxnO5babkwrX1LtyDq6XDende0VVSGAcLB/x4tgVrXTjm1kJb76mYQDvX6RLl5BgaB1Fh80qt16yQ3KS4ttjRkIXFoRzMdStn0ohb0OkcrCVSWvgkUVoO1dAQTujRuMjxCrqBZQ3ynnlxupQWYzCFThQzVak563fLdxbXhD09IbUVtrdZm5qRG0V2iwaZBVpsV6JMH5oKxxhsUVr01/P7QitMmS9maPxEQQ/luG3Y0ZjSiV75oX6j7txQGI7g9zCJ67wb4z7GI/xdDmfmXeiLKSV0FcXj5nJIWRLrickn9VlGVudAyGJhYET0rZzngYFeig+9dBNsJos3YjSXiZ7w2Dda2SHitG0AhGReW71sEUwZsmljRfaWkJro8P2PfrajX/G/CSiWWcbboyzky0mDhjy8KFknvUQqqGSbMhlrppImgUvr0D6UX6xhlp/WQ5jIgb4mRfaGy3DcVaWBgOYwTAG8E5cs3oLBg8FSjrfoTn+KSZ3NDxokYrFEDOySdXxFXuImVrbGiZ2DDIu8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 342384cc-040a-43fb-e110-08dc84bda522 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:03.5154 (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: Dz27FlE4T0QzQUNTukT0jWSiwi5nA0lmssbbnwSeoWkXg0e0IR9mQLouLT9g2hMcDlEug4Fq0E5bHoxg7N4PMoOMQ2BcHpWwfOYHkBxZzzE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB7593 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 spamscore=0 adultscore=0 suspectscore=0 malwarescore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-ORIG-GUID: 7jk2jXqsA4sJBvNYoJnZlLdJraKQEqHl X-Proofpoint-GUID: 7jk2jXqsA4sJBvNYoJnZlLdJraKQEqHl Content-Type: text/plain; charset="utf-8" Set the store type in mas_store_prealloc(). This is needed as mas_wr_store_entry() will be modified to read the store type to make a decision about how to complete the store. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index b37fa8690558..3780d4bb0415 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5631,7 +5631,8 @@ void mas_store_prealloc(struct ma_state *mas, void *e= ntry) { MA_WR_STATE(wr_mas, mas, entry); =20 - mas_wr_store_setup(&wr_mas); + mas_wr_prealloc_setup(&wr_mas); + mas_wr_store_type(&wr_mas); trace_ma_write(__func__, mas, 0, entry); mas_wr_store_entry(&wr_mas); MAS_WR_BUG_ON(&wr_mas, mas_is_err(mas)); --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E703014A622 for ; Tue, 4 Jun 2024 17:42:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522949; cv=fail; b=Wfns5MtAJtyTyuZBBSKDTHD5nhYO+rLnVxFaSZqQ7UfpP9OT5/zpC70OQulfYcuhMMteVyvI6LTXE9mw29wCK4ju36Vqb1AS6jwVX3nNozFTH07UOwzcK6zbsPUTJv/U+TDv2enhZjK2iuMa6RJtshu3Y6yPwJ/NMwz2nb5Ux7c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522949; c=relaxed/simple; bh=EF3oQXtqIaKVD6YYzoRSRrisiKxGk5sCfo3r7kmpD28=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=TMVXFg+c1dUNJ3YrAyj2TZSNd94qds+gFoyhztjjxRlDPgD3z94Wx1XpfeKkp/M60B72d3kL0ZUmUUhoQqYgGfCeHjLhlpgV+OBhxAZFXitXTawFBulAe/vFHaiNJNp5Yt5/7nm0/Wn9sYKyFsOg1x6drTVLsCM4dRSBEf3tJMI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnNwA028131; Tue, 4 Jun 2024 17:42:09 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DRMx6uAATy7QTVcRAH9zV6tiagLCEAV9FtRSVTr0+QWc=3D;_b?= =?UTF-8?Q?=3DS6Tp4q9ARLvKipWqH5fthgPfGLhfKkOAKqmqDll6lMle6A2SKwNXztHOAouJ?= =?UTF-8?Q?wEmNYNcj_dtFVO4FCq8s3h/1gDkcmKFwS5sOwie9Gmca+kK0z0YYLx46TCR5cFk?= =?UTF-8?Q?ezSfjXf/S/yzMi_tME30V57An+LtCWun6miwan720YRCab96A/5rjJzJ8ch0x41?= =?UTF-8?Q?JJxgB3M3fm88Q9D2e7xC_oES+6jE2QbbpHxQbU3ZLwGpBVmfWoH/NBWu8It6AcD?= =?UTF-8?Q?ZgVuL6MTsGI+gQYqYbSFyiTLUO_7qilIxsMVV6Dx0O+7jXHIl9lPyXmZs252Eni?= =?UTF-8?Q?AqtstUSlmwO7/8UtcS9YB0qF7rrAebnp_Rw=3D=3D_?= Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv58dj9g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:09 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HNoQj025242; Tue, 4 Jun 2024 17:42:08 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrt8xx21-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l3WycuekYfUB04VJuoVa1sQQ5HLXtOrpkvEj3cSdBilmnRy/sB0AtHXTIQWwKNtc/Vj6XbuAR1lVH1rI4nRXYCRhvUNmvQ+o1QYlPVKW2gI7aUFcPlXnxOBxBbb8Pj8x2sE/l2bn7w3mLla77xSlC0Yai1TlCxqRr3WquXjS4Xhky7HNTFAsfVAluBMVWDlMRF34lfsC8/y1MhGvwQxR20W4TRyewZsRmp13wL3IUSkzYcXrTqVH5yvy4HJ1atkBo+6XtvEFGSzduGkZc+qWAvsWdwHDWtsr1GyhWSYdWLgbPO5Y2N1ZVm6YuAIutzkGnC+K6lop1vPj9TXSOMgGGg== 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=RMx6uAATy7QTVcRAH9zV6tiagLCEAV9FtRSVTr0+QWc=; b=Vi5NxHzXt3sycoGzRBXd0OEf6Ymnn0fuhXWXGJ/+JDA8yd/kT6OsSVLZUgCdmtu/Q1l7MfqIFe+UwVJMyspYJY3GuKOb8sa9HTzFt2LaA5Oooqt9PEIwU3QRZCMLHxf9dSp6EYTX881Y8R4TYJysnO1/q2YYerijx6j9sGp7SO4+h06aI47mtTUPU2WO0bZk7CWWABAlMi57Tmi3OC/KA9s1/C9tUV7mIOGsjlPIDTP7GQkMmJ8Ox4uvK9RJo19tTsfBc99eOSZxArrjv/pmJGtVjBOKsXi+hGvsFQxelkgZH7n2bhiyJ8+F9aUg2hiihsZ3VhWf7tgCReYU0ikKjw== 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=RMx6uAATy7QTVcRAH9zV6tiagLCEAV9FtRSVTr0+QWc=; b=fxqSD0HJzvaQmYkGEEXUhaD1oGOypL4gaCytaWuyFN1oelsBVKjZe7bzxqDUAj+gIXpi/Qe++GTmM+ShmDvLI1RqSWbJ0EU+osogZGcGC8WJR5+gapcHCsezCvT0BZgj06vDb22UgQN/8lCOiJNsQjv2E6oWTHY7Ty7jANJPKwA= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by SA1PR10MB7593.namprd10.prod.outlook.com (2603:10b6:806:385::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.22; Tue, 4 Jun 2024 17:42:06 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:05 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 06/18] maple_tree: remove mas_destroy() from mas_nomem() Date: Tue, 4 Jun 2024 10:41:33 -0700 Message-ID: <20240604174145.563900-7-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ2PR07CA0011.namprd07.prod.outlook.com (2603:10b6:a03:505::20) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|SA1PR10MB7593:EE_ X-MS-Office365-Filtering-Correlation-Id: 96b9b646-c952-4df8-9144-08dc84bda64c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?YiHAjmRAmUkkNvHpu9QAWBTt4mkzhEuyccGYqtEEye0lkvtJSYApXZ1OMR9J?= =?us-ascii?Q?IqHMEdjAFgXDFmCn6V3GiitNrbWoCJvpz1h6kOiFH6aSQ4ZCo7cOCDCYeYVL?= =?us-ascii?Q?3qJEzlNNNKz9fHJ4LXyax9bHEBVVHmq0gm+54SJJu48vEECz153YZSiFqY+W?= =?us-ascii?Q?Cc1B5sO/j+AvkYf7leHOHPdmYBq4nRgLGXgU6Rpx0YN6Jpe9xMxkPvxu+xnd?= =?us-ascii?Q?5GAyMrk4NPKW9sd590CAefz9awesUv6qM4egUFe55SsmOkir8mZ5op9Kom6I?= =?us-ascii?Q?fuPsBuusM4GXcnszaluDXU10gzb9QZdzyifGCBnykpsig7lqPNbck7eLQgvb?= =?us-ascii?Q?S0NrD+goj7Hel7XKbnEvz31GKmD9myDY6auwSNF+nSHFMTpHMSXEmr2sjCgQ?= =?us-ascii?Q?lXDzRavYTRPbqc4IKBlKIHpw5DWvZFhPbUM5+C4lAddjzANcdpzv4bEvPcRp?= =?us-ascii?Q?xXckJd3XlavmU6FG9VvCnXO9cCv3Uy2KvHaOpHSMTs4C9yN26+BT4SyVWCGI?= =?us-ascii?Q?EwA+GI11rpJ5SCcmD/M1ZJPvgEB3l5AZ0AKc9+RLnhAoljFXwVP44/4s2ieS?= =?us-ascii?Q?yPsfqxGbmtRo/GAL1T/k6vG9GLT/hM5G+jhmeCP7d4LMIPU6DLDyqzZ2ei1x?= =?us-ascii?Q?PSA0ldCVJH+kCida86GVyOriYVoE2IiCSKYq2NCjl/OGiA5EMG8NgDVlFdnH?= =?us-ascii?Q?+70Zh1nWgmKx18asT0N156DoqPmCKetylTCba4GtLEgmqmTco35FTL9Kdxyx?= =?us-ascii?Q?h406VKh0I49wkCfm/r9GpiLu0oKDLvgSkUTEinYAMcGfORdKhvateZbOLWga?= =?us-ascii?Q?xAc0MRtcUMYWpXDhqrgFyDNmOiXkSyQZma13dRFh0IDGlJMKhObZMNOUDfFJ?= =?us-ascii?Q?uQ4mBu83gGuE5Opr+CsfxPRYsz5bQw5nPp/hh9y/nJ224XmrSBreGVOwVayZ?= =?us-ascii?Q?JQZGl3j3Djvvx0KrKrFkbGGiScMN4mLndQPbv/VL1pq5GSWq7/EZBsEbWYOh?= =?us-ascii?Q?X/3wlFkfz6pU9oBk2YO9SCcaXl/OYvulQJCPm5hDPRUjAzsetU5go79TCd+x?= =?us-ascii?Q?OH5XqpZLL39WMN6RunHsENou4SThypCi9cG38SgkdVtW4+o/aYyC0kKUf9iJ?= =?us-ascii?Q?eh9LN/hvHuDgqF5FBn/efR5XpgzNoN9iDqO7u0ugC+Zgc0tERlMd4vimJklu?= =?us-ascii?Q?/v71EqyEout6Vdd9AL9oq3tq0Me8DQhVlSmYjBP+JcssJliHZbYlFjNZtZRV?= =?us-ascii?Q?cYRQq0723mMp5RvLoggLvjtXU/W6V4T4CxDpglsp6Q=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Nd1wa1ulr+wrHbN9dgFwv5mYonHWbPzWO9b8Jsw4UEdNR8jmJ6s1TRzX99o0?= =?us-ascii?Q?jtQCQu3Uzm4grPg3bDESCr7NflIXAZwrLidQzE8TWZnwm6WIJ4Ts6hh2Q1FZ?= =?us-ascii?Q?tOTX8OcP60U1aMv8AYgjcINOR4MVUP00LICbGPDOvO+cKB/JLiQeqdUvnVdc?= =?us-ascii?Q?SbYu7B0ec1rI6XSWolPSjFp3doZ2AXUgLNf2X5WIGYkq1/HK1LnUIQlNjfC5?= =?us-ascii?Q?eMHiXD1V3p4bRBceC88r4S+Gjd16KyGuQyT4YbN2c7bXiIHMbA1Nfwk8kAM2?= =?us-ascii?Q?z7f5hcocat3yS1F+7gFv5W7+gwfJ0sb7byVva5q1JtBRqEds+NS26YPUcoD4?= =?us-ascii?Q?vs80Xm9XuBHpKKTU7LFMmuHzcNsdpxklONQGzOiEknc909SNhKP0UvoaVeOG?= =?us-ascii?Q?57XgWAA/mvwBhj5+JGxnnTqV8VyKRISMmaRwm9KOagQjJ4ZedgnC9Ka2N+fJ?= =?us-ascii?Q?FvGJ2Esm53yyIiTF1mb4y1CxSgvQxEAjLlPEMCAcaw6hR5V4qpQl6JJtyoaK?= =?us-ascii?Q?pxOx7AH9qFdwEIMkNmrj/VKqlErcH9QU5muhwxoQKbMnPRbIRmRmP0K0aPpk?= =?us-ascii?Q?LbeAZJ3UInjeU/1+4fXwezKy1Wqj/AzPmf6iaopUo9cnqUCc+EZZEJg+M6VC?= =?us-ascii?Q?t+BNcvUW7+3VqoVe0FYxVtv6HqqtDz9MYUpYkfhlvKMg8y6Kj0lZlt+UjNPs?= =?us-ascii?Q?xv3SfSTXMeaaFnQDAlQbsn81/5wPY+rKyDYTLPOnWWenAXlW81xyy2WZNbJH?= =?us-ascii?Q?mloYPlUb2d3C0Mfb59AcU3OYbQn71a8zcPL5uF0cll93rCsMEN4gTy04370S?= =?us-ascii?Q?MfVKmkuVeSTeNEDs3+OPcw2/8WisQPukZMvqkEsdachWTeS2dQJYmhhoAVv1?= =?us-ascii?Q?ChGB0Uz+6+z3f0MSpi0DgTB8TwKG8DwnffXB3gN6ZW/vHibtj6XowSollrZ4?= =?us-ascii?Q?PE6MdL8Y5wF3X/F9miogv2BH0t6Vpgb8O1qSbVE9bDADwdXbNKZqbvWaGd4D?= =?us-ascii?Q?UKLGxK6BANO8bObNr/0wgv6SnS2yvQ90YUQEsU27HLi8bVqiX0TXDKI0t0mn?= =?us-ascii?Q?oTFApG+cUt98VRXHmMtlWGd83wJ9ooHrz+u43N9r2HulsCB1zu4jlo+OYp7G?= =?us-ascii?Q?R+hS8s3ykUsk8UDKCnyj2pg/sEgiWlYOCLb8pZD30gP7RbaKC4GmM9qEjSzN?= =?us-ascii?Q?3Ps1LZm8QOAUxtGEGpqvIkqUo3e+wfGNtTKVV3gjl8RM2AOkiTZeYYaN1jMi?= =?us-ascii?Q?6qAq+9vmCF9KkqXmxsTKBAXXqSYwrHnWPJU3XdhrTy6X0OQ0k8NT39SBMp39?= =?us-ascii?Q?PQHjLS5X2XqCTrm5wRr1jWDrSOThqpaKIyGQH8Un6Jj8D7IbEJpRIXOV4Urm?= =?us-ascii?Q?hJRRQSGhlxR0raHVR0nPbT2EtMMRS2O/ErVDjb9SxjaPjarzLI2NRqU/qBRQ?= =?us-ascii?Q?6HLvGs9NE3fTNNPILVXR+/rJVugDO8Oh54u0y5P9lFKlmgA48cUdIs6FPi0+?= =?us-ascii?Q?cMGJu8hOFSv3Z3oN2l8ZLQgweNc9MpD0GHmNB2DC9/tiN3fJhNHiH1j6HtDt?= =?us-ascii?Q?CKHaYbAGvkdP6ElQo6fM98mOho2zzcDhcbb/7KPsyug3M28gOv+A9i8GpcI8?= =?us-ascii?Q?xfm2Vu7zSbQD4oKpzYmd4gM=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: OcsPUAW1XtaFRMsrPAHgAJSpevE8beW+JGRhIYqL/YMo1xAsZdlkv6h0nQfc1BAc17GUbMlsHw0tYOoHPSnMrREmNYW/ouqdgaMeuZ3ndJrnVYifGP78mzvOq0gYoX3XUVg4S+e0/y55zuvrLhT6ILR/0Ub02ebaqaKlbDHKdkf2fiSFHmWnKAvt3+rlnOc2KK51kc0UyxcmG2ZBXoy55ycOR5liLHgiFz8oU5LySFKkwvgj/FsfBRoqSRvSQsbybM/9OfwhN0RBJwGOzaUkO4syyKt0wA1R0HPOUG1FV1BeHl9l+jFciN7o3Kc8UFgFPbCg7SkBdIhZdVw4GHjNZFWWafO6ZO2ym1CtXVDp6l8HLGG8X33G++wQZlDvTC71a+sl9Idiv5t1zSdOsBkjRVE1Oyev4D51Q9rBmnj0Lcv484ev38Xpg1mBu3I1ikOI1aiFvHIOQ+OtvRgSPdBYjf/z17s6jwdB7EW4W/MggicjHcVJTD/UU78JCHsw+42rFpmOXGFG68UsNMwC8OcLZeuK+AuztfEJVNctunNDi9NBpmqUbnUYWQqFYVQjwNNUuVFVfrKaYr+E6lEfpd+SCEuzHQ6lkimLjeey1fqEBvI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96b9b646-c952-4df8-9144-08dc84bda64c X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:05.5732 (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: I/H7kmfCRvKTO8j+9dQwQYTsyE5/O4jKxJjkg1Iq7l8LcLSOyzIy4qcU9GJ4zFjLrrzAxDYEp3emaX7OQWGcrL7VFNEnxVAgnbzn47kk68c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB7593 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 spamscore=0 adultscore=0 suspectscore=0 malwarescore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-ORIG-GUID: ZqddAFvbfuPVpoEFuezy6a7vt05sgPvX X-Proofpoint-GUID: ZqddAFvbfuPVpoEFuezy6a7vt05sgPvX Content-Type: text/plain; charset="utf-8" Separate call to mas_destroy() from mas_nomem() so we can check for no memory errors without destroying the current maple state in mas_store_gfp(). We then add calls to mas_destroy() to callers of mas_nomem(). Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 39 ++++++++++++++++++++------------ tools/testing/radix-tree/maple.c | 11 +++++---- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 3780d4bb0415..f1496817e52a 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4526,6 +4526,7 @@ int mas_alloc_cyclic(struct ma_state *mas, unsigned l= ong *startp, if (*next =3D=3D 0) mas->tree->ma_flags |=3D MT_FLAGS_ALLOC_WRAPPED; =20 + mas_destroy(mas); return ret; } EXPORT_SYMBOL(mas_alloc_cyclic); @@ -5606,18 +5607,22 @@ EXPORT_SYMBOL_GPL(mas_store); int mas_store_gfp(struct ma_state *mas, void *entry, gfp_t gfp) { MA_WR_STATE(wr_mas, mas, entry); + int ret; =20 - mas_wr_store_setup(&wr_mas); - trace_ma_write(__func__, mas, 0, entry); retry: - mas_wr_store_entry(&wr_mas); + mas_wr_preallocate(&wr_mas, entry, gfp); + WARN_ON_ONCE(mas->store_type =3D=3D wr_invalid); + if (unlikely(mas_nomem(mas, gfp))) goto retry; + if (mas_is_err(mas)) + goto out; =20 - if (unlikely(mas_is_err(mas))) - return xa_err(mas->node); - - return 0; + mas_wr_store_entry(&wr_mas); +out: + ret =3D xa_err(mas->node); + mas_destroy(mas); + return ret; } EXPORT_SYMBOL_GPL(mas_store_gfp); =20 @@ -6365,6 +6370,7 @@ void *mas_erase(struct ma_state *mas) if (mas_nomem(mas, GFP_KERNEL)) goto write_retry; =20 + mas_destroy(mas); return entry; } EXPORT_SYMBOL_GPL(mas_erase); @@ -6379,10 +6385,8 @@ EXPORT_SYMBOL_GPL(mas_erase); bool mas_nomem(struct ma_state *mas, gfp_t gfp) __must_hold(mas->tree->ma_lock) { - if (likely(mas->node !=3D MA_ERROR(-ENOMEM))) { - mas_destroy(mas); + if (likely(mas->node !=3D MA_ERROR(-ENOMEM))) return false; - } =20 if (gfpflags_allow_blocking(gfp) && !mt_external_lock(mas->tree)) { mtree_unlock(mas->tree); @@ -6460,6 +6464,7 @@ int mtree_store_range(struct maple_tree *mt, unsigned= long index, { MA_STATE(mas, mt, index, last); MA_WR_STATE(wr_mas, &mas, entry); + int ret =3D 0; =20 trace_ma_write(__func__, &mas, 0, entry); if (WARN_ON_ONCE(xa_is_advanced(entry))) @@ -6475,10 +6480,12 @@ int mtree_store_range(struct maple_tree *mt, unsign= ed long index, goto retry; =20 mtree_unlock(mt); + if (mas_is_err(&mas)) - return xa_err(mas.node); + ret =3D xa_err(mas.node); =20 - return 0; + mas_destroy(&mas); + return ret; } EXPORT_SYMBOL(mtree_store_range); =20 @@ -6514,6 +6521,7 @@ int mtree_insert_range(struct maple_tree *mt, unsigne= d long first, unsigned long last, void *entry, gfp_t gfp) { MA_STATE(ms, mt, first, last); + int ret =3D 0; =20 if (WARN_ON_ONCE(xa_is_advanced(entry))) return -EINVAL; @@ -6529,9 +6537,10 @@ int mtree_insert_range(struct maple_tree *mt, unsign= ed long first, =20 mtree_unlock(mt); if (mas_is_err(&ms)) - return xa_err(ms.node); + ret =3D xa_err(ms.node); =20 - return 0; + mas_destroy(&ms); + return ret; } EXPORT_SYMBOL(mtree_insert_range); =20 @@ -6586,6 +6595,7 @@ int mtree_alloc_range(struct maple_tree *mt, unsigned= long *startp, =20 unlock: mtree_unlock(mt); + mas_destroy(&mas); return ret; } EXPORT_SYMBOL(mtree_alloc_range); @@ -6667,6 +6677,7 @@ int mtree_alloc_rrange(struct maple_tree *mt, unsigne= d long *startp, =20 unlock: mtree_unlock(mt); + mas_destroy(&mas); return ret; } EXPORT_SYMBOL(mtree_alloc_rrange); diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/ma= ple.c index c57979de1576..c834e91e6810 100644 --- a/tools/testing/radix-tree/maple.c +++ b/tools/testing/radix-tree/maple.c @@ -119,7 +119,7 @@ static noinline void __init check_new_node(struct maple= _tree *mt) MT_BUG_ON(mt, mas.alloc->slot[0] =3D=3D NULL); mas_push_node(&mas, mn); mas_reset(&mas); - mas_nomem(&mas, GFP_KERNEL); /* free */ + mas_destroy(&mas); mtree_unlock(mt); =20 =20 @@ -143,7 +143,7 @@ static noinline void __init check_new_node(struct maple= _tree *mt) mn->parent =3D ma_parent_ptr(mn); ma_free_rcu(mn); mas.status =3D ma_start; - mas_nomem(&mas, GFP_KERNEL); + mas_destroy(&mas); /* Allocate 3 nodes, will fail. */ mas_node_count(&mas, 3); /* Drop the lock and allocate 3 nodes. */ @@ -160,7 +160,7 @@ static noinline void __init check_new_node(struct maple= _tree *mt) MT_BUG_ON(mt, mas_allocated(&mas) !=3D 3); /* Free. */ mas_reset(&mas); - mas_nomem(&mas, GFP_KERNEL); + mas_destroy(&mas); =20 /* Set allocation request to 1. */ mas_set_alloc_req(&mas, 1); @@ -275,7 +275,7 @@ static noinline void __init check_new_node(struct maple= _tree *mt) MT_BUG_ON(mt, mas_allocated(&mas) !=3D i - j - 1); } mas_reset(&mas); - MT_BUG_ON(mt, mas_nomem(&mas, GFP_KERNEL)); + mas_destroy(&mas); =20 } =20 @@ -298,7 +298,7 @@ static noinline void __init check_new_node(struct maple= _tree *mt) } MT_BUG_ON(mt, mas_allocated(&mas) !=3D total); mas_reset(&mas); - mas_nomem(&mas, GFP_KERNEL); /* Free. */ + mas_destroy(&mas); /* Free. */ =20 MT_BUG_ON(mt, mas_allocated(&mas) !=3D 0); for (i =3D 1; i < 128; i++) { @@ -35846,6 +35846,7 @@ static noinline void __init check_nomem(struct mapl= e_tree *mt) mas_store(&ms, &ms); /* insert 1 -> &ms */ mas_nomem(&ms, GFP_KERNEL); /* Node allocated in here. */ mtree_unlock(mt); + mas_destroy(&ms); mtree_destroy(mt); } =20 --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7FBA14B064 for ; Tue, 4 Jun 2024 17:42:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522951; cv=fail; b=ow11qh3lIZ2doOVXowIa3atGYtkIEkOrjZ8I31ErmM//ttujyrZt3f5NhWCYnVIr+kWDoqoT0ooTMS4YPOv7ohiBcwJFNXl8oM39SGs1J10tQKKAZ0v7WtlO5N5/jy/143wuvgvEoE+1RWwzxVyYVtafy5eqqTIuV9Se+tRMSyM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522951; c=relaxed/simple; bh=1EHbmB16KRZ2XVMPnEi36BEK8OPFEY37jHi70ip7gv4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=O0olflYD+iOfDznrhxtknsk0A1QAGhy5sfMnLFonJdf3cwdqadVpqL3BeRt6s2yEbjsaN24MxyFMfzPJUwgpeK9mdRmV1CscqJDRScHrp4QYB0VJ+3xhwlNCrpuGC/uVVZW4WwQ1ehTauNmApSuTFRTvdYs+UotIc0pRAnch4Bs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnW2Y032115; Tue, 4 Jun 2024 17:42:12 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3D+orkQoZyCr3o2TgK74ExV+dlpbYMr8fB1RpcQ+RXSw0=3D;_b?= =?UTF-8?Q?=3DNxXKnhXC3KJs+OGMWrWoJMFKOFFSSl3SbqHzdUQILRHf955+PN4wspyoeyXg?= =?UTF-8?Q?sGIRFR9N_DTUoIDWi1PbAhsIBIo2NwHpuMDGm8lRCTLWkNVkz/iRBo4YKmfOCIs?= =?UTF-8?Q?vi+5Ahfn33gNZK_NLCHSFiDxOI+x6TTxbKn5PZjTg0ji7mvVU5ciJ2qOaqChlcw?= =?UTF-8?Q?AqLuGVzjVf/QOVpG8i+4_eHSe3KqcBsJQHoEaQ4D0YGJ50S6vL6Uyd/1p3VRSx1?= =?UTF-8?Q?mlkntoowCTf4E3lxPsO0tTWtkA_3G9SycVfF9l4wNASfTh1S+kF/74U1FVp1iGO?= =?UTF-8?Q?OYXWdeniJp1quKrCLW0HziKAAHNDCQsP_jA=3D=3D_?= Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv6u5jgh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:12 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HPTRn005496; Tue, 4 Jun 2024 17:42:11 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2041.outbound.protection.outlook.com [104.47.55.41]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrmdwn4u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AEkEINlsUInWOwV5zEyPxbQoSILhe16T7XqXCmHKh5SQUsvUejuy/YSak9GFAulmIQbSNCvgRfC24h/GHx7GxgB2C3ivHm25YNdXw41RhU6c8JD3wlUgvAAb414NMqlD5obWtxElPjQbKu4Df1YHAMOXqDT98w5GtB82mKuAaHhBug1LWngCHZqwyKXqgx7sS3pjgR4LoY+nArJPSJxz2ZDmsvKFpOuBvTxzcBaEf4u1Kc1h9lTscGHql7+QGuTiHJ44mtTroRNeNyCYpDTYYjN6rotlBogmi2EN2xMtZU7o66NT5JJSSIQT7+IVanb63PfeNYFnxz/zwqDv/ImxnA== 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=+orkQoZyCr3o2TgK74ExV+dlpbYMr8fB1RpcQ+RXSw0=; b=cljElUESk1qLQCtfjxMDTRINyghR2bZkvA8wAt7RBLEJmed9woSw5lJCsWdcfYsZ+zZ2vP7jZoRrdXBQ/5dmOQNbyKudDMVuNNUjXLF7IodrofDs50ljCeY+Q4hFdJ+C0BRTCNDWu0Ty+Lm0aOtRgjAwjoetN1Ak2M5eEYe0YyVNCs+Hs3Zm2gpaWuQSPOsrGce3jMprSG7xl7Ptv/IrGw6TeJbf7dHbnIVvvdz/dPwpZNaBz0/eJ1oe0qf6LRC7b7MW9zBKY6nV3mSFLMmaEKlO6fEY8J97XBpxIiaVPsoUHD1WKVkm0loWHS7OlD/ZJry9ZTZtnjClQwnuXGDTgQ== 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=+orkQoZyCr3o2TgK74ExV+dlpbYMr8fB1RpcQ+RXSw0=; b=S27tGbpURJJqL9PYkETmrjysNWH+yWXt5AnY6ju87t5ajTsx2w6mryxhj8inOd2a7eDmUBEcyKrA+Dk3hiT7nJWe65pj7FJaFjgIIJyT1Ft9+9g0ex3JzRCLCMz11XCl6bmkVpu7ir78zmsNeu5QOw2j1Pcze33IMFjhNG3T0to= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by PH0PR10MB5893.namprd10.prod.outlook.com (2603:10b6:510:149::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Tue, 4 Jun 2024 17:42:09 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:07 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 07/18] maple_tree: use mas_store_gfp() in mas_erase() Date: Tue, 4 Jun 2024 10:41:34 -0700 Message-ID: <20240604174145.563900-8-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0015.namprd13.prod.outlook.com (2603:10b6:a03:2c0::20) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|PH0PR10MB5893:EE_ X-MS-Office365-Filtering-Correlation-Id: 50728357-e1e2-4c51-d5df-08dc84bda773 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?OBrYYCebI6xF5GSuK05RpGef9AjGnFUvhmt4WxnNq6zFLlcUJWaq4PyOjL9k?= =?us-ascii?Q?TBjuYXLk7oHA3K1NlN4YkG/9qwr/CWDcL9kfiXNMGQR9L3qIN5cd2FzXXsNF?= =?us-ascii?Q?i3jFpt3H61FyIzTIBgSfCxxGDSksfeos/cB9npyueUcJ1GoNf8zGCUqGA5/K?= =?us-ascii?Q?lRBximFOJdTAi7j13wHgyF4JrkWxxgiIlNz+9tvKq7EPgLnz0kgKFh1SoBbc?= =?us-ascii?Q?b/UfbWHIfUIF+1EIURa6WhnJQwivR7pfA5z00CpsiLfG6LLTgTeSgUGP41L1?= =?us-ascii?Q?ZXrb3zoAXKSKPA4imi72z2Kx1Fc4mG0/Yy/9czTv2jw46OCxqW3ibS4pF+1N?= =?us-ascii?Q?nrGKGRS2hkqENB6ra7Wpcd5+k6EY2iXSuBQ1y7xcySUNR745kJdP3iGjVtN6?= =?us-ascii?Q?dCQKAih2KaPQ3xFYnMh/hti3yxfZSXKYwIbFMdiqT/VRdMICM5x60kS7iBqy?= =?us-ascii?Q?f9UwG1qFc7+KT8XawxtWAxYzpXiBwcEYD2lnPnSksD0M6mcLUcX6fPBKhkCr?= =?us-ascii?Q?U/z7Kps/+InU/6rV+Jpr4lcCuCKRpInGZQT+rpXDWyK3veD+m+rkt3oP0LdX?= =?us-ascii?Q?kAm3ahXFneqP7lIdk45q4fe8t35nNZWqra60KtAkG3YJSg+XxLFyCsOEU9jF?= =?us-ascii?Q?VaRa4l6GU80xUFvAq3sVlws7uRVIZZ33ghmI4tmUYwAnWmG2DLIvhrklvIYR?= =?us-ascii?Q?DJQo//EjpjDReWPjQDYfskk3BFFIFdR1qq2WtV7PMoNo/srlB+zPuSamoANg?= =?us-ascii?Q?MMG5h+mwtqp1uZS874hd7YBxjGCe1rWL5cCyv3TKq0ZA5/29l6RZHgZMoqaq?= =?us-ascii?Q?n8Wp8PqczikH8eM/jVJDrSmG5CmTIaSueifctlo2GZXAAoqQjk/OuQBg0/QB?= =?us-ascii?Q?YK8Cx1qUA3F1k1WACjoqCPdCWwPuwDXsRh33mOKIvsJGN3CPEt06LFg14sic?= =?us-ascii?Q?r8T5omu8hyqN2+8r1aWDTwRr9p5kVAZUbQ3pKi//8XU3x7jpGw4hoPx08CzT?= =?us-ascii?Q?A85wFfz+N7QuUt5Doz3rsDvgMRadFeyHV24+J7dcAZOPy30x2VDA/8swMRtq?= =?us-ascii?Q?UnWEVYBByF6qCD5e45k6s7vrnEXEAUb5nPqTnUFj+snkIJVyi5K0C9C9QpjI?= =?us-ascii?Q?iw2/9pQj8bie1YHDLdcbtJ+dAgnRybxHrJf213CBf/6U70ksfguCrqpqvVUj?= =?us-ascii?Q?3/NrjoYQLoJ+AIvDLw/fpzUzXSpd/fGF8xk1rPTlYpB5SMIi2BY2JvLa7shK?= =?us-ascii?Q?/lJ2uAOJaXscw0EFYrw3RWZlxXs6EEprWv44pcU5Tww9qIqqtkO10prQpOWg?= =?us-ascii?Q?9NLaJWeL+sHp8v1Bld5lPm2w?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZDG0Ji+r1AVodrTU5zsTS0rHjqJA+vnONnlE2yJdva/eqpqqOziwAv3zMY4L?= =?us-ascii?Q?7/7CuJaU7OlThDmFJtOhrWnPGqdxggF7rph7hRcQtAgHo05ueWu5LjKRzDgV?= =?us-ascii?Q?JlIOJ7Di2BTizxXA3QzJYCukWJkVZIcyiYeoddy1r14vbEMeeqy7nzlefqSv?= =?us-ascii?Q?p4AY3JpxJuFhqlf/166v3ReZTDNDRcwbb1tgpQq8OaJbJm9nV5snlBsB6OqL?= =?us-ascii?Q?y0vJfcC+nau5YX3cTlkWsKtENyQZaHAiuelZ8lW04a9oF4RM16I/ba3pl/qS?= =?us-ascii?Q?bTxXVVwMRA40CHIAbwGrC4ILq/DzlVHHJzdsSkdo7QiKzZpdI1HSaShSEGVm?= =?us-ascii?Q?qKLQ0PIuUA1YaEh2rKjqd3Vn5upDFU58eONf57F1WjX6FOUeo0kfvzxF2yEZ?= =?us-ascii?Q?XU0FcuAng8/pFE4uz3DQjB96l46Wj9OQbYmlRNwiGHA8tz1zB//lwxZ1jMnT?= =?us-ascii?Q?z4b8IhTSkiTBBpSCEXvWS4B+vRzZJOmHyR5eFPJblVrHY8YI1wO5QQW9Pute?= =?us-ascii?Q?c4vlvDi/9VIcYmmAf0lG14KJ+p4nv0IXRlaPFTYdIrLdxWTvarFAljJpQIFd?= =?us-ascii?Q?DmIo4Hj2uN/iZMVznPCU1qx7ABIQrekTcnsLTXNxpp9TPxNTe0f2yY+rQOQV?= =?us-ascii?Q?McNq+5f5BmFOpsQiStRvDKtqk+ISbS3kM0h6q/xnUOUHZNT1ECxmi5ldihof?= =?us-ascii?Q?t8/P2vOf6wuzi1StM2TYUgGuaHzi8njjJZuwZCsaC9/yZC/she2NJQFDXbtB?= =?us-ascii?Q?W+vlaA1VcOLJlNtvSX6lyiPVB8iR/gDs1HbYSPJtqyzy75x6YYGk8/yB9mD4?= =?us-ascii?Q?TlXzoOHbsbgCxftoJ/Eb4ILEkzBmHc6pqHb/m+La2ST00DDjWgYUsdOXf4AR?= =?us-ascii?Q?Kh94smXwLAlhWDEkufyBn3shydAbHo3xQo35Wtxw+YLovuEzuMnt1leMCG95?= =?us-ascii?Q?u9QjA1KVrtxcAM21Ubd4bGFWXCVBr0SthuJwqbAxJl7Z8KTHqW/NNg3Dn9di?= =?us-ascii?Q?SwI3ZHD6mDgGZ9q10oVx3Ry9N9xozJcGijq1dkktVXKfUtPP7O0+xMMcjbCh?= =?us-ascii?Q?dzHo/J9KRS9iYypbaxK2IbZwcAlC/OzoOcPJq1SY876aLeApdRiq2wkC4RGx?= =?us-ascii?Q?1DvZJpuoM1S11LwpkUiKaZPhkYtk4U5wsEyghIPK97zl6qG/lxsCpA91GTTN?= =?us-ascii?Q?jmQjV8LJgwkxK1/879pDcV3ETmx/uN8RAbf5VriUz6ydbwOm/ZFKwcNdU9/9?= =?us-ascii?Q?bV1vAW80R5YkpDNJAEp53SmQdP2YlR5Zpvr/6wsW8zbeg9zUoIflvPHhTmfW?= =?us-ascii?Q?8L73MBc6Y7JMgn0q0sYLaVzPZJG5fla5MlDqRiQOR7tjctJA4kreJEf9HdL3?= =?us-ascii?Q?hwMShkMkC7aIJulbzWkZID+8/PYhXIqH2ZNIqKKmEhDMsnchcXUak6ituJiV?= =?us-ascii?Q?j5Xagou2+5TcjFbFrASeySgiiaZ400FO3oSEg0mVWUWTCUHbe08JCgORgNNm?= =?us-ascii?Q?V4+E36EqHYS6bbOXYiwppbItXe2j7qDaYh+ziYjvBKwuRt/Bt07rx6H2jYYJ?= =?us-ascii?Q?TAb7HirrGjP+hV5hlfYgVwC1f2P3n6/S6+vCqaufsIwSpwPIu6YkRz3bxVQc?= =?us-ascii?Q?U/wvhN99JES/b0Ngw7V+EcQ=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: qsV4eGQcNweP9DQBURVlbrWgPJ++6TLB7yqnO/ZEJIDl9X0/XtkeOCN+vACpvopD49d96fQTL33GK8wM8haBIYIHcnPanEyzv0WdsKcTq3eqXYSVWzg//ilhH04g4oHtwr6K/zP46tOzhesvNV/ut+RmughdFN3PHvXGDbu70S+HQ7g0UZOrF4tNmreaqfgcfxWNmbowFhorZWzFh0PHs3SBYZeOlKtsGUnaiXXSBdsl6esnkhW53a9JOnHpQktzNmh9lNBmbpn3MOLEth3COCplWiGOC0znWd27MRSdKGiAcOjJWQDczMpQXQ4dS/muPZLFw0yR8wHK3A9P0SrMVatpPpErWrpfEa+k+qrcGvSE0XtRvp+u3YL2kB/cWwT/ZevUyR7RIcgLkqRcU5Ge2UVXlmVoqn+Tqey2UoU4KFm3ItgKTCZQIsG/M2vo1xDk7SGgnVYZdSAY9osQ+PZakX8Qy3hIgqZ0H6zVw8TtbOyX0cdSynAIFjC0ikd0DDut7gucSvvJsMOaZx19uCoGzihIh8hrOULI+L1wg1GTa1GLDfUNFT6pTQITYb10/Idp+npr8U/xNG8EjvwPbUU45pGOtLejr/smdbOkwcy7np0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50728357-e1e2-4c51-d5df-08dc84bda773 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:07.4914 (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: jM9t+DoXvOXLgppLklRBezSxZxDZwvYjaUsCtR6o4uyczbPedAKzwH75n8GSez74uBF5ntkbmYsmZ919+uqWWu9ENNJNWtgbITdXuCXrAA4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxlogscore=999 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-ORIG-GUID: 4o4uQdcgftKhPeQh0lcIiwrGNsrdqlam X-Proofpoint-GUID: 4o4uQdcgftKhPeQh0lcIiwrGNsrdqlam Content-Type: text/plain; charset="utf-8" Refactor mas_erase() to simply call mas_store_gfp() which will abstract storing the null, memory allocation, and error handling. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index f1496817e52a..d74847045bf7 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6352,7 +6352,6 @@ EXPORT_SYMBOL_GPL(mas_find_range_rev); void *mas_erase(struct ma_state *mas) { void *entry; - MA_WR_STATE(wr_mas, mas, NULL); =20 if (!mas_is_active(mas) || !mas_is_start(mas)) mas->status =3D ma_start; @@ -6362,15 +6361,9 @@ void *mas_erase(struct ma_state *mas) if (!entry) return NULL; =20 -write_retry: /* Must reset to ensure spanning writes of last slot are detected */ mas_reset(mas); - mas_wr_store_setup(&wr_mas); - mas_wr_store_entry(&wr_mas); - if (mas_nomem(mas, GFP_KERNEL)) - goto write_retry; - - mas_destroy(mas); + mas_store_gfp(mas, NULL, GFP_KERNEL); return entry; } EXPORT_SYMBOL_GPL(mas_erase); --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5FA614B940 for ; Tue, 4 Jun 2024 17:42:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522953; cv=fail; b=Vq4KyyMDH3BIRzuBUoev4PRwEae/gTw4dl/oRILfJBp/heoVG4neD8Xry2MKcyh/WOj3r32bub1WhHfE8yVurJUA8Ny7icBfHuCItDm2gUnxmOTpe6U5hcs9I4+6CA3/xT451Ne8BaXhW81j4P48C0CfewLNryetg7bPSMslCu8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522953; c=relaxed/simple; bh=3rwQ88qFQ7sPUoDkfB2jQ9DXm+k4GM7TxMwLQc86tms=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Ov7Isi5uVZ3f5V94ATQtzXUVyvw8bsndgMEf8t+fvn5Z5mFgLVgglIH5oP0o6UL44voOAwi3ArUXCcNOrZSnybsldyPr7L5sWYw5mv4wVOYRZWISvGb2Zl56Rx+UjC3RVnCAdndWuOsTcwdAsv0nT8W/zQB6YnGHrlitXi2ROdw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnSP1026512; Tue, 4 Jun 2024 17:42:13 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DeFU5J8MB6LX0FTsp6LFmCb5nYDKq0rtoXYUM8NbzpBY=3D;_b?= =?UTF-8?Q?=3DXTwsaOFmZMHeQS3dWlzkj/cxsV9+STQZ/Il88RiDn6LuqRjkyKXt6J09CNVi?= =?UTF-8?Q?WyMH3OY6_XymYCidPs4r7+dQDbbxa/1ADpzt7eKJrtFsnqRSGQHP6PRV2FYLLms?= =?UTF-8?Q?o7OyGrdQQ4AY/e_Dg11nAVp5fVfE1rvqyKUecPqqKDk35yr8AanQ2uh0GIMtXKi?= =?UTF-8?Q?inrZUjb5ugF6PjCQy79W_nZZA/UzYpS98Ncc30J7fASCLB5PTLCcyp6qIF0LX/c?= =?UTF-8?Q?yUAP/Qd1ep6RDyJkGk//6diu7s_KM8YBs0RtsIk1oE5qRCiGjzIKdvOHuWSOJv/?= =?UTF-8?Q?1GquiBhkA+tvOBuhxu3I31Nkqwsc6lP7_wg=3D=3D_?= Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv07wjxu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:13 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HPTRo005496; Tue, 4 Jun 2024 17:42:12 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2041.outbound.protection.outlook.com [104.47.55.41]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrmdwn4u-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dfAcbnZVtej7HG6eQwxARfw7w/8uKVkLuYhGL2XKimAPMgh+dOomwsdgr4n543J5R64it14duSaNh+JwX7FC3FkjbO2WHgeHq40x83HYIh38G2wI7HQgVIq8jW7BRpcwqyeYkSR6LwE2IIl893ABHj3wEi3/9kiDdth2v6ToGrMiSw4YPUGJB4OgiFPQW+TBJIV4f51gN38y41hQ6RZaLLw5caB+3oF13vGE28aAfBOik+S+pPPOU/FUpcmYgctvXUgxYOc/o36FTa+LdZpjfymJAZK7MVe5cMFJyBT8gx9858qm2uw+R/l7tjL+iJOtg0HgywCOHPxFMMf3yrkdbQ== 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=eFU5J8MB6LX0FTsp6LFmCb5nYDKq0rtoXYUM8NbzpBY=; b=F44uLQhFhmCXFXK1kge+P9GUtR/PoywlWru68zCz2KYB+13QATkSGHIXmNo+wbxwj6KimOXHsa8EDgrpAyuveFXM7o3U2q8W37aI7ddkTSOmmQ/tWwpTPPO4eBHhdeBfHZ6PRdmXD/BZure+Ta87wcSXrnTMYCWFAkWXrH8BLQ9qNoqfMQJBSxpU8VjirQJDc8prv5ajQrxl/0I4iTIgA1qvfxhlymubPYMvq0qtmdmeNZpXq5G/YCUfM7qMi+yHYgswu4ire0HJJauaKuxzOpHJ4ucbWke9bdXYQZoG+K+dNUezfIlVdA7DCwNKk8ZZdOk3u6bE/aeREnp2lGN+NQ== 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=eFU5J8MB6LX0FTsp6LFmCb5nYDKq0rtoXYUM8NbzpBY=; b=mp9UkpSx2nVGRLa2SXNXdPki5h+VYc/x2p0IDZC3JFRv6TjfE4L1RBplCubmXX0GJQoWtSrC5sfRppgrNovqyiSLiCdXlGRn6dt1v2LBHt+y7WW3Vm/r1s7q++1Mt50Q8XjOwSNu2EKMaFvFCeP/7dtYyPSKF8A5xHpnj2QzJag= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by PH0PR10MB5893.namprd10.prod.outlook.com (2603:10b6:510:149::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Tue, 4 Jun 2024 17:42:10 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:09 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 08/18] maple_tree: set write store type in mas_store() Date: Tue, 4 Jun 2024 10:41:35 -0700 Message-ID: <20240604174145.563900-9-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BY5PR13CA0028.namprd13.prod.outlook.com (2603:10b6:a03:180::41) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|PH0PR10MB5893:EE_ X-MS-Office365-Filtering-Correlation-Id: 7d8e8304-49c3-4f30-1ef5-08dc84bda8cf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?j4wOM3u3oW5uDgSWakgQ1RYE5W0217QEMgfYp+lm9+FvMXJeTsM5Vm5CBYQw?= =?us-ascii?Q?byDkYe9hRdtl4hLxT+aADMh8frBR0Y5epWVbOzK0sZr4ZvLJgkpp4y/gzAFI?= =?us-ascii?Q?aSkDETwtzQz2iasr95X+fLi9xvqV32MGzdDrivtEcZpNwXXVGzIWw1+gArm8?= =?us-ascii?Q?OiY/a3sW4d4zNhrSiuW5rLoYxWH9tEr7R5nDTu0dnf5zQIytUjwSIOBKKmcB?= =?us-ascii?Q?cmrAyDlhnfZ6Ex9lpoTH8xPMyb6WztIhtBjCezgrPUnNU0AvwxUO5lWyVgEJ?= =?us-ascii?Q?JRiuVXdaVtVBvY+BgyUTttuajvSE8zRwdbQ9gsQLPBayqbD8E1d3gJvhL5To?= =?us-ascii?Q?2+RTIApROymawDB+T3Yu1wMBiWOA2rKFrOOcJ0zIKcfOey6xcjvrrKnER8lX?= =?us-ascii?Q?/sZJTXm2FF/Z1YK8OcLah1+jQ1cVVB3D+GseugugNbsahG3aVcNHT/IFgvdR?= =?us-ascii?Q?W789jPpHvarE5yz5fXhr3K6yEiH1Y6uVw8lzRPLcws5ux0zUpMFNJ62RMc+r?= =?us-ascii?Q?lEPsG2HpegWRMvoVxzrCwn9WPj31Zkc73zMu3XpE8VXcYz28DGTCedwg/jf8?= =?us-ascii?Q?0ibPhlfUU77vDWrJWIIDm7CFiyv6k0rkH9in1GFWOPJ+WTw3++QR1Xnu1d7v?= =?us-ascii?Q?LxTL4PBF3diS5ctdmrd1DWJL5BFLvn5HOwAIHadZsfz/plhhknjD3+fvm1wn?= =?us-ascii?Q?C6peH199vyaGiQHqv4RWvM/KkeI/uSeG9hgMybVlVPEUhWVl9VuH1GMAy9XH?= =?us-ascii?Q?xt0X7r4bkyI9o6F+SQEOzeLUdPYyEXQCZdVgeRRddg7LjyLvDOpVv83jGFb1?= =?us-ascii?Q?/OrBwjbllhBvSw0CX+Y60DgeCtBdw6unVJxf1h8ckIkwnZK+BnEqTzgrF7sX?= =?us-ascii?Q?WXPlFxrcpC8EWWzzpAqSKVys4K013Rc6yexZyLjEI5ZDAQFdNoc6Ccu4LSXH?= =?us-ascii?Q?LWkZQCXLuwU8IR+M2KrjddsGGM1uidxepdPwEKAbCHKpSVubzO7BZr3VOE9O?= =?us-ascii?Q?5ue1S26x+kQunw2YaPZCj2TS8kT00maevCuShAIlBgUyhcMEf7KiyZWnUkGa?= =?us-ascii?Q?FSkD5i1SOf/PrO9jKimguqub05eja8AY/wLUwcWLavPzJs1xmPvVGTzGe7mh?= =?us-ascii?Q?cxaoDl75fWTDPe3FwbhT7w0cEI4Gq06/2TXoBlIky23uCL4jULXDcR/zZqiz?= =?us-ascii?Q?ux7flsqj9pk0i3WC6j3x7Jv7BZ2udvNUj4JOMSH2A+RKL2eTN+k3qquqH0AS?= =?us-ascii?Q?KAWlPykMTb+s7XHl1sT/RdQaoXyUIoU15kbDwYrubW/2yg08Zq6Be8W3jLz8?= =?us-ascii?Q?1hkT39qNnRAShNCX79CFGEld?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?g7RLOpie6ar/sHnxs+M+dlKmWSFXffO3+h/Kyq0q8iv7XcAIrWtoB/S9Vbz7?= =?us-ascii?Q?CP888UbV0NfzuFAqEpwkGtdfPvXSial1NcJMBp06c3JhcmMb1KZcXDupkf1S?= =?us-ascii?Q?4LOloCNnsLNmNixZAZyLHce41ie74/fybQ/mbFW2OC5ioMBZXABv54LX8niO?= =?us-ascii?Q?fA2/xnvqNvN0sDVaniLqyztgX13w/0lbjAog1X7Q3pyVo3zstqxmUGtUoTrI?= =?us-ascii?Q?Q9PN4oHNUnF/QTCZJuOGLNJsZsPnho6fYPFSTBS0gofgrQncqP4CeVPEtgMl?= =?us-ascii?Q?Bqybntu2JpghZWcH8idLf+ycRcgi6S3xlDFh58NsUVoUYTX+I1TCRLbrVPiP?= =?us-ascii?Q?NIReRjYxiXkQ2wx350R1Af1234kTSg83ZY8gK8dMRYnI2Z8tFgkHsQ7W21q4?= =?us-ascii?Q?rpB8YAJhzV5wTTCCApSZ86JnTYU+SN96rQlNDQklMisCfvlkij4gtL+cWtFV?= =?us-ascii?Q?eWhuRF1KqYweUIy/vYS6rs5Kr38CZeFFg0go55m1tx4xRUsTnsb2YoOAiZzn?= =?us-ascii?Q?FS1KtUbQGbU26yMpdUIUqiPtrv8PATnI0qM1SrZu5GNDvPjYqBh7yiyr79/d?= =?us-ascii?Q?MNScFI+15d4LZdC/6sgvqITqD7ipQoUb5khPf162WDBO7HbbIuvMbXjama9m?= =?us-ascii?Q?SbYFJwvmYU05/JmexPWr17wIfxm3aq6tSnLRL15UznuXyeGKZuq30jZJKmvR?= =?us-ascii?Q?g8ef3JBR60M1F0kVy34JyCbWN3lkAYJ9pWNLYokS2AzSeh/KOnd5hFb6jeDy?= =?us-ascii?Q?cnyw09CAKfUjeZHRsdq0n5XQBwfEN73Cvn1IHqZXB+WVL+ph+M8QM15ZoInM?= =?us-ascii?Q?ErdI5rPmgV6lFyozSilbXi2Ae5j0I5f2LmzZs0fP8Rm5Y5cH7v7e84pebU/A?= =?us-ascii?Q?e9ExaLXpmGvPiuWeO369/UdLRYfxITlfeXDLrTIi/3ei+mXFreGFsRzuykC0?= =?us-ascii?Q?1Z6ztytglYeoBkoerXt+e6ZF2i9eNjexehamNLDBsGIodDx+eVEBPEvuvraB?= =?us-ascii?Q?wfab1qJDoN3fpx1ymaGb/BG7Q31JYmmlL5KbVne3/duN29pCHAfe3MGCXVsF?= =?us-ascii?Q?o+WburwLBpzdiu+dGgY0zHZcUeLTrH8y5UeucEEarTcqoOiiEx73xpAqXKCV?= =?us-ascii?Q?dlYEiyxyiuA7APVCXFgEqAz8FKjIw7XUTc5O9mIKhe+Lxi5i8xv/VJIwRxqi?= =?us-ascii?Q?goqPHr7B74WQ+e4M++0EBh9AmJtWBXfJurcasO4adCQyMapogPDwOvxWNPry?= =?us-ascii?Q?rZbMqN8NRfO1Ax70Q6V4ZXVoxc36Mfa7PpplYSd4cnbu7narn+jmG04a5ifE?= =?us-ascii?Q?DwYZCn1QTreP7KfoOaYY0Tf050Xset4Er2ImlCDYrvRkwL5QkGaTPcz5ahPb?= =?us-ascii?Q?YCKRL6Q1BolfJdqe1gS8f6AtQUgeYILx6125neZ2Zcwm55I8e/KBjknr/xrW?= =?us-ascii?Q?xXDT5K5Z+wxoUl7KjrP+pgUtJ4lWTqZVbUb+DEmsZhUUpeQJmbtETAa2n9QI?= =?us-ascii?Q?kuJE7h4SzGGwHQ/kMXh+iii4hY7DaOSZ/zFYMSsAXEWnrLtX7gf9IQjLBRpK?= =?us-ascii?Q?rSmxNXwjUduuWtr63yqAfWnf5JG75iM0kM/7PVstzUn+JinkN+I4F8GiJht7?= =?us-ascii?Q?kwjdKDuybTdZVvUkVuMhugs=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: a1Ikr3Ge6lqPz+gB1WvphDlbXyIMd1prSkLkUKkPhW+c7SjI6XBsNHYYQklzYJY7b3yDGHbPjrz+TP6AKjxPQi4NX7sUM4eHfzl6YMjr2fPzVbZDF55CH8pG8AZlVJBne9GHnviWC4bgoqn0MBGEO9mYBza0VsZi9zidgFRVOgy7bi6ZTAUHT1Jrviwbm5PFyYbyHx7Qhd97/fewoD6lYvLFBmlqShvluh0d8PgWX5bk6KoYuTd0SQpdCzonkZ2Xz6f1SfB2V1RUgpgZF+Sh4NuV3TLhcqLobS63VgXa1GvyWA28uXD8gUtSwfW2qrvaSb0f6nD79n5zVeKW55IRNsiEQZrc1ux2ec5RQIevHD5kgeE1HEJYRAJ3ruOTGbjqn63LxuVUOj2maQNCe31idZBWyXDXndnP9A1byzlxAAM3WQ7OlCNvIGlhzW55UTVZl827/Rbjq+52uMMZOr74v/MTF8lgKjbghgA9Ku8wvsh7w8O9qLHvbdcO5WpDaenasXdz6cJ7j+PmxVh66rgQiht2K0qd7M6YsxM+hWcO44D4bWazVMpnXhhBW5KAJu5GkeR5RNN2FsMheyRo/4pIMe8i5fd/Aik0rxWwHijofAk= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d8e8304-49c3-4f30-1ef5-08dc84bda8cf X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:09.6525 (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: JmjlCerX0nPBgEhBGwkYAvw9ygo8LIO6jJOYgXTd8nhbkS+qI1ep/kqOJG/yb4KKy+Qc3TTnt03Mutn88uhxmEu7eRsPoxBuLCOn9F8NrgQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxlogscore=999 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-GUID: rBw-hTFVFaLW1hhHoccrVQ1p-fgxij7k X-Proofpoint-ORIG-GUID: rBw-hTFVFaLW1hhHoccrVQ1p-fgxij7k Content-Type: text/plain; charset="utf-8" Set the correct mas->store_type in mas_store() so that the subsequent changes to mas_wr_store_entry() can use the store type to complete the write. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index d74847045bf7..34ff1b3f729c 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5589,7 +5589,8 @@ void *mas_store(struct ma_state *mas, void *entry) * want to examine what happens if a single store operation was to * overwrite multiple entries within a self-balancing B-Tree. */ - mas_wr_store_setup(&wr_mas); + mas_wr_prealloc_setup(&wr_mas); + mas_wr_store_type(&wr_mas); mas_wr_store_entry(&wr_mas); return wr_mas.content; } --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 809A714B086 for ; Tue, 4 Jun 2024 17:42:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522951; cv=fail; b=VAS5U7ndDLfLWs8LXHr9SNLUDNTkmeiltcTLIGM272uyXWneuiQ6bbalYlNfQNzeYPhUJPyuuILn14k8dRwrs3mVhMfB3xv2rRPm872uWyYjrMn3ggPvmEjDelAfiV7LutlijV2vE8sesxJOyEeURgKD7UKAS7JuCCs+vrfZNSQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522951; c=relaxed/simple; bh=re8Bir2TAqFKpAzbQbuQQAWP5zC3HP8ghfkl0E4uGSo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Gk+yMZ2b19wbx53rNgjlufR01EDJzCr5ldiRoTnTjGUJbmgXNndyuQFgomlMiliXkTeccTwADPG4Gk5hipcsq4yHj5uBDFM0v1RiuQkq3APX9j3D+IlZusF0TVACHqyhC2HVU0qHuezSH9XeYs3lxDs6LZdpcTEDukogIA9wDng= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnIf1028071; Tue, 4 Jun 2024 17:42:16 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DqE3lKRhOHhotDxRjulc5YenacaU3n5Sw0mx2DUmpLno=3D;_b?= =?UTF-8?Q?=3DVQ+qVnQ/j7pW678Xd4fK6t0AJDRTOfrQd9/MjLSmD4I/HZ8OXNuM4cUGX+QE?= =?UTF-8?Q?E0H1mM1d_rXjHQIk+JW7eDrX+8jS5NfohFoqAw+yAfJs0sdToHnCfdfxMwK2eSn?= =?UTF-8?Q?/+jftn7Dzi/2Pd_yF/eI3MBaLgabC3/OQbtGshBUPJ2F8sqHb4kuSxN0o3rd7Se?= =?UTF-8?Q?isQ9d6Va0gVF/jc+OR9M_hpWJbqGUIi6QmHBshjFF5ZD57rWH1C37ZIV6xoytYy?= =?UTF-8?Q?g7H0dG7+lVXLNeFEslWFUjpjQy_5hC3KclEAQF+MoOjJmLfvGSDyVB1lIeVkwlm?= =?UTF-8?Q?zvXo1gfMCrnkUVRKhWPyyIzBOzSjnYmQ_VQ=3D=3D_?= Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv58dj9r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:15 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HNoQq025242; Tue, 4 Jun 2024 17:42:14 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2047.outbound.protection.outlook.com [104.47.55.47]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrt8xx7h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GwMlPx8vqvqj+ydH3uPGrbCdjuihKo8X5sR5rsd6ZEbF2zu4IIg+sdmybegvMuT6/3KODPdrTll8io1jmjZ4zuuH3es0h8aVc4eqOf3LRQEIUR3EhzKzrYIhqIVqeF5m2nrn2uBrqY2Oxj7RJUqY+epd3jTj2nn56fwLWOGuqTG7B1rxvBCVJ9mLneVTegxuTq+oUAmFUJQWBCCrpbw4A3vWNvNKRnijGkQsg5stwnnKFVj8rTsb/meSfRR5zPWBHOyvQGDIEnIsn5sT5A9yXMysr1QXYpCydQ57M0XU8pWAF09S2KihE2GZMW4o/N+8PD3u+ZuO6lqhIB5MXuY70w== 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=qE3lKRhOHhotDxRjulc5YenacaU3n5Sw0mx2DUmpLno=; b=AODb+289ncSrKSzKIAqF1KcpE/C2kOM+qjrad6XaK2HG/ZLYKIEpnW3qgSUgxd3Dsw0ABDiiPSvIGZ3+jjuBgTLDbCNth6YW1tOtk32PsU+JVWcBnKbZNutkUhSjNB0+B03GaIZPrGSypj43y+gZ1TmPh9U6z75g5C5euSqY1pBKD+iMpgAweWhGy7RJ2IV+CoTtlaZaxOmEPVsAOqtymAUpflGeQwfPIlF4+WC7+mcfU9W63lEvuz8a8DqIfhK1uvjdQpzBq+l0BAvjm8c7lZZIRa2FsjIHxZAZj+jO96hGEggMxZuuWXtguhFAACCr7XSkxCjR5IhZ15PHmdqHJQ== 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=qE3lKRhOHhotDxRjulc5YenacaU3n5Sw0mx2DUmpLno=; b=MNrhIruwvRBFz44zEE+YJVRij3EF2cx77wImL76CJsiebN+OX6qjrilyg55cVvGaiDqt1wv9YH8yxdfnh1BE7DDjtumRxeAPtAr0B3+Kp4gZq5Hk/Y2z4MpksH3Y5BiinIOSX7c7jIbhzwJ/qssIdjjmULq0ZOBE/3kkIPYI3eE= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by PH0PR10MB5893.namprd10.prod.outlook.com (2603:10b6:510:149::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Tue, 4 Jun 2024 17:42:11 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:11 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 09/18] maple_tree: use mas_store_gfp() in mtree_store_range() Date: Tue, 4 Jun 2024 10:41:36 -0700 Message-ID: <20240604174145.563900-10-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0030.namprd05.prod.outlook.com (2603:10b6:a03:33b::35) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|PH0PR10MB5893:EE_ X-MS-Office365-Filtering-Correlation-Id: 242bdf31-f1cd-4638-0e83-08dc84bda9e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IXzwxLq0YvFeuU6zZm2QzGuGqfiUlohmJzugPXs44LJHef9vuCHU2+BG2hIM?= =?us-ascii?Q?0zZLcqJTsvGeAxB2PEiMgF9eZvd04ZhzUQt6C4xurMRGlZcYhWa7UeEeBZtY?= =?us-ascii?Q?QVbf9vl6yklKQd1IiGNF6gkCcO8q3IK2TaMZ8+rleQ+iF0DTIOwL49rSFRX8?= =?us-ascii?Q?t+Vm7oK4E28LOboEllPHySww1i3JPPWBYOR9gbHCbgR1omCeb8sjnBJIooB3?= =?us-ascii?Q?oS2G6yiSgC1uGsaAOzslAHibZEHxM22j/2E4JMVJ9T2O8FBVsUvagu3HCyaf?= =?us-ascii?Q?/hr3tIoAPKtWUDjL8UHD6VnGQN8/CBHjp813Bpb6mbvE6tFRe1xKMHuTh0Y/?= =?us-ascii?Q?+Jy9Vx6QL/5Nzfg45fg1SOn3ObWCe/A/x8okbeYlLGlqKWI23gvnEBwqfJh9?= =?us-ascii?Q?Pt2X7TjMcmhOIa+ndJd3Fpowo7Ks/HKxODoIq9DBELcIDa3Vce2KKcrDYekD?= =?us-ascii?Q?zBvJafElWXS0gTiBNfor8v81rgzCIQWjvYep2Tycrxr8B7MXAKwje72gnYcj?= =?us-ascii?Q?m0xvhWsY/jRHsF3bDHASsmY60TjVOqVFpVgAWgoZ0uiirv1j0HbyNwnv6zeW?= =?us-ascii?Q?q5hNMLxuQmpYI7MUSWBMJ0Nq55pI3gLVyzzTvB9jzbGUXTFU+9jgDZqV8FzU?= =?us-ascii?Q?eQ2GudjpIRaaXBsqos/G/HAtMFeR3yyJu33NAOwJ9w2ZeznO+t7ms++7SP0Y?= =?us-ascii?Q?gBinc+SqVmgioUvRPlcKYA/sE60ItmjjU8cZZL+l4YgUvGN1Dmqz5jNK7OZT?= =?us-ascii?Q?xOsRd0L7hzpAEWiVvNeS9rajku7YpZAgReQbCtc6sm5AzkxaryKKjwVTBl+U?= =?us-ascii?Q?KVyXrMBJMytPb5K5F17MkDQ07AumPrk+Bo8sLNuOFxhZTZ2p3EHvauqW0dtJ?= =?us-ascii?Q?6XLlcxBjOWdlhR2ytVhpzAtAefOIswyLVkc+E4wiu6Qlt3OFSP9nir30EZvD?= =?us-ascii?Q?ZUqrRRvDuwqcZCFwIe/VEKNMOr3PjR6e9ZmEsKY2rqqQ5f73OQOcJfWsLCyy?= =?us-ascii?Q?TSp+fub3N6TmFkJv+4/wumPKEdBxAxa44LBbSVu0NIbvQUCZc7aRGg7dOYO3?= =?us-ascii?Q?EvitwsOlrEU5iAgl9puvfwNT9q/7B/ub08ElWSBSAi8FTR2YYWvOZkTY0n68?= =?us-ascii?Q?Zfaovrhuyx52rzbf8IDLsIJcJUMogCtWsSC79hU8hHPnQOT/zupYEdHBy70p?= =?us-ascii?Q?ql8hGP2zzRPvLNstGSyy6wifi/YRNGtaqJY3uZT+PIA88PnjLff7jRyv3MOO?= =?us-ascii?Q?4wn/cWcV3elwo50APf/vhVPDEK64JZK3jySuFVYy6SD0iyc77zkoX1mWNQSc?= =?us-ascii?Q?fmnDOcAA8C6hnuQV7CyB7+Hn?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qz3gg/tYo3HyH3+xeMOp5zOQcwC9eOeaJBrnbV9cd1DvXn+BChSK3ENUV7va?= =?us-ascii?Q?fSVmci91UgS+UXXB68SbRAD620Yj80bIqkqeTxKDIoDbYa+pa/lPvqH/bl2+?= =?us-ascii?Q?r1DMRZM1yw8VKlH2SCXzkU22G5kmWKthqHV7ik9UGCZ8gG3otmGofqpv1rep?= =?us-ascii?Q?QME+f/vCV5geXU5rPwLutJzF47l1P8+R/GPTe+nht6mQ38jRyDy3g5MW3UaF?= =?us-ascii?Q?D8pRKFhf3AlqTKIzz3hzfM1Fe7aySi9ZlvnJX4GRbU2HPcdDB892o+wRTTN7?= =?us-ascii?Q?6LIN5irhbqnw1nGZjq7hYl1kGlug8rQNfFCW3LIUQK2Oh2dLcx5zr8rlS+it?= =?us-ascii?Q?0R0LtUBJDB1ri6Pdii8JJC1M0EmczwhjPUgBdHswGljycJm+NCG7OZDekVrV?= =?us-ascii?Q?1zKXso8abhMOMW6F2UVzrgboeR4V0bh48kUNj9iblOHShF6U75OE9PrI0Wkk?= =?us-ascii?Q?dRz+B8zSvVpFbCz7A2kJtQBSXwfODI66aa9+82I0Te1DX1g7k6g5www1JUwd?= =?us-ascii?Q?51XrFYk2QXzbzN71zn1mPXrgeoq7GgT1//nGu27u9B7FzMFDfDH4Ka4IGtSV?= =?us-ascii?Q?iT1M9gVi/SbIwbTkM38AgOwgr75b3mkCm89PQcfxJlvAhJag3gSXclTV31DX?= =?us-ascii?Q?1GGb/V68zunycSbFM944SeLFkoD4J61gjjm5MTVFuwVFQyPMTopuMaY0YlmI?= =?us-ascii?Q?rHt4tJvISN/b5RxE3qiD8McegrRuTDYD1sbGyb7LreAuqhnP9oMYla/sdmUD?= =?us-ascii?Q?vW2mkBAt2x+9vHifW7kovlQS5YSeAgnYKYmoJJbUPMI6bvi1Y7ThWqR8p3A8?= =?us-ascii?Q?H65yrioM1D02fKUVZTJY5JIwCXfHYGRnIC0EOMbL6RnmY0BH92C0dTLLkFD3?= =?us-ascii?Q?OmYJHwIThnPjt+wt1Ezull0s/qzNd1IGN0cltc02xDonH+zMhxQCoeNKlvU9?= =?us-ascii?Q?JGxnNZg+OutC7+rIocn6iyjMkIvl5fk4ajyxVFDUM9cGsUmwUvqseBCgkyrT?= =?us-ascii?Q?PrLJnynTJ2a0Zyt/qJtHW51No2P8pdFYsz6iDYeOz2Ndxukk8qJXoWO2gno1?= =?us-ascii?Q?AB+KldvwzPzeSEQHOdNSBvTCLSVmKGPwYCQrP6Jp0J4sDC3PEJEH7+5DqJyX?= =?us-ascii?Q?XXC4WVSdzlxJyK511NvqlWP2q3cE3KfZAUpO/a0/yJuvShcoWL8pF0ElvQbR?= =?us-ascii?Q?wehrd4elkbzRyvHdgTFKxU8nXHuOZglVaiQyHDj0bNR70q0fZTKSVNwT2qP+?= =?us-ascii?Q?QucEl7zJCr5G4AxBqn/+EjfZulUN7UHTrIFrhp9glg9AOEMsxWbWi5IysKot?= =?us-ascii?Q?aRJT9QF7juZDK3gG2kSHT9+haY0TiJMbF/tojcCmz09lQbYVAOjuLpZixoea?= =?us-ascii?Q?CExoHmIGZAOrhuMFbDyFwbcFPxOpamP0hGJQX23GsScOdSRGNn9Q9pPrmLah?= =?us-ascii?Q?4Ur50Kb6kKBkalrVYNKUqioyrDYLq3als0PA0Rn00Hr6cdOzys7lVt6YXBF+?= =?us-ascii?Q?P2EPYOlbXoHpUVlinaG0kJ9WrSXhAI2vzRXwlHknlXIr+iAwLjzbjqeJUOAa?= =?us-ascii?Q?Io8vlhjhj6ZQkM2FDaT+OuZQyby/iDj0Jy3HI5fj/+inr4OB3Zu3ALhlMC1h?= =?us-ascii?Q?whGNXrt3Ny+2bnCpd+DJK/A=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 1BqzvqVH1AJn7nLZK26jIvq2Ajz6XTYh/bX2MwYMJAORQM+pIq0JY5uISAcmzFdloLxdJA9T+Turo0FOh/Jn9k82jtiAgHziYY7p+H+0H55Yim1v+dlXoutP6F8jaB4PKLovwpgpaCvIEvs0hogaQjR7Zgjjs2lJw+HQB8HsvGm9w6X6i3l9RTDItcD7a3pAh9/gYlaWneHKCgr2tKaW8OU43oyGS86LzZPxCjZNSae443/uHfSghda4KSMBesYvV2C7AiTp/bFW8WYjObpqZLhMBtrWRvG1nWFo0I/kxdfTLfPLQSoO9CDZZAmxRCGT2AVXoPAgBU+kB9bSJXCjkqzUEVepwrcakeZBsOCktjG5JwyEZG23an06nDsqbXsrJKOIuf6Uzgx50yLnWRgH0UQGe7EoIJVnBS3iUxg7RN/u7AvDsz/4p8K10HOVS6zyf9rRYEpaqilsoDuScnXS8reWcuAXa6obY5iUACwReiMnADc/MSLtNDzQBfos8MEO8QfWEw/wUjhpAl7Rz1FpToOsGB6SldYFiucH9WBkZmhsztgV5L5iHkvBnb2z0Af9RZLdd5zfyC2j95ULqouDrhKJJJpn76oyYHTSz2giUZQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 242bdf31-f1cd-4638-0e83-08dc84bda9e5 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:11.5062 (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: PwM1NUKD8GvnhIWhG9hdh4iTki9PWtMFIiZxDJn5hiV4ITbbhdiXjiYoYwmPdmsQg5AcPAKNMas7EY1J6wuZyZpKxTmPzbCaQa6WQtmj1DQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 spamscore=0 adultscore=0 suspectscore=0 malwarescore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-ORIG-GUID: fpFyMsYOsUmCGYh3QBXmq5tmS-FwDlOW X-Proofpoint-GUID: fpFyMsYOsUmCGYh3QBXmq5tmS-FwDlOW Content-Type: text/plain; charset="utf-8" Refactor mtree_store_range() to use mas_store_gfp() which will abstract the store, memory allocation, and error handling. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 34ff1b3f729c..e3ec6649f7da 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6457,7 +6457,6 @@ int mtree_store_range(struct maple_tree *mt, unsigned= long index, unsigned long last, void *entry, gfp_t gfp) { MA_STATE(mas, mt, index, last); - MA_WR_STATE(wr_mas, &mas, entry); int ret =3D 0; =20 trace_ma_write(__func__, &mas, 0, entry); @@ -6468,17 +6467,10 @@ int mtree_store_range(struct maple_tree *mt, unsign= ed long index, return -EINVAL; =20 mtree_lock(mt); -retry: - mas_wr_store_entry(&wr_mas); - if (mas_nomem(&mas, gfp)) - goto retry; - + ret =3D mas_store_gfp(&mas, entry, gfp); mtree_unlock(mt); =20 - if (mas_is_err(&mas)) - ret =3D xa_err(mas.node); - - mas_destroy(&mas); + MT_BUG_ON(mas.tree, mas.store_type =3D=3D wr_invalid); return ret; } EXPORT_SYMBOL(mtree_store_range); --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8420F14B951 for ; Tue, 4 Jun 2024 17:42:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522954; cv=fail; b=VMHx3kxTfM5v0/4bc3ffTwAPSzs4xhBjJQ1ULHW56BbGAlwfuKqEwAGccXNN49/yqXxGFud4F1QF+B0OkWHRM5+Cmve1lHP4oeYrmtWMsIF+P+vYhtpqZRuUROwqIxvNcZzPS5CQh8KjE3YXJovsqhulIDeiJo/o2lzAwP1Sex8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522954; c=relaxed/simple; bh=U5KxjEVQtKiNRRjlHzjjAsBRxhSg+s6y4LlKqpGnr+A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=HuwaMrGeWEyhx1nzIpiJmzy3rTIRU/GvEb6KDe1nErIvughucXBNbUPjqXObg/6NVyasIPcGknYKmjcbDsBs38atp5kmrslz5h7vBKGoXg7b1v3CXMx8++FazaQqvej3SrF4LLBEhFOH8xy95g/PofYy4SWCR5s7x7ooCOiEARc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnRx4026501; Tue, 4 Jun 2024 17:42:18 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3D7+x3u2+/bHbWB8/QSGmRsO0iD0mdBl8MbJVOtKnMvyA=3D;_b?= =?UTF-8?Q?=3DIyNif54fyiEwHSTIc90GOSCgw8IIkLiYMNjUfv/Dnd01lyOMbBstC37tXDQ3?= =?UTF-8?Q?xqntT65c_xvdU7lcMD8n9ilwarQ1rRKCmQx2xEsPYrMvEeSqqB92/Z1KH5REwSm?= =?UTF-8?Q?+ijT83NycngfJu_/SSRSW/bqG2QkLfb0jiZ1GjFoeZHpkZwVd9j1K7sgBzp/nKz?= =?UTF-8?Q?nJSIt2yBY5VrNs2F5c/Z_ZvjY0QZElkIkxbK7LrRJK4ZUZPS9takZW/5RUqH7gF?= =?UTF-8?Q?8idbmGC7sJR2LEs5GTeNmkbHxn_vYJaO63RmiNJquJwwzBIJqJvQSSP02ShcZiE?= =?UTF-8?Q?NZ7JHNOi1lbUDUhTfTGT2M1q1zJnTIe1_+A=3D=3D_?= Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv07wjy6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:18 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HbJvF024002; Tue, 4 Jun 2024 17:42:17 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2045.outbound.protection.outlook.com [104.47.55.45]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrqx69q2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=joVKZxE8R4GowqHZCQZ5z9ym5VnlqPzRWKVvFuF7AIMGEA2KoYxEbWx9PbT5bTDU0fEG1iMBqJJDUbPJSA7R9Cxcvl9Y9Mt2YJWktISgRJ/eWmy19tKkD2qyEReKomhVTC0MNZmtFmmJvHsHRAFhKCQKTcb6la9YhuMczSgTGvP6TQkj9P15JZlhcCew3iejc6tydy4SKgdD/MH+rRM3esYQnYyUyt+g+VCpw2FCVp6NfiVjNk/eW4GnVSXKBiLNZvWFRM6wSo4JpTU2LXTEHBtoccqunZgaApEjdVnTqI/x7GMhSUbZ/dUuUvt9RHPN5nA3y0U8SNw8KPeW+Vh3Ww== 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=7+x3u2+/bHbWB8/QSGmRsO0iD0mdBl8MbJVOtKnMvyA=; b=XJb/tSLSftW3D8bH9SQlfaeamiPo8kvyHoywhZOJcQKRZEOOtOyVw4C/0SGdCU9aAwW9BNDTTlr0hvgAtuI0b6oLCapm+xiHFLOhrZ9FxGAoDEShIpZwa2PYF3jUNEgdLafdhhS4bjVVVRpEh6mXP9u7GEaBOKvMh2bITGvZDDposl8O1xJztBt7MRc1XwdK3XcH+varskk8NgA297+W390CwCDQvCeiz2oFXGLfCEuRkbbm8g22QQoo07IpuNNW+3F68ieMqQQTRLPW4/GrxjUQrkXsXM3iUOWnjFs05BuTN8ivQcdVK0rXVwr8hZvxmFVu1bpcUZvLHlu46F7gzQ== 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=7+x3u2+/bHbWB8/QSGmRsO0iD0mdBl8MbJVOtKnMvyA=; b=kG2vutiOhRzOQGPB7N9Xv809UBi3EH1pnwSl8y7jeVCdCgpjLgR0jILtlZbEtCwgYRYQEcdynG9VgeYWNeFsiKcAP9efCcnQGtyRjroIhhzgijgLXeVXOHL5i8BvMiIDpRhI8Afcrf4UFBaaoNrWkLVF27t37hfhVLJh9Psrq14= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by PH0PR10MB5893.namprd10.prod.outlook.com (2603:10b6:510:149::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Tue, 4 Jun 2024 17:42:13 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:13 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 10/18] maple_tree: print store type in mas_dump() Date: Tue, 4 Jun 2024 10:41:37 -0700 Message-ID: <20240604174145.563900-11-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0191.namprd05.prod.outlook.com (2603:10b6:a03:330::16) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|PH0PR10MB5893:EE_ X-MS-Office365-Filtering-Correlation-Id: 405d5cee-37d2-4432-7490-08dc84bdab2a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?B5C6gJRc3G9mEcWGvyjccogHpND2SQeeNX5R1swj2dGv3c3I8XScWPJwBdFu?= =?us-ascii?Q?Yd9sYNibzziz4wYD1Idmp3r2XyxtQaYXolkweL8BQXWBewHXQhwfpfJjYE3J?= =?us-ascii?Q?XiUiW8vKZN/0kfWFjEjmbbkJVauCMXsRFu3TCR5VJVHFFajb//aaCO9vmlkb?= =?us-ascii?Q?w9q12mTqQOaOabFesZXuTzA/6+NwbGiJVYO2k+8Ue9btzLRG9DoFNwKzaWbS?= =?us-ascii?Q?GQktUKLqmPNYNchUgXjp12QVOMTHPkKBNofniP1RH/BtQeVorkOJhMDLhdqW?= =?us-ascii?Q?YUQolJtN4cdHyUnJYJcBO5/ds5zczTsE2nIXCp5cViKA/BJwZo8Y5zcJXElA?= =?us-ascii?Q?iKLKvCwoeZFhTss3bh5YUBRSxHrRVTpBdapj6QvOR3HpVWa1srZeKwmg/vpG?= =?us-ascii?Q?KLsjqhyr/9cdTMhlOmyXqmynPT5ZKif6PBCpUXAjji2nU1y8T5uf5ZnGpj3Y?= =?us-ascii?Q?lONjoJBBt2o9bNW7lkA3AUKW0XJ0wWRkiN1gPZMTeMi+VaYT4upK0Zjgtrk5?= =?us-ascii?Q?ANXLCd9cG80VxfI+qwm8V8lF6fOFFYFcvqa44jASzvY/jkO8pkj1NvOkdR63?= =?us-ascii?Q?Ejl7zzl3+HZRSY1bZkhsvmTXhleVxBbci5iszFRQPFDVBB8Lp7gf6rjNMaz8?= =?us-ascii?Q?WRamTdGjRIB6IyGaqHHTyE+cJ37eFztlrHOaI7LMZMKJX7nSJUYN9P39xRnU?= =?us-ascii?Q?qnjEfU1BDU8JhqRaA1mwli3UDGdVAyBEcooWfyaJIhNrpVJoi12H/a15xdD+?= =?us-ascii?Q?KnJhTwGohtkmYZf6J0srkO3Gw+0gJVtkyj43+OIg1sgi6CR+FUpvpsnQYcOi?= =?us-ascii?Q?QGHQhAO0s2q7szll22z8EnD8Oty1SWW/82UjL4eof/5BtaU3OvAsFJ1udD1y?= =?us-ascii?Q?FSQsbM/cbmCZVLPLCoe7s7wEYx27aumIBcAGrelE8ipiX8adCS+2yoAvCczN?= =?us-ascii?Q?sWEiV1QPS7xCdwtTyoUAlFtdD8UflpGTlAb/HzY0NOII00Kge4n4Mc5C62Cx?= =?us-ascii?Q?uN54eTfA/sEG2LMy72oVOeuFeAgMUswT6ryq9lJ9K2++44SVjB+/eIeuaKPi?= =?us-ascii?Q?ZBlVAHaHr4beZATQYxt39FXeu7UelxCLnVS2l6+i/QjDURhU29hc3HXUqCqw?= =?us-ascii?Q?42cOe0Ap2Ewb7pdLJS8yCFY1gwnda01XinOPOsFleExfedr5KDiSBm0pdxgd?= =?us-ascii?Q?sPQSGik+Mipo58eypI8U+MBhkgt0DoQs2RWVGX+k537cDFGb4EUDhKWcgx59?= =?us-ascii?Q?pTwed30X4m4CEnPNyi1ppCVXk4Xpay9Ia0fG8inE537wgrMKK0rIji1jrosi?= =?us-ascii?Q?zVVqAabrk4ni0cSRYM08sv22?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7F/y5xskdkhdGZRMJNUIo7hDeHEz4bFd+iu85SHXxl00EdBo8s5PFHwf6zqK?= =?us-ascii?Q?oSDZ0xAwNIxc0N1bGgtcDWnjEcey1RupMljsIQs+88g88Yg/IKvmo8qEjGzg?= =?us-ascii?Q?GDWaH965CKcz8NfLNJ6hfoYjjS1WSgAlqLnu0SeY2LaHZ0CowRWl10I7PwmW?= =?us-ascii?Q?bmhhescYlsbdJraK9YpKUhXPeDI1UaSsbljGcqbqxbCf+KGIwXt16Pr/qb9A?= =?us-ascii?Q?AnsxpxingVUWlw0bcvABkv4HIRXZc9LTKLV2GJ6Je5EdIkx8om9AlEnddE9/?= =?us-ascii?Q?WcNN6Go0uso0qaLN1fUpquLgMSYsXIAHzfViVu8WWCgK48iXW2/bJWQ8MhHa?= =?us-ascii?Q?vDsXKcqT5wHrOyHtLu/tkK02s1tnaXx0ho8KHFIQ9DML6l0bHIv/xthZjyMq?= =?us-ascii?Q?xn+OH2iq/T4xHRspNtpvwOQJMSG+YrXyZ18Gr1uokhPbZKxHm5zHAx06HB8E?= =?us-ascii?Q?YseHHKbq4KzWgDTcBC896yyZ+h0cJQAYWJuARi1xHBmX9qEx+e1BtyTZ171b?= =?us-ascii?Q?87FjFNW5hyTu5z1SwA9ZA4SQISpCgr7UO3ishHaafDOuZTxgIG6ZwpI9gsz3?= =?us-ascii?Q?2W6DRuOwQl8XfK4hjrZHU1UkY+yI0tQXeARItXqdRt/0w4zndhFb7hMZfbpb?= =?us-ascii?Q?xY1aRNlHbrsrMNhZRT0l1BSvwfTJtWaG3gjUs1jDhWDBf/5+F1sN0HFLztWT?= =?us-ascii?Q?0WrzV1uxjAJe3uq6AWopzOV/XIpOZYP8Xah0Qe1KJ1rQXOghn/LPNmEcb613?= =?us-ascii?Q?Y8hWsKW5sx0YboRHQTEivbt826mWkLMT6GN58DqayZrGthlDecopaDWTgC5S?= =?us-ascii?Q?yyz8Cru48z1rnQ3zsH6C8Gm3j0jxJk+nvsN+7Hod9tapnxpIzsJRGlsm+VTm?= =?us-ascii?Q?nxxFHKIAR5o0qnEYoUnKaCCFwJLuFOe9/sD625RU4tBBLLLTpJzkJ+kUF6KB?= =?us-ascii?Q?uq0+g+nhXy1zWqHH4UPCfw9N7c0Mma3W5SAvZ/SftJdulX7DIFYIQaWD2lTD?= =?us-ascii?Q?1KzP2ho+2JwaBOn3gxAFHjUUtd2iBQO1oo917GxipnyMDBnVFT0UqTyNdVuS?= =?us-ascii?Q?xSB87APS1wl5oZLJ49ENK47AH/dbsui7rfcDQehOpTsOKqoaNn+ZS/KUrl5r?= =?us-ascii?Q?TI+zNoFJ89CW0CIo4cOvBohW/X3UcibKM1Ep6eEoZWuBl8Vg452auoRKE/Ax?= =?us-ascii?Q?SUNGV9ADuil9/Iv5MOqVfYPLZ3jdDWCkKCKlHyV9rp083Yw4ApeJhK8oXE8L?= =?us-ascii?Q?1777tnprwrHlR0qyxoYYj6HIpts6P8KjeMzpDvnqeVlT6SNjfRXixLU/MH+1?= =?us-ascii?Q?aXngxT1O3cbwKJnJkYl3Vmfdbj0SvoCcVnxt0eKhxU2X8biTCilbmqThb2vk?= =?us-ascii?Q?NWrv1JkkZpl3Bgl2CLllQ31JI2gO79iIUgUp0iayhrHK2hRqPa4/icvCkXN4?= =?us-ascii?Q?GP6twZRRJifO6jtDnpPY7QQMep2S3LL0nPAhnOVFlGJPaGkkbwnrevI2xcEP?= =?us-ascii?Q?HtbdLTzJKyzloHakvnRCI8EdCJBixjgIQMOT1uEvlzW+O+QqfossDvfrvxzj?= =?us-ascii?Q?nMQAwwvpmjzf6hymBGgbtz11ZwuhjBojcoDIaMjKd27gJJ5BuGwxTvWsi2I6?= =?us-ascii?Q?hGfU5EOleGPRtuzy6JEaEN8=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: AwFAtePsqkSbVCtKJx23r1ADD1ce18c4sz7Vu8gMzaYr5eYDez1XCdvYT6RasVXimWKspy/x+ohgTBrROGl4sKNzNZzSpMbRppz3U+qBfAnbxDkMymhhCtn1DcM6n569gzo4MvF5+lrAbqT56yps/QAqxe5yHqlMGwRFiNDxAR86czPrObPdSkFwELgaNq/AHwvQYkf92ippFJqOIeK3LZdkziZVIJv37giTY8iHmnjRmeDwuGxD45E9d6sza6jM991S8aL0/7dzNUE0xSqGEjqwzaIzE5ozmwR55fqhtJRnYs08vPeoJuF2u9f9FA7ejREea9JNebrjJaVwhGvDz+Mmu2p89nCvtRoVTjXfk21LdDzqHVPIM90HaMhrfwYpZ7vOv0tEEbi1S4ifNYssxlHfvkTjZW44N9SdKX9UXXSgtYlwQu//UEx8RMX41YR6VGfiqoGBL0B9wEJhxSE0XJonY1nb7Nyyz7JgvRFivAlIA0mT0PkTnfjmNPGW+NQ3QS3maPZllc8jMn9bwQoXajhBAxgFjElulilrWiSqiRz4R7SVXvvZ4mm3rzAJH04Y3bD2lwCL9HNK+YTpR1kuD9gvJcdbvTmbkJhYdSO1q2I= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 405d5cee-37d2-4432-7490-08dc84bdab2a X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:13.6768 (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: txgWmva+J+Fbj5Ol6cTvyuguffRclpQ4qFeHFcM/lPREVppb8FDJsJx8KTgrghZuuyi/ybW87jwiJZRQldYys1Jv/PddwGS/JMFoSnFtcr4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 suspectscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-GUID: 2Pa2Yr5cXPSwAKD5iVotpNt70RXKAHXJ X-Proofpoint-ORIG-GUID: 2Pa2Yr5cXPSwAKD5iVotpNt70RXKAHXJ Content-Type: text/plain; charset="utf-8" Knowing the store type of the maple state could be helpful for debugging. Have mas_dump() print mas->store_type. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index e3ec6649f7da..abd2f396bb1e 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -7729,6 +7729,45 @@ void mas_dump(const struct ma_state *mas) break; } =20 + pr_err("Store Type: "); + switch (mas->store_type) { + case wr_invalid: + pr_err("invalid store type\n"); + break; + case wr_new_root: + pr_err("new_root\n"); + break; + case wr_store_root: + pr_err("store_root\n"); + break; + case wr_exact_fit: + pr_err("exact_fit\n"); + break; + case wr_split_store: + pr_err("split_store\n"); + break; + case wr_slot_store: + pr_err("slot_store\n"); + break; + case wr_append: + pr_err("append\n"); + break; + case wr_node_store: + pr_err("node_store\n"); + break; + case wr_spanning_store: + pr_err("spanning_store\n"); + break; + case wr_rebalance: + pr_err("rebalance\n"); + break; + case wr_bnode: + pr_err("write_bnode\n"); + break; + + } + + pr_err("[%u/%u] index=3D%lx last=3D%lx\n", mas->offset, mas->end, mas->index, mas->last); pr_err(" min=3D%lx max=3D%lx alloc=3D%p, depth=3D%u, flags=3D%x\n", --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1EAF14B951 for ; Tue, 4 Jun 2024 17:42:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522960; cv=fail; b=ufwoQ5afackvEZVOH3CqAvnMRfJf552Q6Dl8iU0YHmwTH/7j5ZFij9HioKiqRFzXu5FIOis88haTpJJp0hmn/FKF5wEKTT1XhSz2EGepKx+XVhznaKs0jixPcBZQQZrE43uI2gS+3UpFZwqvQbR0Tr6TJD74fvUr8IaOP8AbWZM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522960; c=relaxed/simple; bh=mE+aMq8WDB2AaWK2fjbZsIZm33h21QBjUJCWEpRZiWo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=UGKaVfuSg6t0zDHhLiR8Fi8YTbF3Pt/RIQQsLUaYxt3on0YCjwDPM5OIeIX0prlrEr0SoJk0FEYM5dU9yX3TDJjnu8ifvfrc/6bOgo1589RKq3OdMlU9gqhJxx9r4QiuP2yyWvIBwlhMDV61b3mNLhWKl37ifZledTQw1U2UPvo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnQgJ026488; Tue, 4 Jun 2024 17:42:19 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DBPtTPhTSFq5Lkbe5Z3QKORs76kLwd90+PV094KlROIg=3D;_b?= =?UTF-8?Q?=3DjFAvl/L+BFGX9WqCcq2irTTNP8oHSeWONISFlwqPB5zq5KsocF5glVTJJ4I+?= =?UTF-8?Q?tVZTslEQ_Z7N/uM+XffOB8WxIgaXHb4YGNbaYDXnWrt+ENiBoa3n0kkcTg0Z8yo?= =?UTF-8?Q?+sRO5XnH6s+bzj_yoHsFrtYcyJfCOh+8q0qAaEldjUdGY7W02bM9fqVZtGJ1G19?= =?UTF-8?Q?p6HSbCNe5M3+QzKO/XBi_Ci6PILK/dTuqDFaukYBDZe5nvfCIZAp6hK4eGNg8ko?= =?UTF-8?Q?lPC1e0ZWqhQPusWQZdNztPj9S0_8hp6HSIKVOaSlzSx/nch3J2RnVA6p12G0hOi?= =?UTF-8?Q?1XEIB3N0ouG7lhGkbxUyxsii4u6vNdim_Xg=3D=3D_?= Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv07wjy7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:19 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HbJvI024002; Tue, 4 Jun 2024 17:42:17 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2045.outbound.protection.outlook.com [104.47.55.45]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrqx69q2-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nL9znb3RP820P0FOFmZTiqIT7lXIQ14qHoFDfd3VDi6+Mb5PA3T2O6PHOBRsXW/hze45LXSuGS4wWOtd4U/JkxnkM6w4Hz3/xI7psBMU5A93jSI5tnxj5PG+qR7cBRfFpvdl3ftndvMt0rTxFoigdpFCx2HDd9zFibS1nmqWJ3L+hhTOdn9gZ/hV0+4BTRJmHI1LRB+ZGLuISmLsBUEULBw0PtP28V71TX7CU3I7XBHnMmIdPAgteqXKKdd8HWiDR6/MGL20b5ePeFq+KdFNyeCsZnhcCz9DDM7fruyiyuN/e7NSySN0qwyJiXJnMGhYUJLCtDfR3KVVDMm8xee2wg== 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=BPtTPhTSFq5Lkbe5Z3QKORs76kLwd90+PV094KlROIg=; b=OYeikNjNgvd+uXyYHhXqX73hiXQCLQGiFVbQ3x2YLT/eHnKxKMY/G79/bf2vLMdWjY6gu1oTBFl0SFmFNgXDLWGMVumwQlhguGlE9Swfz8CFBUikJ68j95mreya3v23ZMFHaxWzgytfrhoadIpYsHqhD0Bsms+y7Aopj2GnG8AdylssdEgR7TypcqCdA3xD9CQIW0fFra9s0UQrkE5y3sCtFDBR6XiwM+hWLCTsQxrLUJRBNWQFs7TFNVD647tJn78WMk/rHWQgS8ka4GgIlqTJYHJXg6EOebaeUishD1DNI6IACXn/rvcU1nOfK8VsXtQ0R1nRIHI6qze9Hcl9C7A== 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=BPtTPhTSFq5Lkbe5Z3QKORs76kLwd90+PV094KlROIg=; b=dySYejhEU3JNsgAuw7nXbTfF0FxyTO9oNqrSWHHA2uWXfBzNO1yJylB8d4NbQnEq7253joOmWq2RA9nXBsbFLQnZFSfLlZZDWSiBsBXWyhi6eCMjLFn5ox9qZ5pjH4zLvZ2hwoh8NHwaJVD2kN/gvlFTDjhkwHI1heS9IAdso8U= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by PH0PR10MB5893.namprd10.prod.outlook.com (2603:10b6:510:149::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Tue, 4 Jun 2024 17:42:15 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:15 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 11/18] maple_tree: use store type in mas_wr_store_entry() Date: Tue, 4 Jun 2024 10:41:38 -0700 Message-ID: <20240604174145.563900-12-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0184.namprd13.prod.outlook.com (2603:10b6:a03:2c3::9) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|PH0PR10MB5893:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e16849e-7ca6-4ec5-7775-08dc84bdac38 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?HRlGNCVrKsgh34T2EFsu6c18mFI4/z/ihT1zCogoSYehSlDALID7bdcjvfhb?= =?us-ascii?Q?j4jHYwVCGxSWKnxsT5GOdK/IBA7uCNv/eXjmiX0JOqaLl4Rt4A623/E39vvl?= =?us-ascii?Q?2Ah9pMZkogE+LxGtlrygjtZjSDgNZaFRZLg3a8A3zqthGcE76+uiUNeoKjm+?= =?us-ascii?Q?zkfnxAS35GsFWSemNbpSpxLnJhq+RI+dazwG/6sCvoFdeu+TzFuti8/bVuu0?= =?us-ascii?Q?eg0tP5scnUDfh6/ELnieoo7UhOtgd2Gw0Xg7umRLkNhz0orzHTjjUf/llrWm?= =?us-ascii?Q?/oUvOj38He6NqFRgnrxP22h3gZc47eAyqCMlNZPFj17vpbxdy/G4HOCH0oa0?= =?us-ascii?Q?cDwNZ8W1y9uEvwAoEblz8bmRSrRAq9N3wV+z8Azc2bazxX21PT4UiXRjYvDN?= =?us-ascii?Q?SIgvoWOPnakm8Trz4DkKq03u00ttngEyMaHTV9dLjXURxsp9wvugOAGJGJMt?= =?us-ascii?Q?YMcWK2galBAIKJzORZSMb4WtWVQAfNABhAuYvhgVkviqTbRwVz5kOQ0vEn8m?= =?us-ascii?Q?ywIiXgHdxN2dL9qAJ/fn1AO9IPeYnKEStFo6MhkS0G/Vg2ZIdtDWaf3+BIys?= =?us-ascii?Q?SeVS2q1v3r+84DmSxFM3oeM0UQ6Vpwmv39+XFrVmbvPJVOBhrIb0CyCuLLtn?= =?us-ascii?Q?MJH6MCHDDx98TQC1Qgti2b5WWZ/yYoH25XFgSxvMB8RaDVR2mflQBbAafOSE?= =?us-ascii?Q?NhUYMa6BSGtDLogfa1rYubD3E1ZcVJaOwNjfIyJHAwxJrGo7d8MG26ZB4Hjx?= =?us-ascii?Q?Mff4ZoEQSCrr//7zrTzSpl4y9UkIIOgdQbyNkvfNLj8iYY8fcGORa73gvPpS?= =?us-ascii?Q?zxmxi2R4AVRwGRUrkL1e+s5drQ2NoZHRWOXlkhCZll+WNLLz3Nb5CfcSrbMj?= =?us-ascii?Q?WfoTz/ftKU/55WVEBw962qmP16nxdYq4A0Q2eVFxbTyEUMW0Yi4a8eL2GmPF?= =?us-ascii?Q?X2wCuGeZLIeAYtsIs5exlWytLZveKq0zYzOYRamuluUM1m+HJlzAT/E1UQhI?= =?us-ascii?Q?GPNI4diLFkQyYd/HN3OEvqEDeTrLUkdCVEWlZV2rIrKo22l226LFZbC0OomM?= =?us-ascii?Q?GwF++iigpKFIfoFeD5I1RtokmDVE90AngiZ7ugnxoNOHv+9GxdYKpUIicwJf?= =?us-ascii?Q?RaG81XojzhHpaWGLJMAfAWqWvh0D+pAPc/QAsID1skTaWdAZgyaSF773i2u8?= =?us-ascii?Q?SEffvQcIfdAQsRvNxp5iHDD/rRuqysRANGukfWzBgCvFfPgu6hDTvheDsndp?= =?us-ascii?Q?PYogx4z473tKCOackTaaO22zdlRPtRzBnypP0Aor2Q1lllUv75Be+D0SS/aB?= =?us-ascii?Q?MxQ=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fciB/gNATGR8qHrIL62bOlHfsPtkZjjJVmDyuGju7M9fi1BaroZ1Ozi6Oeoy?= =?us-ascii?Q?raCkXsW4VPFsa2zupm4S916+1/Kv05wHslXeRmZvJmutAOnsTNvUKT0rd8kH?= =?us-ascii?Q?7g0OigRiGKLfUveCywdX7lNr3ha0gXQHCfP+m5Thnyo2orALHpdSbYES34FM?= =?us-ascii?Q?V4jeTVptTVXEXmOj7gjdlCtVbcJJP11TCYkWkYCdivHqjDJe+m0m6NGVM801?= =?us-ascii?Q?15l6nDlXDc8Us7RIhTqTdqA8Gmt21mOy5P7nWKkYvYbs4KVUE9UHlNHizh6H?= =?us-ascii?Q?kAwnDLbEDMwMvkocQWaFhU2Ga2FeijFfUXfP2NAh6hqY2Gvdgrkrwk/t1wMa?= =?us-ascii?Q?3AARvoD6HhC9Okcud7z68wtBriSzMhJzMf64GD1qlX0yGitWCo+7/iPvdywT?= =?us-ascii?Q?zkDV+a/NUjB1C01M0g98DcB12zxjF/p05T7wCa07oYF7kXUcDrhKoYjXbhUU?= =?us-ascii?Q?MQ0aMPeqMhNMe4p3zrf7HfcPBYbGAjmTwfSKWMGsQmQmrnE4wQDwRZZENtxj?= =?us-ascii?Q?m5itSYBro1rax1Mzr6yIuXmOJv56V0BbL7E+zfMTHmAFyTMokR2Sjji920yZ?= =?us-ascii?Q?KYnDsDKggwZzYLvJoYzKmcIgVcTttXnZHZbEHSLZJbwec0EbiYe189m9xbBI?= =?us-ascii?Q?TRdoACvc8fGQJagr1Dmq1cEJiV1ahngpfeQ8seSGud0p0prpESTn7z/pJYF8?= =?us-ascii?Q?RNIIYCtsxKFRaRWS1wc5pjfSr95tbEB2xZD/qcKggrrH3SDClf1t7QwqevWW?= =?us-ascii?Q?ke1FuHpGWsy+Mzd0dOrHyqK1cBVINyQ+pCv7YGzA21Az5vML2gK6ioJqamAM?= =?us-ascii?Q?L3NqCsNysu+KTT5D3ZRzjZnYxX1D/jjLfVlcS5fi8kxVekbSjjBfIE+42ubQ?= =?us-ascii?Q?tphqLemE7VeyxX9BVYPAI6MEqsD5xn2aO16qFmUuFZgUw3M4XVcyjsFUobmz?= =?us-ascii?Q?oPXId/QFwArME0PfrwqfjGyYLpJdaSOxkoFRyH+jrq8zRxcE9RWKo0gDmgim?= =?us-ascii?Q?uDjOV6r5bbOrsNDu1N1zFEEUku+/XOAhUW8NlZBHOLzBi6nppbPnwS7K6LGq?= =?us-ascii?Q?ErZ4u3VR0VP/q32qJV4xhDp327TcFZGXPBl+3MC0XgfwdMdhEIleLj5VZcEg?= =?us-ascii?Q?F01wmcKL0zLuHVpG6U93Cma68IoUCseR2nzzPohEgEug2bQnQvwipwmdt54T?= =?us-ascii?Q?j92GW6zxNyY4Rwr2Pl7kbYvsMc7p1sY96hTF6yW32hWd0bi7xuvkJRpQkYqb?= =?us-ascii?Q?vsfs9Ng8dEdAbZ+aHQQTUEJoRPj8JEmClE9OTKj+C+GEh3C661iONAkzKOuK?= =?us-ascii?Q?pCalvmhaz2pm1pTMmiLSWn/wVnjQMX73P0G9ZlC146OupC7+9r6vqv8mqws+?= =?us-ascii?Q?yASdFad91xDlvXH9B0h5yL2z0rKmzgqBkuPb1faSXRpFmRLqEeq0QU+yDSPM?= =?us-ascii?Q?t8OSE8NLKZVmgvChoHADFmE0+0Fr6xx8mtpCYUbcLcp+zJTW1bb+6Iwm7fGo?= =?us-ascii?Q?9T8uiiCtAHpOgk3Hdvu0QdKA7o0Tn7Um65jazNV5QkrClCfByZUP7sSnlpzQ?= =?us-ascii?Q?IpaCT5IRkKuFVtV4cO8lUDXZJMLz7zXeVMpZAHk71mb0Y8tg0LcdS1jVZc2A?= =?us-ascii?Q?kRYZqfP0nov343Qic1CSnWI=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: GhywvZYYAFFMkY5colRjYWv9aMGDUWNoQqTqzXiVUKxcuzb0XY7keexKdTbVkPdHq3J9nYEx6E9E8koGTT4GDxAK3cw0TnjgmLAo6D3dNcrtfEL33GRHfAzd9f5F0n4ShZjiKJwJ9YD1eMk4TM49A85XnM+S2qPITUWoeMJCP0aG5LiY0oNlwHpDKuE7eKTXUpTDFe2O8aNDJ3iSbbtc//LvzaciJSr1KqUr72McoEM9Yk+v++L24c0qLi/9a4Dg05LQk7M5dcpcmkpy+hG1V2Wl51ftYRbjc2aGdLVsz4iPaLc37FmXfU32A8tn47GIkAeV7rpB9wj3uJQpn+0Dw2NSYa/dvBm8hmRapHule6eS6PJLpSJtWrefAUESaBbdX8fefHoRwz8GvoDx/W/VnBzPjEWgl/d96LhFx9jOMrhVURFh7zuOErNx0wsHZtI3kJtjCaoQhqQV4OV5AHv8fMCh4mYVng1zzoTVnbo9Vt30p8oG++EdBKTBUjcSggirttXymeAQf9UZZK1fSQgi76B0fZb35dkpDylfmZpYa8E+7eOBylknj0l0yJeZKqTHN8M+noT5WsVAvSbNr6facFLMApa6paOkJkvFYk0UCts= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e16849e-7ca6-4ec5-7775-08dc84bdac38 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:15.3905 (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: 3j1JllUW84s9B0dS+xfwsLSw6oxuW0HJvR8mCpd+Ib0vwRIMKKdqNnRdqpVI2bSfr7lKKu8A5vUqsdf5O5+T/1Y8dcI513uU7P0IK4xD4eA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 suspectscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-GUID: sPgAtGPgjca7tCyYUEaocuu-5rsppJpx X-Proofpoint-ORIG-GUID: sPgAtGPgjca7tCyYUEaocuu-5rsppJpx Content-Type: text/plain; charset="utf-8" When storing an entry, we can read the store type that was set from a previous partial walk of the tree. Now that the type of store is known, select the correct write helper function to use to complete the store. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index abd2f396bb1e..20e9d13c2980 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4206,27 +4206,42 @@ static inline void mas_wr_modify(struct ma_wr_state= *wr_mas) static inline void *mas_wr_store_entry(struct ma_wr_state *wr_mas) { struct ma_state *mas =3D wr_mas->mas; + unsigned char new_end =3D mas_wr_new_end(wr_mas); =20 - wr_mas->content =3D mas_start(mas); - if (mas_is_none(mas) || mas_is_ptr(mas)) { + switch (mas->store_type) { + case wr_invalid: + MT_BUG_ON(mas->tree, 1); + return NULL; + case wr_new_root: + mas_new_root(mas, wr_mas->entry); + break; + case wr_store_root: mas_store_root(mas, wr_mas->entry); - return wr_mas->content; - } - - if (unlikely(!mas_wr_walk(wr_mas))) { + break; + case wr_exact_fit: + rcu_assign_pointer(wr_mas->slots[mas->offset], wr_mas->entry); + if (!!wr_mas->entry ^ !!wr_mas->content) + mas_update_gap(mas); + break; + case wr_append: + mas_wr_append(wr_mas, new_end); + break; + case wr_slot_store: + mas_wr_slot_store(wr_mas); + break; + case wr_node_store: + mas_wr_node_store(wr_mas, new_end); + break; + case wr_spanning_store: mas_wr_spanning_store(wr_mas); - return wr_mas->content; - } - - /* At this point, we are at the leaf node that needs to be altered. */ - mas_wr_end_piv(wr_mas); - /* New root for a single pointer */ - if (unlikely(!mas->index && mas->last =3D=3D ULONG_MAX)) { - mas_new_root(mas, wr_mas->entry); - return wr_mas->content; + break; + case wr_split_store: + case wr_rebalance: + case wr_bnode: + mas_wr_bnode(wr_mas); + break; } =20 - mas_wr_modify(wr_mas); return wr_mas->content; } =20 --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB0D414C588 for ; Tue, 4 Jun 2024 17:42:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522956; cv=fail; b=na1O1oBSYoFj/uLdcX4p7+2mHvFm35xCGucTYceubtM3FrjvcKc5Hd+3JjR64azIHFHsPwiIgATKjIyhMvdDKroJ3Yef3z4tWa5ddOhHsINpHtwzXT16jLE3BFSjcukhtT48ND+kDoLOzVgk3/wrTYcS890ZES9vDKkAAXaEqJo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522956; c=relaxed/simple; bh=U920KuQz9P8oqbMEEE5wD4Mz5EglQjz7U2pjJqhKLI0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=qcGWdqLCPGTsi3AcQCQeBO37wqDv72sYqb8/bBvz7h0R4YrmkRMjWjDVrs00P30PjttT5NTyc6eF2DOkHkohLvmynX3/EDfa0dn23QCsyHeYDRz+i6RvGGLqpUOGpdH+ejioVkbGtFSmMvyLRhgMQhx1r536ty6hOHWZYmf2tmY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnIf2028071; Tue, 4 Jun 2024 17:42:21 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DEFfMVjj0307ATe57Wpr6UCL8Rk+6A4Ycxlj6HCesF/A=3D;_b?= =?UTF-8?Q?=3DMxRPowNGd2saAS3eiLyrnf3094PXk/wZ2viGL1WvVVMa3+ZvQSu5mX150sH2?= =?UTF-8?Q?BPfuEB4T_nDufJJu9J5Aa/3ksqNGXgtqfrE6EQzHNhcX+J41n7p2Ei06+R4Dwik?= =?UTF-8?Q?7AfgYmE+8uyp04_kN6hwgeZwqlYpCEcLtPTQYrkNlfTaA2C+wOmn/PtTKNSBsbS?= =?UTF-8?Q?tUdawznoVKqGSsQYjrwC_pU0bC0YhhTs1fjbSO2Bss31ovyS2r/ppLwtfCL9qbA?= =?UTF-8?Q?ye1W8pLZgPdkt9d38/vkUxhDpI_HZOSk/DMXqLu130nxNCgya9WxbyLWyphwOrS?= =?UTF-8?Q?fmVbzxiq+XQsSc1SlOoZbRTWWv6zWY8b_TQ=3D=3D_?= Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv58dj9y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:20 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454GNr3H015565; Tue, 4 Jun 2024 17:42:19 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2047.outbound.protection.outlook.com [104.47.55.47]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrjcnn8h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XpCeQkY7ZBmEoTHs2vdXK8WB2CjJg4JWC+VH7L4sEkPcdy9G0qFPJdjWYl94CWKtLkRNSMEiFtW1WRxi32b1spAB7/du48S/jhILz55ccFYYurjnWlWeL2XiaYFK+RHADuJ4TXKa5Is9+NzPk5NSNolUOHqbBarh2oKeALZPOcnds0i7nGdSpEp8Z/takWl8ge+YueHvCa/C2azn7gp0h1dw6S8ccCAJyH6LLWzVVq6TRgsSkUdAHGS6lQPTp3lY73ln7vN567wzu5VWV0GA3Xl8V1W1DhALcsYvGCSso53bqu/IvZZmqlalQcRN1WM9yTAlLrzAHKqam2A7QsZxpw== 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=EFfMVjj0307ATe57Wpr6UCL8Rk+6A4Ycxlj6HCesF/A=; b=mJVu2Gg7AgF6BKePpOvI2Av5LN1oihP76yRoy0Nj1LG3SkdtUEwnY0bYGWgwIW9TNxZrSzVK9IjcBCM5ozcVCVEMIEvKJTgRTKbfhmoUguhLZxkg/+RbKnJU2U+d0W859r2aJDrEyP+KiDUrtaiaHieKBAQKToQwR2deLibYqj07NiEhxo87JQpLmyaM7dx+gTVmBEejGtObSoUz72naQMjFpND3InkS/jwBX7Tncn6WyYH6OrH5OeyOa1Sl9frX43vDKxMzJrvGfQ71GEA77D6yKAhb6Pc/1Jm1MNpq5urDuDHIX1JAvDYRj4TYYtVLlRCvMD+ixBjD4UKivBmUcg== 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=EFfMVjj0307ATe57Wpr6UCL8Rk+6A4Ycxlj6HCesF/A=; b=HrGS3b+P4DbRWhOPIMzuODGyTXiiKIMIpVicHlMkiE1lrAtVSN6Nerp3cEZB9EtC8cXuxMcfZFr6dQTlShCeQ/28NIkmGOKmrt3iFpMTEpg/IfcUGBodDp1YEUpo5ZVxAWwSjwiATO//K/eZBlO1qKOdDwz6//aPruSeLcU7qpE= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by PH0PR10MB5893.namprd10.prod.outlook.com (2603:10b6:510:149::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Tue, 4 Jun 2024 17:42:17 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:17 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 12/18] maple_tree: convert mas_insert() to preallocate nodes Date: Tue, 4 Jun 2024 10:41:39 -0700 Message-ID: <20240604174145.563900-13-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BY5PR04CA0021.namprd04.prod.outlook.com (2603:10b6:a03:1d0::31) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|PH0PR10MB5893:EE_ X-MS-Office365-Filtering-Correlation-Id: 04ec3810-4fbb-4c8d-5448-08dc84bdad56 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?fx8YT6T8OoI7g9f+ur+pbGPrHdctdYfCvEZNDjXQK6r/F6AlgjgD4FvRq527?= =?us-ascii?Q?/Y4YC/uPfjYyh7wckC9JPjSrOcj9jNHzGbrTuJTnsvE85gLIhT9yngY4Bi4e?= =?us-ascii?Q?qIOiaFlWZblieMABwAul01IgTiMLaq4THSpjn2sOm1RzYwQajz+oW2rxm+UI?= =?us-ascii?Q?8ydHlUqk1XfypibJPWMjzyb/MCsOqvCeCh8PS8dD4beKZeYnFiPY7Jtq22h2?= =?us-ascii?Q?ya4M4Lk3veYxW9bemKLP36/cVvvTx01HTi30erYqumHmr1Uqyt3/5fPXxeZ4?= =?us-ascii?Q?+V00chbdgqjHI8cxl8PGQex0cAW46rs0KVfLsNcX4iJmepnqpYK9bG6H2xGh?= =?us-ascii?Q?Xue8FxjAwgVRA7cytigapSFj27C26oCKtyP6Q5BA/FR1gfhTEH3aFZglflKZ?= =?us-ascii?Q?HiemgEug2oTKo444L8WKxU89gT35KGsbiyGQuCrTyBblcduFNUcvzrD9HEiQ?= =?us-ascii?Q?Ok74RA3UM0JWHQcDnmqYph1IqPox5fTuUi7VDfj1hugZOQdEb5gR4HUyHUby?= =?us-ascii?Q?02gw3mvK0mMo1Plgx5JXQ0ZnHkoOOOKWCNmM4/GSDGHazHf7sxuITUrZkI9Q?= =?us-ascii?Q?lwTyTkrnh4Yn6ERiqwthGvzwvGwLxtnUSgxYhBWov4U2RYvKnNvncBTvHU/x?= =?us-ascii?Q?SMqYDOYI0M65PF2FQ8daxWvNWKCcJr9QuFH3Tu1cgkJQM+cpdtRsUToxeE5c?= =?us-ascii?Q?xx559E6PuY0YyjcQ+jUlpNK/4QpG4xkShnbvWMmMXn+VIVZvqce5ufoyDtev?= =?us-ascii?Q?sIazoctbpNUHBDIdRSD8QSz9bzw6gyYLx4gDpcjaNcQAEF9iILCcLnBD/+0z?= =?us-ascii?Q?4frFAHg81ndSIgzh5FGslQBaXSN6Jogz/ImfxAHez2rbkKXCh55VfHVVhbq3?= =?us-ascii?Q?QJYnoNs0sz0yB4rwCwI2kaH96Us+9+P+P62i74KMo7GoKeGPY3/K5sU0gj7q?= =?us-ascii?Q?Locxsf0fcMZZ4mkDaRNL/UqlTpdC9sexvfa8t9J/IztH/mne9z9byqjbJTmw?= =?us-ascii?Q?iNAGgMdMA6+sJ9TjnFNI9Ms21XsAcT+s8fUtATfC+bh+1nJfdxWXAE/4XxXf?= =?us-ascii?Q?DStBDXF3sI/tCNEppuFgLUlgQFKIVkoIf6e0CA8i7GZWb/g6+gaZIJJVr1/+?= =?us-ascii?Q?018Ma3ieopGqzKYpnDLMT6UmfTDpMgQ/YpuW3wDnNoQIT2Lai6zE6ljG4PZO?= =?us-ascii?Q?e77cfEZ1JXwQwMtIkMIDkAO8QElWdcXLQfu7/h5qJUfiCDhwRdwxveFmTEE3?= =?us-ascii?Q?/anaX84AlYAZOV4nAJacwm+Wc2g4B2sT7m9LIBySwjCIkNOgywfcspgbq9bn?= =?us-ascii?Q?4uDHzRi9NchJ/PngEeAA8xcm?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZinUU1qFYwWIC9W1nKI1//VZPfNSM1dL4ZyXfc/Hr0++9jxCblnT7Z4N4/lS?= =?us-ascii?Q?WPNBgJ5CpVACT9YchnMvVDemWbitCKnq2xSeFq5wSe8xS4l+egxSfcHr5SOg?= =?us-ascii?Q?vAThyU21Eq2wLNEQEC84xLwGbrvdIyOc+Xl1hk65zvzJHkeQLi+4qS7ZrGtP?= =?us-ascii?Q?fkflwQA4m1TMPQLLnEDeVS8OohpA/+Q6tf1epWF3zfnCSxTTkutYVB0/yBV4?= =?us-ascii?Q?1+RkcrJDY/dX7DdmIvqrzBPnzJbK/2yYEgmsGmViiuD4ESDf6u+1L7MHCWAN?= =?us-ascii?Q?AhBPTz98Fsxxlo6p9Spl6Wgbas+ntK41uzZ7Zp3GNhUuDK7fM8f4Nwu4CJCn?= =?us-ascii?Q?fN+c39oFhSvyPTvgA7+FnzQ0/2R/0Th3qU0cRNyd8s4DGEYIwazNtSMK5J76?= =?us-ascii?Q?KqltDFScYvi1/dCOZyvdmJvvi9PYvkASozv+8E2nUnfXA8AASLfrZVhapow5?= =?us-ascii?Q?36bJ3Mfu7/O//x9lAImkjJba0R7GDrqzvClHIZqYmtzMYo+ZEAZm3jgVERCn?= =?us-ascii?Q?c8h9HQm83Ckuj0ARI8hT1SBCkkcWj5iBsmmwjj8KUGT4WuDDu74aAv4UZ+me?= =?us-ascii?Q?9eDGABl7CYbVwp4U0XbyoSqIwSbZmv1+mXisAhZWVQkzaEcw851hSjoDX2U3?= =?us-ascii?Q?BfXfD1us7azZ8/XROIDepmoW3G6Z0oCoJ6yfrEn+3i3sDwl+TCuTHkZspaWe?= =?us-ascii?Q?8AItsQNydPL1t9WgbV6s/ipyiJ8t0vj2V/Yno229LnikThjSBzdYXagj/mfb?= =?us-ascii?Q?hnis7u9+ssCw+llaLht1g+LWkcMJd6yvKLRblUnRV/wzKxawIIAb85ZiIWIJ?= =?us-ascii?Q?D8lXLNF/trR3Y9cuSwy5zfZNLGzx7WkUbLhWFDsJAvFkUgGB9MIcetMhju4l?= =?us-ascii?Q?veT9esSMp35qwcoMtsEmzxR6j3SpssMBnu7IqcEBMhSLYwih6C3FqVeqe9f1?= =?us-ascii?Q?TO+hzswiUraM+IlisGnlArqUCujf8yz65k3aH41chTqAk3d/h19U6ykJ1FdS?= =?us-ascii?Q?ystX5u4UK6Ep4mazwZ17g0v7Nu+VC+Fn/r7isrpH03KBaez+lLG2T/tMaGB9?= =?us-ascii?Q?8+OnyS8Sh0uOzg2xMnpMv9eKfJ8oNH/gNuJEqwurlYU4avShFbS2j74nQKsO?= =?us-ascii?Q?eXGxUoJqmakIF1IygZJAoi3xDch6gsoe7XCkHZdy4Ec4oIIGMx4TU2XMwBog?= =?us-ascii?Q?TJgrJ7SjXGMUqiA3qKWeB2Lm/Pf8o6M4uphLmefGqiYjIECNiPJ+h1v7YxiR?= =?us-ascii?Q?G2MzaxXmKhYgSrEXfDl0J6wnFDLSmz29vFi8y14QkB3RvRha2KvuirJWrsPb?= =?us-ascii?Q?7B1K79hlyBsakHZWswhjBpHiw39lgIXdnqiXAMm6J4pIM+3kN1nRAUnXWziL?= =?us-ascii?Q?KtXPumxA1uPeYfqXZwD/Sk6/tvzHE0XOC8ZCuUMv7Rzba4qGbKIGYpDw845B?= =?us-ascii?Q?CC/QPzGW990rMgfv8R0FcAXg+YFOsxQ6+sS+VICbqOFjj0FLc/nv8stoQqq5?= =?us-ascii?Q?KTyFWlRpR4hXHxfFnNNfRryNDpcFbZeWVzxWv6Yv8mZJGWLcFxRFT2qhHHm+?= =?us-ascii?Q?AwjeFtOOmeAcZHu2KwPKJ9iSGk8okAd9GA5/4iJiUr+JgCQXLpIKd9DRiFJi?= =?us-ascii?Q?d/Q8dJgtNvm8Mq+Pqd+HoWE=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: SvA4u3yM5wfYFDGDk9XPpIwjfm/1jTYbdV0vXNGfwog2N5j1ACKkWThQO45vzEeboYue6e42ExgwLDuvOEJbrzydGdCqr6zFOKKK/C11yot+Qb4j/68u0JPiA6RXINCgTFZhFMm5KeDfTdHA7/svCkuBrf3Cp1/uEjZVIVaf9mx6p0ovdDoMjqpPKQO/Jht7yh36v4MPqVjMBZUr58mbDF44CBrFUnEZ2SuBKswbIlLNZWI6wffwsz6r0w9FxTfNchy2SEMs8avTObzRK0eSxBJ7Sco2AReVgx9w5AAyRZngCnaurBF34KGfKK7//QK7dl1KrkDMb9VUdntspqbmsqRays/gu/iBf+9qRQN37OXfgHhQ8CHNyZlwWD0RKCC/YkBCmRqBBV+2DqT0CoXfL47gAOH5EZYb5N3TOMd3LW9Lbck3tXn2ghvjRHij5YHa/tRAtixIeWCV8nOuHz+GGmthlblV0LxiTYZy4Wj/fUdB2uRGH1WuYJ3iOXwERIuv/9k0eUbz/BAn9QGg4Fn8Gqg558KEWde6uU472khyuKegCGAHhjpx1HcktbzjsSPolCOF9EB+JGTleJ+tobgoyi8D/SPI8vcUZduUoOKIdIw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04ec3810-4fbb-4c8d-5448-08dc84bdad56 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:17.3339 (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: hJb2WTfQgHcTzFpbNcate9PY7xndkOcCA+OlEgNmKK26YiBT2FJmgcxUo6din0quAH/jg9ZQi7tk07ZMuzNmtqZ6/AVk9BrzmMLChgsYYGU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 adultscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-ORIG-GUID: ZMVqSr4Kl0NzC6Lyq8I0ug1sQjfAqvXt X-Proofpoint-GUID: ZMVqSr4Kl0NzC6Lyq8I0ug1sQjfAqvXt Content-Type: text/plain; charset="utf-8" By setting the store type in mas_insert(), we no longer need to use mas_wr_modify() to determine the correct store function to use. Instead, set the store type and call mas_wr_store_entry(). Also, pass in the requested gfp flags to mas_insert() so they can be passed to the call to mas_wr_preallocate(). Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 20e9d13c2980..314691fd1c67 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4445,7 +4445,7 @@ static inline void mas_wr_preallocate(struct ma_wr_st= ate *wr_mas, void *entry, g * Return: %NULL or the contents that already exists at the requested index * otherwise. The maple state needs to be checked for error conditions. */ -static inline void *mas_insert(struct ma_state *mas, void *entry) +static inline void *mas_insert(struct ma_state *mas, void *entry, gfp_t gf= p) { MA_WR_STATE(wr_mas, mas, entry); =20 @@ -4467,26 +4467,24 @@ static inline void *mas_insert(struct ma_state *mas= , void *entry) if (wr_mas.content) goto exists; =20 - if (mas_is_none(mas) || mas_is_ptr(mas)) { - mas_store_root(mas, entry); + mas_wr_preallocate(&wr_mas, entry, gfp); + if (mas_is_err(mas)) return NULL; - } =20 /* spanning writes always overwrite something */ - if (!mas_wr_walk(&wr_mas)) + if (mas->store_type =3D=3D wr_spanning_store) goto exists; =20 /* At this point, we are at the leaf node that needs to be altered. */ - wr_mas.offset_end =3D mas->offset; - wr_mas.end_piv =3D wr_mas.r_max; - - if (wr_mas.content || (mas->last > wr_mas.r_max)) - goto exists; + if (mas->store_type !=3D wr_new_root && mas->store_type !=3D wr_store_roo= t) { + wr_mas.offset_end =3D mas->offset; + wr_mas.end_piv =3D wr_mas.r_max; =20 - if (!entry) - return NULL; + if (wr_mas.content || (mas->last > wr_mas.r_max)) + goto exists; + } =20 - mas_wr_modify(&wr_mas); + mas_wr_store_entry(&wr_mas); return wr_mas.content; =20 exists: @@ -4531,7 +4529,7 @@ int mas_alloc_cyclic(struct ma_state *mas, unsigned l= ong *startp, return ret; =20 do { - mas_insert(mas, entry); + mas_insert(mas, entry, gfp); } while (mas_nomem(mas, gfp)); if (mas_is_err(mas)) return xa_err(mas->node); @@ -6532,7 +6530,7 @@ int mtree_insert_range(struct maple_tree *mt, unsigne= d long first, =20 mtree_lock(mt); retry: - mas_insert(&ms, entry); + mas_insert(&ms, entry, gfp); if (mas_nomem(&ms, gfp)) goto retry; =20 @@ -6581,7 +6579,7 @@ int mtree_alloc_range(struct maple_tree *mt, unsigned= long *startp, if (ret) goto unlock; =20 - mas_insert(&mas, entry); + mas_insert(&mas, entry, gfp); /* * mas_nomem() may release the lock, causing the allocated area * to be unavailable, so try to allocate a free area again. @@ -6663,7 +6661,7 @@ int mtree_alloc_rrange(struct maple_tree *mt, unsigne= d long *startp, if (ret) goto unlock; =20 - mas_insert(&mas, entry); + mas_insert(&mas, entry, gfp); /* * mas_nomem() may release the lock, causing the allocated area * to be unavailable, so try to allocate a free area again. --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC6C714A4CC for ; Tue, 4 Jun 2024 17:42:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522962; cv=fail; b=IlBqsrm3C/8xbET+arI0nBGfY3QrRHEfyQNV5CVBZ3AmR4RRMoRfnWXer+98YvL2X3GP3nHNjzfsoZC2dx/eor0fncBHg6+xvS6lGusPT+NMmhkHqXAYNeU5mDn9v977yNXztHi3G62RDcLgBqx/GpxfAKbfxMq+Yc3VUXFEULU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522962; c=relaxed/simple; bh=5JP921fyINXM7JJlV4W18vvviXFq4RxHYMFXKKLHgtc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=JXWpJ66/OVpZuInxxGaqFhuey7upI8gIL7Eu6hBFN5Es5j2JdmHMHixOvnzHAZfl6HRWrspMVk0Zwh1Fy0RivooM57MwrGZH/oxxTK3FvkUDga40lsrMaGir2lIt44DoLDSU8r2xYcjs0YbuElNRKtUB0F/A3wvpciHFWe86768= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnW2b032115; Tue, 4 Jun 2024 17:42:24 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DubIaSEckWfJUp+wkuVmhNaKmXVwwu71VQEcFJ3DDB9Q=3D;_b?= =?UTF-8?Q?=3DSTvYyx7S19v+AcJ+wSAd6/eC6r+b6AqJbjblr/wQJPxJ6qnEMmdz0iZiNYFp?= =?UTF-8?Q?Nbezjral_GxriVPs83VO6Xb2uvhEQtICg1SqBwKm6jW4Fu2f4y+ibKaeAM/jfSb?= =?UTF-8?Q?DB9LFc9vYyUPMq_/vnLvs7kmptcDOfkfHVV5XuZPoLBdsDoEw3QaHLL9rzND3oe?= =?UTF-8?Q?l7K8Os5Ci3M56Tef6Lsw_OWoLx05rlWuvYRCawWpnGzD+gPAjlp57JDs3jvKCLe?= =?UTF-8?Q?bNK0vu/+8GbHSx28/JiLPT4Z2A_3VUucqivzkBeJjOVUUPbyyi2GfhnTdH4VFWG?= =?UTF-8?Q?B6HI0vwmvOyX0dZn4AxuWrZ6SlXUuGye_lg=3D=3D_?= Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv6u5jgy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:23 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HN68q016121; Tue, 4 Jun 2024 17:42:22 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2042.outbound.protection.outlook.com [104.47.55.42]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrsaf37v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hzw/truBpbgZ6g0jbfuY9frHFcXHeQfrJGC9zm5lE37TEtOjWClU7K03wL0yV+BalLeeNR1K4q4pXNcAWK5z2xc+/ds1qXhVW5jDLHbznKTQriZAMl4a456BDtkwMp9UAS+nsqhPY3s31mjoYpBAGienkwINI97a299rNrPXX3IKqpUQEV2V3E+2E3gZxgtO3ftAF/5wqOYTVkBjetVVxi4tCkbFpFU9UcenLFW68zLx5osVfiEYEtyRAh0Vqb0iIDQBpT1Rq6RmpF4RHURwhshMoTCuDsufJn/Rbsmu0BlcKqzmeRDbdA5Oibroy7sH6IvTl+ZKUiRBU4X3AEvYoQ== 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=ubIaSEckWfJUp+wkuVmhNaKmXVwwu71VQEcFJ3DDB9Q=; b=Zv4QX9HeLm5+b7oIORRXaIzyEq/QGXbA5x6SjRhfJcdaQYljJ6HPhNkJSWDZ2Cr/0nf8LynQZbF2iXV5zYmUa1ontorlabH3rOF2McY1VAs9yunTwGTpmrsSS/FCtfF58Fb1eimCmFUAVItGtnkDvPNLu63HtjLTEnpcElQQyi4BMcmIQeltXTH+tIsd/IdM0LzTFB0CqFa0mEEwZsbee8gX2+SoTmJc99OGv3xEVWcr0DDwUjsNqzj9rn6lawDSTquQok8/HaPwg7OQ55sUbN5eVFtSrQa27OYMRHpckPX9ObizCA+QnGPbLfpGaZ7nZiWhRRxvbvjI8V4J02UnEQ== 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=ubIaSEckWfJUp+wkuVmhNaKmXVwwu71VQEcFJ3DDB9Q=; b=hUrSkAFOedraG8um4FDdjpo09CTufqcioahyK3YOTxvGDhJaroU1tTU4gG1Wo8LUpJfW6RqhfqBCf5AjGQ5u6ouICa4HgLZlq5zLSQG1R+AmrEXD8QUnioWhcHjhl4PJYqN01QT/cF8CxSkeyOTtTsWgZWW1JRufKxzrezTckQs= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by PH0PR10MB5893.namprd10.prod.outlook.com (2603:10b6:510:149::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Tue, 4 Jun 2024 17:42:19 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:19 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 13/18] maple_tree: simplify mas_commit_b_node() Date: Tue, 4 Jun 2024 10:41:40 -0700 Message-ID: <20240604174145.563900-14-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR11CA0077.namprd11.prod.outlook.com (2603:10b6:a03:f4::18) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|PH0PR10MB5893:EE_ X-MS-Office365-Filtering-Correlation-Id: 6fe7c6a7-65c6-40bf-e3c5-08dc84bdaea1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+kK2KGzddLPySy2B4Atki29wKkhpiO1IgdUVEGE2Sq/TP6xkBIdl3qisuNiz?= =?us-ascii?Q?3xH/SHoqn62+WME3vx0wJ9AqPK3wz1DBIMBuBKQw4VEu+lhxhR16tKVbsSgo?= =?us-ascii?Q?WJPqc0Ux3mpAXP4O4IeeXKnhOVRWbvISBINk26QT4WvQep3NPJdEsCQ8ZrcO?= =?us-ascii?Q?xj7XrzHQkkXGYqdp9k61tlA3lat6HkSqMvTc+A+cM7wT4Eb4U8UGunh3kgU5?= =?us-ascii?Q?RxnuvDwFVPGueb6xerByPULEF3/Ry35SCQa1ZegNyFdMR4ODj7VCkVKhtL4K?= =?us-ascii?Q?zh5kz74SnwVKgne786kbZwHzT5XrE/FOx3v7hO1+2mxxa2Xv8JCx91j4Un7B?= =?us-ascii?Q?+k21IgXA9pC4IMDH5hQ4cVZv9OlbT10B6TJimT+FhwHQHjgPt7KGlxvCXI+N?= =?us-ascii?Q?dNm+/w3MtU1GCMMFUPtEKMob4EMlJkgWxxE0DXMiyMUbzZFn+Ri+BaD9crMF?= =?us-ascii?Q?kqn+S8aNr0CuXohdIMadEuGCXV7iuFLDxsBYSVP4P5Lij7EyanagzbqhY/OH?= =?us-ascii?Q?iNELOquZPjDxpGZxRKc61VnbzKiK2LVuGSjnMD9cUton/p93w8x/CD1ts7kP?= =?us-ascii?Q?CF8CRI8IFd3pAQUzJ+9vzoE1zz20dES0zviNfXq9uSXj51haSKyz7knfBsyy?= =?us-ascii?Q?VXnGy69D7sqS4hyrUPJSacQWY1kKlucU4Tmw5YgZ0rbD2kJzWf01+fHCw9nM?= =?us-ascii?Q?Qw8NMaOSp2ivN2GEgPLSUlqQTQq+IVj1OwPSB3DXEHboXYkDcZG7ovaHDWTq?= =?us-ascii?Q?k+fzfAwBCdHlDTDqwcvdh+SGEApCS/9B2L/88+HTKFZWqbeV3jNErtOSzS3n?= =?us-ascii?Q?W3KCsOUGBd1iys8MHxqENPv8eVswaJ4BISGGNQTXDx6kLRr6gvZX7OicooPW?= =?us-ascii?Q?44Qcwtn/IVEZhEL4Jc4KPL7VSOCwgi+dTrAXiYRaiRRZTSpxYWp3MXiSyEzs?= =?us-ascii?Q?AO1PO4RSf72z5SCQU0j6kFxl0eC+kvVnJZb8+XbjsnR1q4v0Cr86x9gY5rYz?= =?us-ascii?Q?q19xYMaVqu+4cgAe/7HHeJfZTGcVBAsMogOPzmNWtys4q5HLqQFutT9VlETu?= =?us-ascii?Q?R3jYxRSAuoEW8suIzZ2shyEAIq2CdJRe4/juwaF8moe/bxf009Yf9prX85MK?= =?us-ascii?Q?FG5n5jLiFfND3BG+i6POJy783oUuSbOVlGz6WIkbd9+ilAF1dddVJY71cWIt?= =?us-ascii?Q?ZLlqiG12Ja6BTR211nQTU12eUB/2lbTDFD50Mb8rIkGoEZI2ZJYGi3BDVHFI?= =?us-ascii?Q?EwBo8fcrdxCbXUYbx1Jb1uSizuICZK7QKT/rhGFdHqevk5J1wxIds1jwCtxe?= =?us-ascii?Q?OJk=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3OttyyjxZ5HHPCYFYASpfXl22+oZA7jFjJx1SK5C4ogKvW6Q2bDKyF2ga6Zs?= =?us-ascii?Q?rGXrFdZPxa/XtQUxsJ+PDo4Va5gwefyKYgfnpzlw7CXEL055lyKCrTBnowji?= =?us-ascii?Q?JCo2wCQnchMSR2fC1xaA5NTN1zzB/52vr9sCaJGH30lUwhJ+ODsSaU665JNe?= =?us-ascii?Q?vhI7XXeIXp74l3elKeG61HUR/wD63hCoI+RtAW7n+Nmqm9mvy3NapVchQ2R5?= =?us-ascii?Q?TWAFAA8VQvKw5eRQRwBLE6PQLcj/MuAaqfVfcp5JG4Dcgf0hNGVYGGoHCb4d?= =?us-ascii?Q?uUL3nkhshfCWqzg5g6mQzVi7ZaLqRC95XKeGwbiIfh8JvC58Ox8n0OEkp2PC?= =?us-ascii?Q?C/b9uKiHC11F37PMLj+qWQjR/4tekVr01XPfB87KRN676XIQR/Dimj3yLnZi?= =?us-ascii?Q?Gqq/ENVewySZ6gZSKnANdBnnDTyDWj3ickdy//ctuGt6pchzAxMjqWHBISIU?= =?us-ascii?Q?bPIHECT3wcnR5Fb1+SqiAc+SanzsJAxbLHMo+Ck7Yx3mLnbgVc9/jIFq1/P7?= =?us-ascii?Q?8AjmxKGOF++IqsxpsuLMxs8E2vxUdI0aLnvHqNsN4CVl+c7uDyaod0Co6o5T?= =?us-ascii?Q?MWh01Je0hMYKJcJ7TATUwbTu6YkdfNFsvyyEMleV04UFBKyF93aCbgVNBF+g?= =?us-ascii?Q?gtebjooVg6fFa9d3iPQlbn+D4eazyG7W/JO/0fTN59jrdj40WqERVYgEghJ7?= =?us-ascii?Q?yJcT7qBPJPtmB4HeLI3XE4VYw1wzb0A4aey8cXU+cDY9pAQ6c1kx9rDxZ3RL?= =?us-ascii?Q?C46kLPSXKOqhuiboma4fXqHLlW6GwStIryem/ExdYUt8YaWLaGJsXpB/BIxx?= =?us-ascii?Q?mTk/7Xl+2rUb63kHQaJdc8SDmqG4C0008oWDIzqWhEd5yXklRtv0c3pK2mlj?= =?us-ascii?Q?g64zFSVU0L7fPRK28gANKAFg+P/TOQ50RJWAB5hMgFcsITgL4RgDvmRMXBhb?= =?us-ascii?Q?qEEny3eGpCrZ+dCMtNXO/2nNaXQF8PbVn1IyIl4uji2sxXPue13EYwd8FVA7?= =?us-ascii?Q?BHP1fnx9rjYm7ZLj1lWl0gYZnWSWDJmWUoDDTxcSiyiTNW13z3wFL5s9kV3y?= =?us-ascii?Q?RGvnqdkYGzZ8Ma667FQRwkRmG4lOiJUJPuiRl4u/PDYL5PWC8TIclOF3666X?= =?us-ascii?Q?Vm/Pf1UrSfRiIbO2sAhtm68igmh8lpziuUe0xvmfASWzAw3pvm4VtiPEOZId?= =?us-ascii?Q?2LNmZLl2R5SPmbLEMge6UIieLCtAHyEWI8L95ayeOSQkuNpe1/cz7OBmqcKH?= =?us-ascii?Q?2ij7TTOuoKtGSk8KjfJFn1OYMQJ4WaSJ21WSS1HTTYbPLHFRaw/JDEYhaSmB?= =?us-ascii?Q?WzLMmSVPjUOAQnQNFEmVzn50VT+MhqwFi96zrAUqPXiX5ayb/STZckgU2hml?= =?us-ascii?Q?7AWTvTofIOqRW5jjWDrGq5nCOniy2Y/F1UVVqtGnq8UNVipIyRnjJNgw0/7X?= =?us-ascii?Q?V0hjU1PADSkxSIr1riORlfFLuZXRFsN+NUBxlD7yWkC6Q4E4D4vIPFXTpfxI?= =?us-ascii?Q?uzNWmxOJr5ewZ1qKEkdU0eIrB1mL+3kLPsDgi4Bf8/9zaAMHlrhRrQd7F6Tj?= =?us-ascii?Q?1bk8zjJvxH8umI2rb05tu5Sn5yJ/5oiLQwEfBoooqiqYyT3JuOsCm9Ay9xAG?= =?us-ascii?Q?hQbzCDwmDN048eGygJdnSq8=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: DIZtzwqlC6x3HJjjpAGjxI1faSAIjls1EHwzuaAH0c8aPwmaXnE32fTbiomUF/8d/3dDEZ8iYgxrsPtrnMvsHOF9Aj9HEOYlY8SWWDwF1GBe9w6ZHkoJxCG45UIkht3HpoGO1bgCXRRWyfMGBTBxbXCpPSyvNNLpAjz5RuaFK8TWJTUY01VkQ3X8BFKPYg8xnXUnaJ2PFKxPqd8o01f1nIXGikFlhil5pafPkXKPEA6e5zNMXqtJsO+nL7O7nfFOimSMvD1ejLUoTJWyAqKUMarLbnHzuWJRy831OAtUYcVpl16IXNQ47gOx4hL68Nv1W/CiYVPHNCQ7XYB7cSYbB5XPnXnzyzqbOSAriK89k+MjGBhUAL+4iERxQGkuxxWPd8C1z85z8KOqVA+FiktMcvKlaFSS4903QN8fD3xfzHX+hrL8T+2Zy3lohRCzi0a11iD2XOdN+oSjGbv+WU/kZu3mDa0DJlZfg/Y4/uCx7xjOLGQNQETlKQjsbDvTcYwaiP0Nha27895qpI9zOojKX+RDjjF6OyZsHEyJwCMFYbZTCtNmJxeSBY0T1XDGwU/syZNDleb/ti/2mt9lq2VioDEK3EAZuSpy8QX+tKkKtbU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6fe7c6a7-65c6-40bf-e3c5-08dc84bdaea1 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:19.4660 (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: N9yW4mv9qAxhUDproKoOHz8CFRqa0K0As926vzCUlWj5EZuuyCBOXxIs/t7RF3lcvqF9JV457bmabGLfJzzsivVs75jrEZCGdWESxsK01EU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 phishscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-ORIG-GUID: cB5MMEMfwgSWjE-ewRZnY6Cz5dzYmA7v X-Proofpoint-GUID: cB5MMEMfwgSWjE-ewRZnY6Cz5dzYmA7v Content-Type: text/plain; charset="utf-8" Use mas->store_type to simplify the logic of identifying the type of write. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 314691fd1c67..faadddbe2086 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -3437,12 +3437,10 @@ static noinline_for_kasan int mas_commit_b_node(str= uct ma_wr_state *wr_mas, enum maple_type b_type =3D b_node->type; =20 old_enode =3D wr_mas->mas->node; - if ((b_end < mt_min_slots[b_type]) && - (!mte_is_root(old_enode)) && - (mas_mt_height(wr_mas->mas) > 1)) + if (wr_mas->mas->store_type =3D=3D wr_rebalance) return mas_rebalance(wr_mas->mas, b_node); =20 - if (b_end >=3D mt_slots[b_type]) + if (wr_mas->mas->store_type =3D=3D wr_split_store) return mas_split(wr_mas->mas, b_node); =20 if (mas_reuse_node(wr_mas, b_node, end)) --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E1DF514D6F8 for ; Tue, 4 Jun 2024 17:42:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522964; cv=fail; b=hek1zgfPpgDnBq6N+WITn/zwPvAsEu0DVq0nc0ydfUkyg/OZVXPIPe24ZrnMtEVJtswUm4TmCaiVf8+jqP4V/QnEZ1pydQY0iNG0AVv+TewyUm+KgbXYWsYSGoIizKYPMDveR2YM2mJZukVYYURZ3poTY58ajf/8UPCuk5r3Aiw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522964; c=relaxed/simple; bh=4qXLWDNNl+1n1S0DbiuNoFIy+bmeWQIVeS7Ikdl6n9Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=hwSjBVmRRvxM++KqKsuIt5ytmnvigbtq6N1wwlxQJyqlsbXxtn1O2f5tOg0czhYuIwm0tk9YnSsJtFgc0uV5FcyHCObGy+BlY91f88My4VGkpvadbOH3MKuTeITo6kxXLC/eugRqryALnFPjr0Vu/5UGYaxi3i3PuF55u9tZ2Gc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BneW7026963; Tue, 4 Jun 2024 17:42:25 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DPmOkY5uADHU69ozTyLP7cB1Ob5n4YcKEW7gbl4Eh+y4=3D;_b?= =?UTF-8?Q?=3DUgwBhLyXcxXZCTDkHc5e4lh8htUFNwNUGJIKhHWaPEmdLx1KidtME//HZhl3?= =?UTF-8?Q?X9W6DBS4_iV41prM+mD+KrolPYFYw/2Qvu94CNr2q99KJP3pjGIFqAEFCi0d3yf?= =?UTF-8?Q?NvAkBTOWFtcwQc_t/G6+f2HPlhqeYIyJv6T6xY6qqEeH91KjkJwm7ctdhxbgSuN?= =?UTF-8?Q?PcWaBu1jtQkeHjvtrTh9_eAwE0fa/GhN5CCzb+9lK+Zl0hZ4/zbg38V+wc45V1Z?= =?UTF-8?Q?1ALSmTpDwEQjIUfbvBMI/RZQNt_UkJNOiJXEubNwO//IxOmFfYguLjeP33f/BMf?= =?UTF-8?Q?+IEVjH4SNJy+oQz+2etk+qfrIgUJYArS_gw=3D=3D_?= Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv07wjyg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:24 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HCsqT020553; Tue, 4 Jun 2024 17:42:24 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2048.outbound.protection.outlook.com [104.47.55.48]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrj2bmjb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mtqasz5RuwN4Abju39lAXe5HRYFnvAQciEQWjejT0cU3Qc7qzEHoMX6/YL97gYj2ORYNIKvnupNrV+WlBSbKoXvzUmf4AIILiGULpLZTCO4wazVsvzSsUVpyZkgsTlyWT07NpM0tCP7UNvfF5/rkAq3RjPK6+MDJF0XMqbOUFo1O52sFpaMdySuOl2oUwJfeJx3w/it9wJ5URUrJt7K6gHICuS9M7697Dv/dRkWN9NG8YI/XMycVtkWMyTGB3GQWupPsq929Zv622qthKzKRr08bm1MCgc5jl378E0OkHPtws5tilx5rL37jck3vVUW9VjqzfmFQQOkeyTgnxbobwA== 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=PmOkY5uADHU69ozTyLP7cB1Ob5n4YcKEW7gbl4Eh+y4=; b=eakLP0NoaAblN6z1znqY73s44l0JP3E0O4sHmK4E5kdw4b55rJjVFNX2TYAPRVlo+UljQGdWaV0K39OzPSixNEygqoOOLOyQ8Z3H3ZQw+myYubXL6hBlW4eWDuXWOjOmuV5oMUuQ+lztb+yygojhBwdVj0tLvqBUTNECUtj/s9b+dVt7QIV4VhCPMbUyTK1L1JJfshxeCtlsypL42fLgz2snkOBNbVX8gMbjUQ566TD55tVH9JBkDCS3imTl7tW9ov/d/TxzCWMqcZZ9FJzZb533GmeONEaA2IAw6coINu07mmFwXu2LFy4sfWgeEqsOmkZTbyr50bmtk3SIFy2SoQ== 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=PmOkY5uADHU69ozTyLP7cB1Ob5n4YcKEW7gbl4Eh+y4=; b=rpv4Aga6sfD+G0Ng8X/+W/WoLckFI0C74e8/rwQ3LqgmIlSGcNbx1a5Fz1YKSIOfDaakplm35Wz4YFLcauz5MdxYYNDFpBzcaU9FePgLc+J8zF0w9nKSkmNZPhMyiIGbu86LNYnOc/LDC+qdZm34O11M0buuzr935600tj9rMEk= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by PH0PR10MB5893.namprd10.prod.outlook.com (2603:10b6:510:149::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Tue, 4 Jun 2024 17:42:21 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:21 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 14/18] maple_tree: remove mas_wr_modify() Date: Tue, 4 Jun 2024 10:41:41 -0700 Message-ID: <20240604174145.563900-15-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BY3PR03CA0002.namprd03.prod.outlook.com (2603:10b6:a03:39a::7) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|PH0PR10MB5893:EE_ X-MS-Office365-Filtering-Correlation-Id: 90ee5abf-e6a7-4e06-dff6-08dc84bdafbf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ckn6NwjpeA2wr8c2K6e3ayuHD+v3OB3CS3/zsLWDjWDL61n6g5vTHDKrPL5M?= =?us-ascii?Q?ObsivVTAkc2WsNL0Wzy2mQ1Wy+y2UZ6eqK73VK7KdtkcpQBFZg0uujD71boZ?= =?us-ascii?Q?h7tVMk7dQdPEi6F9rTTIE870bAa1IrbBVhQaMx4REyEIPeglpNjLiQKg4uHS?= =?us-ascii?Q?hFGFWPdiBhXDql7kKdwy0Hfb5bMyHCgdnKVxcPTB2O5xKskDOu6d5cNopksL?= =?us-ascii?Q?pDWj/OIg80GZx170NsXeg8SGOAvTKjAsPAjXw2EW69JQh1JFnfCR3X3Pr98w?= =?us-ascii?Q?dEuwMbWNp6z5xBn80Y69s6zQbR+ghG+l4DwQgghJw9AGzV/ZA3nFrSG0EvRc?= =?us-ascii?Q?bLF6UPzD7qbSlLP0kPzpWzW0jujJr/bQzrZ28Yzd2xAqlQ/NblCOvhP/+nFW?= =?us-ascii?Q?NXEnXkqn90uVOFZgKAAINEOEWk1C+UiFoZhubKyZMoin8sO0j8PZJNE8ZAUJ?= =?us-ascii?Q?cG/+e50QxZ+a0qrzF0H8ntq8Ebt2QkbCwZobxFrIN6HSsvlkbzcVLwhuCdv+?= =?us-ascii?Q?fJmome2Ey4N/vcairAmRrklG4zC7GIJVnJTiIWsUIyl7xVdkiY4XrwVrMSze?= =?us-ascii?Q?r6Ip1bMLcBnJZdbOSMagFkTMiX6mC7Fg1/esuujm0LgZIQrQFdePrl/pvNPB?= =?us-ascii?Q?PwH7iJplVNyAH50IrSz511LDsZmSYokgz074FaX0of+T+LVwS3u0JYUCJk9j?= =?us-ascii?Q?2/uJ75NhfDgtUWl+MX8hqMPnwfVyUzWCg6Su3uNFhZhJUlFVTM/IfOVZSIv2?= =?us-ascii?Q?JFw6orulal6tuEgjJ5cm7Uh+paqxDZFoiGpFn73792hi4qcFTrQ3A+Ehl0gq?= =?us-ascii?Q?fJD86wLRznHKm2V/kzuqcBx/YTyexAv0FydWiVZ83J4oeGELFJfs/KX53Q2c?= =?us-ascii?Q?ChGJTeqas93spXhdtIYCQ0h1G9E6WvfMhMz6kcPBp4D8AdkL5XvRPJOmhjDQ?= =?us-ascii?Q?XJzt1te5FdWA+ka6BA5r+STbGPz5akI7cuuMElhlpFrgBvwjeeZOu7vQAr6s?= =?us-ascii?Q?5cLipg7GKeVJCgfyynTS5AVVfiIgagqmxEn4lOMr5duyov4xK52omtZbs63d?= =?us-ascii?Q?ApcvwF+c+EkeUuPVDWI0jjfm2YyeCNO7ONG0mJZW6vKcdh/ZIY/goF9HBuou?= =?us-ascii?Q?MxU2yh5QFx/RLkJ23otHJVkBpI1SBi82XnI2uuT/Uja3e+yma+UBhFgBe/YA?= =?us-ascii?Q?twA6h+PuLt+f7HFHVd7UdxFgUUJY3XvqzMpEZKqj/IE1RMgn59n+vZ8joDXR?= =?us-ascii?Q?H2GHm/0jysFrxy7uPYldDEq/JdRQ9FCue/DHq4L/Jka2Z0DBDFnaKmq9ZOtB?= =?us-ascii?Q?tMU=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?r0pWn5+nKiqB1zurAQZFl3/3fINdf823dORO2h/V2jCBWXZ67ln1Pw9EXHF7?= =?us-ascii?Q?WUbIqGXKvXgnay3iiUNS/7Clw/vcCaY4pP7Fb7b+bFDA+JsDTKzK7o8he09F?= =?us-ascii?Q?c/a0mTqUkhsyzkA4hxV+tThpEQOdyxm0Oni7g8CIcbq45uBMtKdxrQHVXgmQ?= =?us-ascii?Q?OrpBOlMJrepxD0gq5b/MJ5Q70uMQNtHP+aWJ/WAPmyCfQldKFBrdpCbMz3kY?= =?us-ascii?Q?jsF4nY5oJ/TjEkQC+x1w4TrXxtw1SenA/MLphYAStWGMn31hVkBItgRw3xGu?= =?us-ascii?Q?H2x6tVWZ5nP9VCX+YFv/yu9mtma4LW13vEiRRj3G08Bnn5kW0OUxHx1eGbgp?= =?us-ascii?Q?kL3b6DClJiXBiSyet4DShy8bAYelUnZEzBcy4oGsAmtC6rHNDQ3etQp5I1AT?= =?us-ascii?Q?u32EUXt7XDKQSGGle0klyr3gIeRajP1VYLdQzDgkatPy3jz1vatLDs0W6NT2?= =?us-ascii?Q?oycoX5fAn1XzOdKN2AvjXXpvg5lVj75yN71cgeW/7I7yRfI5f+tcWqgQIUEY?= =?us-ascii?Q?380aIx6i8kVqHHFH3CaEx5Z3WSpoEMPUFdpPh8Rc9FSUzl4ulP/98KVZwHi2?= =?us-ascii?Q?0H24DNW/9PI8s1CWBL3OaooJqVTEAt02pWopx0wTkzd9d0V6PpO1Bb4yYFQ+?= =?us-ascii?Q?63y8EeRjfsf79a8E48w58Vv09Hf/DycAlns1iBmVwF5IIfxZ5/UGEK4hWQB7?= =?us-ascii?Q?zuy1IMLAJRLdQ4QtZO8bNS9z23V6k6YYXz/XiH89s82Qz3Pv39pUIOqD5KWU?= =?us-ascii?Q?u2MfGSliKJePjO91Zwzp6ih5udiUVAyYtqP+OleGroiyoMF4oGpypirNfd9e?= =?us-ascii?Q?zdPDnfS4x0sY6nmqWCc2NOwnydhaojAG6ANTmFuxcqeAkRjgK5cpB/RuK8it?= =?us-ascii?Q?hnIz8Dx8+tOVw5i7STtYecY15sd3vwUfB/HrmgEdNq+l1rzh+oq7Ar1DTVxf?= =?us-ascii?Q?I5SG0LcpY+tKbojQJ81ZKUPO4RlFKiyDhrCkxK2AomwA3STrtiesAYudJ96Y?= =?us-ascii?Q?iYGgCrqPU5179HtgRxl5SAj+Ztt5x0KJjibM0pMZfChbNeP4hSiMtlaUhFEo?= =?us-ascii?Q?omNNHG/wgr7g7QdI6UKspeUGWzNOLSw1BUaHoEy9ba7fPNQkfE2GDh1dtfZz?= =?us-ascii?Q?62x3RKNjjVxrGh4NhqBhdMSOnd981vp7M2E1j3Onbmc/xsjilPaBjIPZ8/2R?= =?us-ascii?Q?vUG1oGF3poFPT6GrEsWecPFRFvfz8VwU30y9A1PcaW1IKCd0P7izcDW9By9e?= =?us-ascii?Q?72tlfrPMYbbQjnT2vBrFuBoS5UqWvFmZmGMTa+Ge0NxdOkT9gkYCNvGjCnCP?= =?us-ascii?Q?2lV9W5wi8vmqj8wkc44islyn8qVjRqimObnBG+xpK4Z8WjatZRLFYeDIbGdF?= =?us-ascii?Q?ILsVvQnPx90gLvU3TrPhyZj4dIQtfjL2Eirpe7EnwjvFI8+5zRfumT5RDMxY?= =?us-ascii?Q?vofyBGdIw6a/UaqEH3RH42pc5oYOqIxbQX8dJVue41oaSVv1RaYF/5arEzis?= =?us-ascii?Q?PR75wH+6ItASVXpUU2CUed6V2fJcUCRaNXC8HxTfEbcL1eJ3QZbWWlSDiTG0?= =?us-ascii?Q?MW/fnyvigCmO8j8tb38hYOJuobqmTo+gE3SYSME0idCHKnGkKBtgU4GmEJeH?= =?us-ascii?Q?zi7zx6gXXWnGYc6tI8kWA9I=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: AKKC8uLLziVrpPjiLlJeGoCQI8I8qzZcsJ5M7SbfU3zqu5tAn6S96XDvxVSIkK4mxJ/cZj1EIiEMHwih1XuaGQv3+6dDY9h2WivkluXvMyuTqVdGftOVPnAmY0QgdRwlTfwplFhbvJ7OCSXIFDtkbtSyBVmxyz3OlWcnio7nXnzKf1C7DreqLEnE/bLFM43aSWpzJXAoCZQRxADJ597Wxo0f4J68L/I65VkPmBBhW5O8QQCbSMZt40VEwUd22GC3B1Ew4PJJFhht1qxGYjy98I4JgEgOBe5Fez/oZ+2UIzjLDpfuCG3pA+rlNAVSlo8SF37fwS94XkuDdLVRwlorwAMFplPypgMXkVk4NlAbwTIZ1mL1VoEkgoCBuSDAr3QiCkf7CLNWMUhcSDlP0RFayGtYcs4NIx2jP3v3RO9AFB0S48WglCY8qRNyhd8rkhwnDQxhboaycMLL3NUF+H5Z+CVJf23tjRwSjkZV0F5j/Ekr/H/Tgm0u7JtrqeiQlAgAqv+4SBsXC33560WD9MZTDoxnKTunJ6f8AQYowhyT//r20gYi9mxh90Ii3Xg3++AdegrWU05dxD+8SLMYYs69kSzTkO1Ws7iR+MbqNVmIEEQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 90ee5abf-e6a7-4e06-dff6-08dc84bdafbf X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:21.6149 (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: ox6citQADmsN/7xFaUUz01HdyZy0ppGJzdOhZ4mp1iftmLAlaZQrBBiEJAxbUTEXDHBGNQg7FuZ/YwfPCTmbqxwi84eWGojoTNoy8zIJuc4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 bulkscore=0 adultscore=0 spamscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-GUID: YfQEzQo8Ys4uGqUOXfb-ed01T_5hyxdl X-Proofpoint-ORIG-GUID: YfQEzQo8Ys4uGqUOXfb-ed01T_5hyxdl Content-Type: text/plain; charset="utf-8" There are no more users of the function, safely remove it. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index faadddbe2086..74c89aad8bca 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4156,44 +4156,6 @@ static void mas_wr_bnode(struct ma_wr_state *wr_mas) mas_commit_b_node(wr_mas, &b_node, wr_mas->mas->end); } =20 -static inline void mas_wr_modify(struct ma_wr_state *wr_mas) -{ - struct ma_state *mas =3D wr_mas->mas; - unsigned char new_end; - - /* Direct replacement */ - if (wr_mas->r_min =3D=3D mas->index && wr_mas->r_max =3D=3D mas->last) { - rcu_assign_pointer(wr_mas->slots[mas->offset], wr_mas->entry); - if (!!wr_mas->entry ^ !!wr_mas->content) - mas_update_gap(mas); - return; - } - - /* - * new_end exceeds the size of the maple node and cannot enter the fast - * path. - */ - new_end =3D mas_wr_new_end(wr_mas); - if (new_end >=3D mt_slots[wr_mas->type]) - goto slow_path; - - /* Attempt to append */ - if (mas_wr_append(wr_mas, new_end)) - return; - - if (new_end =3D=3D mas->end && mas_wr_slot_store(wr_mas)) - return; - - if (mas_wr_node_store(wr_mas, new_end)) - return; - - if (mas_is_err(mas)) - return; - -slow_path: - mas_wr_bnode(wr_mas); -} - /* * mas_wr_store_entry() - Internal call to store a value * @mas: The maple state --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C13E14D70C for ; Tue, 4 Jun 2024 17:42:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522965; cv=fail; b=gb5WHp40W9Hu71N9OOO9aVVDFVRfa6xmikcoLYgjSol8FXKInoEzkqLco9nbdslyJ88NwgDeaIr+g4jPfrt2aLLzYFdnav6PaIOTktBOzYv1lXUnU1eV8R/ExvIEVkMP4pbP5zOO3dqnEeqXm617cROHiJs9aohER32FdieE9sg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522965; c=relaxed/simple; bh=Pt/9dUu4Lw/XzB+VJ4+0W1s0xT1SH0tGyEQkHEEwXvI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=AcLGfHE30u+RtAeIyldsoC0d44D4Qi0PJT3It1+LWVuofMdRJe7wB/j7Z3F/L7pgIE0hwLmth/ZM/OXLfmMLc3TYnOeHa8WriRjkGZl2kp7dapYd4+aT7jyOZbL2QCT5a8rbCfhICvpHjkF8/E1a2LnUmNSaTD9Ul6urzwaCccE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BnRkg026498; Tue, 4 Jun 2024 17:42:27 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3DWeX6GL25hnGC9aDaBruf9RjJKsgQfe5nXvPBB1WbfRE=3D;_b?= =?UTF-8?Q?=3DQRrkR52dgdB8E69+PjPNGWyEEZGkYiIdHhMn2Tro5Ma3d/co0Zd1e4GDR7GI?= =?UTF-8?Q?0k7furWw_Of9rQLLdeyDfRg9GVBQhyrWzRar/EMpbgb7y/dli1PgOqD2s16DpOZ?= =?UTF-8?Q?CNppwJiR/cPw9g_vbIlBojRNoclYka/x29Gqi8IEuhbykapAwEtngqZIL7i3s5C?= =?UTF-8?Q?tLnU1oJ4Wu7P5Q+mhh9I_hqdnpYSLjdj9hReVw0znSKwIhtN/A6pD3no1Ajbx/a?= =?UTF-8?Q?90EfHKT4NmWYA5t/2psUxcYBwG_awHZ1lyGKOhkWNmMx5/4AFA++OWAtBaWXcDk?= =?UTF-8?Q?wx1AN745lc9MCBNs2c2c6e3dSplqEZ43_dw=3D=3D_?= Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfv07wjyn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:27 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HaZ5b005523; Tue, 4 Jun 2024 17:42:26 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2048.outbound.protection.outlook.com [104.47.55.48]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrmdwneg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NM6v0rhj+1nwdIn3+vXXhvhVY5r/j0jkr/iQiZHHxlNeDHwtihXdBO9MuHHZidSTEnQNBo+rSDqIoEMS7DLMAXFVZclZMFvIk2ccGKLOcjMQakKRcSBcMY7U+tbjOVfVVaYpinFvWbH1IFmFbM7zrpdffKHI9U1fX0i8xVja08RzbHBkWKiNXRuvcQjnrX0mYU90eR2gfjw5vWovVAdQVONmO12vE25SVUL2fgGnuuttK+10phZiVHLeaq23GiIpAkCKjBGvgOFhYInmYeGqYMCfsCALXmF61gnNyr/wqCo2o9Y2YQ8wu2D617kSy52hzVvky4lzXtA2+biotIqxMA== 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=WeX6GL25hnGC9aDaBruf9RjJKsgQfe5nXvPBB1WbfRE=; b=AMZOf/piO3d1rYFP5JBg7BSXFoUf5MPWgEax/GPDQF2tsV+BRCFAjlBUF+6PRD5lxvg6SBna9eM7S6+vGUkLFM2D0mEWMneug7kSfJdgPmChuVQE5qItJ1ors1QIzbQPN8/PRQ7lnBU0BM56l6UQ3uX3+k7b2MK7G+Rrma0Cr72R8yZrqhlR/AfbkWu2++Gh0yGPCO9M1a8F2JusXXOfEjcsDaxW/APP90OnUWM0O7ayStf2gfVHeqX09SN7/w8CRVfwK1uAkSsmnEFhW+LGbeTx5JAs1rHjV2jjM0Y5ZrAm91mwMHMLLYYEggR1Ub0u9+dFBi/o5DxO77lN0OxpaA== 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=WeX6GL25hnGC9aDaBruf9RjJKsgQfe5nXvPBB1WbfRE=; b=ndMT0opIC9U3z7y7JtW2tnRaUQynlyL9O1lDPoLsm7MP3UVD6Mw1NVKks5NB4pxYxGVhZIxX3eQj7g6g6DjKcxirmr7jOfr/2WgCOBYW2K4+1iYO41sws+kQCZnFKCfYAo/QFWKSB1RrgHEa5+IRfabJZIEHKc4Np32Ut1HPHHw= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by PH0PR10MB5893.namprd10.prod.outlook.com (2603:10b6:510:149::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Tue, 4 Jun 2024 17:42:24 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:24 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 15/18] maple_tree: have mas_store() allocate nodes if needed Date: Tue, 4 Jun 2024 10:41:42 -0700 Message-ID: <20240604174145.563900-16-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR05CA0047.namprd05.prod.outlook.com (2603:10b6:a03:33f::22) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|PH0PR10MB5893:EE_ X-MS-Office365-Filtering-Correlation-Id: 3ac6587b-87c1-42be-d999-08dc84bdb15c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?r00WyTM7Y1RnVW/wjBUuT+CLcybtSUe1cLn+KavO7kwl+K+0h2c4l91MpxFy?= =?us-ascii?Q?Q7u36sqp3hwoqUmgDIQySs3ovSZNYP5UdwDmb0msZd30QxWxfZnm1js4+JEf?= =?us-ascii?Q?tQ+cf85ayj6EWOh7TfQPb07IvzNv+rujiga8yDII19fEuKkOSCefBlUFd10K?= =?us-ascii?Q?hGcf2pose0Zd2hu4004zjNNA1u1JgX/WDFPoB38TKQOrAdMA2dLx+Szc1tui?= =?us-ascii?Q?cCyGRBNxKBpp3L7REYLAbjeAAQNJ41IRFEPQeN3qwafN6FdTVnkrPNl7C8Dg?= =?us-ascii?Q?sBifmTQc9ALOG0EUbTSF8Kv96eTW9skU2J1ym+cEGqhNsF+W47sWTQCyQgl8?= =?us-ascii?Q?CbrSI18Gk7UI9m9/rrHcS8o/Tl4pQDqr8ETAXl30QTGWgxEoVRbABPJDR20I?= =?us-ascii?Q?nWK7XhSagr75KUXhrneWgEcMmg/KylPVPDLxNtqZ+EcooIjdBW2ECsDnrytP?= =?us-ascii?Q?x/tl03z3tYbe7wfsHaQheHITi9/RQZ3OC4VEv0NxvG6G3RLw6iVOke48plw4?= =?us-ascii?Q?8knkvG+V6M95Tq54hszvTYgE6HGYU0fX1s//v8GqllNn34mWj7KyPuVfUJQC?= =?us-ascii?Q?eHgfr4deOyh7YZDbBbWwGC3YcwRdRQHNbFxXsKdZygdtQLZYCK/jH6pjFwYC?= =?us-ascii?Q?GVDgDU4/qm704GF+ZFU+ptbRNJu619KdWKW3VrvdZYTAaX2wQFrPn/Pgz0AR?= =?us-ascii?Q?DbKWxy/aijGF1zekPDs/Yyd+8et7q5hVdfs4i+pDbwIGdRE6+Y4AND6nKc37?= =?us-ascii?Q?kpcXpN6Ux1yhWFHBc84bdT7XwA4X2BMMIRKJNbGIh0+gQqZVoSyS9HuJJIq4?= =?us-ascii?Q?qee+eV9TsLXB3LVPBCMdzwAKJtSKdWLrtwTwI+mId46BFH9QkV1c7yfYoKHV?= =?us-ascii?Q?bZ4VZJMU6yrLyzBYJEnxg1t+93tNqyHURNeOBFBKNZfCWJBz4Pptd11YZIc9?= =?us-ascii?Q?vE0hCmbk/c+H5lX/3KMKNrQyePIoDLQbBfXqGXZD3LdQRYZEpf2ZDpqJIXxI?= =?us-ascii?Q?q9LSd/yOatPHvr/2LFjqsp+jjM8qXf9oVsc02a0fljs3mjHUhZNCa6M57iX8?= =?us-ascii?Q?UP8cC8aaA9lILcJYKNNmLhySradhB7CYEFwIHVz13ksU1/IfEKvGJ8ubMDV4?= =?us-ascii?Q?xffRRYWYdVyINiB/hsYtHqEDPhldIAV9fQK54PHPdIOjSrPUzUU/U5DbR8MW?= =?us-ascii?Q?Da/tSnm8g0upbfaPw8fWo73fJFxdcTfnwQjG6sANImRWxNIGCOshofavRmHh?= =?us-ascii?Q?4WHO/rRtFdSgv6S7NQmSouLzSTrzuhMWVjOAw5zt2IxUZ6o+Qqi8S17AODBs?= =?us-ascii?Q?RRpZ2BcmukvOud8b3Niq8pnv?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FUNxPaOKGGIpBDcrulIZDC/9QiyIv+tb4656ixOsth2MzU/mtufgXilcliVL?= =?us-ascii?Q?qFvejcR7LhX/hq9LCfk/+sa9j/itQSGUgT3jEpp8smhYB4lC/3ztoHbU4vXP?= =?us-ascii?Q?0FYTjln7CYCBdnC07ORnIZWEz610wCOn4u69Ac3DmrujqSsjuu5S2SJh5JZR?= =?us-ascii?Q?rnfAqxTPG0oS3sS/GotlfEdRoPLUhgzr6HlvmUcrwXNf2z8RKmJGnhqZPAJ0?= =?us-ascii?Q?ZHzbqHwxG1mcYHw3wpWAL6GJbHhHLVwEu6gPxkYCu7/eBRUvIoiy0nNqIy5A?= =?us-ascii?Q?1o89GEIG6xk5VDNO8G5GnceHh66SRCatzmu/sOF4PxflT+tXS6nuvSmredzv?= =?us-ascii?Q?2qfNKz3tpQwZCntuWslsN845O1wqICEX8dUmbMdqvqjuQza+Y2+eWry0M70R?= =?us-ascii?Q?HHOEHNOft0opdIavUhEpTGpNuZfw8Y7pPnQ8AJEcKU2N581nko68IMwtftua?= =?us-ascii?Q?fLFJqfFfF/v10D5RVdWwTOsuSUZV/Osc9SzplCpkXVIzT3w5naj5RhuaS6uU?= =?us-ascii?Q?mEEonHSmExZU7ofhimR1qo5F+GuZh34JKuMoMpRkBZIg7EfKkhM283oHXFPT?= =?us-ascii?Q?WgCgo+zBft1wqf4DzZsbOHgJUEr4q1C+Yq3RFouAopyR8flWd/o0WAdA/2gS?= =?us-ascii?Q?8VcBEEaXbLvO54822Rf0Bpjjbo01KAYM68hvrwTEROlWqIDovVVLkQhQyMCo?= =?us-ascii?Q?OcSyVn3Nqvz1Ajval44skTPz06Mi+2C5Jzj1VXGtyQTCzZ/UI6fVmXo/AVJh?= =?us-ascii?Q?Pjc9/8S4y0lGZrTemknHs5KYvFXtCiOEJBMw2BaKEnZpq1uDljpUBdGZg0tq?= =?us-ascii?Q?HIzitf3/nLv2ReJpZR6nyfqNkVX3kx78W9amy6MQHNl6ULsl8rkVRI8qEguM?= =?us-ascii?Q?gxu6MwD7Mrb6arBYlLxiRgIbQW55lw/X85YLdmoYQeVp8DQMDwla1oRNWmOQ?= =?us-ascii?Q?nR9UbZ79fAWaCGCqrOq/e7B9zViQe2F8Mnf8MsxIDlzRw+cORpmq22pFP2pF?= =?us-ascii?Q?A3pJMLunBCfnU5GGWUpQL+QANsVfP1fIiO8e7xYI+xA3bNo5fSh3HmW2PcTl?= =?us-ascii?Q?S7G7A5omkZ0gKUIl77pxbEhTLvOZVNjRlFbTeomlPB97VNQIVHfErH1T2aIf?= =?us-ascii?Q?x+fjfnHdeiIyHx3+nyzd4M5WElSssncx4xNHhviEqsDHCfBDTJDf0g6zR1xv?= =?us-ascii?Q?lhaCrUDAbmbr0ADcdYlatiRBXjeg8I4Nll9zRJe/1BOVbCFoszEektkao94g?= =?us-ascii?Q?JOjyJxkcxooKa3PxBpD7j1OiPLwsvbPMakkdxjD88edpi0nSI+ecqLKCF+Gd?= =?us-ascii?Q?BrieIeb7J7tP99EJ2P46U99IhrLFLec2K5zIGKRdxR3GflLuyXbcf0xVLC7C?= =?us-ascii?Q?RfLl5uFWyH+0eJ+VEf27oVeN9NQp0RU4EyIh5A1ZeaUKM1UwGd3921F5r0h5?= =?us-ascii?Q?pgXP8NvU4fORK0j7/Gee9+/jCS21/u09gwFs9EF3p6R+HBFUEgWfvEdNUGE8?= =?us-ascii?Q?smmyxXg0S4E62LRWVtRd2Gar/eDl2/VQM1U3QT9BoouJZIPa7b9XB97xs9Qs?= =?us-ascii?Q?9eRrFh0eWoENYYvZS6tNWBDnOlBwhrd3Sc/ZNhKnSR7oygb0sPmD7NZKj/2N?= =?us-ascii?Q?sF32YkfZ8jCgFt23NDVt9oY=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ptiEZJZFUa7z2lIyCMEHEZM8yel5ja2Anf0cJxGFI6/zwFfbO4rOkhG2u7cGtYpWT1ln+4KYFcr8Qm7ReTVb3wFMbErot1BVFJIGVAcNukSyBvxS2FYHm/HdtU/MnHel7Ty1WeWEocBrxTPGUelPTQ9ijf/Jy6scSQe6hNu14cFGUzFuYz531aVr45PF3iKsfZEdaO6tA9lmil1MWWsYz+aIQZLpo88TTPFNsgR5VX7HW3/7QCfu4sDRBOz1EJ50t/ibbVsE0NcVw3HZLw0fZgbYmPHu8tCWoJV6ZZYLPF/V6fMTC8YWllgHjw02lZnqB1LbSfs0lQEt0AlVPnMTzQo6qUxmRELaj5/C19OirYk66d4tYkiSZ9wrP6KbqjL7KTmGJO5dh6XoonK1GJe8NL0XcS1FGgO4ErNqlZnOfK+t2lK3NnmxTcLL3ry9tD0pHjL0OaB5OUaNu1BgJSNZEqmzqUg88SwOXNykLzOEjVKx7qXdZD9JL4rK+DwKBeStWsVhO7/Ek9g7yQEuG6vmsfUEHCgewpXiw/KNKSNZScBk/oy0+zD6YVG27ehROcsq+ae7/nD4BeMfRC6QFIlZFQJpUL2hP3ff0JRaw3YFc2M= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ac6587b-87c1-42be-d999-08dc84bdb15c X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:24.0725 (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: wOBtlI6fABzyiKXYfONatcmFi0A4OoYPogci3Cnri53ViV6XFBpFVvuua2z0OZIjBedNPGBOtGFvLA7GxnNQoeChtQ+aD63RaB+q9OI4F+o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 malwarescore=0 suspectscore=0 spamscore=0 mlxlogscore=999 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-GUID: -P_sf5WsdP8KvgGPyKUYg2Zhc89639JI X-Proofpoint-ORIG-GUID: -P_sf5WsdP8KvgGPyKUYg2Zhc89639JI Content-Type: text/plain; charset="utf-8" Not all users of mas_store() enter with nodes already preallocated. Check for the MA_STATE_PREALLOC flag to decide whether to preallocate nodes within mas_store() rather than relying on future write helper functions to perform the allocations. This allows the write helper functions to be simplified as they do not have to do checks to make sure there are enough allocated nodes to perform the write. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 74c89aad8bca..42853afc3885 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5527,6 +5527,20 @@ static inline void mte_destroy_walk(struct maple_eno= de *enode, mt_destroy_walk(enode, mt, true); } } + +static inline void mas_wr_store_prealloc(struct ma_wr_state *wr_mas, void = *entry) +{ + struct ma_state *mas =3D wr_mas->mas; + int request; + + mas_wr_prealloc_setup(wr_mas); + mas_wr_store_type(wr_mas); + request =3D mas_prealloc_calc(mas, entry); + if (!request) + return; + + mas_node_count(mas, request); +} /* Interface */ =20 /** @@ -5535,8 +5549,6 @@ static inline void mte_destroy_walk(struct maple_enod= e *enode, * @entry: The entry to store. * * The @mas->index and @mas->last is used to set the range for the @entry. - * Note: The @mas should have pre-allocated entries to ensure there is mem= ory to - * store the entry. Please see mas_expected_entries()/mas_destroy() for m= ore details. * * Return: the first entry between mas->index and mas->last or %NULL. */ @@ -5562,9 +5574,21 @@ void *mas_store(struct ma_state *mas, void *entry) * want to examine what happens if a single store operation was to * overwrite multiple entries within a self-balancing B-Tree. */ - mas_wr_prealloc_setup(&wr_mas); - mas_wr_store_type(&wr_mas); + if (mas->mas_flags & MA_STATE_PREALLOC) { + mas_wr_prealloc_setup(&wr_mas); + mas_wr_store_type(&wr_mas); + mas_wr_store_entry(&wr_mas); + MAS_WR_BUG_ON(&wr_mas, mas_is_err(mas)); + return wr_mas.content; + } + + mas_wr_store_prealloc(&wr_mas, entry); + WARN_ON_ONCE(mas->store_type =3D=3D wr_invalid); + if (mas_is_err(mas)) + return NULL; + mas_wr_store_entry(&wr_mas); + mas_destroy(mas); return wr_mas.content; } EXPORT_SYMBOL_GPL(mas_store); --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAA7A14E2D6 for ; Tue, 4 Jun 2024 17:42:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522968; cv=fail; b=oFBqGF4fc1WSBWQSU0P59WqTUJGQZaKlKEBmxvxM1SD7YcNEK/P8Y1iJnSi49nEIDEeqDfWaQSJcbOvkk/MUzXJCK/OUy+2BeNkEkISXVq/HY4Bp2lJP1pnoZHIMF86P/z9ZkEgKSn5foOmR5kiLRlqbJImtMlqIM/ZH0uOye7U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522968; c=relaxed/simple; bh=H9hUTn0iiv4Wx6kgm5qw3t79LsUP9/bEVVIGje6HMP8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=VHeawZWLqSp5ho85tWCqxBMefDN8buenBuWBBd3LvzcST4I14eziLK2t3hKxFxBou1GIIy9k+hflnrW91k++3gURPrEbBR6J9BHNWjxzgN5VWcpIsYPUWjijSX6QuOBPZKPT70IHItoNuyI0VoFCyphuzjyMNUmJDsfkgcvggAw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454Bn0BI032321; Tue, 4 Jun 2024 17:42:29 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3D0uxtuNjYvHMIW8wAN+0vAK8V7rBgN5K87NjJME5JiWY=3D;_b?= =?UTF-8?Q?=3DSuSDeCT6k4JxTRnAh7YZG19ZY5u98xhIPhe392kcyRogcz8oNHCgGZTO783M?= =?UTF-8?Q?zGzNPPc3_x7UsMe42V5rgvdOxkZLrRFtJxFr5LNEmKIJtS9fPjYz0yqsoNqyS8n?= =?UTF-8?Q?bpwg2au6Yyw5Be_gfkD7uavK52wcip5wzZi6gf0SSUANVNGeeC547lKTHE67tgh?= =?UTF-8?Q?oqy0BRmiRPalkAO3X8LY_LB2zyPnaM7jsxz+2YOohXAAVzrVUSkRJa7l9Ws8ZKz?= =?UTF-8?Q?AUhDW0vdXP/KfPQFo1JDYw//Eq_LDs8M3225KMU35pTwJFSlDJQchP8QdnXvLtY?= =?UTF-8?Q?Q1Xfqxpu10BN7U0sDJ/hleF2FIUb5P2n_9Q=3D=3D_?= Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfuyu5j6x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:29 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HVuMC016217; Tue, 4 Jun 2024 17:42:29 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2040.outbound.protection.outlook.com [104.47.55.40]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrsaf3bu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ejQ1k1KIl0LvQ+vGg/OA3JREpbN2oLRHEOoG/BnPnOypYA7XUd8dpoyFAPi1nwSkOqU6wiAET27LP8SNAW/Z7By5vNqxn8sH9T5Xc8lMikCD7kD5lyEs89122qVwC/tcLdfZoDscx+TYUxlF6I5ryA6K9VTBhAOBjgMJDzQuy0PY9S9qaCStYs4mKS0JEZ6GShRJjMy1jPOCzWtFtjXfwyFchcFjeX2dBi1iFMIq9WueFDK0oXsvyu0TqdznA+rDJFnusH1cRAHr8pqjgD70XusuY/jpAPu7cmIfiqhGS2ZJvbSwM5hJZJEe5nhW7WciyjB4QhWJ1cM/cX+NxbcWIw== 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=0uxtuNjYvHMIW8wAN+0vAK8V7rBgN5K87NjJME5JiWY=; b=UyPFarxfD+BvOcB4iJNjRYJY3CPDjq3nGgXzhC3GoBeYN2CheeKSWHnWEsfNuqN26z2NEzlcZD4mpLIwzRpby926xkF8BpiavEPCM/SAwRj96vTF1yl4njytn247vH8un027suvv+IQ1FFmOhmi+LQYx803ewGFRZG7FM8YgOJubMouYva0bYHrsMf2Szbm1PLeVGaADkVPZyslTYqfRVL0MHNnZV7ZvxyDs3qmedIMneoLzl36ud0YYgPGqbK1fQSpNbbbZynvvii8MjPSzJS5kqb41PMC3/qgDfC6ia8Ru8UjeHTktPFWW+L+IMDpkyAhQ0xQ2DZB6QIEJqsXtKg== 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=0uxtuNjYvHMIW8wAN+0vAK8V7rBgN5K87NjJME5JiWY=; b=RBMDmi1KrKtLwLolYilKgkciEsUNgQ9D2lwqGJDkbfCtN0se22yha9+nm05qx2kxmx2g7bcWk6mMmnbOEiC3hoj8X3CeCC/8gUIY2rH3i6qIQM1sWs4P+Xdn/ADycbz1hjCRbIQMvvZEElkh9K+JzNOQ5JmoirZ/v3kYayCoSiU= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by PH0PR10MB5893.namprd10.prod.outlook.com (2603:10b6:510:149::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.17; Tue, 4 Jun 2024 17:42:26 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:26 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 16/18] maple_tree: remove node allocations from various write helper functions Date: Tue, 4 Jun 2024 10:41:43 -0700 Message-ID: <20240604174145.563900-17-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0144.namprd13.prod.outlook.com (2603:10b6:a03:2c6::29) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|PH0PR10MB5893:EE_ X-MS-Office365-Filtering-Correlation-Id: 8488f0fc-f35a-4911-06f9-08dc84bdb2aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|366007|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oK/OcY0NJ6d5ujnBIVNTzNIo22tuS5FIWAIZLJZwMqj7lIuuINspIl4nDzV8?= =?us-ascii?Q?MLQlL6ueBpb1okEa3sUSuXy19uCJJQtJprXjv0QuErIshbGq6mMbwQiEeVJL?= =?us-ascii?Q?8S+nXZ7XPMWWj1K8UkMjvDlgzNnzO4rME2cHffEjaPw1cM6zfKkTaIbQc0gT?= =?us-ascii?Q?Rfn9i2hry4DCaH3yeGKyLtsxdu4wu8ClRxEk11mXHYNjufUEQzNPrFGdTRR6?= =?us-ascii?Q?RlDq36I4IzGCDd8vNzPtIq/s6aE4uxBrIRYmN3pmNaNY3mDJbeaQzqxuXIe7?= =?us-ascii?Q?BJpND6quU+b5Rvnbvp6jaPK+6lKuCusxIPMQiEo8kl3wPyWxhI1CJPRQy/EZ?= =?us-ascii?Q?BHZLaOun7SCbCV3xxBgiJlPdNiuYwtfOWFdiZauksH4ApLswgyu79IFiD54T?= =?us-ascii?Q?gPdFcW0f+qedbCqwu8LUKQG2rqbN24v/MXG1EgPetc5hB+a4N3b/6mpYbQde?= =?us-ascii?Q?RLPGTAjFMyMEoZQqRps8+hMOkIWAk+L0GSZGwUZ+YfCksjy8tJ4Eup2wHwz4?= =?us-ascii?Q?sWq6m+jLcbQCq+hYIP4i79WQ8mf+xxz/bVicjA0nj0KGDyoP5KueYFI27ms8?= =?us-ascii?Q?lBFnCGEbakgrG5Rbfn4x31ax2Zgney5QN+6oayc6n1Bnoa2kSWpTli/FT6jf?= =?us-ascii?Q?SSEG4FV/f1W+rE5LYuIXh3TjqgfMoTAo6uQTSWFFFzAW1xWbdGEhZz2OaGDP?= =?us-ascii?Q?it1RIUCLrBCqfjXWIpqmhErzKwJgWAtC1bVyydP4BxrcpR4mOHUVZCjACMfJ?= =?us-ascii?Q?HESKkn++iodtAv7Bu55G9attLD0yy/rjLitdabQlFzDjNhKfxMJAIC8Gik/c?= =?us-ascii?Q?amV9DcBuoIMPA1R5EpV5slKfa/AoqkToOMqJSIHEzN4ex6ao0nPjrPSCsPHr?= =?us-ascii?Q?zWvwDgqB0Z9LKDQAPVO0x9OB9IyP5XYV6deHetd284yLk/WPW87OSPUIkLEo?= =?us-ascii?Q?7UMqfPX1hE3J+QEKv9K7PwbuBiK4nznfeAH+hAbDmleKTAXQPZqgbwR1sN67?= =?us-ascii?Q?7eEjnfRIxv2fEuYMMAyXTq4tYiOkAmD7HAEM/bI8bKETOkai8FAuyD2oNJO+?= =?us-ascii?Q?IHAyae+rmi2dGvqHYepkXNheoEf0Oz20fFAiVr6Fe5EyxLlcILvVX/fMwSsf?= =?us-ascii?Q?BL0aiOaSQtSkZnb/1bKmpXREBD6+OR6j3BtuzUKuTbd8wRC98nNaJlxHBCZy?= =?us-ascii?Q?cJHmiHEk0erbEmzogm+Oxl5z35Tr2CI/mvYAYfg6n+yoF7n7JxCxKrkFtNq1?= =?us-ascii?Q?WL+Thqm8gMmz4AtO5GwpVA5xhpGGc7/zDv+j50lyF5NBJ2OmE4l4cJUakAm9?= =?us-ascii?Q?8ncEEfzjPBJ/A/5OjQEYFJgG?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BXcOFhxRzYF5/v1cbW0Kp9kHw9VvjKp4zwSPLwnAZdXMB8YCivdIFluCKX63?= =?us-ascii?Q?aTGEDWSPjctkWm3HB9rurfmRRQ4OY91zkRIUa8WuALX/4ajkWEIimz2OAfxT?= =?us-ascii?Q?gJJ2e32cSe3S/KYEuGsaxfnz77EiaaClpBdyDakhNQCInMlIzcd6MG0j4fOf?= =?us-ascii?Q?NBPsT3Ce8d9/S6KdHssrJmlUcDz4yFn4tKJe/CQwptmZEfHSMvQYwh6U7qFe?= =?us-ascii?Q?ayxdJX9BkSbJU5ut2B+Gbez8EDVUuRRMo+nLHal1ZOHdQu596O7ectXVnTBX?= =?us-ascii?Q?IWbXm1JVfaHufGP3slGlgjzbRvWEFbTBPu07IGU2PBu4DK6dktNBL2+xKLQ+?= =?us-ascii?Q?EZergsvbTKIU8YTjqddaQXScZ2iSk3Qqc4irvaSrU9RD50ObEzVqdzP1CX0v?= =?us-ascii?Q?xkyzj068TeTxJfCM6fBi/PXXL0dNtfVGZXHpPPLZU9mhynqMrnF7Zt5C0Qsm?= =?us-ascii?Q?PXf/LeZNTHy7KGUy6dOBSMxpj7EXdTLtGixWrPj2+mkLz2OF1XmcaVZutSwt?= =?us-ascii?Q?H9w6yFjR3LyepG/MuiX5ILz4eVdSBVuAD9K3VaFcYHLn5p0wO8CaV0sYUt48?= =?us-ascii?Q?U7fXDb6OMggkYpbv5EmbYCCZuKPCd0Kv5YYc3/rPTiskML5b5rqWrc0K+WJ0?= =?us-ascii?Q?CHZHWjL9E5H3Omc+Szkf7biKXcFV6az8dq9D/majh5e20rHJXnmvXpS4dKx0?= =?us-ascii?Q?wz9a/RCK18xDBsMJhz+wtlHPNFq8/jGQsrGKT9zFlXzH6/Nls6sicRvumgDz?= =?us-ascii?Q?/9O5sS/UIrVbCPpCY6CsmdVG/hOEjE0lFrI1t8o5z+b6ApEtL8Akl09OxsdT?= =?us-ascii?Q?gLGXTFB3SXn1y3Y+WQAqFm0PasDGvpSa3MjHmCN00hFWAW+Ifaa/faEuPoEC?= =?us-ascii?Q?r3xRiju5Isv2ZGgM5bOKMmqnStDh4qS/sGXi301exzHlskXhpc632X3i4dHI?= =?us-ascii?Q?niL/x9ch86anrC3CUcak/Ycs6yVheKVXk8iX7nCfyKr2ykzkYDxRk6G6aXok?= =?us-ascii?Q?HioOQ35aI9eoA/3vlHURkCqY/H2u0V+lEQzsMWob/LqkSfKMEn1+LOQi6pgA?= =?us-ascii?Q?rzebwbdepr946X7N+MjCuONJn9q2KILFGLq4ZCqt+ykVPs+sWcJOJuh5nfHe?= =?us-ascii?Q?XMuEmU04+j/gSl1PxKBlYmxO+nLtibchPtCpladduP35aGq4rkysoBm2q+NY?= =?us-ascii?Q?wKA8C6WzDgcHAjJgHi4F0VINbv37NPFc6Rd9pMqSWHL8XUroj2iMlaLNOHkp?= =?us-ascii?Q?UJ1roHAtoKr2l9XEmzgyeJWTjwbgdYGofpuyiVDNzWJSTdOrA7At/ri0KsuY?= =?us-ascii?Q?CQiFhsb52sdU25UvXZqC/RMdTdBZ/EeQGY/0qPdJH665/gjDIztKZGh9Drgp?= =?us-ascii?Q?7TBbwG1j8kpSJbopZViWqUYs0M4tdBQWA76ciASssR1O6LsFHqCOj2/IkkCl?= =?us-ascii?Q?hga4w5MAIzt+AKmrt7Nv7eJOjG+6WvXsyFMqpnxJDkDPqIibK4Bw8yo5jj3/?= =?us-ascii?Q?2reIUSgx0y5Khja4y4aE297XKoUQ/b74IEH+cSX5tlHLqc4Y3wnjG03MSQTx?= =?us-ascii?Q?lmZe7OUzXEsd+/MP5vZxJ7PK600vCu0Vb2ol+IGjgI1V9vTcBkLhAH1v2smb?= =?us-ascii?Q?eC5EozJUw5HVGm5qpJdy//E=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: SvjC0emdopi8UgS/Izqw9Jy1k9GcC+7sZV6U+12VGRUBORNsXNLSPHmjiLAaMg9q4cYlgiBQxj+sLCP2yO8gSLgBmBhhrPTCPJEzUSnz2wbQy77yWJnxYYMZjrNAtac6zheueJLYSRlHBtaZX7sUcvJAg4p+i7PhOjcuOyntMd4bIvWILg9KRM/p2XvMZbHz0Gqj19G/F9Ds4rMVlit0RJs3BTAGdKvUclggsoD18r2W3lFNvtF0xIGTDvPn6FwKQPqhnrMK35mNd2eIxYlTXv2spO/2/jnCme0F9tMI0LPcuJPvpw0L7FPYhetwBtnNCrjOM+BP7KGdp3ua26EoF4aL3w4NkvKvHinZxh94ww9aPkftVkeZ0v5idM5lEL+pReHWCOEo6zce8aAL4iZwBLLMIkcCwLlXSHgAcWdVr2oruJbSlidhfdfjjpN+VegU+R1MFPiQ3eZNMMPNhhljrGQgU16gtzNlbymciJgqzhVT6gVY0xn0n565QIOtmAjZT3blQBwStvKwQ7KkbXVAP8UsmfNqP1cVndDWZj1h4MuyMj9AFpEL5jGVY2rAJGXcau6YQENOgyGZGE3iunyC6mvBSFlocRePMKjN3o45DWQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8488f0fc-f35a-4911-06f9-08dc84bdb2aa X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:26.2483 (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: VEoo2PFgHYUssV8ayh73BYLJ0CA60xpLE1OGAtK1AV2WjyAD/YBbE8iiKBfoGcHX+s/Vkau1pBLxdGxO71Z36c6JXol/dyqLz/o5TSUkSyU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5893 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 phishscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-GUID: mfb-EawXCMblJdKVNmvf0rl_1vmYtDiL X-Proofpoint-ORIG-GUID: mfb-EawXCMblJdKVNmvf0rl_1vmYtDiL Content-Type: text/plain; charset="utf-8" These write helper functions are all called from store paths which preallocate enough nodes that will be needed for the write. There is no more need to allocate within the functions themselves. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 42853afc3885..3d2d8c2c24df 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -2976,9 +2976,6 @@ static inline int mas_rebalance(struct ma_state *mas, * tries to combine the data in the same way. If one node contains the * entire range of the tree, then that node is used as a new root node. */ - mas_node_count(mas, empty_count * 2 - 1); - if (mas_is_err(mas)) - return 0; =20 mast.orig_l =3D &l_mas; mast.orig_r =3D &r_mas; @@ -3029,11 +3026,6 @@ static inline void mas_destroy_rebalance(struct ma_s= tate *mas, unsigned char end =20 /* set up node. */ if (in_rcu) { - /* Allocate for both left and right as well as parent. */ - mas_node_count(mas, 3); - if (mas_is_err(mas)) - return; - newnode =3D mas_pop_node(mas); } else { newnode =3D &reuse; @@ -3341,10 +3333,6 @@ static int mas_split(struct ma_state *mas, struct ma= ple_big_node *b_node) =20 trace_ma_op(__func__, mas); mas->depth =3D mas_mt_height(mas); - /* Allocation failures will happen early. */ - mas_node_count(mas, 1 + mas->depth * 2); - if (mas_is_err(mas)) - return 0; =20 mast.l =3D &l_mas; mast.r =3D &r_mas; @@ -3446,10 +3434,6 @@ static noinline_for_kasan int mas_commit_b_node(stru= ct ma_wr_state *wr_mas, if (mas_reuse_node(wr_mas, b_node, end)) goto reuse_node; =20 - mas_node_count(wr_mas->mas, 1); - if (mas_is_err(wr_mas->mas)) - return 0; - node =3D mas_pop_node(wr_mas->mas); node->parent =3D mas_mn(wr_mas->mas)->parent; wr_mas->mas->node =3D mt_mk_node(node, b_type); @@ -3475,10 +3459,6 @@ static inline int mas_root_expand(struct ma_state *m= as, void *entry) unsigned long *pivots; int slot =3D 0; =20 - mas_node_count(mas, 1); - if (unlikely(mas_is_err(mas))) - return 0; - node =3D mas_pop_node(mas); pivots =3D ma_pivots(node, type); slots =3D ma_slots(node, type); @@ -3747,10 +3727,6 @@ static inline int mas_new_root(struct ma_state *mas,= void *entry) goto done; } =20 - mas_node_count(mas, 1); - if (mas_is_err(mas)) - return 0; - node =3D mas_pop_node(mas); pivots =3D ma_pivots(node, type); slots =3D ma_slots(node, type); @@ -3813,9 +3789,6 @@ static inline int mas_wr_spanning_store(struct ma_wr_= state *wr_mas) * entries per level plus a new root. */ height =3D mas_mt_height(mas); - mas_node_count(mas, 1 + height * 3); - if (mas_is_err(mas)) - return 0; =20 /* * Set up right side. Need to get to the next offset after the spanning @@ -3899,10 +3872,6 @@ static inline bool mas_wr_node_store(struct ma_wr_st= ate *wr_mas, =20 /* set up node. */ if (in_rcu) { - mas_node_count(mas, 1); - if (mas_is_err(mas)) - return false; - newnode =3D mas_pop_node(mas); } else { memset(&reuse, 0, sizeof(struct maple_node)); --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE9CA14EC42 for ; Tue, 4 Jun 2024 17:42:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522970; cv=fail; b=c9WY6DSXiql8ERUTal3qZWuQX8OfV/Oww/wVzK8ONq6JXlbmQjDVQhAigEoA4S7gSyypNSBKZ9qj0y6tsHWvT9jS4yu0Nlrua3CVPQP4ncxek5V43NAXCTBN+EGqsl+hcmnbdK/qOeh4W6mktHJozgahfOxZj3gAOh6XIQV0vv8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522970; c=relaxed/simple; bh=XSIe0Azr+askvOjun3d+S5/XsXbXTxwjTZcGmD7Chq4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=jLmOu58ivXLGx+zDDoisz1T5vY13joGa3oR3lgBe5bpw13Zg9n/Qv6TU6Utef8SlI4R+FJKxwGa5UD3PQD7IjZO7aRJ1UtRaHpYQ0XjVQ624qmjjlOfOy36CfVBRgd9io92w84P05rGojG1xkynEGobYfnDLDA54nKyxse7g8ZQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454Bn1i7032558; Tue, 4 Jun 2024 17:42:31 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3D5zvCRKl+U2ByYXCU/OBlf+JIMmoEO64HTB1VnCJPdP4=3D;_b?= =?UTF-8?Q?=3DNeAlU3KggAcL7oCzb245s3ruw61z046ZZMuyQ/lQDOJXFKaTI91aeu9e/uF5?= =?UTF-8?Q?/31jUcvZ_fas4l+XakfEzWdnxC+m9KUtIWalDTllZASHb3MKzFXEwhonHCZe97A?= =?UTF-8?Q?HM5FA3iXZlpsjx_hM4CEcgNs2CaeMbqJoTMVTgvMBig322enjM7QXtGEo5wqFii?= =?UTF-8?Q?QmmhNbX67Ypvictb2G6P_PComKxGm7KJvo0IZYPd8aFVeQgXNczB8cz5C0ozXB4?= =?UTF-8?Q?veh8ByRm0OeLcoww+yazKGok7o_qyUy7nXFLEePRS9n6qYIN2D1MSBU5b1mQD7k?= =?UTF-8?Q?9DSqdmn0HtKgsy8DTyn9Lz8mAx0xL+/p_3A=3D=3D_?= Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfuyu5j6y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:31 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HRBZL015719; Tue, 4 Jun 2024 17:42:30 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2175.outbound.protection.outlook.com [104.47.58.175]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrjcnnes-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hFl7b9SvHKR6MsTQoZ9q/cL5/rR9J/MJGBBszGkYX86Q9f84uIRK8NS8+RjDq9NRvrDtVE/6dzIPwqdlspH2qpiW/AvH7W4Mnktb2F62CEns/QW8tuAkw9wzDzanPzuHVzq7OGxPSVWD6HtMcog36KDw2KuvxPqLse6olhY4c3q7h3CCKGilgd4CE+MD7Zu0NKVThwgseqkej1Xi6Mz1Wuo3EftLI/dgAOx92bo3wi6c5FUPH6/dR3fWJOfZRzq2mD1Z/4UeEAKhVnkkxfKbrJg976RGNiwLfdZCmIjMgaDSNThMxansEF0/8T5WOsOjGoUE6yFEXt123axvrm7XXQ== 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=5zvCRKl+U2ByYXCU/OBlf+JIMmoEO64HTB1VnCJPdP4=; b=iSEC/rkeea8k0sQVO/B+hEIy79HLYDwjC97NBEV9xK0oMHt9XmLxDGbEuEKVJ7n5rEc+xlM5gc0d5YvTiXVGgdwqP7IM7d/zyrrVbKYUJorbMtIML8NgbAnxMSMT+L7XAggWdD84ctbQQwchlsHunC3Z6l33Kg0LWgDI3tFxvw2cl5ffborzehEYDTJQi5eTMVt+DA8d6m7sW/DodoOT1b93+rdPebtZ6uDLyEnNK5YUR4Eap5tScvW0/FCOolj+POz2s5NlIWhhDGnM573846bjmVJx0O8p2fUNYwGWKtF3ky0J+c7viSK9r/iWSahfp0ugzinJ8Xjbt8Ksp/s0Tw== 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=5zvCRKl+U2ByYXCU/OBlf+JIMmoEO64HTB1VnCJPdP4=; b=nDu2E6DwPqt8xqBGnJUuIiQV415gGQ1T+w9Bp023O8Qca5Z9P6Gf429y/57vA1lsKrShaVHd/rGry6YPbYqFmhftU0LdIxDgMQ7FKecg76IwDpZ87gHkRS9/89WT+t086YOFt5iSBf7A5mgudgTvhfN/bo8VkIJSejyzF7hluZo= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by SA1PR10MB7593.namprd10.prod.outlook.com (2603:10b6:806:385::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.22; Tue, 4 Jun 2024 17:42:28 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:28 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 17/18] maple_tree: remove repeated sanity checks from mas_wr_append() Date: Tue, 4 Jun 2024 10:41:44 -0700 Message-ID: <20240604174145.563900-18-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BYAPR07CA0029.namprd07.prod.outlook.com (2603:10b6:a02:bc::42) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|SA1PR10MB7593:EE_ X-MS-Office365-Filtering-Correlation-Id: 92b8bb8e-f776-4443-cc63-08dc84bdb3c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nUTGd/dcNXJlnlFN2G5bnxHf7IY7R2ArEtXhl1Ww9WK3cLgjE6zxgMpt/+7Y?= =?us-ascii?Q?0+bwpfUuxJ6UwPAkQjjuDkqwoJKhZRYN6QRHQ8LspUnr7omgEbCyEaH4NS5B?= =?us-ascii?Q?Ii/mNkl1HHV4e4+XqztLLkBTWzaQQDMpffVZCrwtEIazuRvnUS900jQtgqv1?= =?us-ascii?Q?HZsRFRlI/wBw/K5lBl9TvCSxkmR/DBYpf/r30rRcocVKXkz6IXBBbyN1cXTD?= =?us-ascii?Q?Rie/wfiiknLIkXkyKsuOQecZaPAXTlg40i2fxoVF6tIk84s5ywXvUA1KYKUR?= =?us-ascii?Q?2Rkjbc8hQO1f6x5LTW9HKSHqCiIijS0Oivg+xAF+IFKoNixioZ1ZaifCQQTf?= =?us-ascii?Q?QFoVjAsp2DEuf7OEoA08xWlMNPc7ECMaWhM2P9I58/JkuECKTWxIh9QkbFm/?= =?us-ascii?Q?P0rLVUCDtzw03fUCRceO4+/WcttjA/NlqGnIRezpY/zX5yVZ7Mcm+e1OpjrY?= =?us-ascii?Q?zFJXRgt57LqgBv94z2GOl4UYGl0GrMO82D/zg4ZLXXVbsewnhlCpbc9EfdhQ?= =?us-ascii?Q?+2zAeszq4GN8JIgpVBvjOBtiWSmmEREhOOm8lgFO3XiuK2fLraJHXjhxqmIU?= =?us-ascii?Q?4fLRH+vEDhKT+ZCtaOgQj0U3DggldbcYT23Qgga3ooyCK6Y4NNshT/EScBU1?= =?us-ascii?Q?uJMY2S0Pvn4hsl7USolrigz26aDcmIHlhhB6tLug4a25uqx0tMSP/bVvCiAC?= =?us-ascii?Q?2APqL3jprRSJpSLdnaBzGMhOBVYbIkMKXPH0CE/moS3+VXf/LvoNj+C37BNG?= =?us-ascii?Q?bwBmLqnqXVbiw0HUdaErxztRufwhZ7noKFP24lsUFOi4UT7alEbiGuD8xYYY?= =?us-ascii?Q?+/mb28yEbSYImrVgpGXslWX0yrIUfDzA+x92FG6mT51E4vLtw4E5mbmgUYMT?= =?us-ascii?Q?NMxCqkJqq3YuZsjbf7zwIEjdLt8lYcmyYEAs6+ztB5ug3++APM2XMfRRF82j?= =?us-ascii?Q?VTHw/GT/3bLeXZF7BvhYy+r1BnFMcu0FRwoeqIhpoBhaCRzN/Ct3I6/NETwR?= =?us-ascii?Q?jffte2SGv9cjVpcgVY3YLVN3FFu08Pn+f1oefD8FUYUtnmUaeVex36dqK1ab?= =?us-ascii?Q?kYwBUOE6e8vhN7Xj7RLZ2qH/E65JQoVG24lRs+cB7GUgvr9+YSTPdCw8dgi+?= =?us-ascii?Q?Ulgi4lxexPCN1ZyIGebkg50HM5K1oHPuULW1cS3IEkh5W/mst9z2Nikp0Iqh?= =?us-ascii?Q?TQ5hbpZtkyEOkhqT4LDkE2L8pSjKwmafR5S+UToXMhbSOeYE8lSswDACCKh9?= =?us-ascii?Q?+kzept1FpTkdo4uUUQ3wWDjLBzGUmQgtfNBorYj5yw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?e1kGhgBKCXxSAav1yd37nRSGR7XM1hngRzfAUrEMvTm/BDKGlRv+y1TC3mDo?= =?us-ascii?Q?k8Un1lvuS7A0aKzQZChqDsbUtnTDiRCdji7CQh+lB5cfovoyOAAjAaca9Rij?= =?us-ascii?Q?FBk/IM3Grcr0vYvtf2kdhIdpJ1LNXDGHr+19vvGgn4/BBs5ShagMUq0V0gVp?= =?us-ascii?Q?g28lKAOkwUo3pAmU3E5BhRR8Lrb2yezZY6kwwNde3/FyDySUxKIgJsHQYxPS?= =?us-ascii?Q?JWwysiABSBbne1DchjxD9lw9CPmL3wIcfmbpdPJYuhmwgbrG4sjB3w0GuzCq?= =?us-ascii?Q?49LUdPkjhQnowLz4KSyc8jnA65oCEEYdCiZbnoKvLELZH9thy9C/be2m12Ag?= =?us-ascii?Q?+cnzUUbCfYd5ii1Bs0+cO7fcA2QuyOcbG7S6IdHdUhlmv7y+Mfppd6gn5biD?= =?us-ascii?Q?5rzNR3kYAkYHcFrAWmOtNscG7MO01m6TlCJQry8E+oiYDhNGTutQaMgFOiO8?= =?us-ascii?Q?b8vpPzPLbcCDO+a+RrKzg0bT3TpvhukRcbyjDXbdt+JHaRTxpiPa6XMSmYZQ?= =?us-ascii?Q?xfOcGRlgqszAbn8I+YbgeFsSsGjYeyRA5ivkK2WkD8khE3oa1rO/G6MrWjAE?= =?us-ascii?Q?ybr2eJaYrJT6MVaTSaTwXjmm1ISFhOph3nF6yXeVHYL3p2NcZ8Ely47viiu+?= =?us-ascii?Q?ZSMlIwJCbnWMkApT0q2R7AtRosWtKSN6KHGlMqVZmtTkT8kKpT0mqyhAe+U9?= =?us-ascii?Q?UZCj7C6G5n3cMp9BCFaHv8sT6pTNRxifu8LcCnHX/D4+/ulRyQ468hvptJWK?= =?us-ascii?Q?4ad3boFrEhOIsieHb4PSr/J5iM8cz8GgBeAO6xDLZ0JNru2Po5HwQiZLza7k?= =?us-ascii?Q?xhYR16vrhd2R+OtdSanatmdnzwYE3UWiMESw1Oa1Hrsnl6opjg/VjM6djedK?= =?us-ascii?Q?ue0ECXXZioqumPE5HWH2LWoXZnsn5dKEG4aSeqde+z39W7fsdWvJHbNjlU5D?= =?us-ascii?Q?8wRqNUsnZsL9D0hPHgySLScCq4l6vFY3t+yAfuEwdSB/XyTx0wUfzLNOA0Zn?= =?us-ascii?Q?z+lVEGdcB/zowBd8aJjHcuYMO3kQNR/GUa7slQE5sMig1zpVljJO1es00EFp?= =?us-ascii?Q?dLRmWN9X/NfiNianHRW1eV2fgHatiafuN4q+moNPTxrxmH7X0LnqzEA1Low9?= =?us-ascii?Q?f7g+zsPU2QmWlFQXinaHnoXaqj8ZhoD+UFlrJ/UQF/6Voxr+y2tV7IRY8uEr?= =?us-ascii?Q?NWq9NaPlrbVYCJqCqbwS4aiF16zG8GQYLc31Lwyn+KQAA4e4Gkb52aObNWRq?= =?us-ascii?Q?jcKUTCoNd0puxfA9JahXaP4ZOkln4KncaSOlUpgBNWXqrtcMSHLRVPnY3BaV?= =?us-ascii?Q?vlRMG/c+ubmCTpqsrDWCkVckai985bzaUOXX0mhtLxlKdAqYzOitChy0KTmx?= =?us-ascii?Q?bPq07cTdx4uGOZLq3XR27De/8U+QXosccLqTsFPIdNqjrMQoYyTVP3+ipTXt?= =?us-ascii?Q?Gg5cX4zY56XXYeWJ4nmpWy2KO45bF41gJOVIv5ouvIig9lr55ho3KN/pVdPu?= =?us-ascii?Q?Q7bzbxO552T5tpBzc27HbOJDgi9YYE8J7BJvzDGgDN03qEfENsL0v0JYgGMt?= =?us-ascii?Q?JhGN3ScugtCd/1fV7uG2WZlgDy+uhmzEjm+YSvF6oBaCTiRtLPSXgplcEI2I?= =?us-ascii?Q?Cm4sptlo4155wELBdNSpIB4=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: SIWrxWfRw262gcaH0L0iavJqfugcDUXH8XlH2GeY9N5tYfwWTzZaKTgwS6YZQpc4eV2T/GDYXyLF4uFOsTydJQ1psjbvttYpoYOW3jJSgmXpJ2iq5nPdZ0ytb1XonwvpgYhxt1gryYMJsJunmjpWYq718XVLa6b4i6OibfHhBXi4VENIu12rx0NehXUQjyejCBbYsLok7i2noTWsAAfzUQYTAmubsk2yvM/RYLM2wF49OEcp7L/VRqkPh3HshF3OyOO/RB6Wbr0jqwt8x9O+S+3xELL7dMrqTVjNn40xbqgYXVJhoKHqAiO0WZpepDjzk6i59z4EvqBopUdVYqihbcNZDPB0//DpOJHcfWTp2DdOR85Da1ZCPhxO/67Q6Of5l3+kaslYKgo84tvEc2fnYq5uOoWb0GrZ835LfBLAzeJ5jR3Ae3a3OT+CzfzVhfTv4fIk1d6JPVFMPfPL6Vk0p9OKOP4Oj/X7uPOCh5esp+w3mnrlmJgLsh+VM6S3udwkdoOfLqhAumgdV2fISBHXZEYEbuODK3PlqooX53hzk951BLrsuKuU1J63VIxHcJyePMAQAh72QStGaSiwRaND+iGodYYtlHHItZlkdY0yR1s= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 92b8bb8e-f776-4443-cc63-08dc84bdb3c6 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:28.0714 (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: dqalQIRAKT9dG/CWhIooAQmAIDeEngSHw4BlcB93OklvZKJ7RIvlugOnYS/bfgrCedx8tAnnRv7Jd+tetZdVEnOTgphB9//1oKvAiNU76Cs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB7593 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 adultscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-GUID: zERGJ5ykFZStswL5NZ8BtfpYz35ybi5m X-Proofpoint-ORIG-GUID: zERGJ5ykFZStswL5NZ8BtfpYz35ybi5m Content-Type: text/plain; charset="utf-8" These sanity checks are now redundant as they are already checked in mas_wr_store_type(). We can remove them from mas_wr_append(). Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 3d2d8c2c24df..a90512d15549 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4062,17 +4062,9 @@ static inline unsigned char mas_wr_new_end(struct ma= _wr_state *wr_mas) static inline bool mas_wr_append(struct ma_wr_state *wr_mas, unsigned char new_end) { - struct ma_state *mas; + struct ma_state *mas =3D wr_mas->mas; void __rcu **slots; - unsigned char end; - - mas =3D wr_mas->mas; - if (mt_in_rcu(mas->tree)) - return false; - - end =3D mas->end; - if (mas->offset !=3D end) - return false; + unsigned char end =3D mas->end; =20 if (new_end < mt_pivots[wr_mas->type]) { wr_mas->pivots[new_end] =3D wr_mas->pivots[end]; --=20 2.45.1 From nobody Fri Feb 13 00:08:00 2026 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85A7E14EC40 for ; Tue, 4 Jun 2024 17:42:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522972; cv=fail; b=FtFX5grOGwnm35JyouP8BfMH4/Cl38U1VikNK9Z/b6/Aj3oySLDG9siL4AmnuisrtW5k+oK/HuFyPjVaWn0spA+jcpipZgj8m/6dyO2wDOz6sow8+7jEIwjV9tR14IBgebsMMKMfJ0e82bJVlV44oTz4JRil9kHKUh3EgwKdeQQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717522972; c=relaxed/simple; bh=yFgI5wZicJi+A0srqZeBYBTdhTU3OD8SXqkCWczeL/k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=e0D4CM1EMJCvOiQQgktAH/BWCKv3wjzDdZRHNlaA2H21FRSuQ1dmnU/aSwh/g3t+SOJR4+1L5xzEGuESLHe5VoHLc/1FclTULqsFMs9xy6Z+9RrB6N+RrjW0irQPhXdyHW1KBuR0TAkqifZshHx1XFrV7AFraI+D4UpJkd3sjYk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 454BmoPB013712; Tue, 4 Jun 2024 17:42:33 GMT DKIM-Signature: =?UTF-8?Q?v=3D1;_a=3Drsa-sha256;_c=3Drelaxed/relaxed;_d=3Doracle.com;_h?= =?UTF-8?Q?=3Dcc:content-transfer-encoding:content-type:date:from:in-reply?= =?UTF-8?Q?-to:message-id:mime-version:references:subject:to;_s=3Dcorp-202?= =?UTF-8?Q?3-11-20;_bh=3D/axvbuW8khhoVEyMPhrQgsnIMUV1XCKocXZ29JyAv1E=3D;_b?= =?UTF-8?Q?=3DFqeNTKLDyd3Qz9ctX6mzBfYdl/yjrF15aSUWmAGSeEmdUGj7O9wJH3gDqwko?= =?UTF-8?Q?KVGWl5Ht_l5WOFBhunHkze6VyccJ6uIj+wk4EsEk65AWlfsJh8x96AEjKR/7df1?= =?UTF-8?Q?cI4Jf1N75AMbBw_HrZAHPd38oPoAjb0HEs73/BnpP7lVAfHZOLt4abOqJJyShtS?= =?UTF-8?Q?RcQzda6Xx7q8HUMt9YcW_zot2mghC9O/BbiyNfXpCLqwvnozyeKLhpqtTFJakNa?= =?UTF-8?Q?F4BlrqZU43AgbiKHUlbYJP3+SP_0f9yBi0vUKhGyTc/QFRpQ8VsxrVjR1ZfIVix?= =?UTF-8?Q?BJ2HS2V+TwSK9YXfiGgzJG46cimb8esp_bA=3D=3D_?= Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3yfuwm5jrc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:33 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 454HW4DG016141; Tue, 4 Jun 2024 17:42:32 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2169.outbound.protection.outlook.com [104.47.59.169]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3ygrsaf3dn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Jun 2024 17:42:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PFmhjP+pH2PLlpTAIjwP8sBusL9t0gVpWc6Y/dVTsbYP+jB3XwxM36oK/O8FQUjbGgihHe534Ou4EOh8EjqoOex0jD1Y3qM8BhfoASpsQHZAusLVdpLLaNwl9orLNCUyirazIxGCSouIfz3Sj6xTCCnn3Sk9nqlv4VvqhaL6T/r9lOrAfgqTYP73aeXwG7t7vdCDuW3Ykvb8mEXjwc2Mp1EpOuNeDSh7CvpUHKd8HKC4cE1MyywfReJHESyQLNWsq2ouW3U8b08Rc23eO3ydSZMP0jR8udChJA/1eN5yjZnSMWLyB9NcFDfhJo8KARSUp8MAbd5jHJW42Ru9+Wq4FQ== 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=/axvbuW8khhoVEyMPhrQgsnIMUV1XCKocXZ29JyAv1E=; b=KfnTjjQ2Gk7796y4X3fN0VB9z7n7eal1cuAQCLamVwWTHsk2OAtmhS0LXYenO6X6ROOUzemLOjMEO0Yt+4HGhsjTM76bqDOYpjycJEA7ok/dvA1bFkhT4uA+SHw/rSkS8rLcXNeMWmsePi83CvawOENBm/EtqnWJqMX2mNFafKhTm4gpp2ZVNlOAeVXs3R0AV9EgXx+hbk4hK7wcseXwmAVLiYPd9zONpZu/beiK/611EhD+OUiMTrnRSHHDCqIIXrgjB9X0b+wLEdggsGadyRLv0En8XqJQHMogcmkckCY7uTRBRqupP2+CCzdlaKJNOpakHVJUxEHoTw7IpcLU5w== 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=/axvbuW8khhoVEyMPhrQgsnIMUV1XCKocXZ29JyAv1E=; b=H0d9RaWIb0Mrw+7vx0h1rwT72pQtdnuFMAQJSZeKl10TfzZzwIxgQLS1TfmJDg6aCvWL/oe64K+VBAxgiHqm/wXdI4XiZwSzSpYoDlGGS/nyVD2gP4d8wP8l+Ep3neegxVuTAllCtL78joqwSqCU+kECm402vvUm3myXvo1stY8= Received: from CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) by SA1PR10MB7593.namprd10.prod.outlook.com (2603:10b6:806:385::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.22; Tue, 4 Jun 2024 17:42:30 +0000 Received: from CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2]) by CH0PR10MB5113.namprd10.prod.outlook.com ([fe80::eab6:6dcc:f05f:5cb2%7]) with mapi id 15.20.7633.021; Tue, 4 Jun 2024 17:42:30 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, zhangpeng.00@bytedance.com, willy@infradead.org, Sidhartha Kumar Subject: [PATCH 18/18] maple_tree: remove unneeded mas_wr_walk() in mas_store_prealloc() Date: Tue, 4 Jun 2024 10:41:45 -0700 Message-ID: <20240604174145.563900-19-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604174145.563900-1-sidhartha.kumar@oracle.com> References: <20240604174145.563900-1-sidhartha.kumar@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SJ0PR13CA0035.namprd13.prod.outlook.com (2603:10b6:a03:2c2::10) To CH0PR10MB5113.namprd10.prod.outlook.com (2603:10b6:610:c9::8) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH0PR10MB5113:EE_|SA1PR10MB7593:EE_ X-MS-Office365-Filtering-Correlation-Id: 6c1b2a79-7cbc-4d59-d95c-08dc84bdb511 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|376005|1800799015; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4JvesdLVzHDvKx/UsmwaAyB9tozbNNdyDOvqpt17AFVnalB83nu2gH3Jd9zs?= =?us-ascii?Q?5+Sl+9YfZb03YNuWWlR0MoBadJG4n3qVNymch65Kd9q/K29t1rOwqJvXdIB7?= =?us-ascii?Q?dllit98fvMEULjLMDgv1lh22bubZwtjEUiVDBiqDUBDbAtFMcgSm/3Pd8ekc?= =?us-ascii?Q?uSm+S9tSk2GEHeRElgPo8HDyjvY30uWbPgwblfgT8EAIfNZC47Y+xGhocby/?= =?us-ascii?Q?RfS1mDckIskrfILQ5+z/7zCjQDFDyUPCRCGM57/a8vQqufi9SSzqoDo51CF0?= =?us-ascii?Q?aR4J5v6N3ybPW7vhEjZBbPQlrc+rHG/RjLI0HHjqOQYTJOHtnLfhpQsn2VAS?= =?us-ascii?Q?J/3RzFu2MReKwgBJ//rBghwhyZRnRQquOge3BTEaDbIqoppeXT3si7DHBRgo?= =?us-ascii?Q?TNa8o8RCg3jyNxpdMnQZyOGhF2U9/sPUyWxdlWvYSFp9GPyYjhtGVnHv/Muv?= =?us-ascii?Q?G8hd+3wamSLXLQhZ9nff9EtupKI7hKantLi2V7bTjpANkOjounHxf8SoX0Kl?= =?us-ascii?Q?KjFcAewDs9hRy+GgFG+jZYu/4r7OwiCNGLiPBRFDtPJ5tYVofyY/O6UnwGic?= =?us-ascii?Q?xZhkliDOZZKmZc/Jr+6v2qDNq1e/gA29pTbtxQ383ikB305EvyG/Ia6M4Iwe?= =?us-ascii?Q?EfVC3Igqa5KAAtTuspAUM0sK+v6nxdO3BZcA2yECJuJ5c3Hy/lUcq7Eo/Qu4?= =?us-ascii?Q?1bhEOtwinTfL18FLaaM+0u06iT2aezfkqoR45xLsXHsS3LidcfHV89VmEjpR?= =?us-ascii?Q?EZxPaQSB1Med2S279F49qHbvAKhump4Tww9FcHzlXdfgLMqDeW98mxn9lwXJ?= =?us-ascii?Q?ApIzg9k2EFuBXLwltdFQhmLxKC2DLfYrsxCrgNyEXKnEoWEjvDW4LFibjN/Z?= =?us-ascii?Q?PaD8lnWMCdQlPK2i0TOrmUn/3MQPdNzZNQQAHaX61P4dCp62VCYPr4ScaURY?= =?us-ascii?Q?4Slo4HgcD94LI+VmA3+93AjVA/xOPa6xSGRZnP6ck5kmOYAkqZf67kFgaUeT?= =?us-ascii?Q?tYegJ/vFNdKe4SWnQjPmy0wX2SiS8aXQXii0zDV5MuzLMt23NblEZle/A5if?= =?us-ascii?Q?E3OAVbHOJMGUe3LeEsbNYwNI46/DSBxUaAzNHh/ox5lwceYCuemYMWJejrD6?= =?us-ascii?Q?SlzWDJEPkka7zZBqEh+/Qlih9Og8ocoA6Dyd61L9A006ksZsyH+PmmdGohEn?= =?us-ascii?Q?XSlV5tZAPlfPM0llwKNwexZZICMcHtAWUQzp4nYnUM8PuT1SM626pNNxZu4P?= =?us-ascii?Q?bOlEhcCOPGtPXRiSpRX9QuVTIcGno7/URgBkn3eG9w=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH0PR10MB5113.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366007)(376005)(1800799015);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ycagm2bgr6iZ/tQh0OMuZdS8BNzS3JiTBIjdFISc+jq7SI/6YPOOyCHjSKoq?= =?us-ascii?Q?vetVaEAJM9aNGJeyFUcSkvMcoqsytWgbKzxddhE0eBnpigl54S5aYvAiT6pS?= =?us-ascii?Q?rEl2qPQgl7kE98jxgy7hpAP6rR+9KCG8fcJ6qUOCNw5QUNVO8O0EJ+KcqDI3?= =?us-ascii?Q?KDwbCpgsRB+eAMM1tpJWVOZdxpeQOUktQOv7XofnlrVj2M/a4Lz53FUD0cl9?= =?us-ascii?Q?ApYYfqRTz6TgX+K/BHSovmDHOx8lMRviT1MZURlK4zIYonDsvRh1qb0/Me63?= =?us-ascii?Q?M84UmC0hQDBcVhEWLulGQQNKNFAyO9KR617LyNLZmAjwtB23BjGEg7mhUx0x?= =?us-ascii?Q?Wge+No1fWRiOw0sQYG/hY4AKPUDrSxu8aOyFlTITxsnHwLBN6QbbArpbW5ku?= =?us-ascii?Q?2aQ5PbetoGrldwxThKJpgzDTOud4iFB2a4yeaIC1z3qkx5qUOmCfX9HKU3d/?= =?us-ascii?Q?Zpumue97O1/vfBVt8RTEIXKOI5ZB/SpOmLJEWensJ4AFaqCnvpRCMD/ITYQm?= =?us-ascii?Q?K3+dQ579/+X5TaYjKKNmDg0PY8E/89RMKFKLFs61/K1KGgdzFgg0FNdMp091?= =?us-ascii?Q?H8sTgeea8OkFN/ghDsRCyfTh7tY6gzg5mgfbEwzE+3vsq1NX3pdZ3WfE3oGn?= =?us-ascii?Q?0c7qPVzYi9bcrF/skCc8jON4sMY2b84c1xL8EvBihfGNqYgi2MZb17/xPf6C?= =?us-ascii?Q?6Q85pLw2eL44mrKWDxaAGDoA89D5WSKw6/r8ny65ob61KkuOGEwlVjNOV+UM?= =?us-ascii?Q?WeGAmLPc0mEJr3BMUUUqiWZtPELnTQ4WJy0tchWojebOOImbVBI1Q6LqbkCx?= =?us-ascii?Q?stlTzxXZs1dgqt5onTZvbSiymKe5OQbgSnf34drgRdIwudxxUQsFiuO17H9u?= =?us-ascii?Q?+3cQ6F9xBo0DAZrHVBMIJ4DzRcKXdp/OW/tLpZHVnMfenVMbwEMSEwy7Sckm?= =?us-ascii?Q?62Ah0XV+8RXyfAwPC2u1FXvOVZrpnM6pGWG7kxcms868AJTp8HIAA7GuuxJ5?= =?us-ascii?Q?VnnjZJxQ3tlsZjGjQ9msLBZ/VZFbPNoX9F1CiG6rTMVprQcK8hSV6nYMGAdc?= =?us-ascii?Q?41yUosZzyM62/BdpR9K3D1GMiyYx8lWEy7troPUMLJBw6l0/YzDLRQgcp9Rr?= =?us-ascii?Q?bOGiTXNjzaF+oObQCXFtcH6o2+2UCUhDQVkCKSu17ivf8a6GR+82hWQf18rC?= =?us-ascii?Q?gBTgb4uDwlg6af9VP9gAIn1MAHUoOT4L7M8CXpZoBU3CZzRYpx/LfKq+nS6k?= =?us-ascii?Q?q2evjQMPUA7+4IZ78Q2wvVSHfowLl/49x4UQyrOqPyXYDWoUkInGJXCktUFW?= =?us-ascii?Q?k0ZtsOCEkwypWEVlrXnQ4URsvrJ+xD3K8Ps2mtp7UJW2qH8t0ehsH6h+DDc1?= =?us-ascii?Q?+sLpdOSnbP88R7WTwKhusUxrI/rmCBtRrePSIb4Feygy1iNj0N4PHBqVuHYk?= =?us-ascii?Q?TMB4faHwmOsNdB5SJChk/vH1DfevAMJREk+FUsktSj4YLCdN8pbP3jP6V67R?= =?us-ascii?Q?QKYKchKv16Hzkf7jOkPdAfCi0NQyEW1R7uicDeXEZtqLbaP2TXQViBw29vne?= =?us-ascii?Q?Zju4RonfJ7Gpu75BkX+UxxyqFG0lc4/q1flzoxDCAfykwnnpemdhHzK321K1?= =?us-ascii?Q?WmeHO4cIGm+iBHkuI9CmF+E=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: YKbrFAaLGIG/HTeukfjRLIc49EaiepX5IBcYjVGxFMDa9ICbAJSwmHlRQ9s+MllqkSyU637F49Ct9lLCa5Z37afNS/gQyoucHnZRSac1dc9u1bP7zVQpneWvmYUrNF9pRKejaL5RF4KbH/gYBxRT0XWmsQyupl49vEk69M+2MgsUAyHWrMFj3yq/qk3kuopXgRLY5BaNl0CNIyoYtP963/waq/MVRr/7nutPOhj+Mpu4zs4UzgaBSYYYhoHfbdglRVoUQTWfiyYpbCxwRhIvsRuHgAKtL3NkWtC4fKD6baD1pdnnqgdexP81wez7iDneoxAB3YkfcZZ0byhpG23z86hAUspVEBIXb/6f4pS3TKpohmty2cIQOkztayP++26e7zUyIQhrF1RikTyeWHWHriuxHln9xO0f25meTMVnvZ3e7ncP/6rQfVkr2N+A1uC5MEk3UYrwhmYZI7miwpz4vP8Nym3daLIkVu01Ad2Pc15E60B86fb343LOZcq0BY7T4u9jiPnvL7p6PgzBdwv7F1FkceCc7Xv0xQa3Rli9SFUCHNysiO/gASHRRWQoJX+DfwwPf2CUK/luQG1A2CRxMVdY147ngj7UFuLdubV/TKc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c1b2a79-7cbc-4d59-d95c-08dc84bdb511 X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2024 17:42:30.3087 (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: 28sTVdoYgGp2d/vQuPtCKDld9SvwYHE8tdslpLKVSP97AUI0DHhm0ynaD4WbXWfd+21Pm4tPlVSy4yJZYguJRz6/rxQoDnXnWqh2Qg/yg8o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB7593 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-04_09,2024-06-04_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 suspectscore=0 phishscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406040142 X-Proofpoint-GUID: auNnVvWluD28L6jy7NFku5XcrXrWOj0I X-Proofpoint-ORIG-GUID: auNnVvWluD28L6jy7NFku5XcrXrWOj0I Content-Type: text/plain; charset="utf-8" Users of mas_store_prealloc() enter this function with nodes already preallocated. This means the store type must be already set. We can then remove the call to mas_wr_store_type() and initialize the write state to continue the partial walk that was done when determining the store type. Signed-off-by: Sidhartha Kumar --- lib/maple_tree.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index a90512d15549..eeb8def13f63 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4028,9 +4028,6 @@ static inline void mas_wr_end_piv(struct ma_wr_state = *wr_mas) wr_mas->end_piv =3D wr_mas->pivots[wr_mas->offset_end]; else wr_mas->end_piv =3D wr_mas->mas->max; - - if (!wr_mas->entry) - mas_wr_extend_null(wr_mas); } =20 static inline unsigned char mas_wr_new_end(struct ma_wr_state *wr_mas) @@ -5595,12 +5592,23 @@ void mas_store_prealloc(struct ma_state *mas, void = *entry) { MA_WR_STATE(wr_mas, mas, entry); =20 - mas_wr_prealloc_setup(&wr_mas); - mas_wr_store_type(&wr_mas); + if (mas->store_type =3D=3D wr_store_root) { + mas_wr_prealloc_setup(&wr_mas); + goto store; + } + + mas_wr_walk_descend(&wr_mas); + if (mas->store_type !=3D wr_spanning_store) { + /* set wr_mas->content to current slot */ + wr_mas.content =3D mas_slot_locked(mas, wr_mas.slots, mas->offset); + mas_wr_end_piv(&wr_mas); + } +store: trace_ma_write(__func__, mas, 0, entry); mas_wr_store_entry(&wr_mas); MAS_WR_BUG_ON(&wr_mas, mas_is_err(mas)); mas_destroy(mas); + } EXPORT_SYMBOL_GPL(mas_store_prealloc); =20 --=20 2.45.1