[for-linus][PATCH 05/13] ftrace: Fix the possible incorrect kernel message

From: Steven Rostedt
Date: Sun Nov 20 2022 - 15:07:53 EST


From: Wang Wensheng <wangwensheng4@xxxxxxxxxx>

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@xxxxxxxxxx

Cc: <mhiramat@xxxxxxxxxx>
Cc: <mark.rutland@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Fixes: 5821e1b74f0d0 ("function tracing: fix wrong pos computing when read buffer has been fulfilled")
Signed-off-by: Wang Wensheng <wangwensheng4@xxxxxxxxxx>
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
---
kernel/trace/ftrace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 7dc023641bf1..8b13ce2eae70 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -7391,7 +7391,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));

ret = ftrace_process_locs(NULL,
__start_mcount_loc,
--
2.35.1