Commit 3041feee authored Nov 09, 2022 by Wang Wensheng Committed by Greg Kroah-Hartman Nov 25, 2022

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: 5821e1b7 ("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>

parent 04e9e5eb

kernel/trace/ftrace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -6259,7 +6259,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;