Attachment 153350 Details for Bug 236929 – PATCH 5: Fix up evtchn to not smp_call_function

[patch] PATCH 5: Fix up evtchn to not smp_call_function

linux-2.6.9-xen-evtchn-fix.patch (text/plain), 2.89 KB, created by Chris Lalancette on 2007-04-24 13:33:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2007-04-24 13:33:27 UTC

Size: 2.89 KB

patch

obsolete

>--- linux-2.6.9/drivers/xen/core/evtchn.c.orig
>+++ linux-2.6.9/drivers/xen/core/evtchn.c
>@@ -444,12 +444,6 @@ void unbind_from_irqhandler(unsigned int
> }
> EXPORT_SYMBOL_GPL(unbind_from_irqhandler);
> 
>-#ifdef CONFIG_SMP
>-static void do_nothing_function(void *ign)
>-{
>-}
>-#endif
>-
> /* Rebind an evtchn so that it gets delivered to a specific cpu */
> static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu)
> {
>@@ -459,8 +453,6 @@ static void rebind_irq_to_cpu(unsigned i
> 	if (!VALID_EVTCHN(evtchn))
> 		return;
> 
>-	spin_lock(&irq_mapping_update_lock);
>-
> 	/* Send future instances of this interrupt to other vcpu. */
> 	bind_vcpu.port = evtchn;
> 	bind_vcpu.vcpu = tcpu;
>@@ -472,21 +464,6 @@ static void rebind_irq_to_cpu(unsigned i
> 	 */
> 	if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_vcpu, &bind_vcpu) >= 0)
> 		bind_evtchn_to_cpu(evtchn, tcpu);
>-
>-	spin_unlock(&irq_mapping_update_lock);
>-
>-	/*
>-	 * Now send the new target processor a NOP IPI. When this returns, it
>-	 * will check for any pending interrupts, and so service any that got 
>-	 * delivered to the wrong processor by mistake.
>-	 * 
>-	 * XXX: The only time this is called with interrupts disabled is from
>-	 * the hotplug/hotunplug path. In that case, all cpus are stopped with 
>-	 * interrupts disabled, and the missed interrupts will be picked up
>-	 * when they start again. This is kind of a hack.
>-	 */
>-	if (!irqs_disabled())
>-		smp_call_function(do_nothing_function, NULL, 0, 0);
> }
> 
> 
>@@ -709,12 +686,11 @@ static struct hw_interrupt_type pirq_typ
> 
> int irq_ignore_unhandled(unsigned int irq)
> {
>-	struct physdev_irq_status_query irq_status;
>+	struct physdev_irq_status_query irq_status = { .irq = irq };
> 
> 	if (!is_running_on_xen())
> 		return 0;
> 
>-	irq_status.irq = irq;
> 	(void)HYPERVISOR_physdev_op(PHYSDEVOP_irq_status_query, &irq_status);
> 	return !!(irq_status.flags & XENIRQSTAT_shared);
> }
>@@ -769,11 +745,8 @@ void unmask_evtchn(int port)
> 	 */
> 	if (synch_test_bit(port, &s->evtchn_pending[0]) &&
> 	    !synch_test_and_set_bit(port / BITS_PER_LONG,
>-				    &vcpu_info->evtchn_pending_sel)) {
>+				    &vcpu_info->evtchn_pending_sel))
> 		vcpu_info->evtchn_upcall_pending = 1;
>-		if (!vcpu_info->evtchn_upcall_mask)
>-			force_evtchn_callback();
>-	}
> }
> EXPORT_SYMBOL_GPL(unmask_evtchn);
> 
>@@ -794,7 +767,9 @@ void irq_resume(void)
> 		BUG_ON(irq_info[pirq_to_irq(pirq)] != IRQ_UNBOUND);
> 
> 	/* Secondary CPUs must have no VIRQ or IPI bindings. */
>-	for (cpu = 1; cpu < NR_CPUS; cpu++) {
>+	for_each_possible_cpu(cpu) {
>+	        if (cpu == 0)
>+		        continue;
> 		for (virq = 0; virq < NR_VIRQS; virq++)
> 			BUG_ON(per_cpu(virq_to_irq, cpu)[virq] != -1);
> 		for (ipi = 0; ipi < NR_IPIS; ipi++)
>@@ -883,8 +858,7 @@ void __init xen_init_IRQ(void)
> 
> #ifdef RTC_IRQ
> 		/* If not domain 0, force our RTC driver to fail its probe. */
>-		if ((i == RTC_IRQ) &&
>-		    !(xen_start_info->flags & SIF_INITDOMAIN))
>+		if ((i == RTC_IRQ) && !is_initial_xendomain())
> 			continue;
> #endif
>

Actions: View | Diff

Attachments on bug 236929: 153275 | 153276 | 153277 | 153278 | 153350 | 153821 | 153881 | 153962 | 153977