From: Ravi Bangoria <ravi.bangoria@linux.ibm.com> To: srikar@linux.vnet.ibm.com, oleg@redhat.com, rostedt@goodmis.org, mhiramat@kernel.org Cc: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, alexander.shishkin@linux.intel.com, jolsa@redhat.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, ananth@linux.vnet.ibm.com, alexis.berlemont@gmail.com, naveen.n.rao@linux.vnet.ibm.com, linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, linux@armlinux.org.uk, ralf@linux-mips.org, paul.burton@mips.com, Ravi Bangoria <ravi.bangoria@linux.ibm.com> Subject: [PATCH v6 4/6] trace_uprobe/sdt: Prevent multiple reference counter for same uprobe Date: Mon, 16 Jul 2018 14:17:04 +0530 [thread overview] Message-ID: <20180716084706.28244-5-ravi.bangoria@linux.ibm.com> (raw) In-Reply-To: <20180716084706.28244-1-ravi.bangoria@linux.ibm.com> We assume to have only one reference counter for one uprobe. Don't allow user to add multiple trace_uprobe entries having same inode+offset but different reference counter. Ex, # echo "p:sdt_tick/loop2 /home/ravi/tick:0x6e4(0x10036)" > uprobe_events # echo "p:sdt_tick/loop2_1 /home/ravi/tick:0x6e4(0xfffff)" >> uprobe_events bash: echo: write error: Invalid argument # dmesg trace_kprobe: Reference counter offset mismatch. There are two exceptions though: 1) When user is trying to replace the old entry with the new one, we allow this if the new entry does not conflict with any other existing entry. 2) Any one of the reference counter offset is 0 while comparing new entry with old one. Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com> --- kernel/trace/trace_uprobe.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index bf2be098eb08..9fafb183c49d 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -324,6 +324,38 @@ static int unregister_trace_uprobe(struct trace_uprobe *tu) return 0; } +/* + * Uprobe with multiple reference counter is not allowed. i.e. + * If inode and offset matches, reference counter offset *must* + * match as well. Though, there are two exceptions: + * 1) We are replacing old trace_uprobe with new one(same + * group/event) then we don't care as far as the new entry + * does not conflict with any other existing entry. + * 2) Any one of the reference counter offset is 0 while comparing + * new entry with old one. + */ +static struct trace_uprobe *find_old_trace_uprobe(struct trace_uprobe *new) +{ + struct trace_uprobe *tmp, *old = NULL; + struct inode *new_inode = d_real_inode(new->path.dentry); + + old = find_probe_event(trace_event_name(&new->tp.call), + new->tp.call.class->system); + + list_for_each_entry(tmp, &uprobe_list, list) { + if ((old ? old != tmp : true) && + new_inode == d_real_inode(tmp->path.dentry) && + new->offset == tmp->offset && + new->ref_ctr_offset != tmp->ref_ctr_offset && + new->ref_ctr_offset != 0 && + tmp->ref_ctr_offset != 0) { + pr_warn("Reference counter offset mismatch."); + return ERR_PTR(-EINVAL); + } + } + return old; +} + /* Register a trace_uprobe and probe_event */ static int register_trace_uprobe(struct trace_uprobe *tu) { @@ -333,8 +365,12 @@ static int register_trace_uprobe(struct trace_uprobe *tu) mutex_lock(&uprobe_lock); /* register as an event */ - old_tu = find_probe_event(trace_event_name(&tu->tp.call), - tu->tp.call.class->system); + old_tu = find_old_trace_uprobe(tu); + if (IS_ERR(old_tu)) { + ret = PTR_ERR(old_tu); + goto end; + } + if (old_tu) { /* delete old event */ ret = unregister_trace_uprobe(old_tu); -- 2.14.4
WARNING: multiple messages have this Message-ID (diff)
From: ravi.bangoria@linux.ibm.com (Ravi Bangoria) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 4/6] trace_uprobe/sdt: Prevent multiple reference counter for same uprobe Date: Mon, 16 Jul 2018 14:17:04 +0530 [thread overview] Message-ID: <20180716084706.28244-5-ravi.bangoria@linux.ibm.com> (raw) In-Reply-To: <20180716084706.28244-1-ravi.bangoria@linux.ibm.com> We assume to have only one reference counter for one uprobe. Don't allow user to add multiple trace_uprobe entries having same inode+offset but different reference counter. Ex, # echo "p:sdt_tick/loop2 /home/ravi/tick:0x6e4(0x10036)" > uprobe_events # echo "p:sdt_tick/loop2_1 /home/ravi/tick:0x6e4(0xfffff)" >> uprobe_events bash: echo: write error: Invalid argument # dmesg trace_kprobe: Reference counter offset mismatch. There are two exceptions though: 1) When user is trying to replace the old entry with the new one, we allow this if the new entry does not conflict with any other existing entry. 2) Any one of the reference counter offset is 0 while comparing new entry with old one. Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com> --- kernel/trace/trace_uprobe.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index bf2be098eb08..9fafb183c49d 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -324,6 +324,38 @@ static int unregister_trace_uprobe(struct trace_uprobe *tu) return 0; } +/* + * Uprobe with multiple reference counter is not allowed. i.e. + * If inode and offset matches, reference counter offset *must* + * match as well. Though, there are two exceptions: + * 1) We are replacing old trace_uprobe with new one(same + * group/event) then we don't care as far as the new entry + * does not conflict with any other existing entry. + * 2) Any one of the reference counter offset is 0 while comparing + * new entry with old one. + */ +static struct trace_uprobe *find_old_trace_uprobe(struct trace_uprobe *new) +{ + struct trace_uprobe *tmp, *old = NULL; + struct inode *new_inode = d_real_inode(new->path.dentry); + + old = find_probe_event(trace_event_name(&new->tp.call), + new->tp.call.class->system); + + list_for_each_entry(tmp, &uprobe_list, list) { + if ((old ? old != tmp : true) && + new_inode == d_real_inode(tmp->path.dentry) && + new->offset == tmp->offset && + new->ref_ctr_offset != tmp->ref_ctr_offset && + new->ref_ctr_offset != 0 && + tmp->ref_ctr_offset != 0) { + pr_warn("Reference counter offset mismatch."); + return ERR_PTR(-EINVAL); + } + } + return old; +} + /* Register a trace_uprobe and probe_event */ static int register_trace_uprobe(struct trace_uprobe *tu) { @@ -333,8 +365,12 @@ static int register_trace_uprobe(struct trace_uprobe *tu) mutex_lock(&uprobe_lock); /* register as an event */ - old_tu = find_probe_event(trace_event_name(&tu->tp.call), - tu->tp.call.class->system); + old_tu = find_old_trace_uprobe(tu); + if (IS_ERR(old_tu)) { + ret = PTR_ERR(old_tu); + goto end; + } + if (old_tu) { /* delete old event */ ret = unregister_trace_uprobe(old_tu); -- 2.14.4
next prev parent reply other threads:[~2018-07-16 8:47 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-16 8:47 [PATCH v6 0/6] Uprobes: Support SDT markers having reference count (semaphore) Ravi Bangoria 2018-07-16 8:47 ` Ravi Bangoria 2018-07-16 8:47 ` [PATCH v6 1/6] Uprobes: Simplify uprobe_register() body Ravi Bangoria 2018-07-16 8:47 ` Ravi Bangoria 2018-07-16 8:47 ` [PATCH v6 2/6] Uprobe: Additional argument arch_uprobe to uprobe_write_opcode() Ravi Bangoria 2018-07-16 8:47 ` Ravi Bangoria 2018-07-16 8:47 ` [PATCH v6 3/6] Uprobes: Support SDT markers having reference count (semaphore) Ravi Bangoria 2018-07-16 8:47 ` Ravi Bangoria 2018-07-23 16:26 ` Oleg Nesterov 2018-07-23 16:26 ` Oleg Nesterov 2018-07-24 3:34 ` Ravi Bangoria 2018-07-24 3:34 ` Ravi Bangoria 2018-07-27 13:59 ` Oleg Nesterov 2018-07-27 13:59 ` Oleg Nesterov 2018-07-24 14:21 ` Masami Hiramatsu 2018-07-24 14:21 ` Masami Hiramatsu 2018-07-16 8:47 ` Ravi Bangoria [this message] 2018-07-16 8:47 ` [PATCH v6 4/6] trace_uprobe/sdt: Prevent multiple reference counter for same uprobe Ravi Bangoria 2018-07-16 8:47 ` [PATCH v6 5/6] Uprobes/sdt: " Ravi Bangoria 2018-07-16 8:47 ` Ravi Bangoria 2018-07-25 11:08 ` Oleg Nesterov 2018-07-25 11:08 ` Oleg Nesterov 2018-07-27 4:17 ` Ravi Bangoria 2018-07-27 4:17 ` Ravi Bangoria 2018-07-27 13:55 ` Oleg Nesterov 2018-07-27 13:55 ` Oleg Nesterov 2018-07-16 8:47 ` [PATCH v6 6/6] perf probe: Support SDT markers having reference counter (semaphore) Ravi Bangoria 2018-07-16 8:47 ` Ravi Bangoria 2018-07-20 13:47 ` [PATCH v6 0/6] Uprobes: Support SDT markers having reference count (semaphore) Ravi Bangoria 2018-07-20 13:47 ` Ravi Bangoria
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=20180716084706.28244-5-ravi.bangoria@linux.ibm.com \ --to=ravi.bangoria@linux.ibm.com \ --cc=acme@kernel.org \ --cc=alexander.shishkin@linux.intel.com \ --cc=alexis.berlemont@gmail.com \ --cc=ananth@linux.vnet.ibm.com \ --cc=jolsa@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@linux-mips.org \ --cc=linux@armlinux.org.uk \ --cc=mhiramat@kernel.org \ --cc=mingo@redhat.com \ --cc=namhyung@kernel.org \ --cc=naveen.n.rao@linux.vnet.ibm.com \ --cc=oleg@redhat.com \ --cc=paul.burton@mips.com \ --cc=peterz@infradead.org \ --cc=ralf@linux-mips.org \ --cc=rostedt@goodmis.org \ --cc=srikar@linux.vnet.ibm.com \ /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.