This is a note to let you know that I've just added the patch titled
ftrace: Fix the possible incorrect kernel message
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ftrace-fix-the-possible-incorrect-kernel-message.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 08948caebe93482db1adfd2154eba124f66d161d Mon Sep 17 00:00:00 2001
From: Wang Wensheng <wangwensheng4@xxxxxxxxxx>
Date: Wed, 9 Nov 2022 09:44:32 +0000
Subject: ftrace: Fix the possible incorrect kernel message
From: Wang Wensheng <wangwensheng4@xxxxxxxxxx>
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@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>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
kernel/trace/ftrace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- 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;
Patches currently in stable-queue which might be from wangwensheng4@xxxxxxxxxx are
queue-5.15/ftrace-optimize-the-allocation-for-mcount-entries.patch
queue-5.15/ftrace-fix-the-possible-incorrect-kernel-message.patch
