tools headers UAPI: Sync openat2.h with the kernel sources

[linux-2.6-microblaze.git] / kernel / kprobes.c

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index d5a3eb7..745f08f 100644 (file)
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -861,7 +861,6 @@ out:
        cpus_read_unlock();
 }
 
-#ifdef CONFIG_SYSCTL
 static void optimize_all_kprobes(void)
 {
        struct hlist_head *head;
@@ -887,6 +886,7 @@ out:
        mutex_unlock(&kprobe_mutex);
 }
 
+#ifdef CONFIG_SYSCTL
 static void unoptimize_all_kprobes(void)
 {
        struct hlist_head *head;
@@ -1520,13 +1520,16 @@ valid:
        return ap;
 }
 
-/* Return error if the kprobe is being re-registered */
-static inline int check_kprobe_rereg(struct kprobe *p)
+/*
+ * Warn and return error if the kprobe is being re-registered since
+ * there must be a software bug.
+ */
+static inline int warn_kprobe_rereg(struct kprobe *p)
 {
        int ret = 0;
 
        mutex_lock(&kprobe_mutex);
-       if (__get_valid_kprobe(p))
+       if (WARN_ON_ONCE(__get_valid_kprobe(p)))
                ret = -EINVAL;
        mutex_unlock(&kprobe_mutex);
 
@@ -1614,7 +1617,7 @@ int register_kprobe(struct kprobe *p)
                return PTR_ERR(addr);
        p->addr = addr;
 
-       ret = check_kprobe_rereg(p);
+       ret = warn_kprobe_rereg(p);
        if (ret)
                return ret;
 
@@ -1995,7 +1998,7 @@ int register_kretprobe(struct kretprobe *rp)
                return ret;
 
        /* If only rp->kp.addr is specified, check reregistering kprobes */
-       if (rp->kp.addr && check_kprobe_rereg(&rp->kp))
+       if (rp->kp.addr && warn_kprobe_rereg(&rp->kp))
                return -EINVAL;
 
        if (kretprobe_blacklist_size) {
@@ -2497,18 +2500,14 @@ static int __init init_kprobes(void)
                }
        }
 
-#if defined(CONFIG_OPTPROBES)
-#if defined(__ARCH_WANT_KPROBES_INSN_SLOT)
-       /* Init kprobe_optinsn_slots */
-       kprobe_optinsn_slots.insn_size = MAX_OPTINSN_SIZE;
-#endif
-       /* By default, kprobes can be optimized */
-       kprobes_allow_optimization = true;
-#endif
-
        /* By default, kprobes are armed */
        kprobes_all_disarmed = false;
 
+#if defined(CONFIG_OPTPROBES) && defined(__ARCH_WANT_KPROBES_INSN_SLOT)
+       /* Init kprobe_optinsn_slots for allocation */
+       kprobe_optinsn_slots.insn_size = MAX_OPTINSN_SIZE;
+#endif
+
        err = arch_init_kprobes();
        if (!err)
                err = register_die_notifier(&kprobe_exceptions_nb);
@@ -2523,6 +2522,21 @@ static int __init init_kprobes(void)
 }
 early_initcall(init_kprobes);
 
+#if defined(CONFIG_OPTPROBES)
+static int __init init_optprobes(void)
+{
+       /*
+        * Enable kprobe optimization - this kicks the optimizer which
+        * depends on synchronize_rcu_tasks() and ksoftirqd, that is
+        * not spawned in early initcall. So delay the optimization.
+        */
+       optimize_all_kprobes();
+
+       return 0;
+}
+subsys_initcall(init_optprobes);
+#endif
+
 #ifdef CONFIG_DEBUG_FS
 static void report_probe(struct seq_file *pi, struct kprobe *p,
                const char *sym, int offset, char *modname, struct kprobe *pp)