[PATCH v2 07/12] uprobes: inline alloc_uprobe() logic into __uprobe_register()

[Andrii Nakryiko]

To allow unbundling alloc-uprobe-and-insert step which is currently
tightly coupled, inline alloc_uprobe() logic into
uprobe_register_batch() loop. It's called from one place, so we don't
really lose much in terms of maintainability.

No functional changes.

Signed-off-by: Andrii Nakryiko <and...@kernel.org>
---
 kernel/events/uprobes.c | 65 ++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 68fdf1b8e4bf..0f928a72a658 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -869,40 +869,6 @@ ref_ctr_mismatch_warn(struct uprobe *cur_uprobe, struct 
uprobe *uprobe)
                (unsigned long long) uprobe->ref_ctr_offset);
 }
 
-static struct uprobe *alloc_uprobe(struct inode *inode, loff_t offset,
-                                  loff_t ref_ctr_offset)
-{
-       struct uprobe *uprobe, *cur_uprobe;
-
-       uprobe = kzalloc(sizeof(struct uprobe), GFP_KERNEL);
-       if (!uprobe)
-               return ERR_PTR(-ENOMEM);
-
-       uprobe->inode = inode;
-       uprobe->offset = offset;
-       uprobe->ref_ctr_offset = ref_ctr_offset;
-       init_rwsem(&uprobe->register_rwsem);
-       init_rwsem(&uprobe->consumer_rwsem);
-       RB_CLEAR_NODE(&uprobe->rb_node);
-       atomic64_set(&uprobe->ref, 1);
-
-       /* add to uprobes_tree, sorted on inode:offset */
-       cur_uprobe = insert_uprobe(uprobe);
-       /* a uprobe exists for this inode:offset combination */
-       if (cur_uprobe != uprobe) {
-               if (cur_uprobe->ref_ctr_offset != uprobe->ref_ctr_offset) {
-                       ref_ctr_mismatch_warn(cur_uprobe, uprobe);
-                       put_uprobe(cur_uprobe);
-                       kfree(uprobe);
-                       return ERR_PTR(-EINVAL);
-               }
-               kfree(uprobe);
-               uprobe = cur_uprobe;
-       }
-
-       return uprobe;
-}
-
 static void consumer_add(struct uprobe *uprobe, struct uprobe_consumer *uc)
 {
        down_write(&uprobe->consumer_rwsem);
@@ -1332,14 +1298,39 @@ int uprobe_register_batch(struct inode *inode, int cnt,
        }
 
        for (i = 0; i < cnt; i++) {
+               struct uprobe *cur_uprobe;
+
                uc = get_uprobe_consumer(i, ctx);
 
-               uprobe = alloc_uprobe(inode, uc->offset, uc->ref_ctr_offset);
-               if (IS_ERR(uprobe)) {
-                       ret = PTR_ERR(uprobe);
+               uprobe = kzalloc(sizeof(struct uprobe), GFP_KERNEL);
+               if (!uprobe) {
+                       ret = -ENOMEM;
                        goto cleanup_uprobes;
                }
 
+               uprobe->inode = inode;
+               uprobe->offset = uc->offset;
+               uprobe->ref_ctr_offset = uc->ref_ctr_offset;
+               init_rwsem(&uprobe->register_rwsem);
+               init_rwsem(&uprobe->consumer_rwsem);
+               RB_CLEAR_NODE(&uprobe->rb_node);
+               atomic64_set(&uprobe->ref, 1);
+
+               /* add to uprobes_tree, sorted on inode:offset */
+               cur_uprobe = insert_uprobe(uprobe);
+               /* a uprobe exists for this inode:offset combination */
+               if (cur_uprobe != uprobe) {
+                       if (cur_uprobe->ref_ctr_offset != 
uprobe->ref_ctr_offset) {
+                               ref_ctr_mismatch_warn(cur_uprobe, uprobe);
+                               put_uprobe(cur_uprobe);
+                               kfree(uprobe);
+                               ret = -EINVAL;
+                               goto cleanup_uprobes;
+                       }
+                       kfree(uprobe);
+                       uprobe = cur_uprobe;
+               }
+
                uc->uprobe = uprobe;
        }
 
-- 
2.43.0