1 files changed, 15 insertions, 8 deletions

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 098f396aa409..f230e81a9db6 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -471,7 +471,6 @@ static LIST_HEAD(unoptimizing_list);
 
 static void kprobe_optimizer(struct work_struct *work);
 static DECLARE_DELAYED_WORK(optimizing_work, kprobe_optimizer);
-static DECLARE_COMPLETION(optimizer_comp);
 #define OPTIMIZE_DELAY 5
 
 /*
@@ -552,8 +551,7 @@ static __kprobes void do_free_cleaned_kprobes(struct list_head *free_list)
 /* Start optimizer after OPTIMIZE_DELAY passed */
 static __kprobes void kick_kprobe_optimizer(void)
 {
-        if (!delayed_work_pending(&optimizing_work))
-                schedule_delayed_work(&optimizing_work, OPTIMIZE_DELAY);
+        schedule_delayed_work(&optimizing_work, OPTIMIZE_DELAY);
 }
 
 /* Kprobe jump optimizer */
@@ -592,16 +590,25 @@ static __kprobes void kprobe_optimizer(struct work_struct *work)
         /* Step 5: Kick optimizer again if needed */
         if (!list_empty(&optimizing_list) || !list_empty(&unoptimizing_list))
                 kick_kprobe_optimizer();
-        else
-                /* Wake up all waiters */
-                complete_all(&optimizer_comp);
 }
 
 /* Wait for completing optimization and unoptimization */
 static __kprobes void wait_for_kprobe_optimizer(void)
 {
-        if (delayed_work_pending(&optimizing_work))
-                wait_for_completion(&optimizer_comp);
+        mutex_lock(&kprobe_mutex);
+
+        while (!list_empty(&optimizing_list) || !list_empty(&unoptimizing_list)) {
+                mutex_unlock(&kprobe_mutex);
+
+                /* this will also make optimizing_work execute immmediately */
+                flush_delayed_work(&optimizing_work);
+                /* @optimizing_work might not have been queued yet, relax */
+                cpu_relax();
+
+                mutex_lock(&kprobe_mutex);
+        }
+
+        mutex_unlock(&kprobe_mutex);
 }
 
 /* Optimize kprobe if p is ready to be optimized */