maple_tree-update-mas_preallocate-testing.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: update mas_preallocate() testing
has been removed from the -mm tree. Its filename was
maple_tree-update-mas_preallocate-testing.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: "Liam R. Howlett" <[email protected]>
Subject: maple_tree: update mas_preallocate() testing
Date: Mon, 24 Jul 2023 14:31:54 -0400
Since the mas_preallocate() calculation has been updated to be more precise, the testing must also be updated to check for what is expected.
---
tools/testing/radix-tree/maple.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
tools/testing/radix-tree/maple.c renamed from tools/testing/radix-tree/maple.c~maple_tree-update-mas_preallocate-testing +16 -11
@@ -35458,6 +35458,8 @@ static noinline void __init check_preallfor (i =0 ; i <= max; i++)mtree_test_store_range (mt, i *10 , i *10 +5 , &i); +/* Spanning store */ +mas_set_range (&mas,470 ,500 );MT_BUG_ON (mt,mas_preallocate (&mas, ptr,GFP_KERNEL ) !=0 ); allocated =mas_allocated (&mas); height =mas_mt_height (&mas);
@@ -35481,7 +35483,6 @@ static noinline void __init check_preallMT_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 );
@@ -35495,7 +35496,6 @@ static noinline void __init check_preallMT_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 );
@@ -35509,7 +35509,6 @@ static noinline void __init check_preallMT_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 );
@@ -35523,33 +35522,37 @@ static noinline void __init check_preallMT_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 ); +/* Slot store does not need allocations */ +mas_set_range (&mas,6 ,9 );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, allocated !=0 );mas_store_prealloc (&mas, ptr);MT_BUG_ON (mt,mas_allocated (&mas) !=0 ); + +mas_set_range (&mas,6 ,10 );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, allocated !=1 );mas_store_prealloc (&mas, ptr); +MT_BUG_ON (mt,mas_allocated (&mas) !=0 ); +/* Split */ +mas_set_range (&mas,54 ,54 );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, allocated !=1 + height *2 );mas_store_prealloc (&mas, ptr);MT_BUG_ON (mt,mas_allocated (&mas) !=0 );mt_set_non_kernel (1 ); +/* Spanning store */ +mas_set_range (&mas,1 ,100 );MT_BUG_ON (mt,mas_preallocate (&mas, ptr,GFP_KERNEL &GFP_NOWAIT ) ==0 ); allocated =mas_allocated (&mas); height =mas_mt_height (&mas);
@@ -35557,6 +35560,7 @@ static noinline void __init check_preallmas_destroy (&mas); +/* Spanning store */ MT_BUG_ON (mt,mas_preallocate (&mas, ptr,GFP_KERNEL ) !=0 ); allocated =mas_allocated (&mas); height =mas_mt_height (&mas);
@@ -35564,6 +35568,7 @@ static noinline void __init check_preallMT_BUG_ON (mt, allocated !=1 + height *3 );mas_store_prealloc (&mas, ptr);MT_BUG_ON (mt,mas_allocated (&mas) !=0 ); +mas_set_range (&mas,0 ,200 );mt_set_non_kernel (1 );MT_BUG_ON (mt,mas_preallocate (&mas, ptr,GFP_KERNEL &GFP_NOWAIT ) ==0 ); allocated =mas_allocated (&mas);
_
Patches currently in -mm which might be from [email protected] are
maple_tree-add-hex-output-to-maple_arange64-dump.patch maple_tree-reorder-replacement-of-nodes-to-avoid-live-lock.patch maple_tree-introduce-mas_put_in_tree.patch maple_tree-introduce-mas_tree_parent-definition.patch maple_tree-change-mas_adopt_children-parent-usage.patch maple_tree-replace-data-before-marking-dead-in-split-and-spanning-store.patch