diff options
author | Wang Wensheng <wangwensheng4@huawei.com> | 2022-11-09 09:44:33 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-26 09:24:42 +0100 |
commit | fadfcf39fbcdc9916b8593b93e47116845f45875 (patch) | |
tree | 6c88e54fc795c29c8513fed5bf0a9ac5203b7b79 /kernel/trace/ftrace.c | |
parent | 5c5f2642898f86ec43462d62fc7859c3655b1251 (diff) | |
download | linux-stable-fadfcf39fbcdc9916b8593b93e47116845f45875.tar.gz linux-stable-fadfcf39fbcdc9916b8593b93e47116845f45875.tar.bz2 linux-stable-fadfcf39fbcdc9916b8593b93e47116845f45875.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>
Diffstat (limited to 'kernel/trace/ftrace.c')
-rw-r--r-- | kernel/trace/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 21b804f4f325..5b49c0058040 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -3174,7 +3174,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; } |