summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWang Wensheng <wangwensheng4@huawei.com>2022-11-09 09:44:33 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-11-25 17:36:51 +0100
commit7eb7b342758e1bab6c2d0b86c319da46529f83aa (patch)
tree4de7694cfae066a7fbf9ff96ae15246606024c43
parentc07fd1115d7cfb53c5d5f85f2891b72f63488b11 (diff)
downloadlinux-7eb7b342758e1bab6c2d0b86c319da46529f83aa.tar.gz
linux-7eb7b342758e1bab6c2d0b86c319da46529f83aa.tar.bz2
linux-7eb7b342758e1bab6c2d0b86c319da46529f83aa.zip
ftrace: Optimize the allocation for mcount entries
commit bcea02b096333dc74af987cb9685a4dbdd820840 upstream. If we can't allocate this size, try something smaller with half of the size. Its order should be decreased by one instead of divided by two. Link: https://lkml.kernel.org/r/20221109094434.84046-3-wangwensheng4@huawei.com Cc: <mhiramat@kernel.org> Cc: <mark.rutland@arm.com> Cc: stable@vger.kernel.org Fixes: a79008755497d ("ftrace: Allocate the mcount record pages as groups") Signed-off-by: Wang Wensheng <wangwensheng4@huawei.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/trace/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index c11629930d57..0abb8b53e9d5 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3105,7 +3105,7 @@ static int ftrace_allocate_records(struct ftrace_page *pg, int count)
/* if we can't allocate this size, try something smaller */
if (!order)
return -ENOMEM;
- order >>= 1;
+ order--;
goto again;
}