maple_tree-reorganize-testing-to-restore-module-testing.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: reorganize testing to restore module testing
has been removed from the -mm tree. Its filename was
maple_tree-reorganize-testing-to-restore-module-testing.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Liam Howlett <[email protected]>
Subject: maple_tree: reorganize testing to restore module testing
Date: Fri, 28 Oct 2022 18:04:30 +0000
Along the development cycle, the testing code support for module/in-kernel compiles was removed. Restore this functionality by moving any internal API tests to the userspace side, as well as threading tests. Fix the lockdep issues and add a way to reduce memory usage so the tests can complete with KASAN + memleak detection. Make the tests work on 32 bit hosts where possible and detect 32 bit hosts in the radix test suite.
---
include/linux/maple_tree.h | 7 lib/Kconfig.debug | 4 lib/Makefile | 1 lib/maple_tree.c | 38 lib/test_maple_tree.c |35930 ---------------- tools/testing/radix-tree/.gitignore | 1 tools/testing/radix-tree/Makefile | 19 tools/testing/radix-tree/generated/autoconf.h | 2 tools/testing/radix-tree/linux.c | 4 tools/testing/radix-tree/maple.c |35770 +++++++++++++++ 10 files changed, 36031 insertions(+), 35745 deletions(-)
include/linux/maple_tree.h renamed from include/linux/maple_tree.h~maple_tree-reorganize-testing-to-restore-module-testing +7 -0
@@ -638,6 +638,12 @@ static inline void mt_set_in_rcu(struct } } +static inline unsigned int mt_height (const struct maple_tree *mt) + +{ +return (mt->ma_flags &MT_FLAGS_HEIGHT_MASK ) >>MT_FLAGS_HEIGHT_OFFSET ; +} +void *mt_find (struct maple_tree *mt,unsigned long *index,unsigned long max);void *mt_find_after (struct maple_tree *mt,unsigned long *index,unsigned long max);
@@ -664,6 +670,7 @@ extern atomic_t maple_tree_tests_passed;void mt_dump (const struct maple_tree *mt);void mt_validate (struct maple_tree *mt); +void mt_cache_shrink (void );#define MT_BUG_ON (__tree, __x) do { \ atomic_inc(&maple_tree_tests_run); \ if (__x) { \
lib/Kconfig.debug renamed from lib/Kconfig.debug~maple_tree-reorganize-testing-to-restore-module-testing +4 -0
@@ -2241,6 +2241,10 @@ config TEST_UUID config TEST_XARRAY tristate "Test the XArray code at runtime" +config TEST_MAPLE_TREE + select DEBUG_MAPLE_TREE + tristate "Test the Maple Tree code at runtime" + config TEST_RHASHTABLE tristate "Perform selftest on resizable hash table" help
lib/Makefile renamed from lib/Makefile~maple_tree-reorganize-testing-to-restore-module-testing +1 -0
@@ -85,6 +85,7 @@ obj-$(CONFIG_TEST_BITMAP) += test_bitmap obj-$(CONFIG_TEST_STRSCPY) += test_strscpy.o obj-$(CONFIG_TEST_UUID) += test_uuid.o obj-$(CONFIG_TEST_XARRAY) += test_xarray.o +obj-$(CONFIG_TEST_MAPLE_TREE) += test_maple_tree.o obj-$(CONFIG_TEST_PARMAN) += test_parman.o obj-$(CONFIG_TEST_KMOD) += test_kmod.o obj-$(CONFIG_TEST_DEBUG_VIRTUAL) += test_debug_virtual.o
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-reorganize-testing-to-restore-module-testing +32 -6
@@ -183,10 +183,6 @@ static void ma_free_rcu(struct maple_nodcall_rcu (&node->rcu, mt_free_rcu); } -static unsigned int mt_height (const struct maple_tree *mt) -{ -return (mt->ma_flags &MT_FLAGS_HEIGHT_MASK ) >>MT_FLAGS_HEIGHT_OFFSET ; -}static void mas_set_height (struct ma_state *mas) {
@@ -5061,6 +5057,7 @@ retry:return entry; } +EXPORT_SYMBOL_GPL (mas_walk);static inline bool mas_rewind_node (struct ma_state *mas) {
@@ -5272,6 +5269,7 @@ int mas_empty_area(struct ma_state *mas, mas->last = mas->index + size -1 ;return 0 ; } +EXPORT_SYMBOL_GPL (mas_empty_area);/* * mas_empty_area_rev() - Get the highest address within the range that is
@@ -5335,6 +5333,7 @@ int mas_empty_area_rev(struct ma_state * mas->index = mas->last - size +1 ;return 0 ; } +EXPORT_SYMBOL_GPL (mas_empty_area_rev);static inline int mas_alloc (struct ma_state *mas,void *entry,unsigned long size,unsigned long *index)
@@ -5656,6 +5655,7 @@ void *mas_store(struct ma_state *mas, vomas_wr_store_entry (&wr_mas);return wr_mas.content; } +EXPORT_SYMBOL_GPL (mas_store);/** * mas_store_gfp() - Store a value into the tree.
@@ -5682,6 +5682,7 @@ retry:return 0 ; } +EXPORT_SYMBOL_GPL (mas_store_gfp);/** * mas_store_prealloc() - Store a value into the tree using memory
@@ -5699,6 +5700,7 @@ void mas_store_prealloc(struct ma_stateBUG_ON (mas_is_err (mas));mas_destroy (mas); } +EXPORT_SYMBOL_GPL (mas_store_prealloc);/** * mas_preallocate() - Preallocate enough nodes for a store operation
@@ -5768,6 +5770,7 @@ void mas_destroy(struct ma_state *mas) } mas->alloc =NULL ; } +EXPORT_SYMBOL_GPL (mas_destroy);/* * mas_expected_entries() - Set the expected number of entries that will be inserted.
@@ -5829,6 +5832,7 @@ int mas_expected_entries(struct ma_statereturn ret; } +EXPORT_SYMBOL_GPL (mas_expected_entries);/** * mas_next() - Get the next entry.
@@ -6009,6 +6013,7 @@ void *mas_find(struct ma_state *mas, uns/* Retries on dead nodes handled by mas_next_entry */ return mas_next_entry (mas, max); } +EXPORT_SYMBOL_GPL (mas_find);/** * mas_find_rev: On the first call, find the first non-null entry at or below
@@ -6055,7 +6060,7 @@ void *mas_find_rev(struct ma_state *mas,/* Retries on dead nodes handled by mas_next_entry */ return mas_prev_entry (mas, min); } -EXPORT_SYMBOL_GPL (mas_find); +EXPORT_SYMBOL_GPL (mas_find_rev);/** * mas_erase() - Find the range in which index resides and erase the entire
@@ -6537,8 +6542,27 @@ static inline int mas_dead_node(struct mmas_rewalk (mas, index); return 1; } -#endif /* not defined __KERNEL__ */ +void mt_cache_shrink (void ) +{ +} +#else +/* +* mt_cache_shrink() - For testing, don't use this. +* +* Certain testcases can trigger an OOM when combined with other memory +* debugging configuration options. This function is used to reduce the +* possibility of an out of memory even due to kmem_cache objects remaining +* around for longer than usual. +*/ +void mt_cache_shrink (void ) +{ +kmem_cache_shrink (maple_node_cache); + +} +EXPORT_SYMBOL_GPL (mt_cache_shrink); + +#endif /* not defined __KERNEL__ */ /* * mas_get_slot() - Get the entry in the maple state node stored at @offset. * @mas: The maple state
@@ -6812,6 +6836,7 @@ void mt_dump(const struct maple_tree *mtelse if (entry)mt_dump_node (mt, entry,0 , mt_max[mte_node_type (entry)],0 ); } +EXPORT_SYMBOL_GPL (mt_dump);/* * Calculate the maximum gap in a node and check if that's what is reported in
@@ -7122,5 +7147,6 @@ done: rcu_read_unlock(); } +EXPORT_SYMBOL_GPL (mt_validate);#endif /* CONFIG_DEBUG_MAPLE_TREE */
lib/test_maple_tree.c renamed from lib/test_maple_tree.c~maple_tree-reorganize-testing-to-restore-module-testing +195 -35735
2,842 lines not on this page · raw message
tools/testing/radix-tree/generated/autoconf.h renamed from tools/testing/radix-tree/generated/autoconf.h~maple_tree-reorganize-testing-to-restore-module-testing +1 -1
Lines of this file are not shown. View the raw message.
tools/testing/radix-tree/.gitignore renamed from tools/testing/radix-tree/.gitignore~maple_tree-reorganize-testing-to-restore-module-testing +1 -0
Lines of this file are not shown. View the raw message.
tools/testing/radix-tree/linux.c renamed from tools/testing/radix-tree/linux.c~maple_tree-reorganize-testing-to-restore-module-testing +4 -0
Lines of this file are not shown. View the raw message.
tools/testing/radix-tree/Makefile renamed from tools/testing/radix-tree/Makefile~maple_tree-reorganize-testing-to-restore-module-testing +16 -3
Lines of this file are not shown. View the raw message.
tools/testing/radix-tree/maple.c renamed from tools/testing/radix-tree/maple.c~maple_tree-reorganize-testing-to-restore-module-testing +35770 -0
35,770 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
_
Patches currently in -mm which might be from [email protected] are
maple_tree-fix-mas_find_rev-comment.patch maple_tree-update-copyright-dates-for-test-code.patch maple_tree-mte_set_full-and-mte_clear_full-clang-analyzer-clean-up.patch
Part of the diff is not shown here. View the raw message.