ftrace: Fix the possible incorrect kernel message

commit 08948caebe93482db1adfd2154eba124f66d161d upstream.

If the number of mcount entries is an integer multiple of
ENTRIES_PER_PAGE, the page count showing on the console would be wrong.

Link: https://lkml.kernel.org/r/20221109094434.84046-2-wangwensheng4@huawei.com
Cc: <mhiramat@kernel.org>
Cc: <mark.rutland@arm.com>
Cc: stable@vger.kernel.org
Fixes: 5821e1b74f0d0 ("function tracing: fix wrong pos computing when read buffer has been fulfilled")
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>
(cherry picked from commit 5c5f2642898f86ec43462d62fc7859c3655b1251)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index c197f39fdb78de3802af2da1a32706c38ca66a38..21b804f4f3253ff996f892a3dd86dede90ad1e47 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -6870,7 +6870,7 @@ void __init ftrace_init(void)
        }
 
        pr_info("ftrace: allocating %ld entries in %ld pages\n",
-               count, count / ENTRIES_PER_PAGE + 1);
+               count, DIV_ROUND_UP(count, ENTRIES_PER_PAGE));
 
        last_ftrace_enabled = ftrace_enabled = 1;