]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
xen/events: Convert to hotplug state machine
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Wed, 7 Sep 2016 17:19:01 +0000 (13:19 -0400)
committerDavid Vrabel <david.vrabel@citrix.com>
Fri, 30 Sep 2016 10:23:04 +0000 (11:23 +0100)
Install the callbacks via the state machine.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
drivers/xen/events/events_fifo.c
include/linux/cpuhotplug.h

index 266c2c7330394566244805c8459e286db0b9ef40..7ef27c6ed72fb397167aaf86384da4adf947d6e6 100644 (file)
@@ -418,30 +418,18 @@ static int evtchn_fifo_alloc_control_block(unsigned cpu)
        return ret;
 }
 
-static int evtchn_fifo_cpu_notification(struct notifier_block *self,
-                                                 unsigned long action,
-                                                 void *hcpu)
+static int xen_evtchn_cpu_prepare(unsigned int cpu)
 {
-       int cpu = (long)hcpu;
-       int ret = 0;
-
-       switch (action) {
-       case CPU_UP_PREPARE:
-               if (!per_cpu(cpu_control_block, cpu))
-                       ret = evtchn_fifo_alloc_control_block(cpu);
-               break;
-       case CPU_DEAD:
-               __evtchn_fifo_handle_events(cpu, true);
-               break;
-       default:
-               break;
-       }
-       return ret < 0 ? NOTIFY_BAD : NOTIFY_OK;
+       if (!per_cpu(cpu_control_block, cpu))
+               return evtchn_fifo_alloc_control_block(cpu);
+       return 0;
 }
 
-static struct notifier_block evtchn_fifo_cpu_notifier = {
-       .notifier_call  = evtchn_fifo_cpu_notification,
-};
+static int xen_evtchn_cpu_dead(unsigned int cpu)
+{
+       __evtchn_fifo_handle_events(cpu, true);
+       return 0;
+}
 
 int __init xen_evtchn_fifo_init(void)
 {
@@ -456,7 +444,9 @@ int __init xen_evtchn_fifo_init(void)
 
        evtchn_ops = &evtchn_ops_fifo;
 
-       register_cpu_notifier(&evtchn_fifo_cpu_notifier);
+       cpuhp_setup_state_nocalls(CPUHP_XEN_EVTCHN_PREPARE,
+                                 "CPUHP_XEN_EVTCHN_PREPARE",
+                                 xen_evtchn_cpu_prepare, xen_evtchn_cpu_dead);
 out:
        put_cpu();
        return ret;
index 33d352f3295dc92116dfe1f07394970a5716b397..5f603166831ce6dbec11ae6fd432941a496a914c 100644 (file)
@@ -22,6 +22,7 @@ enum cpuhp_state {
        CPUHP_SMPCFD_PREPARE,
        CPUHP_RCUTREE_PREP,
        CPUHP_XEN_PREPARE,
+       CPUHP_XEN_EVTCHN_PREPARE,
        CPUHP_NOTIFY_PREPARE,
        CPUHP_TIMERS_DEAD,
        CPUHP_BRINGUP_CPU,