maple_tree-add-a-test-checking-storing-null.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: add a test checking storing null
has been removed from the -mm tree. Its filename was
maple_tree-add-a-test-checking-storing-null.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Wei Yang <[email protected]>
Subject: maple_tree: add a test checking storing null
Date: Thu, 31 Oct 2024 23:16:27 +0000
Add a test to assert that, when storing null to am empty tree or a single entry tree it will not result into:
* a root node with range [0, ULONG_MAX] set to NULL
* a root node with consecutive slot set to NULL
---
lib/test_maple_tree.c | 90 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)
lib/test_maple_tree.c renamed from lib/test_maple_tree.c~maple_tree-add-a-test-checking-storing-null +90 -0
@@ -1387,6 +1387,92 @@ static noinline void __init check_prev_emas_unlock (&mas); } +static noinline void __init check_store_null(struct maple_tree *mt) +{ +MA_STATE (mas, mt,0 ,ULONG_MAX ); + +/* +* Store NULL at range [0, ULONG_MAX] to an empty tree should result +* in an empty tree +*/ +mt_init_flags (mt,MT_FLAGS_ALLOC_RANGE ); +mas_lock (&mas); +mas_store_gfp (&mas,NULL ,GFP_KERNEL ); +MT_BUG_ON (mt, !mtree_empty (mt)); +mas_unlock (&mas); +mtree_destroy (mt); + +/* +* Store NULL at any range to an empty tree should result in an empty +* tree +*/ +mt_init_flags (mt,MT_FLAGS_ALLOC_RANGE ); +mas_lock (&mas); +mas_set_range (&mas,3 ,10 ); +mas_store_gfp (&mas,NULL ,GFP_KERNEL ); +MT_BUG_ON (mt, !mtree_empty (mt)); +mas_unlock (&mas); +mtree_destroy (mt); + +/* +* Store NULL at range [0, ULONG_MAX] to a single entry tree should +* result in an empty tree +*/ +mt_init_flags (mt,MT_FLAGS_ALLOC_RANGE ); +mas_lock (&mas); +mas_set (&mas,0 ); +mas_store_gfp (&mas, &mas,GFP_KERNEL ); +mas_set_range (&mas,0 ,ULONG_MAX ); +mas_store_gfp (&mas,NULL ,GFP_KERNEL ); +MT_BUG_ON (mt, !mtree_empty (mt)); +mas_unlock (&mas); +mtree_destroy (mt); + +/* +* Store NULL at range [0, n] to a single entry tree should +* result in an empty tree +*/ +mt_init_flags (mt,MT_FLAGS_ALLOC_RANGE ); +mas_lock (&mas); +mas_set (&mas,0 ); +mas_store_gfp (&mas, &mas,GFP_KERNEL ); +mas_set_range (&mas,0 ,5 ); +mas_store_gfp (&mas,NULL ,GFP_KERNEL ); +MT_BUG_ON (mt, !mtree_empty (mt)); +mas_unlock (&mas); +mtree_destroy (mt); + +/* +* Store NULL at range [m, n] where m > 0 to a single entry tree +* should still be a single entry tree +*/ +mt_init_flags (mt,MT_FLAGS_ALLOC_RANGE ); +mas_lock (&mas); +mas_set (&mas,0 ); +mas_store_gfp (&mas, &mas,GFP_KERNEL ); +mas_set_range (&mas,2 ,5 ); +mas_store_gfp (&mas,NULL ,GFP_KERNEL ); +MT_BUG_ON (mt,mtree_empty (mt)); +// MT_BUG_ON(mt, xa_is_node(mas_root(&mas))); +mas_unlock (&mas); +mtree_destroy (mt); + +/* +* Store NULL at range [0, ULONG_MAX] to a tree with node should +* result in an empty tree +*/ +mt_init_flags (mt,MT_FLAGS_ALLOC_RANGE ); +mas_lock (&mas); +mas_set_range (&mas,1 ,3 ); +mas_store_gfp (&mas, &mas,GFP_KERNEL ); +// MT_BUG_ON(mt, !xa_is_node(mas_root(&mas))); +mas_set_range (&mas,0 ,ULONG_MAX ); +mas_store_gfp (&mas,NULL ,GFP_KERNEL ); +MT_BUG_ON (mt, !mtree_empty (mt)); +mas_unlock (&mas); +mtree_destroy (mt); +} + static noinline void __init check_root_expand(struct maple_tree *mt) {MA_STATE (mas, mt,0 ,0 );
@@ -3711,6 +3797,10 @@ static int __init maple_tree_seed(void)#endif mt_init_flags (&tree,MT_FLAGS_ALLOC_RANGE ); +check_store_null (&tree); +mtree_destroy (&tree); + +mt_init_flags (&tree,MT_FLAGS_ALLOC_RANGE );check_root_expand (&tree);mtree_destroy (&tree);
_
Patches currently in -mm which might be from [email protected] are