diff options
| author | Liam R. Howlett <Liam.Howlett@Oracle.com> | 2023-04-11 11:10:45 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-04-13 16:55:39 +0200 |
| commit | 19d8f782e380c0266b034cf445100361164837b4 (patch) | |
| tree | f0218b5dd5a01491b66fb90801e79f5a5be69c5b /lib | |
| parent | 2c9bc4903b96da06220c81b056d6506b2e8e50ad (diff) | |
| download | linux-stable-19d8f782e380c0266b034cf445100361164837b4.tar.gz linux-stable-19d8f782e380c0266b034cf445100361164837b4.tar.bz2 linux-stable-19d8f782e380c0266b034cf445100361164837b4.zip | |
maple_tree: fix handle of invalidated state in mas_wr_store_setup()
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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/maple_tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 360b4bbccd33..203bd3e51c98 100644 --- 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); |