Changeset 270

Timestamp:

05/08/14 01:24:05 (11 years ago)

Author:

atzm

Message:

revert r269, this causes cpu soft lockup

File:

• ksyslog/trunk/ksyslog.c (modified) (7 diffs)

ksyslog/trunk/ksyslog.c

@@ -22 +22 @@
 static struct socket *ksyslog_rcv_sk = NULL;
 
-static struct delayed_work __percpu *ksyslog_work = NULL;
+static struct delayed_work ksyslog_work;
 static struct workqueue_struct *ksyslog_wq = NULL;
 
@@ -297 +297 @@
 
 static void
-ksyslog_work_register_cpu(int cpu, struct delayed_work *work, unsigned long timer)
-{
-        queue_delayed_work_on(cpu, ksyslog_wq, work, timer * HZ / 1000);
-}
-
-static void
 ksyslog_work_register(unsigned long timer)
 {
-        int cpu;
-
-        for_each_possible_cpu(cpu)
-                ksyslog_work_register_cpu(cpu, per_cpu_ptr(ksyslog_work, cpu), timer);
+        queue_delayed_work(ksyslog_wq, &ksyslog_work, timer * HZ / 1000);
 }
 
@@ -314 +305 @@
 ksyslog_work_unregister(void)
 {
-        int cpu;
-
-        for_each_possible_cpu(cpu)
-                cancel_delayed_work_sync(per_cpu_ptr(ksyslog_work, cpu));
+        cancel_delayed_work_sync(&ksyslog_work);
 }
 
@@ -360 +348 @@
 
 out:
-        ksyslog_work_register_cpu(smp_processor_id(),
-                                  per_cpu_ptr(ksyslog_work, smp_processor_id()),
-                                  ksyslog_flush_interval);
+        ksyslog_work_register(ksyslog_flush_interval);
 }
 
@@ -631 +617 @@
         ksyslog_rcv_sk = NULL;
 
-        if (ksyslog_work) {
+        if (ksyslog_wq) {
                 ksyslog_work_unregister();
-                free_percpu(ksyslog_work);
-        }
-        ksyslog_work = NULL;
-
-        if (ksyslog_wq)
                 destroy_workqueue(ksyslog_wq);
+        }
         ksyslog_wq = NULL;
 
@@ -654 +636 @@
 ksyslog_init(void)
 {
-        int cpu, err;
+        int err;
         struct sockaddr_in sin;
 
@@ -674 +656 @@
         }
 
-        ksyslog_work = alloc_percpu(struct delayed_work);
-        if (!ksyslog_work) {
-                pr_err("ksyslog: alloc_percpu(ksyslog_work) failed\n");
-                err = -ENOMEM;
-                goto err;
-        }
-        for_each_possible_cpu(cpu)
-                INIT_DELAYED_WORK(per_cpu_ptr(ksyslog_work, cpu), ksyslog_work_handler);
+        INIT_DELAYED_WORK(&ksyslog_work, ksyslog_work_handler);
 
         err = sock_create(AF_INET, SOCK_DGRAM, 0, &ksyslog_rcv_sk);