Commit 9547689f authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk

xen/smp: Introduce a common structure to contain the IRQ name and interrupt line.

This patch adds a new structure to contain the common two things
that each of the per-cpu interrupts need:
 - an interrupt number,
 - and the name of the interrupt (to be added in 'xen/smp: Don't leak
   interrupt name when offlining').

This allows us to carry the tuple of the per-cpu interrupt data structure
and expand it as we need in the future.
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 53b94fdc
...@@ -39,11 +39,15 @@ ...@@ -39,11 +39,15 @@
cpumask_var_t xen_cpu_initialized_map; cpumask_var_t xen_cpu_initialized_map;
static DEFINE_PER_CPU(int, xen_resched_irq); struct xen_common_irq {
static DEFINE_PER_CPU(int, xen_callfunc_irq); int irq;
static DEFINE_PER_CPU(int, xen_callfuncsingle_irq); char *name;
static DEFINE_PER_CPU(int, xen_irq_work); };
static DEFINE_PER_CPU(int, xen_debug_irq) = -1; static DEFINE_PER_CPU(struct xen_common_irq, xen_resched_irq);
static DEFINE_PER_CPU(struct xen_common_irq, xen_callfunc_irq);
static DEFINE_PER_CPU(struct xen_common_irq, xen_callfuncsingle_irq);
static DEFINE_PER_CPU(struct xen_common_irq, xen_irq_work);
static DEFINE_PER_CPU(struct xen_common_irq, xen_debug_irq) = { .irq = -1 };
static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id); static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id);
static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id); static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id);
...@@ -100,20 +104,20 @@ static void __cpuinit cpu_bringup_and_idle(void) ...@@ -100,20 +104,20 @@ static void __cpuinit cpu_bringup_and_idle(void)
static void xen_smp_intr_free(unsigned int cpu) static void xen_smp_intr_free(unsigned int cpu)
{ {
if (per_cpu(xen_resched_irq, cpu) >= 0) if (per_cpu(xen_resched_irq, cpu).irq >= 0)
unbind_from_irqhandler(per_cpu(xen_resched_irq, cpu), NULL); unbind_from_irqhandler(per_cpu(xen_resched_irq, cpu).irq, NULL);
if (per_cpu(xen_callfunc_irq, cpu) >= 0) if (per_cpu(xen_callfunc_irq, cpu).irq >= 0)
unbind_from_irqhandler(per_cpu(xen_callfunc_irq, cpu), NULL); unbind_from_irqhandler(per_cpu(xen_callfunc_irq, cpu).irq, NULL);
if (per_cpu(xen_debug_irq, cpu) >= 0) if (per_cpu(xen_debug_irq, cpu).irq >= 0)
unbind_from_irqhandler(per_cpu(xen_debug_irq, cpu), NULL); unbind_from_irqhandler(per_cpu(xen_debug_irq, cpu).irq, NULL);
if (per_cpu(xen_callfuncsingle_irq, cpu) >= 0) if (per_cpu(xen_callfuncsingle_irq, cpu).irq >= 0)
unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu), unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu).irq,
NULL); NULL);
if (xen_hvm_domain()) if (xen_hvm_domain())
return; return;
if (per_cpu(xen_irq_work, cpu) >= 0) if (per_cpu(xen_irq_work, cpu).irq >= 0)
unbind_from_irqhandler(per_cpu(xen_irq_work, cpu), NULL); unbind_from_irqhandler(per_cpu(xen_irq_work, cpu).irq, NULL);
}; };
static int xen_smp_intr_init(unsigned int cpu) static int xen_smp_intr_init(unsigned int cpu)
{ {
...@@ -129,7 +133,7 @@ static int xen_smp_intr_init(unsigned int cpu) ...@@ -129,7 +133,7 @@ static int xen_smp_intr_init(unsigned int cpu)
NULL); NULL);
if (rc < 0) if (rc < 0)
goto fail; goto fail;
per_cpu(xen_resched_irq, cpu) = rc; per_cpu(xen_resched_irq, cpu).irq = rc;
callfunc_name = kasprintf(GFP_KERNEL, "callfunc%d", cpu); callfunc_name = kasprintf(GFP_KERNEL, "callfunc%d", cpu);
rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_VECTOR, rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_VECTOR,
...@@ -140,7 +144,7 @@ static int xen_smp_intr_init(unsigned int cpu) ...@@ -140,7 +144,7 @@ static int xen_smp_intr_init(unsigned int cpu)
NULL); NULL);
if (rc < 0) if (rc < 0)
goto fail; goto fail;
per_cpu(xen_callfunc_irq, cpu) = rc; per_cpu(xen_callfunc_irq, cpu).irq = rc;
debug_name = kasprintf(GFP_KERNEL, "debug%d", cpu); debug_name = kasprintf(GFP_KERNEL, "debug%d", cpu);
rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu, xen_debug_interrupt, rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu, xen_debug_interrupt,
...@@ -148,7 +152,7 @@ static int xen_smp_intr_init(unsigned int cpu) ...@@ -148,7 +152,7 @@ static int xen_smp_intr_init(unsigned int cpu)
debug_name, NULL); debug_name, NULL);
if (rc < 0) if (rc < 0)
goto fail; goto fail;
per_cpu(xen_debug_irq, cpu) = rc; per_cpu(xen_debug_irq, cpu).irq = rc;
callfunc_name = kasprintf(GFP_KERNEL, "callfuncsingle%d", cpu); callfunc_name = kasprintf(GFP_KERNEL, "callfuncsingle%d", cpu);
rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_SINGLE_VECTOR, rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_SINGLE_VECTOR,
...@@ -159,7 +163,7 @@ static int xen_smp_intr_init(unsigned int cpu) ...@@ -159,7 +163,7 @@ static int xen_smp_intr_init(unsigned int cpu)
NULL); NULL);
if (rc < 0) if (rc < 0)
goto fail; goto fail;
per_cpu(xen_callfuncsingle_irq, cpu) = rc; per_cpu(xen_callfuncsingle_irq, cpu).irq = rc;
/* /*
* The IRQ worker on PVHVM goes through the native path and uses the * The IRQ worker on PVHVM goes through the native path and uses the
...@@ -177,7 +181,7 @@ static int xen_smp_intr_init(unsigned int cpu) ...@@ -177,7 +181,7 @@ static int xen_smp_intr_init(unsigned int cpu)
NULL); NULL);
if (rc < 0) if (rc < 0)
goto fail; goto fail;
per_cpu(xen_irq_work, cpu) = rc; per_cpu(xen_irq_work, cpu).irq = rc;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment