From: Song Liu <liu.song.a23@gmail.com>
To: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: srikar@linux.vnet.ibm.com, Oleg Nesterov <oleg@redhat.com>,
Steven Rostedt <rostedt@goodmis.org>,
mhiramat@kernel.org, Peter Zijlstra <peterz@infradead.org>,
mingo@redhat.com, acme@kernel.org,
alexander.shishkin@linux.intel.com, jolsa@redhat.com,
namhyung@kernel.org, open list <linux-kernel@vger.kernel.org>,
ananth@linux.vnet.ibm.com,
Alexis Berlemont <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
Subject: Re: [PATCH v8 1/6] Uprobes: Simplify uprobe_register() body
Date: Sat, 11 Aug 2018 01:00:45 -0700 [thread overview]
Message-ID: <CAPhsuW4zyC1v59bwe4D7j-K3Nw90FbDs2FZ5HuT2HOgR_oooUg@mail.gmail.com> (raw)
In-Reply-To: <20180809041856.1547-2-ravi.bangoria@linux.ibm.com>
On Wed, Aug 8, 2018 at 9:18 PM, Ravi Bangoria
<ravi.bangoria@linux.ibm.com> wrote:
> Simplify uprobe_register() function body and let __uprobe_register()
> handle everything. Also move dependency functions around to fix build
> failures.
>
> Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Reviewed-by: Song Liu <songliubraving@fb.com>
> ---
> kernel/events/uprobes.c | 69 ++++++++++++++++++++++++++-----------------------
> 1 file changed, 36 insertions(+), 33 deletions(-)
>
> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
> index ccc579a7d32e..471eac896635 100644
> --- a/kernel/events/uprobes.c
> +++ b/kernel/events/uprobes.c
> @@ -840,13 +840,8 @@ register_for_each_vma(struct uprobe *uprobe, struct uprobe_consumer *new)
> return err;
> }
>
> -static int __uprobe_register(struct uprobe *uprobe, struct uprobe_consumer *uc)
> -{
> - consumer_add(uprobe, uc);
> - return register_for_each_vma(uprobe, uc);
> -}
> -
> -static void __uprobe_unregister(struct uprobe *uprobe, struct uprobe_consumer *uc)
> +static void
> +__uprobe_unregister(struct uprobe *uprobe, struct uprobe_consumer *uc)
> {
> int err;
>
> @@ -860,24 +855,46 @@ static void __uprobe_unregister(struct uprobe *uprobe, struct uprobe_consumer *u
> }
>
> /*
> - * uprobe_register - register a probe
> + * uprobe_unregister - unregister a already registered probe.
> + * @inode: the file in which the probe has to be removed.
> + * @offset: offset from the start of the file.
> + * @uc: identify which probe if multiple probes are colocated.
> + */
> +void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
> +{
> + struct uprobe *uprobe;
> +
> + uprobe = find_uprobe(inode, offset);
> + if (WARN_ON(!uprobe))
> + return;
> +
> + down_write(&uprobe->register_rwsem);
> + __uprobe_unregister(uprobe, uc);
> + up_write(&uprobe->register_rwsem);
> + put_uprobe(uprobe);
> +}
> +EXPORT_SYMBOL_GPL(uprobe_unregister);
> +
> +/*
> + * __uprobe_register - register a probe
> * @inode: the file in which the probe has to be placed.
> * @offset: offset from the start of the file.
> * @uc: information on howto handle the probe..
> *
> - * Apart from the access refcount, uprobe_register() takes a creation
> + * Apart from the access refcount, __uprobe_register() takes a creation
> * refcount (thro alloc_uprobe) if and only if this @uprobe is getting
> * inserted into the rbtree (i.e first consumer for a @inode:@offset
> * tuple). Creation refcount stops uprobe_unregister from freeing the
> * @uprobe even before the register operation is complete. Creation
> * refcount is released when the last @uc for the @uprobe
> - * unregisters. Caller of uprobe_register() is required to keep @inode
> + * unregisters. Caller of __uprobe_register() is required to keep @inode
> * (and the containing mount) referenced.
> *
> * Return errno if it cannot successully install probes
> * else return 0 (success)
> */
> -int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
> +static int __uprobe_register(struct inode *inode, loff_t offset,
> + struct uprobe_consumer *uc)
> {
> struct uprobe *uprobe;
> int ret;
> @@ -904,7 +921,8 @@ int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *
> down_write(&uprobe->register_rwsem);
> ret = -EAGAIN;
> if (likely(uprobe_is_active(uprobe))) {
> - ret = __uprobe_register(uprobe, uc);
> + consumer_add(uprobe, uc);
> + ret = register_for_each_vma(uprobe, uc);
> if (ret)
> __uprobe_unregister(uprobe, uc);
> }
> @@ -915,6 +933,12 @@ int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *
> goto retry;
> return ret;
> }
> +
> +int uprobe_register(struct inode *inode, loff_t offset,
> + struct uprobe_consumer *uc)
> +{
> + return __uprobe_register(inode, offset, uc);
> +}
> EXPORT_SYMBOL_GPL(uprobe_register);
>
> /*
> @@ -946,27 +970,6 @@ int uprobe_apply(struct inode *inode, loff_t offset,
> return ret;
> }
>
> -/*
> - * uprobe_unregister - unregister a already registered probe.
> - * @inode: the file in which the probe has to be removed.
> - * @offset: offset from the start of the file.
> - * @uc: identify which probe if multiple probes are colocated.
> - */
> -void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc)
> -{
> - struct uprobe *uprobe;
> -
> - uprobe = find_uprobe(inode, offset);
> - if (WARN_ON(!uprobe))
> - return;
> -
> - down_write(&uprobe->register_rwsem);
> - __uprobe_unregister(uprobe, uc);
> - up_write(&uprobe->register_rwsem);
> - put_uprobe(uprobe);
> -}
> -EXPORT_SYMBOL_GPL(uprobe_unregister);
> -
> static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm)
> {
> struct vm_area_struct *vma;
> --
> 2.14.4
>
next prev parent reply other threads:[~2018-08-11 8:00 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-09 4:18 [PATCH v8 0/6] Uprobes: Support SDT markers having reference count (semaphore) Ravi Bangoria
2018-08-09 4:18 ` [PATCH v8 1/6] Uprobes: Simplify uprobe_register() body Ravi Bangoria
2018-08-11 8:00 ` Song Liu [this message]
2018-08-13 8:56 ` Srikar Dronamraju
2018-08-14 0:07 ` Steven Rostedt
2018-08-09 4:18 ` [PATCH v8 2/6] Uprobe: Additional argument arch_uprobe to uprobe_write_opcode() Ravi Bangoria
2018-08-11 8:01 ` Song Liu
2018-08-13 8:51 ` Srikar Dronamraju
2018-08-09 4:18 ` [PATCH v8 3/6] Uprobes: Support SDT markers having reference count (semaphore) Ravi Bangoria
2018-08-09 14:38 ` Oleg Nesterov
2018-08-10 19:58 ` Steven Rostedt
2018-08-11 6:14 ` Song Liu
2018-08-14 0:01 ` Steven Rostedt
2018-08-14 0:05 ` Steven Rostedt
2018-08-11 7:57 ` Song Liu
2018-08-11 15:37 ` Steven Rostedt
2018-08-13 5:47 ` Ravi Bangoria
2018-08-13 7:38 ` Ravi Bangoria
2018-08-13 11:50 ` Oleg Nesterov
2018-08-13 13:01 ` Ravi Bangoria
2018-08-13 13:17 ` Oleg Nesterov
2018-08-13 14:26 ` Ravi Bangoria
2018-08-13 14:51 ` Oleg Nesterov
2018-08-13 17:12 ` Song Liu
2018-08-14 4:37 ` Ravi Bangoria
2018-08-14 16:35 ` Song Liu
2018-08-14 0:03 ` Steven Rostedt
2018-08-13 16:50 ` Song Liu
2018-08-13 10:03 ` Srikar Dronamraju
2018-08-13 11:23 ` Oleg Nesterov
2018-08-14 8:56 ` Ravi Bangoria
2018-08-09 4:18 ` [PATCH v8 4/6] Uprobes/sdt: Prevent multiple reference counter for same uprobe Ravi Bangoria
2018-08-11 8:04 ` Song Liu
2018-08-13 8:50 ` Srikar Dronamraju
2018-08-09 4:18 ` [PATCH v8 5/6] trace_uprobe/sdt: " Ravi Bangoria
2018-08-11 8:12 ` Song Liu
2018-08-13 8:19 ` Ravi Bangoria
2018-08-13 8:49 ` Srikar Dronamraju
2018-08-13 16:27 ` Song Liu
2018-08-13 8:48 ` Srikar Dronamraju
2018-08-09 4:18 ` [PATCH v8 6/6] perf probe: Support SDT markers having reference counter (semaphore) Ravi Bangoria
2018-08-13 16:55 ` [PATCH v8 0/6] Uprobes: Support SDT markers having reference count (semaphore) Oleg Nesterov
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=CAPhsuW4zyC1v59bwe4D7j-K3Nw90FbDs2FZ5HuT2HOgR_oooUg@mail.gmail.com \
--to=liu.song.a23@gmail.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=ravi.bangoria@linux.ibm.com \
--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: 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).