Commit 7d04319a authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/apic: Convert to IRQCHIP_MOVE_DEFERRED 



Instead of marking individual interrupts as safe to be migrated in
arbitrary contexts, mark the interrupt chips, which require the interrupt
to be moved in actual interrupt context, with the new IRQCHIP_MOVE_DEFERRED
flag. This makes more sense because this is a per interrupt chip property
and not restricted to individual interrupts.

That flips the logic from the historical opt-out to a opt-in model. This is
simpler to handle for other architectures, which default to unrestricted
affinity setting. It also allows to cleanup the redundant core logic
significantly.

All interrupt chips, which belong to a top-level domain sitting directly on
top of the x86 vector domain are marked accordingly, unless the related
setup code marks the interrupts with IRQ_MOVE_PCNTXT, i.e. XEN.

No functional change intended.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarSteve Wahl <steve.wahl@hpe.com>
Acked-by: default avatarWei Liu <wei.liu@kernel.org>
Link: https://lore.kernel.org/all/20241210103335.563277044@linutronix.de
parent a648eb3a

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ config X86 
	select GENERIC_IRQ_RESERVATION_MODE

	select GENERIC_IRQ_SHOW

	select GENERIC_PENDING_IRQ		if SMP

	select GENERIC_PENDING_IRQ_CHIPFLAGS	if SMP

	select GENERIC_PTDUMP

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL

arch/x86/hyperv/irqdomain.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static struct irq_chip hv_pci_msi_controller = { 
	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_compose_msi_msg	= hv_irq_compose_msi_msg,

	.irq_set_affinity	= msi_domain_set_affinity,

	.flags			= IRQCHIP_SKIP_SET_WAKE,

	.flags			= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MOVE_DEFERRED,

};



static struct msi_domain_ops pci_msi_domain_ops = {

arch/x86/kernel/apic/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ static struct irq_chip ioapic_chip __read_mostly = { 
	.irq_set_affinity	= ioapic_set_affinity,

	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_get_irqchip_state	= ioapic_irq_get_chip_state,

	.flags			= IRQCHIP_SKIP_SET_WAKE |

	.flags			= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MOVE_DEFERRED |

				  IRQCHIP_AFFINITY_PRE_STARTUP,

};

arch/x86/kernel/apic/msi.c

+2 −1
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ static bool x86_init_dev_msi_info(struct device *dev, struct irq_domain *domain, 
		if (WARN_ON_ONCE(domain != real_parent))

			return false;

		info->chip->irq_set_affinity = msi_set_affinity;

		info->chip->flags |= IRQCHIP_MOVE_DEFERRED;

		break;

	case DOMAIN_BUS_DMAR:

	case DOMAIN_BUS_AMDVI:
@@ -315,7 +316,7 @@ static struct irq_chip dmar_msi_controller = { 
	.irq_retrigger		= irq_chip_retrigger_hierarchy,

	.irq_compose_msi_msg	= dmar_msi_compose_msg,

	.irq_write_msi_msg	= dmar_msi_write_msg,

	.flags			= IRQCHIP_SKIP_SET_WAKE |

	.flags			= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MOVE_DEFERRED |

				  IRQCHIP_AFFINITY_PRE_STARTUP,

};

arch/x86/kernel/hpet.c

+0 −8
Original line number Diff line number Diff line
@@ -516,22 +516,14 @@ static int hpet_msi_init(struct irq_domain *domain, 
			 struct msi_domain_info *info, unsigned int virq,

			 irq_hw_number_t hwirq, msi_alloc_info_t *arg)

{

	irq_set_status_flags(virq, IRQ_MOVE_PCNTXT);

	irq_domain_set_info(domain, virq, arg->hwirq, info->chip, NULL,

			    handle_edge_irq, arg->data, "edge");



	return 0;

}



static void hpet_msi_free(struct irq_domain *domain,

			  struct msi_domain_info *info, unsigned int virq)

{

	irq_clear_status_flags(virq, IRQ_MOVE_PCNTXT);

}



static struct msi_domain_ops hpet_msi_domain_ops = {

	.msi_init	= hpet_msi_init,

	.msi_free	= hpet_msi_free,

};



static struct msi_domain_info hpet_msi_domain_info = {