projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2c9bc49
)
maple_tree: fix handle of invalidated state in mas_wr_store_setup()
author
Liam R. Howlett
<Liam.Howlett@Oracle.com>
Tue, 11 Apr 2023 15:10:45 +0000
(11:10 -0400)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 13 Apr 2023 14:55:39 +0000
(16:55 +0200)
commit
1202700c3f8cc5f7e4646c3cf05ee6f7c8bc6ccf
upstream.
If an invalidated maple state is encountered during write, reset the maple
state to MAS_START. This will result in a re-walk of the tree to the
correct location for the write.
Link:
https://lore.kernel.org/all/20230107020126.1627-1-sj@kernel.org/
Link:
https://lkml.kernel.org/r/20230120162650.984577-6-Liam.Howlett@oracle.com
Cc: <Stable@vger.kernel.org>
Fixes:
54a611b60590
("Maple Tree: add new data structure")
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Reported-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
lib/maple_tree.c
patch
|
blob
|
history
diff --git
a/lib/maple_tree.c
b/lib/maple_tree.c
index
360b4bb
..
203bd3e
100644
(file)
--- a/
lib/maple_tree.c
+++ b/
lib/maple_tree.c
@@
-5594,6
+5594,9
@@
static inline void mte_destroy_walk(struct maple_enode *enode,
static void mas_wr_store_setup(struct ma_wr_state *wr_mas)
{
+ if (unlikely(mas_is_paused(wr_mas->mas)))
+ mas_reset(wr_mas->mas);
+
if (!mas_is_start(wr_mas->mas)) {
if (mas_is_none(wr_mas->mas)) {
mas_reset(wr_mas->mas);