The following commit has been merged into the perf/core branch of tip:
Commit-ID: 12026d2034dfeb575e0eb28f33431cbf03dc732c
Gitweb: https://git.kernel.org/tip/12026d2034dfeb575e0eb28f33431cbf03dc732c
Author: Oleg Nesterov <oleg@xxxxxxxxxx>
AuthorDate: Thu, 01 Aug 2024 15:27:49 +02:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Fri, 02 Aug 2024 11:30:32 +02:00
uprobes: shift put_uprobe() from delete_uprobe() to uprobe_unregister()
Kill the extra get_uprobe() + put_uprobe() in uprobe_unregister() and
move the possibly final put_uprobe() from delete_uprobe() to its only
caller, uprobe_unregister().
Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Reviewed-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
Acked-by: "Masami Hiramatsu (Google)" <mhiramat@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240801132749.GA8817@xxxxxxxxxx
---
kernel/events/uprobes.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 175058b..30348f1 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -939,7 +939,6 @@ static void delete_uprobe(struct uprobe *uprobe)
rb_erase(&uprobe->rb_node, &uprobes_tree);
write_unlock(&uprobes_treelock);
RB_CLEAR_NODE(&uprobe->rb_node); /* for uprobe_is_active() */
- put_uprobe(uprobe);
}
struct map_info {
@@ -1094,7 +1093,6 @@ void uprobe_unregister(struct uprobe *uprobe, struct uprobe_consumer *uc)
{
int err;
- get_uprobe(uprobe);
down_write(&uprobe->register_rwsem);
if (WARN_ON(!consumer_del(uprobe, uc)))
err = -ENOENT;
@@ -1102,10 +1100,16 @@ void uprobe_unregister(struct uprobe *uprobe, struct uprobe_consumer *uc)
err = register_for_each_vma(uprobe, NULL);
/* TODO : cant unregister? schedule a worker thread */
- if (!err && !uprobe->consumers)
- delete_uprobe(uprobe);
+ if (!err) {
+ if (!uprobe->consumers)
+ delete_uprobe(uprobe);
+ else
+ err = -EBUSY;
+ }
up_write(&uprobe->register_rwsem);
- put_uprobe(uprobe);
+
+ if (!err)
+ put_uprobe(uprobe);
}
EXPORT_SYMBOL_GPL(uprobe_unregister);
|