maple_tree: check for MA_STATE_BULK on setting wr_rebalance
Subsystems (4)
PATCH 1/2 maple_tree: check for MA_STATE_BULK on setting wr_rebalance
It is possible for a bulk operation (MA_STATE_BULK is set) to enter the new_end < mt_min_slots[type] case and set wr_rebalance as a store type. This is incorrect as bulk stores do not rebalance per write, but rather after the all of the writes are done through the mas_bulk_rebalance() path. Therefore, add a check to make sure MA_STATE_BULK is not set before we return wr_rebalance as the store type.
Also add a test to make sure wr_rebalance is never the store type when doing bulk operations via mas_expected_entries()
---
Hi Andrew, this commit is a hotfix for this rc however it has no userspace effects as there are no users of the bulk instertion mode.
lib/maple_tree.c | 2 +- tools/testing/radix-tree/maple.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-)
lib/maple_tree.c +1 -1
@@ -4228,7 +4228,7 @@ static inline void mas_wr_store_type(struct ma_wr_state *wr_mas)/* Potential spanning rebalance collapsing a node */ if (new_end < mt_min_slots[wr_mas->type]) { -if (!mte_is_root (mas->node)) { +if (!mte_is_root (mas->node) && !(mas->mas_flags &MA_STATE_BULK )) { mas->store_type = wr_rebalance;return ; }
tools/testing/radix-tree/maple.c +26 -0
@@ -36317,6 +36317,28 @@ static inline int check_vma_modification(struct maple_tree *mt)return 0 ; } +/* +* test to check that bulk stores do not use wr_rebalance as the store +* type. +*/ +static inline void check_bulk_rebalance (struct maple_tree *mt) +{ +MA_STATE (mas, mt,ULONG_MAX ,ULONG_MAX ); +int max =10 ; + +build_full_tree (mt,0 ,2 ); + +/* erase every entry in the tree */ +do { +/* set up bulk store mode */ +mas_expected_entries (&mas, max); +mas_erase (&mas); +MT_BUG_ON (mt, mas.store_type == wr_rebalance); + }while (mas_prev (&mas,0 ) !=NULL ); + +mas_destroy (&mas); +} +void farmer_tests (void ) {struct maple_node *node;
@@ -36328,6 +36350,10 @@ void farmer_tests(void)check_vma_modification (&tree);mtree_destroy (&tree); +mt_init (&tree); +check_bulk_rebalance (&tree); +mtree_destroy (&tree); + tree.ma_root =xa_mk_value (0 );mt_dump (&tree, mt_dump_dec);
Signature · 1 line
2.43.0
PATCH 2/2 maple_tree: refactor mas_wr_store_type()
In mas_wr_store_type(), we check if new_end < mt_slots[wr_mas->type]. If this check fails, we know that ,after this, new_end is >= mt_min_slots. Checking this again when we detect a wr_node_store later in the function is reduntant. Because this check is part of an OR statement, the statement will always evaluate to true, therefore we can just get rid of it.
We also refactor mas_wr_store_type() to return the store type rather than set it directly as it greatly cleans up the function.
---
Hi Andrew, could you please drop
"maple_tree: remove conditionals to detect wr_node_store" in mm-unstable before applying this patch
lib/maple_tree.c | 72 +++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 47 deletions(-)
lib/maple_tree.c +25 -47
@@ -4191,24 +4191,22 @@ static inline int mas_prealloc_calc(struct ma_state *mas, void *entry) }/* -* mas_wr_store_type() - Set the store type for a given +* mas_wr_store_type() - Determine the store type for a given * store operation. * @wr_mas: The maple write state +* +* Return: the type of store needed for the operation */ -static inline void mas_wr_store_type (struct ma_wr_state *wr_mas) +static inline enum store_type mas_wr_store_type (struct ma_wr_state *wr_mas) {struct ma_state *mas = wr_mas->mas;unsigned char new_end; -if (unlikely (mas_is_none (mas) ||mas_is_ptr (mas))) { - mas->store_type = wr_store_root; -return ; - } +if (unlikely (mas_is_none (mas) ||mas_is_ptr (mas))) +return wr_store_root; -if (unlikely (!mas_wr_walk (wr_mas))) { - mas->store_type = wr_spanning_store; -return ; - } +if (unlikely (!mas_wr_walk (wr_mas))) +return wr_spanning_store;/* At this point, we are at the leaf node that needs to be altered. */ mas_wr_end_piv (wr_mas);
@@ -4216,50 +4214,30 @@ static inline void mas_wr_store_type(struct ma_wr_state *wr_mas)mas_wr_extend_null (wr_mas); new_end =mas_wr_new_end (wr_mas); -if ((wr_mas->r_min == mas->index) && (wr_mas->r_max == mas->last)) { - mas->store_type = wr_exact_fit; -return ; - } +if ((wr_mas->r_min == mas->index) && (wr_mas->r_max == mas->last)) +return wr_exact_fit; -if (unlikely (!mas->index && mas->last ==ULONG_MAX )) { - mas->store_type = wr_new_root; -return ; - } +if (unlikely (!mas->index && mas->last ==ULONG_MAX )) +return wr_new_root;/* Potential spanning rebalance collapsing a node */ if (new_end < mt_min_slots[wr_mas->type]) { -if (!mte_is_root (mas->node) && !(mas->mas_flags &MA_STATE_BULK )) { - mas->store_type = wr_rebalance; -return ; - } - mas->store_type = wr_node_store; -return ; +if (!mte_is_root (mas->node) && !(mas->mas_flags &MA_STATE_BULK )) +return wr_rebalance; +return wr_node_store; } -if (new_end >= mt_slots[wr_mas->type]) { - mas->store_type = wr_split_store; -return ; - } +if (new_end >= mt_slots[wr_mas->type]) +return wr_split_store; -if (!mt_in_rcu (mas->tree) && (mas->offset == mas->end)) { - mas->store_type = wr_append; -return ; - } +if (!mt_in_rcu (mas->tree) && (mas->offset == mas->end)) +return wr_append;if ((new_end == mas->end) && (!mt_in_rcu (mas->tree) || - (wr_mas->offset_end - mas->offset ==1 ))) { - mas->store_type = wr_slot_store; -return ; - } - -if (mte_is_root (mas->node) || (new_end >= mt_min_slots[wr_mas->type]) || - (mas->mas_flags &MA_STATE_BULK )) { - mas->store_type = wr_node_store; -return ; - } + (wr_mas->offset_end - mas->offset ==1 ))) +return wr_slot_store; - mas->store_type = wr_invalid; -MAS_WARN_ON (mas,1 ); +return wr_node_store; }/**
@@ -4274,7 +4252,7 @@ static inline void mas_wr_preallocate(struct ma_wr_state *wr_mas, void *entry)int request;mas_wr_prealloc_setup (wr_mas); -mas_wr_store_type (wr_mas); + mas->store_type =mas_wr_store_type (wr_mas); request =mas_prealloc_calc (mas, entry);if (!request)return ;
@@ -5446,7 +5424,7 @@ void *mas_store(struct ma_state *mas, void *entry)* overwrite multiple entries within a self-balancing B-Tree. */ mas_wr_prealloc_setup (&wr_mas); -mas_wr_store_type (&wr_mas); + mas->store_type =mas_wr_store_type (&wr_mas);if (mas->mas_flags &MA_STATE_PREALLOC ) {mas_wr_store_entry (&wr_mas);MAS_WR_BUG_ON (&wr_mas,mas_is_err (mas));
@@ -5549,7 +5527,7 @@ int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)int request;mas_wr_prealloc_setup (&wr_mas); -mas_wr_store_type (&wr_mas); + mas->store_type =mas_wr_store_type (&wr_mas); request =mas_prealloc_calc (mas, entry);if (!request)return ret;
Signature · 1 line
2.43.0
Re: [PATCH 2/2] maple_tree: refactor mas_wr_store_type()
Quoted 6 lines · Sidhartha Kumar
In
mas_wr_store_type(), we check ifnew_end< mt_slots[wr_mas->type]. If this check fails, we know that ,after this,new_endis >=mt_min_slots. Checking this again when we detect awr_node_storelater in the function is reduntant. Because this check is part of an OR statement, the statement will always evaluate to true, therefore we can just get rid of it.
Quoted 6 lines
We also refactor
mas_wr_store_type()to return the store type rather than set it directly as it greatly cleans up the function.Suggested-by Liam Howlett <[email protected]>Suggested-by Wei Yang <[email protected]>Signed-off-by Sidhartha <[email protected]>
Signature · 2 lines
Wei Yang Help you, Help me
Re: [PATCH 2/2] maple_tree: refactor mas_wr_store_type()
In reply to Sidhartha KumarQuoted 6 lines · Sidhartha Kumar
In
mas_wr_store_type(), we check ifnew_end< mt_slots[wr_mas->type]. If this check fails, we know that ,after this,new_endis >=mt_min_slots. Checking this again when we detect awr_node_storelater in the function is reduntant. Because this check is part of an OR statement, the statement will always evaluate to true, therefore we can just get rid of it.
Quoted 6 lines
We also refactor
mas_wr_store_type()to return the store type rather than set it directly as it greatly cleans up the function.Suggested-by Liam Howlett <[email protected]>Suggested-by Wei Yang <[email protected]>Signed-off-by Sidhartha <[email protected]>
Quoted 141 lines
---
Hi Andrew, could you please drop
"maple_tree: remove conditionals to detectwr_node_store" in mm-unstable before applying this patchlib/maple_tree.c | 72 +++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 47 deletions(-)lib/maple_tree.c +25
-47@@ -4191,24 +4191,22 @@ static inline int mas_prealloc_calc(struct ma_state *mas, void *entry) }/* -* mas_wr_store_type() - Set the store type for a given +* mas_wr_store_type() - Determine the store type for a given * store operation. * @wr_mas: The maple write state +* +* Return: the type of store needed for the operation */ -static inline void mas_wr_store_type (struct ma_wr_state *wr_mas) +static inline enum store_type mas_wr_store_type (struct ma_wr_state *wr_mas) {struct ma_state *mas = wr_mas->mas;unsigned char new_end; -if (unlikely (mas_is_none (mas) ||mas_is_ptr (mas))) { - mas->store_type = wr_store_root; -return ; - } +if (unlikely (mas_is_none (mas) ||mas_is_ptr (mas))) +return wr_store_root; -if (unlikely (!mas_wr_walk (wr_mas))) { - mas->store_type = wr_spanning_store; -return ; - } +if (unlikely (!mas_wr_walk (wr_mas))) +return wr_spanning_store;/* At this point, we are at the leaf node that needs to be altered. */ mas_wr_end_piv (wr_mas);@@ -4216,50 +4214,30 @@ static inline void mas_wr_store_type(struct ma_wr_state *wr_mas)mas_wr_extend_null (wr_mas); new_end =mas_wr_new_end (wr_mas); -if ((wr_mas->r_min == mas->index) && (wr_mas->r_max == mas->last)) { - mas->store_type = wr_exact_fit; -return ; - } +if ((wr_mas->r_min == mas->index) && (wr_mas->r_max == mas->last)) +return wr_exact_fit; -if (unlikely (!mas->index && mas->last ==ULONG_MAX )) { - mas->store_type = wr_new_root; -return ; - } +if (unlikely (!mas->index && mas->last ==ULONG_MAX )) +return wr_new_root;/* Potential spanning rebalance collapsing a node */ if (new_end < mt_min_slots[wr_mas->type]) { -if (!mte_is_root (mas->node) && !(mas->mas_flags &MA_STATE_BULK )) { - mas->store_type = wr_rebalance; -return ; - } - mas->store_type = wr_node_store; -return ; +if (!mte_is_root (mas->node) && !(mas->mas_flags &MA_STATE_BULK )) +return wr_rebalance; +return wr_node_store; } -if (new_end >= mt_slots[wr_mas->type]) { - mas->store_type = wr_split_store; -return ; - } +if (new_end >= mt_slots[wr_mas->type]) +return wr_split_store; -if (!mt_in_rcu (mas->tree) && (mas->offset == mas->end)) { - mas->store_type = wr_append; -return ; - } +if (!mt_in_rcu (mas->tree) && (mas->offset == mas->end)) +return wr_append;if ((new_end == mas->end) && (!mt_in_rcu (mas->tree) || - (wr_mas->offset_end - mas->offset ==1 ))) { - mas->store_type = wr_slot_store; -return ; - } - -if (mte_is_root (mas->node) || (new_end >= mt_min_slots[wr_mas->type]) || - (mas->mas_flags &MA_STATE_BULK )) { - mas->store_type = wr_node_store; -return ; - } + (wr_mas->offset_end - mas->offset ==1 ))) +return wr_slot_store; - mas->store_type = wr_invalid; -MAS_WARN_ON (mas,1 ); +return wr_node_store; }/** @@ -4274,7 +4252,7 @@ static inline void mas_wr_preallocate(struct ma_wr_state *wr_mas, void *entry)int request;mas_wr_prealloc_setup (wr_mas); -mas_wr_store_type (wr_mas); + mas->store_type =mas_wr_store_type (wr_mas); request =mas_prealloc_calc (mas, entry);if (!request)return ;@@ -5446,7 +5424,7 @@ void *mas_store(struct ma_state *mas, void *entry)* overwrite multiple entries within a self-balancing B-Tree. */ mas_wr_prealloc_setup (&wr_mas); -mas_wr_store_type (&wr_mas); + mas->store_type =mas_wr_store_type (&wr_mas);if (mas->mas_flags &MA_STATE_PREALLOC ) {mas_wr_store_entry (&wr_mas);MAS_WR_BUG_ON (&wr_mas,mas_is_err (mas));@@ -5549,7 +5527,7 @@ int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)int request;mas_wr_prealloc_setup (&wr_mas); -mas_wr_store_type (&wr_mas); + mas->store_type =mas_wr_store_type (&wr_mas); request =mas_prealloc_calc (mas, entry);if (!request)return ret;Signature · 1 line
2.43.0
Quoted 7 lines · Sidhartha Kumar
It is possible for a bulk operation (
MA_STATE_BULKis set) to enter thenew_end< mt_min_slots[type] case and setwr_rebalanceas a store type. This is incorrect as bulk stores do not rebalance per write, but rather after the all of the writes are done through themas_bulk_rebalance()path. Therefore, add a check to make sureMA_STATE_BULKis not set before we returnwr_rebalanceas the store type.
Quoted 6 lines
Also add a test to make sure
wr_rebalanceis never the store type when doing bulk operations viamas_expected_entries()Fixes 5d659bbb52a2 ("maple_tree: introduce mas_wr_store_type()")Suggested-by Liam Howlett <[email protected]>Signed-off-by Sidhartha <[email protected]>
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 7 lines · Sidhartha Kumar
It is possible for a bulk operation (
MA_STATE_BULKis set) to enter thenew_end< mt_min_slots[type] case and setwr_rebalanceas a store type. This is incorrect as bulk stores do not rebalance per write, but rather after the all of the writes are done through themas_bulk_rebalance()path. Therefore, add a check to make sureMA_STATE_BULKis not set before we returnwr_rebalanceas the store type.
Quoted 6 lines
Also add a test to make sure
wr_rebalanceis never the store type when doing bulk operations viamas_expected_entries()Fixes 5d659bbb52a2 ("maple_tree: introduce mas_wr_store_type()")Suggested-by Liam Howlett <[email protected]>Signed-off-by Sidhartha <[email protected]>
Quoted 69 lines
---
Hi Andrew, this commit is a hotfix for this rc however it has no userspace effects as there are no users of the bulk instertion mode.
lib/maple_tree.c | 2 +- tools/testing/radix-tree/maple.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-)lib/maple_tree.c +1
-1@@ -4228,7 +4228,7 @@ static inline void mas_wr_store_type(struct ma_wr_state *wr_mas)/* Potential spanning rebalance collapsing a node */ if (new_end < mt_min_slots[wr_mas->type]) { -if (!mte_is_root (mas->node)) { +if (!mte_is_root (mas->node) && !(mas->mas_flags &MA_STATE_BULK )) { mas->store_type = wr_rebalance;return ; }tools/testing/radix-tree/maple.c +26
-0@@ -36317,6 +36317,28 @@ static inline int check_vma_modification(struct maple_tree *mt)return 0 ; } +/* +* test to check that bulk stores do not use wr_rebalance as the store +* type. +*/ +static inline void check_bulk_rebalance (struct maple_tree *mt) +{ +MA_STATE (mas, mt,ULONG_MAX ,ULONG_MAX ); +int max =10 ; + +build_full_tree (mt,0 ,2 ); + +/* erase every entry in the tree */ +do { +/* set up bulk store mode */ +mas_expected_entries (&mas, max); +mas_erase (&mas); +MT_BUG_ON (mt, mas.store_type == wr_rebalance); + }while (mas_prev (&mas,0 ) !=NULL ); + +mas_destroy (&mas); +} +void farmer_tests (void ) {struct maple_node *node;@@ -36328,6 +36350,10 @@ void farmer_tests(void)check_vma_modification (&tree);mtree_destroy (&tree); +mt_init (&tree); +check_bulk_rebalance (&tree); +mtree_destroy (&tree); + tree.ma_root =xa_mk_value (0 );mt_dump (&tree, mt_dump_dec);Signature · 1 line
2.43.0