Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 08/14] maple_tree: Re-introduce entry to mas_preallocate() arguments
Date:   Wed, 31 May 2023 22:15:59 -0400
Message-Id: <20230601021605.2823123-9-Liam.Howlett@oracle.com>
In-Reply-To: <20230601021605.2823123-1-Liam.Howlett@oracle.com>
References: <20230601021605.2823123-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YkSzHga2t4SJ4OpmT4ZJ56jUij1OUXHlAR4Wmo6sooAqQq1Mgv9lnFk+Gg4Q?=
 =?us-ascii?Q?EABD8zdvCsZNEXZwBa2TvE3h50dQGLYscAB6wEHij7hL84lxHQIJZzlbcU+4?=
 =?us-ascii?Q?gt9ktIP3sAv9EKwg7SiEdEHmhxXMuKlZk19clnS1i3DlN1aanGhxR3q1eSBV?=
 =?us-ascii?Q?JkjJFitFaekYt+O4KDnJlSBPUqyGL2V4a0Lg89zcBI6YGdzu8dKtvbk8HIzK?=
 =?us-ascii?Q?LK5nqYsCpOgbUDJMtad1o0ch76XlarknGmdNa3DzHyxl39g7hx7ufH9238+H?=
 =?us-ascii?Q?HKMXaAFkH8kg+FBVtKh+zg0SCbVFjyvO/eoirF33T9rVyiN5sin5BzHl9J9B?=
 =?us-ascii?Q?obMhkQuhabKw9/MWTj0YORLh1qEM0tSw5f/kITZ7fPgrw8UH7nT4vX9Utvq7?=
 =?us-ascii?Q?gb3M5JJ2jYTnUZ4kw3luVE3NS0IYLV5+JcK6u3SmFCUnmjbDNxIeqeFC2/cv?=
 =?us-ascii?Q?Q5O/Jy1UNrHxlAu0YPe2xPhr22ZekySi9Ew6Q2iX2SHP9jS2WaQ440fTD85z?=
 =?us-ascii?Q?y6LFlPUKXB8GvYn0XHT7rE8p9YNPG2pA5z9eGrZNvnLs62eu/0Wksyjci7RE?=
 =?us-ascii?Q?opFGAa7RSnmcgA8XcnxbWjAmepTMfnUJE783Pw4hkZ9LvduQPrQLm9Eq0AIs?=
 =?us-ascii?Q?3tXJikqFmRJUXH/AzJLbGDn4K9+Vr1me8ku+5HR7p8YFL4O5ax+HJ+Mo5d6c?=
 =?us-ascii?Q?Az++pVnmln2lA5yWsJwn/vLjUulzJcpYA2OQ64bBSt3AfYW3XuEY+uF1t7UO?=
 =?us-ascii?Q?lb8NmwHepyvGM9o3utlEujquwYJNMq5/eQV0VUHt+rPzyQMs87CThRxqcURF?=
 =?us-ascii?Q?JMMPecBi9fKxw+6P1x/q0230LzcxlYL9ZuSFXa7tbLB7UvIlrHRSUB2W15lw?=
 =?us-ascii?Q?qoqWRy0YsHvktElk5cvf8kvJr+kPPz57UJ4jfHLA+JDw6EeWOax0+pCM9J9g?=
 =?us-ascii?Q?L2U8TWTcz2IipdHbKElnsxZIl99PUJ/1GnXwty9WUuhCRKk4+HS4Kj4k8zIz?=
 =?us-ascii?Q?NlVYG2mA6LgIJZQ4t2rjgJLoHx8/OWxMVPZriZvHJsHHwT39uURcnlwWbShq?=
 =?us-ascii?Q?5M8J1BLlyr2V94FZPOfjEct/tUqaiyksmvXq+djKwqY/8WJGgKWxO99R63Sx?=
 =?us-ascii?Q?Pi9LcMhzR4A0pjJ8HC6ag2SvrZrSbX9nv0LZ+TLs4iFwvinlh34qnoJUhe1Y?=
 =?us-ascii?Q?KQVKvT1kWt/PqaRFZXrYghejqVRAU/88D5zzvxNGcMAzrsO5IQb3H+IsetBB?=
 =?us-ascii?Q?QpqqaX+GgNtxvWyeUjH6Of5rhXZdU91W0H7k5sE7LKOtS8P9v7wfTzAC209E?=
 =?us-ascii?Q?SxdzzMe6BiNEYVNFn8Lhsa8zN6FNVf72pRoWKSdbT9vQrcPJk5FbBc8yMV+q?=
 =?us-ascii?Q?GQysRm5gqu7Qwppe8a28rR08I1OYwB0E1KBBCYAGGKcDYhkdmL6J4FqdNkts?=
 =?us-ascii?Q?AmC8gZsjmj2fkMpSoAhxvm7hwrTxGnQIpGZT1MnYmoiftt1iPSNAz2/Cn4gn?=
 =?us-ascii?Q?QhyWHdz8GCJvsZJz2v2yTtwhwStTsJDbF6jXsrhlj5c6NlhPSc/owGNHp+mX?=
 =?us-ascii?Q?NsOe09N/zTfSPr/uYoAP6DxxeC4y6ltZgb2h5A0tdsnPq4xKO/of/oS5ZKZM?=
 =?us-ascii?Q?nQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Yv7rRJvAVR5VBEwp7FG4jeoHKKkSbI/MuAkBEh4TUvk4tjN8cCPUqmvnc5/8yqUWPfIjZcBQkuyw0YdAeSRjVFf1lAFt4uELBCCfBDPuOiEVxDiUevJb2OUGhGeKKz5WJ1HS2jKdkPSb7eAADhpNu9JV4vPCfRjqArlN2kDeuNrNlK0j3zTuHsrrqULklgP33EUMyygoLAm2BgyQ2u1dIxEjx97Cm34wCxrBi4WsUXBHsESY2hoNitvvc3/qhEY/BCd+c4pi0sIQ+PXB+iuBCjkHilITs1PIkZftJNR9cSw6WOjgsgQ1XyX8xxmmzrVXh8vw6Ft++KBttkW4/QF4G7NuEqHtcU6IC4CjqOwuegW4pzdMZYEwQNFynbKDIKVyI3aX2lQoUcDIiFcfRogKs00DQbHlCLtWFn6fANb1K22uoMlsPgZiYpVc16CwjAAlDkJA50MQTlJ+owiYG69sjEifdjCON5BSRMTWyaVLHhPz2wbikCmjn+Mb/vrYgVY0WJ/unERQJ4SRMwxKihJ4FRyQM+rM1cK5AVkspSH2ngSPxkwPlZ4XP3uUJCIz+SODVz9JfxGA7icMEkSvWV24tzxGGn0MH6ZPSF18NFlE9kV7tQWlXIyQFdLah85swV5lGFYc9meMtYSX9t3B5nqXNsALUMNFSRyNbPUpJ6xv2MrH7DHoQ1dhfui5ZFMLHaji5hv+F0ZmE0og0H0BvfgnWFPSI8mYMvDv/G7ueJispE7edyLlH9vPquEN4O9+UMekVi7BUkwLUIymzSptqOUIUE7bkIel/hnB1J9K9URGP2gPzkyCERfXRph8DcjDKJYx5LtHnAw7lTI3Th9AVhJ476w0pkrFEjiMAPEbmrqRXPcA+lGg33yi407Wm+MQDaBuOHPCM8uW+4N5JcxpBcVWww==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cec4d59d-3a1e-42a1-6281-08db62463a0c
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2023 02:16:36.5299
 (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: y63BrENuFU4Mvevt5h77JMyodALECCUgqZdEMgaeHTGeWy4p6VzBmwHZWP2GzDKNcXqiu3Uby3OiPBu03+ohqw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4687
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-05-31_18,2023-05-31_03,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 spamscore=0
 phishscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000
 definitions=main-2306010016
X-Proofpoint-ORIG-GUID: DIFzhmCDkco2r01SE62ZRXspyZbAP9cn
X-Proofpoint-GUID: DIFzhmCDkco2r01SE62ZRXspyZbAP9cn
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The current preallocation strategy is to preallocate the absolute
worst-case allocation for a tree modification.  The entry (or NULL) is
needed to know how many nodes are needed to write to the tree.  Start by
adding the argument to the mas_preallocate() definition.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 include/linux/maple_tree.h       |  2 +-
 lib/maple_tree.c                 |  3 ++-
 mm/internal.h                    |  2 +-
 mm/mmap.c                        |  4 ++--
 tools/testing/radix-tree/maple.c | 32 ++++++++++++++++----------------
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h
index ed50d8f459e6..e18ecbefc7f7 100644
--- a/include/linux/maple_tree.h
+++ b/include/linux/maple_tree.h
@@ -458,7 +458,7 @@ void *mas_find(struct ma_state *mas, unsigned long max);
 void *mas_find_range(struct ma_state *mas, unsigned long max);
 void *mas_find_rev(struct ma_state *mas, unsigned long min);
 void *mas_find_range_rev(struct ma_state *mas, unsigned long max);
-int mas_preallocate(struct ma_state *mas, gfp_t gfp);
+int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp);
 bool mas_is_err(struct ma_state *mas);
 
 bool mas_nomem(struct ma_state *mas, gfp_t gfp);
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index bfffbb7cab26..34eccddb0b47 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5535,11 +5535,12 @@ EXPORT_SYMBOL_GPL(mas_store_prealloc);
 /**
  * mas_preallocate() - Preallocate enough nodes for a store operation
  * @mas: The maple state
+ * @entry: The entry that will be stored
  * @gfp: The GFP_FLAGS to use for allocations.
  *
  * Return: 0 on success, -ENOMEM if memory could not be allocated.
  */
-int mas_preallocate(struct ma_state *mas, gfp_t gfp)
+int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)
 {
 	int ret;
 
diff --git a/mm/internal.h b/mm/internal.h
index cdf06f680d6e..2691deca9699 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1047,7 +1047,7 @@ static inline void vma_iter_config(struct vma_iterator *vmi,
  */
 static inline int vma_iter_prealloc(struct vma_iterator *vmi)
 {
-	return mas_preallocate(&vmi->mas, GFP_KERNEL);
+	return mas_preallocate(&vmi->mas, NULL, GFP_KERNEL);
 }
 
 static inline void vma_iter_clear(struct vma_iterator *vmi,
diff --git a/mm/mmap.c b/mm/mmap.c
index 8b3e58d6ac40..75b2a86e1faa 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1982,7 +1982,7 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
 		/* Check that both stack segments have the same anon_vma? */
 	}
 
-	if (mas_preallocate(&mas, GFP_KERNEL))
+	if (mas_preallocate(&mas, vma, GFP_KERNEL))
 		return -ENOMEM;
 
 	/* We must make sure the anon_vma is allocated. */
@@ -2064,7 +2064,7 @@ int expand_downwards(struct vm_area_struct *vma, unsigned long address)
 			return -ENOMEM;
 	}
 
-	if (mas_preallocate(&mas, GFP_KERNEL))
+	if (mas_preallocate(&mas, vma, GFP_KERNEL))
 		return -ENOMEM;
 
 	/* We must make sure the anon_vma is allocated. */
diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
index 03539d86cdf0..cfadc4b75d51 100644
--- a/tools/testing/radix-tree/maple.c
+++ b/tools/testing/radix-tree/maple.c
@@ -35383,7 +35383,7 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	for (i = 0; i <= max; i++)
 		mtree_test_store_range(mt, i * 10, i * 10 + 5, &i);
 
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated == 0);
@@ -35392,18 +35392,18 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	allocated = mas_allocated(&mas);
 	MT_BUG_ON(mt, allocated != 0);
 
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated == 0);
 	MT_BUG_ON(mt, allocated != 1 + height * 3);
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	mas_destroy(&mas);
 	allocated = mas_allocated(&mas);
 	MT_BUG_ON(mt, allocated != 0);
 
 
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated == 0);
@@ -35412,26 +35412,26 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1);
 	mn->parent = ma_parent_ptr(mn);
 	ma_free_rcu(mn);
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	mas_destroy(&mas);
 	allocated = mas_allocated(&mas);
 	MT_BUG_ON(mt, allocated != 0);
 
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated == 0);
 	MT_BUG_ON(mt, allocated != 1 + height * 3);
 	mn = mas_pop_node(&mas);
 	MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1);
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	mas_destroy(&mas);
 	allocated = mas_allocated(&mas);
 	MT_BUG_ON(mt, allocated != 0);
 	mn->parent = ma_parent_ptr(mn);
 	ma_free_rcu(mn);
 
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated == 0);
@@ -35440,12 +35440,12 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1);
 	mas_push_node(&mas, mn);
 	MT_BUG_ON(mt, mas_allocated(&mas) != allocated);
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	mas_destroy(&mas);
 	allocated = mas_allocated(&mas);
 	MT_BUG_ON(mt, allocated != 0);
 
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated == 0);
@@ -35453,21 +35453,21 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	mas_store_prealloc(&mas, ptr);
 	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
 
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated == 0);
 	MT_BUG_ON(mt, allocated != 1 + height * 3);
 	mas_store_prealloc(&mas, ptr);
 	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated == 0);
 	MT_BUG_ON(mt, allocated != 1 + height * 3);
 	mas_store_prealloc(&mas, ptr);
 
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated == 0);
@@ -35475,14 +35475,14 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	mas_store_prealloc(&mas, ptr);
 	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
 	mt_set_non_kernel(1);
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL & GFP_NOWAIT) == 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL & GFP_NOWAIT) == 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated != 0);
 	mas_destroy(&mas);
 
 
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated == 0);
@@ -35490,7 +35490,7 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	mas_store_prealloc(&mas, ptr);
 	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
 	mt_set_non_kernel(1);
-	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL & GFP_NOWAIT) == 0);
+	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL & GFP_NOWAIT) == 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
 	MT_BUG_ON(mt, allocated != 0);
-- 
2.39.2