Re: [tip:irq/core] x86: xen: Sanitise sparse_irq handling

Jeremy Fitzhardinge
2010-10-16T00:15:11Z

On 10/12/2010 01:29 PM, tip-bot for Thomas Gleixner wrote:
> Commit-ID: 77dff1c755c3218691e95e7e38ee14323b35dbdb
> Gitweb: http://git.kernel.org/tip/77dff1c755c3218691e95e7e38ee14323b35dbdb
> Author: Thomas Gleixner <tglx@linutronix.de>
> AuthorDate: Wed, 29 Sep 2010 17:37:10 +0200
> Committer: Thomas Gleixner <tglx@linutronix.de>
> CommitDate: Tue, 12 Oct 2010 16:53:44 +0200
>
> x86: xen: Sanitise sparse_irq handling
>
> There seems to be more cleanups possible, but that's left to the xen
> experts :)

This causes the kernel to fail to boot under Xen. The WARN_ON(res !=
irq) triggers and nobody is very happy about the results.

It looks like the patch below might be sufficient, but then the system
fails due to block IO errors (not sure if that's related).

J

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 7d24b0d..a11fabb 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -338,31 +338,7 @@ static void unmask_evtchn(int port)

static int find_unbound_irq(void)
{
- struct irq_data *data;
- int irq, res;
-
- for (irq = 0; irq < nr_irqs; irq++) {
- data = irq_get_irq_data(irq);
- /* only 0->15 have init'd desc; handle irq > 16 */
- if (!data)
- break;
- if (data->chip == &no_irq_chip)
- break;
- if (data->chip != &xen_dynamic_chip)
- continue;
- if (irq_info[irq].type == IRQT_UNBOUND)
- return irq;
- }
-
- if (irq == nr_irqs)
- panic("No available IRQ to bind to: increase nr_irqs!\n");
-
- res = irq_alloc_desc_at(irq, 0);
-
- if (WARN_ON(res != irq))
- return -1;
-
- return irq;
+ return irq_alloc_descs(-1, 0, 1, 0);
}

int bind_evtchn_to_irq(unsigned int evtchn)

> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Reviewed-by: Ingo Molnar <mingo@elte.hu>
> Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
> ---
> drivers/xen/events.c | 23 +++++++++++------------
> 1 files changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/xen/events.c b/drivers/xen/events.c
> index 13365ba..7d24b0d 100644
> --- a/drivers/xen/events.c
> +++ b/drivers/xen/events.c
> @@ -338,30 +338,29 @@ static void unmask_evtchn(int port)
>
> static int find_unbound_irq(void)
> {
> - int irq;
> - struct irq_desc *desc;
> + struct irq_data *data;
> + int irq, res;
>
> for (irq = 0; irq < nr_irqs; irq++) {
> - desc = irq_to_desc(irq);
> + data = irq_get_irq_data(irq);
> /* only 0->15 have init'd desc; handle irq > 16 */
> - if (desc == NULL)
> + if (!data)
> break;
> - if (desc->chip == &no_irq_chip)
> + if (data->chip == &no_irq_chip)
> break;
> - if (desc->chip != &xen_dynamic_chip)
> + if (data->chip != &xen_dynamic_chip)
> continue;
> if (irq_info[irq].type == IRQT_UNBOUND)
> - break;
> + return irq;
> }
>
> if (irq == nr_irqs)
> panic("No available IRQ to bind to: increase nr_irqs!\n");
>
> - desc = irq_to_desc_alloc_node(irq, 0);
> - if (WARN_ON(desc == NULL))
> - return -1;
> + res = irq_alloc_desc_at(irq, 0);
>
> - dynamic_irq_init_keep_chip_data(irq);
> + if (WARN_ON(res != irq))
> + return -1;
>
> return irq;
> }
> @@ -495,7 +494,7 @@ static void unbind_from_irq(unsigned int irq)
> if (irq_info[irq].type != IRQT_UNBOUND) {
> irq_info[irq] = mk_unbound_info();
>
> - dynamic_irq_cleanup(irq);
> + irq_free_desc(irq);
> }
>
> spin_unlock(&irq_mapping_update_lock);