Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / mm / swap.c

diff --git a/kernel/mm/swap.c b/kernel/mm/swap.c
index ca194ae..ad16649 100644 (file)
--- a/kernel/mm/swap.c
+++ b/kernel/mm/swap.c
@@ -821,9 +821,15 @@ void lru_add_drain_cpu(int cpu)
                unsigned long flags;
 
                /* No harm done if a racing interrupt already did this */
+#ifdef CONFIG_PREEMPT_RT_BASE
+               local_lock_irqsave_on(rotate_lock, flags, cpu);
+               pagevec_move_tail(pvec);
+               local_unlock_irqrestore_on(rotate_lock, flags, cpu);
+#else
                local_lock_irqsave(rotate_lock, flags);
                pagevec_move_tail(pvec);
                local_unlock_irqrestore(rotate_lock, flags);
+#endif
        }
 
        pvec = &per_cpu(lru_deactivate_file_pvecs, cpu);
@@ -866,12 +872,32 @@ void lru_add_drain(void)
        local_unlock_cpu(swapvec_lock);
 }
 
+
+#ifdef CONFIG_PREEMPT_RT_BASE
+static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work)
+{
+       local_lock_on(swapvec_lock, cpu);
+       lru_add_drain_cpu(cpu);
+       local_unlock_on(swapvec_lock, cpu);
+}
+
+#else
+
 static void lru_add_drain_per_cpu(struct work_struct *dummy)
 {
        lru_add_drain();
 }
 
 static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
+static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work)
+{
+       struct work_struct *work = &per_cpu(lru_add_drain_work, cpu);
+
+       INIT_WORK(work, lru_add_drain_per_cpu);
+       schedule_work_on(cpu, work);
+       cpumask_set_cpu(cpu, has_work);
+}
+#endif
 
 void lru_add_drain_all(void)
 {
@@ -884,20 +910,17 @@ void lru_add_drain_all(void)
        cpumask_clear(&has_work);
 
        for_each_online_cpu(cpu) {
-               struct work_struct *work = &per_cpu(lru_add_drain_work, cpu);
-
                if (pagevec_count(&per_cpu(lru_add_pvec, cpu)) ||
                    pagevec_count(&per_cpu(lru_rotate_pvecs, cpu)) ||
                    pagevec_count(&per_cpu(lru_deactivate_file_pvecs, cpu)) ||
-                   need_activate_page_drain(cpu)) {
-                       INIT_WORK(work, lru_add_drain_per_cpu);
-                       schedule_work_on(cpu, work);
-                       cpumask_set_cpu(cpu, &has_work);
-               }
+                   need_activate_page_drain(cpu))
+                       remote_lru_add_drain(cpu, &has_work);
        }
 
+#ifndef CONFIG_PREEMPT_RT_BASE
        for_each_cpu(cpu, &has_work)
                flush_work(&per_cpu(lru_add_drain_work, cpu));
+#endif
 
        put_online_cpus();
        mutex_unlock(&lock);