From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [for-next][PATCH 6/7] ftrace: Add another check for match in register_ftrace_direct()
Date: Sun, 17 Nov 2019 17:13:02 -0500 [thread overview]
Message-ID: <20191117221310.917990004@goodmis.org> (raw)
In-Reply-To: 20191117221256.228674565@goodmis.org
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
As an instruction pointer passed into register_ftrace_direct() may just
exist on the ftrace call site, but may not be the start of the call site
itself, register_ftrace_direct() still needs to update test if a direct call
exists on the normalized site, as only one direct call is allowed at any one
time.
Fixes: 763e34e74bb7d ("ftrace: Add register_ftrace_direct()")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/ftrace.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 32e4e5ffdd97..9fe33ebaf914 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -5030,7 +5030,12 @@ int register_ftrace_direct(unsigned long ip, unsigned long addr)
goto out_unlock;
/* Make sure the ip points to the exact record */
- ip = rec->ip;
+ if (ip != rec->ip) {
+ ip = rec->ip;
+ /* Need to check this ip for a direct. */
+ if (find_rec_direct(ip))
+ goto out_unlock;
+ }
ret = -ENOMEM;
if (ftrace_hash_empty(direct_functions) ||
--
2.24.0
next prev parent reply other threads:[~2019-11-17 22:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-17 22:12 [for-next][PATCH 0/7] tracing: Some more updates for 5.5 Steven Rostedt
2019-11-17 22:12 ` [for-next][PATCH 1/7] ftrace: Add modify_ftrace_direct() Steven Rostedt
2019-11-17 22:12 ` [for-next][PATCH 2/7] ftrace/samples: Add a sample module that implements modify_ftrace_direct() Steven Rostedt
2019-11-17 22:12 ` [for-next][PATCH 3/7] tracing: Increase SYNTH_FIELDS_MAX for synthetic_events Steven Rostedt
2019-11-17 22:13 ` [for-next][PATCH 4/7] ftrace/selftests: Fix spelling mistake "wakeing" -> "waking" Steven Rostedt
2019-11-17 22:13 ` [for-next][PATCH 5/7] ftrace: Fix accounting bug with direct->count in register_ftrace_direct() Steven Rostedt
2019-11-17 22:13 ` Steven Rostedt [this message]
2019-11-17 22:13 ` [for-next][PATCH 7/7] ftrace: Add helper find_direct_entry() to consolidate code Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191117221310.917990004@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).