diff options
| author | Vitaly Kuznetsov <vkuznets@redhat.com> | 2017-03-14 18:35:42 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2017-05-02 11:04:18 +0200 |
| commit | 04e95761faae743f50a04aab47b9dc457c82063f (patch) | |
| tree | e5fd283c4a7e92b3718e6c88c92ebff35e553a01 /arch/x86/xen/smp.c | |
| parent | e1dab14cf68d1e03950135969af3faf322f0db04 (diff) | |
x86/xen: split xen_smp_intr_init()/xen_smp_intr_free()
xen_smp_intr_init() and xen_smp_intr_free() have PV-specific code and as
a praparatory change to splitting smp.c we need to split these fucntions.
Create xen_smp_intr_init_pv()/xen_smp_intr_free_pv().
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86/xen/smp.c')
| -rw-r--r-- | arch/x86/xen/smp.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index eaa36162ed4a..18fbec1fca34 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -133,9 +133,10 @@ void xen_smp_intr_free(unsigned int cpu) kfree(per_cpu(xen_callfuncsingle_irq, cpu).name); per_cpu(xen_callfuncsingle_irq, cpu).name = NULL; } - if (xen_hvm_domain()) - return; +} +void xen_smp_intr_free_pv(unsigned int cpu) +{ if (per_cpu(xen_irq_work, cpu).irq >= 0) { unbind_from_irqhandler(per_cpu(xen_irq_work, cpu).irq, NULL); per_cpu(xen_irq_work, cpu).irq = -1; @@ -149,11 +150,12 @@ void xen_smp_intr_free(unsigned int cpu) kfree(per_cpu(xen_pmu_irq, cpu).name); per_cpu(xen_pmu_irq, cpu).name = NULL; } -}; +} + int xen_smp_intr_init(unsigned int cpu) { int rc; - char *resched_name, *callfunc_name, *debug_name, *pmu_name; + char *resched_name, *callfunc_name, *debug_name; resched_name = kasprintf(GFP_KERNEL, "resched%d", cpu); rc = bind_ipi_to_irqhandler(XEN_RESCHEDULE_VECTOR, @@ -200,12 +202,17 @@ int xen_smp_intr_init(unsigned int cpu) per_cpu(xen_callfuncsingle_irq, cpu).irq = rc; per_cpu(xen_callfuncsingle_irq, cpu).name = callfunc_name; - /* - * The IRQ worker on PVHVM goes through the native path and uses the - * IPI mechanism. - */ - if (xen_hvm_domain()) - return 0; + return 0; + + fail: + xen_smp_intr_free(cpu); + return rc; +} + +int xen_smp_intr_init_pv(unsigned int cpu) +{ + int rc; + char *callfunc_name, *pmu_name; callfunc_name = kasprintf(GFP_KERNEL, "irqwork%d", cpu); rc = bind_ipi_to_irqhandler(XEN_IRQ_WORK_VECTOR, @@ -234,7 +241,7 @@ int xen_smp_intr_init(unsigned int cpu) return 0; fail: - xen_smp_intr_free(cpu); + xen_smp_intr_free_pv(cpu); return rc; } |