From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>,
"Naveen N. Rao" <naveen.n.rao@linux.ibm.com>,
Steven Rostedt <rostedt@goodmis.org>
Cc: "x86@kernel.org" <x86@kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/4] kprobes: adjust kprobe addr for KPROBES_ON_FTRACE
Date: Mon, 19 Aug 2019 11:36:09 +0000 [thread overview]
Message-ID: <20190819192505.483c0bf0@xhacker.debian> (raw)
In-Reply-To: <20190819192422.5ed79702@xhacker.debian>
For KPROBES_ON_FTRACE case, we need to adjust the kprobe's addr
correspondingly.
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
kernel/kprobes.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 9873fc627d61..f8400753a8a9 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1560,6 +1560,9 @@ int register_kprobe(struct kprobe *p)
addr = kprobe_addr(p);
if (IS_ERR(addr))
return PTR_ERR(addr);
+#ifdef CONFIG_KPROBES_ON_FTRACE
+ addr = (kprobe_opcode_t *)ftrace_call_adjust((unsigned long)addr);
+#endif
p->addr = addr;
ret = check_kprobe_rereg(p);
--
2.23.0.rc1
next prev parent reply other threads:[~2019-08-19 11:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 11:35 [PATCH 0/4] arm64: KPROBES_ON_FTRACE Jisheng Zhang
2019-08-19 11:36 ` Jisheng Zhang [this message]
2019-08-19 16:43 ` [PATCH 1/4] kprobes: adjust kprobe addr for KPROBES_ON_FTRACE Naveen N. Rao
2019-08-20 1:51 ` Jisheng Zhang
2019-08-20 0:01 ` Masami Hiramatsu
2019-08-20 2:05 ` Jisheng Zhang
2019-08-19 11:36 ` [PATCH 2/4] kprobes/x86: use instruction_pointer and instruction_pointer_set Jisheng Zhang
2019-08-20 0:09 ` Masami Hiramatsu
2019-08-19 11:37 ` [PATCH 3/4] kprobes: move kprobe_ftrace_handler() from x86 and make it weak Jisheng Zhang
2019-08-20 0:07 ` Masami Hiramatsu
2019-08-20 1:56 ` Jisheng Zhang
2019-08-19 11:38 ` [PATCH 4/4] arm64: implement KPROBES_ON_FTRACE Jisheng Zhang
2019-08-19 16:52 ` Naveen N. Rao
2019-08-20 2:16 ` Jisheng Zhang
2019-08-19 12:53 ` [PATCH 0/4] arm64: KPROBES_ON_FTRACE Mark Rutland
2019-08-19 13:10 ` Masami Hiramatsu
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=20190819192505.483c0bf0@xhacker.debian \
--to=jisheng.zhang@synaptics.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=naveen.n.rao@linux.ibm.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=x86@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).