From: Wang Wensheng <wangwensheng4@huawei.com>
Date: Wed, 9 Nov 2022 09:44:33 +0000 (+0000)
Subject: ftrace: Optimize the allocation for mcount entries
X-Git-Tag: baikal/mips/sdk5.8.2~1862
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=ecfbc496e20e7bbbeba02c1ac2c805f222570a09;p=kernel.git

ftrace: Optimize the allocation for mcount entries

commit 73d6cfcea13742c44c3195217d8be609983c10a5 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: b5abe386e6d2c ("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>
---

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index dbf69b7de0de6..7a9fee4b314e8 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3017,7 +3017,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;
 	}