* [PATCH Fix] maple_tree: Use metadata for mas_dead_leaves() walk
@ 2022-07-12 14:53 Liam Howlett
2022-07-12 15:38 ` Liam Howlett
0 siblings, 1 reply; 3+ messages in thread
From: Liam Howlett @ 2022-07-12 14:53 UTC (permalink / raw)
To: maple-tree, linux-mm, linux-kernel, Andrew Morton
When walking the dead leaves, use the nodes metadata for the end of the
node. This avoids needing to use tricks for BE/LE unions.
Fixes: d0aac5e48048 (Maple Tree: add new data structure)
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
lib/maple_tree.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 14e9ab14c1da..c661fda37665 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5390,15 +5390,12 @@ unsigned char mas_dead_leaves(struct ma_state *mas, void __rcu **slots)
enum maple_type type;
void *entry;
int offset;
+ unsigned end = mas_data_end(mas);
- for (offset = 0; offset < mt_slot_count(mas->node); offset++) {
+ for (offset = 0; offset <= end; offset++) {
entry = mas_slot_locked(mas, slots, offset);
type = mte_node_type(entry);
node = mte_to_node(entry);
- /* Use both node and type to catch LE & BE metadata */
- if (!node || !type)
- break;
-
mte_set_node_dead(entry);
smp_wmb(); /* Needed for RCU */
node->type = type;
--
2.35.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH Fix] maple_tree: Use metadata for mas_dead_leaves() walk
2022-07-12 14:53 [PATCH Fix] maple_tree: Use metadata for mas_dead_leaves() walk Liam Howlett
@ 2022-07-12 15:38 ` Liam Howlett
0 siblings, 0 replies; 3+ messages in thread
From: Liam Howlett @ 2022-07-12 15:38 UTC (permalink / raw)
To: maple-tree, linux-mm, linux-kernel, Andrew Morton
Please do not apply this patch. More testing is needed. Again, sorry
for the noise.
* Liam R. Howlett <Liam.Howlett@oracle.com> [220712 10:53]:
> When walking the dead leaves, use the nodes metadata for the end of the
> node. This avoids needing to use tricks for BE/LE unions.
>
> Fixes: d0aac5e48048 (Maple Tree: add new data structure)
> Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
> ---
> lib/maple_tree.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index 14e9ab14c1da..c661fda37665 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -5390,15 +5390,12 @@ unsigned char mas_dead_leaves(struct ma_state *mas, void __rcu **slots)
> enum maple_type type;
> void *entry;
> int offset;
> + unsigned end = mas_data_end(mas);
>
> - for (offset = 0; offset < mt_slot_count(mas->node); offset++) {
> + for (offset = 0; offset <= end; offset++) {
> entry = mas_slot_locked(mas, slots, offset);
> type = mte_node_type(entry);
> node = mte_to_node(entry);
> - /* Use both node and type to catch LE & BE metadata */
> - if (!node || !type)
> - break;
> -
> mte_set_node_dead(entry);
> smp_wmb(); /* Needed for RCU */
> node->type = type;
> --
> 2.35.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH Fix] maple_tree: Use metadata for mas_dead_leaves() walk
@ 2022-07-15 19:43 Liam Howlett
0 siblings, 0 replies; 3+ messages in thread
From: Liam Howlett @ 2022-07-15 19:43 UTC (permalink / raw)
To: maple-tree, linux-mm, linux-kernel, Andrew Morton, Yu Zhao, Hugh Dickins
When walking the dead leaves, use the nodes metadata for the end of the
node. This avoids needing to use tricks for BE/LE unions.
Fixes: d0aac5e48048 (Maple Tree: add new data structure)
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
lib/maple_tree.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 14e9ab14c1da..c661fda37665 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5390,15 +5390,12 @@ unsigned char mas_dead_leaves(struct ma_state *mas, void __rcu **slots)
enum maple_type type;
void *entry;
int offset;
+ unsigned end = mas_data_end(mas);
- for (offset = 0; offset < mt_slot_count(mas->node); offset++) {
+ for (offset = 0; offset <= end; offset++) {
entry = mas_slot_locked(mas, slots, offset);
type = mte_node_type(entry);
node = mte_to_node(entry);
- /* Use both node and type to catch LE & BE metadata */
- if (!node || !type)
- break;
-
mte_set_node_dead(entry);
smp_wmb(); /* Needed for RCU */
node->type = type;
--
2.35.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-15 19:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-12 14:53 [PATCH Fix] maple_tree: Use metadata for mas_dead_leaves() walk Liam Howlett
2022-07-12 15:38 ` Liam Howlett
2022-07-15 19:43 Liam Howlett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox