ftrace: Fix the possible incorrect kernel message
authorWang Wensheng <wangwensheng4@huawei.com>
Wed, 9 Nov 2022 09:44:32 +0000 (09:44 +0000)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Thu, 17 Nov 2022 20:41:31 +0000 (15:41 -0500)
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>
kernel/trace/ftrace.c

index 7dc023641bf10cbd6cdb37dcb86327304ffb36bc..8b13ce2eae705dd799d2662c90236853673bccd4 100644 (file)
@@ -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,