Drop maple tree changes from 6.1

diff --git a/queue-6.1/maple_tree-add-mas_is_active-to-detect-in-tree-walks.patch b/queue-6.1/maple_tree-add-mas_is_active-to-detect-in-tree-walks.patch
deleted file mode 100644 (file)
index 6be5a6c..0000000
--- a/queue-6.1/maple_tree-add-mas_is_active-to-detect-in-tree-walks.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 562b1f633915512df826243cd52eeb774147186c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 21 Sep 2023 14:12:35 -0400
-Subject: maple_tree: add mas_is_active() to detect in-tree walks
-
-From: Liam R. Howlett <Liam.Howlett@oracle.com>
-
-[ Upstream commit 5c590804b6b0ff933ed4e5cee5d76de3a5048d9f ]
-
-Patch series "maple_tree: Fix mas_prev() state regression".
-
-Pedro Falcato retported an mprotect regression [1] which was bisected back
-to the iterator changes for maple tree.  Root cause analysis showed the
-mas_prev() running off the end of the VMA space (previous from 0) followed
-by mas_find(), would skip the first value.
-
-This patchset introduces maple state underflow/overflow so the sequence of
-calls on the maple state will return what the user expects.
-
-Users who encounter this bug may see mprotect(), userfaultfd_register(),
-and mlock() fail on VMAs mapped with address 0.
-
-This patch (of 2):
-
-Instead of constantly checking each possibility of the maple state,
-create a fast path that will skip over checking unlikely states.
-
-Link: https://lkml.kernel.org/r/20230921181236.509072-1-Liam.Howlett@oracle.com
-Link: https://lkml.kernel.org/r/20230921181236.509072-2-Liam.Howlett@oracle.com
-Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
-Cc: Pedro Falcato <pedro.falcato@gmail.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/maple_tree.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h
-index 443dec917ec64..27864178d1918 100644
---- a/include/linux/maple_tree.h
-+++ b/include/linux/maple_tree.h
-@@ -488,6 +488,15 @@ static inline bool mas_is_paused(struct ma_state *mas)
-       return mas->node == MAS_PAUSE;
- }
- 
-+/* Check if the mas is pointing to a node or not */
-+static inline bool mas_is_active(struct ma_state *mas)
-+{
-+      if ((unsigned long)mas->node >= MAPLE_RESERVED_RANGE)
-+              return true;
-+
-+      return false;
-+}
-+
- /**
-  * mas_reset() - Reset a Maple Tree operation state.
-  * @mas: Maple Tree operation state.
--- 
-2.40.1
-

diff --git a/queue-6.1/maple_tree-relocate-the-declaration-of-mas_empty_are.patch b/queue-6.1/maple_tree-relocate-the-declaration-of-mas_empty_are.patch
deleted file mode 100644 (file)
index 51387cc..0000000
--- a/queue-6.1/maple_tree-relocate-the-declaration-of-mas_empty_are.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2c6b47348d1fd76c15dc3f4068829747a550419a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 24 May 2023 11:12:47 +0800
-Subject: maple_tree: relocate the declaration of mas_empty_area_rev().
-
-From: Peng Zhang <zhangpeng.00@bytedance.com>
-
-[ Upstream commit 06b27ce36a1a3dc5ea6f8314d0c7d1baa9f8ece7 ]
-
-Relocate the declaration of mas_empty_area_rev() so that mas_empty_area()
-and mas_empty_area_rev() are together.
-
-Link: https://lkml.kernel.org/r/20230524031247.65949-11-zhangpeng.00@bytedance.com
-Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
-Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Stable-dep-of: 5c590804b6b0 ("maple_tree: add mas_is_active() to detect in-tree walks")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/maple_tree.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h
-index 1a424edb71a65..443dec917ec64 100644
---- a/include/linux/maple_tree.h
-+++ b/include/linux/maple_tree.h
-@@ -469,6 +469,12 @@ void *mas_next(struct ma_state *mas, unsigned long max);
- 
- int mas_empty_area(struct ma_state *mas, unsigned long min, unsigned long max,
-                  unsigned long size);
-+/*
-+ * This finds an empty area from the highest address to the lowest.
-+ * AKA "Topdown" version,
-+ */
-+int mas_empty_area_rev(struct ma_state *mas, unsigned long min,
-+                     unsigned long max, unsigned long size);
- 
- /* Checks if a mas has not found anything */
- static inline bool mas_is_none(struct ma_state *mas)
-@@ -482,12 +488,6 @@ static inline bool mas_is_paused(struct ma_state *mas)
-       return mas->node == MAS_PAUSE;
- }
- 
--/*
-- * This finds an empty area from the highest address to the lowest.
-- * AKA "Topdown" version,
-- */
--int mas_empty_area_rev(struct ma_state *mas, unsigned long min,
--                     unsigned long max, unsigned long size);
- /**
-  * mas_reset() - Reset a Maple Tree operation state.
-  * @mas: Maple Tree operation state.
--- 
-2.40.1
-

diff --git a/queue-6.1/maple_tree-remove-the-redundant-code.patch b/queue-6.1/maple_tree-remove-the-redundant-code.patch
deleted file mode 100644 (file)
index 0031b86..0000000
--- a/queue-6.1/maple_tree-remove-the-redundant-code.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 8115a697c47c8d0d1e35d67364eb7fb1b5fcf922 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Dec 2022 14:00:56 +0800
-Subject: maple_tree: remove the redundant code
-
-From: Vernon Yang <vernon2gm@gmail.com>
-
-[ Upstream commit eabb305293835b191ffe60234587ae8bf5e4e9fd ]
-
-The macros CONFIG_DEBUG_MAPLE_TREE_VERBOSE no one uses, functions
-mas_dup_tree() and mas_dup_store() are not implemented, just function
-declaration, so drop it.
-
-Link: https://lkml.kernel.org/r/20221221060058.609003-6-vernon2gm@gmail.com
-Signed-off-by: Vernon Yang <vernon2gm@gmail.com>
-Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Stable-dep-of: 5c590804b6b0 ("maple_tree: add mas_is_active() to detect in-tree walks")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/maple_tree.h | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h
-index e594db58a0f14..1a424edb71a65 100644
---- a/include/linux/maple_tree.h
-+++ b/include/linux/maple_tree.h
-@@ -12,7 +12,6 @@
- #include <linux/rcupdate.h>
- #include <linux/spinlock.h>
- /* #define CONFIG_MAPLE_RCU_DISABLED */
--/* #define CONFIG_DEBUG_MAPLE_TREE_VERBOSE */
- 
- /*
-  * Allocated nodes are mutable until they have been inserted into the tree,
-@@ -483,9 +482,6 @@ static inline bool mas_is_paused(struct ma_state *mas)
-       return mas->node == MAS_PAUSE;
- }
- 
--void mas_dup_tree(struct ma_state *oldmas, struct ma_state *mas);
--void mas_dup_store(struct ma_state *mas, void *entry);
--
- /*
-  * This finds an empty area from the highest address to the lowest.
-  * AKA "Topdown" version,
--- 
-2.40.1
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 88522b59be2b63f8502b41e3f301e670c6f501bf..ffc7d8c115d9aacef67a5923acf04b4d2167e1e3 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -7,9 +7,6 @@ alsa-hda-realtek-alc287-i2s-speaker-platform-support.patch
 alsa-hda-realtek-alc287-realtek-i2s-speaker-platform.patch
 asoc-soc-utils-export-snd_soc_dai_is_dummy-symbol.patch
 asoc-tegra-fix-redundant-plla-and-plla_out0-updates.patch
-maple_tree-remove-the-redundant-code.patch
-maple_tree-relocate-the-declaration-of-mas_empty_are.patch
-maple_tree-add-mas_is_active-to-detect-in-tree-walks.patch
 mptcp-rename-timer-related-helper-to-less-confusing-.patch
 mptcp-fix-dangling-connection-hang-up.patch
 mptcp-annotate-lockless-accesses-to-sk-sk_err.patch