maple_tree-reduce-stack-usage-with-gcc-9-and-earlier.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: reduce stack usage with gcc-9 and earlier
has been removed from the -mm tree. Its filename was
maple_tree-reduce-stack-usage-with-gcc-9-and-earlier.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Arnd Bergmann <[email protected]>
Subject: maple_tree: reduce stack usage with gcc-9 and earlier
Date: Tue, 14 Feb 2023 11:30:24 +0100
gcc-10 changed the way inlining works to be less aggressive, but older versions run into an oversized stack frame warning whenever CONFIG_KASAN_STACK is enabled, as that forces variables from inlined callees to be non-overlapping:
lib/maple_tree.c: In function 'mas_wr_bnode':lib/maple_tree.c:4320:1: error: the frame size of 1424 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
Change the annotations on mas_store_b_node() and mas_commit_b_node() to explicitly forbid inlining in this configuration, which is the same behavior that newer versions already have.
---
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-reduce-stack-usage-with-gcc-9-and-earlier +9 -2
@@ -146,6 +146,13 @@ struct maple_subtree_state {struct maple_big_node *bn; }; +#ifdef CONFIG_KASAN_STACK +/* Prevent mas_wr_bnode() from exceeding the stack frame limit */ +#define noinline_for_kasan noinline_for_stack +#else +#define noinline_for_kasan inline +#endif +/* Functions */ static inline struct maple_node *mt_alloc_one (gfp_t gfp) {
@@ -2107,7 +2114,7 @@ static inline void mas_bulk_rebalance(st* * Return: The actual end of the data stored in @b_node */ -static inline void mas_store_b_node (struct ma_wr_state *wr_mas, +static noinline_for_kasan void mas_store_b_node(struct ma_wr_state *wr_mas,struct maple_big_node *b_node,unsigned char offset_end) {unsigned char slot;
@@ -3579,7 +3586,7 @@ static inline bool mas_reuse_node(struct* @b_node: The maple big node * @end: The end of the data. */ -static inline int mas_commit_b_node (struct ma_wr_state *wr_mas, +static noinline_for_kasan int mas_commit_b_node(struct ma_wr_state *wr_mas,struct maple_big_node *b_node,unsigned char end) {struct maple_node *node;
_
Patches currently in -mm which might be from [email protected] are
kasan-mark-addr_has_metadata-__always_inline.patch kmsan-disable-ftrace-in-kmsan-core-code.patch objtool-add-uaccess-exceptions-for-__tsan_volatile_read-write.patch