From: Jisheng Zhang <Jisheng.Zhang@synaptics.com> To: Masami Hiramatsu <mhiramat@kernel.org> Cc: Steven Rostedt <rostedt@goodmis.org>, Catalin Marinas <catalin.marinas@arm.com>, Jonathan Corbet <corbet@lwn.net>, 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>, "x86@kernel.org" <x86@kernel.org>, "Naveen N. Rao" <naveen.n.rao@linux.ibm.com>, Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>, "David S. Miller" <davem@davemloft.net>, "linux-doc@vger.kernel.org" <linux-doc@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org> Subject: Re: [PATCH v2 2/3] kprobes: adjust kprobe addr for KPROBES_ON_FTRACE Date: Wed, 21 Aug 2019 02:50:12 +0000 [thread overview] Message-ID: <20190821103857.14d2a40d@xhacker.debian> (raw) In-Reply-To: <20190821110739.fb3ab6b69423dff64a3b4a29@kernel.org> Hi, On Wed, 21 Aug 2019 11:07:39 +0900 Masami Hiramatsu wrote: > > > Hi Jisheng, > > On Tue, 20 Aug 2019 03:53:31 +0000 > Jisheng Zhang <Jisheng.Zhang@synaptics.com> wrote: > > > For KPROBES_ON_FTRACE case, we need to adjust the kprobe's addr > > correspondingly. > > Either KPROBES_ON_FTRACE=y or not, ftrace_location() check must be > done correctly. If it failed, kprobes can modify the instruction > which can be modified by ftrace. > > > > > Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> > > --- > > kernel/kprobes.c | 10 +++++++--- > > 1 file changed, 7 insertions(+), 3 deletions(-) > > > > diff --git a/kernel/kprobes.c b/kernel/kprobes.c > > index 9873fc627d61..3fd2f68644da 100644 > > --- a/kernel/kprobes.c > > +++ b/kernel/kprobes.c > > @@ -1484,15 +1484,19 @@ static inline int check_kprobe_rereg(struct kprobe *p) > > > > int __weak arch_check_ftrace_location(struct kprobe *p) > > { > > - unsigned long ftrace_addr; > > + unsigned long ftrace_addr, addr = (unsigned long)p->addr; > > > > - ftrace_addr = ftrace_location((unsigned long)p->addr); > > +#ifdef CONFIG_KPROBES_ON_FTRACE > > + addr = ftrace_call_adjust(addr); > > +#endif > > + ftrace_addr = ftrace_location(addr); > > No, this is not right way to do. If we always need to adjust address > before calling ftrace_location(), something wrong with ftrace_location() > interface. > ftrace_location(addr) must check the address is within the range which > can be changed by ftrace. (dyn->ip <= addr <= dyn->ip+MCOUNT_INSN_SIZE) yeah! I will try Naveen's suggestion, I.E patch kprobe_lookup_name() instead. Thanks > > > > if (ftrace_addr) { > > #ifdef CONFIG_KPROBES_ON_FTRACE > > /* Given address is not on the instruction boundary */ > > - if ((unsigned long)p->addr != ftrace_addr) > > + if (addr != ftrace_addr) > > return -EILSEQ; > > p->flags |= KPROBE_FLAG_FTRACE; > > + p->addr = (kprobe_opcode_t *)addr; > > And again, please don't change the p->addr silently. > > Thank you, > > > #else /* !CONFIG_KPROBES_ON_FTRACE */ > > return -EINVAL; > > #endif > > -- > > 2.23.0.rc1 > > > > > -- > Masami Hiramatsu <mhiramat@kernel.org>
WARNING: multiple messages have this Message-ID (diff)
From: Jisheng Zhang <Jisheng.Zhang@synaptics.com> To: Masami Hiramatsu <mhiramat@kernel.org> Cc: Jonathan Corbet <corbet@lwn.net>, Catalin Marinas <catalin.marinas@arm.com>, "x86@kernel.org" <x86@kernel.org>, "linux-doc@vger.kernel.org" <linux-doc@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>, "H. Peter Anvin" <hpa@zytor.com>, "Naveen N. Rao" <naveen.n.rao@linux.ibm.com>, Thomas Gleixner <tglx@linutronix.de>, Will Deacon <will@kernel.org>, "David S. Miller" <davem@davemloft.net>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org> Subject: Re: [PATCH v2 2/3] kprobes: adjust kprobe addr for KPROBES_ON_FTRACE Date: Wed, 21 Aug 2019 02:50:12 +0000 [thread overview] Message-ID: <20190821103857.14d2a40d@xhacker.debian> (raw) In-Reply-To: <20190821110739.fb3ab6b69423dff64a3b4a29@kernel.org> Hi, On Wed, 21 Aug 2019 11:07:39 +0900 Masami Hiramatsu wrote: > > > Hi Jisheng, > > On Tue, 20 Aug 2019 03:53:31 +0000 > Jisheng Zhang <Jisheng.Zhang@synaptics.com> wrote: > > > For KPROBES_ON_FTRACE case, we need to adjust the kprobe's addr > > correspondingly. > > Either KPROBES_ON_FTRACE=y or not, ftrace_location() check must be > done correctly. If it failed, kprobes can modify the instruction > which can be modified by ftrace. > > > > > Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> > > --- > > kernel/kprobes.c | 10 +++++++--- > > 1 file changed, 7 insertions(+), 3 deletions(-) > > > > diff --git a/kernel/kprobes.c b/kernel/kprobes.c > > index 9873fc627d61..3fd2f68644da 100644 > > --- a/kernel/kprobes.c > > +++ b/kernel/kprobes.c > > @@ -1484,15 +1484,19 @@ static inline int check_kprobe_rereg(struct kprobe *p) > > > > int __weak arch_check_ftrace_location(struct kprobe *p) > > { > > - unsigned long ftrace_addr; > > + unsigned long ftrace_addr, addr = (unsigned long)p->addr; > > > > - ftrace_addr = ftrace_location((unsigned long)p->addr); > > +#ifdef CONFIG_KPROBES_ON_FTRACE > > + addr = ftrace_call_adjust(addr); > > +#endif > > + ftrace_addr = ftrace_location(addr); > > No, this is not right way to do. If we always need to adjust address > before calling ftrace_location(), something wrong with ftrace_location() > interface. > ftrace_location(addr) must check the address is within the range which > can be changed by ftrace. (dyn->ip <= addr <= dyn->ip+MCOUNT_INSN_SIZE) yeah! I will try Naveen's suggestion, I.E patch kprobe_lookup_name() instead. Thanks > > > > if (ftrace_addr) { > > #ifdef CONFIG_KPROBES_ON_FTRACE > > /* Given address is not on the instruction boundary */ > > - if ((unsigned long)p->addr != ftrace_addr) > > + if (addr != ftrace_addr) > > return -EILSEQ; > > p->flags |= KPROBE_FLAG_FTRACE; > > + p->addr = (kprobe_opcode_t *)addr; > > And again, please don't change the p->addr silently. > > Thank you, > > > #else /* !CONFIG_KPROBES_ON_FTRACE */ > > return -EINVAL; > > #endif > > -- > > 2.23.0.rc1 > > > > > -- > Masami Hiramatsu <mhiramat@kernel.org> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-21 2:50 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-20 3:50 [PATCH v2 0/3] arm64: KPROBES_ON_FTRACE Jisheng Zhang 2019-08-20 3:50 ` Jisheng Zhang 2019-08-20 3:52 ` [PATCH v2 1/3] kprobes/x86: use instruction_pointer and instruction_pointer_set Jisheng Zhang 2019-08-20 3:52 ` Jisheng Zhang 2019-08-20 8:53 ` Thomas Gleixner 2019-08-20 8:53 ` Thomas Gleixner 2019-08-20 9:02 ` Jisheng Zhang 2019-08-20 9:02 ` Jisheng Zhang 2019-08-20 9:20 ` Jisheng Zhang 2019-08-20 9:20 ` Jisheng Zhang 2019-08-20 13:21 ` Peter Zijlstra 2019-08-20 13:21 ` Peter Zijlstra 2019-08-21 2:02 ` Jisheng Zhang 2019-08-21 2:02 ` Jisheng Zhang 2019-08-21 1:52 ` Masami Hiramatsu 2019-08-21 1:52 ` Masami Hiramatsu 2019-08-21 2:09 ` Jisheng Zhang 2019-08-21 2:09 ` Jisheng Zhang 2019-08-23 14:51 ` Masami Hiramatsu 2019-08-23 14:51 ` Masami Hiramatsu 2019-08-20 3:53 ` [PATCH v2 2/3] kprobes: adjust kprobe addr for KPROBES_ON_FTRACE Jisheng Zhang 2019-08-20 3:53 ` Jisheng Zhang 2019-08-20 10:15 ` Naveen N. Rao 2019-08-20 10:15 ` Naveen N. Rao 2019-08-20 10:41 ` Jisheng Zhang 2019-08-20 10:41 ` Jisheng Zhang 2019-08-21 2:07 ` Masami Hiramatsu 2019-08-21 2:07 ` Masami Hiramatsu 2019-08-21 2:50 ` Jisheng Zhang [this message] 2019-08-21 2:50 ` Jisheng Zhang 2019-08-20 3:54 ` [PATCH v2 3/3] arm64: implement KPROBES_ON_FTRACE Jisheng Zhang 2019-08-20 3:54 ` Jisheng Zhang 2019-08-20 7:17 ` Jisheng Zhang 2019-08-20 7:17 ` Jisheng Zhang 2019-08-20 8:53 ` Thomas Gleixner 2019-08-20 8:53 ` Thomas Gleixner
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=20190821103857.14d2a40d@xhacker.debian \ --to=jisheng.zhang@synaptics.com \ --cc=anil.s.keshavamurthy@intel.com \ --cc=bp@alien8.de \ --cc=catalin.marinas@arm.com \ --cc=corbet@lwn.net \ --cc=davem@davemloft.net \ --cc=hpa@zytor.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.