Commit 47bea873 authored by David Woodhouse's avatar David Woodhouse Committed by Thomas Gleixner
Browse files

x86/msi: Only use high bits of MSI address for DMAR unit 



The Intel IOMMU has an MSI-like configuration for its interrupt, but it
isn't really MSI. So it gets to abuse the high 32 bits of the address, and
puts the high 24 bits of the extended APIC ID there.

This isn't something that can be used in the general case for real MSIs,
since external devices using the high bits of the address would be
performing writes to actual memory space above 4GiB, not targeted at the
APIC.

Factor the hack out and allow it only to be used when appropriate, adding a
WARN_ON_ONCE() if other MSIs are targeted at an unreachable APIC ID. That
should never happen since the compatibility MSI messages are not used when
Interrupt Remapping is enabled.

The x2apic_enabled() check isn't needed because Linux won't bring up CPUs
with higher APIC IDs unless IR and x2apic are enabled anyway.

Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201024213535.443185-3-dwmw2@infradead.org
parent 26573a97

arch/x86/kernel/apic/msi.c

+27 −6
Original line number Diff line number Diff line
@@ -23,13 +23,11 @@ 


struct irq_domain *x86_pci_msi_default_domain __ro_after_init;



static void __irq_msi_compose_msg(struct irq_cfg *cfg, struct msi_msg *msg)

static void __irq_msi_compose_msg(struct irq_cfg *cfg, struct msi_msg *msg,

				  bool dmar)

{

	msg->address_hi = MSI_ADDR_BASE_HI;



	if (x2apic_enabled())

		msg->address_hi |= MSI_ADDR_EXT_DEST_ID(cfg->dest_apicid);



	msg->address_lo =

		MSI_ADDR_BASE_LO |

		((apic->irq_dest_mode == 0) ?
@@ -43,18 +41,29 @@ static void __irq_msi_compose_msg(struct irq_cfg *cfg, struct msi_msg *msg) 
		MSI_DATA_LEVEL_ASSERT |

		MSI_DATA_DELIVERY_FIXED |

		MSI_DATA_VECTOR(cfg->vector);



	/*

	 * Only the IOMMU itself can use the trick of putting destination

	 * APIC ID into the high bits of the address. Anything else would

	 * just be writing to memory if it tried that, and needs IR to

	 * address higher APIC IDs.

	 */

	if (dmar)

		msg->address_hi |= MSI_ADDR_EXT_DEST_ID(cfg->dest_apicid);

	else

		WARN_ON_ONCE(MSI_ADDR_EXT_DEST_ID(cfg->dest_apicid));

}



void x86_vector_msi_compose_msg(struct irq_data *data, struct msi_msg *msg)

{

	__irq_msi_compose_msg(irqd_cfg(data), msg);

	__irq_msi_compose_msg(irqd_cfg(data), msg, false);

}



static void irq_msi_update_msg(struct irq_data *irqd, struct irq_cfg *cfg)

{

	struct msi_msg msg[2] = { [1] = { }, };



	__irq_msi_compose_msg(cfg, msg);

	__irq_msi_compose_msg(cfg, msg, false);

	irq_data_get_irq_chip(irqd)->irq_write_msi_msg(irqd, msg);

}
@@ -276,6 +285,17 @@ struct irq_domain *arch_create_remap_msi_irq_domain(struct irq_domain *parent, 
#endif



#ifdef CONFIG_DMAR_TABLE

/*

 * The Intel IOMMU (ab)uses the high bits of the MSI address to contain the

 * high bits of the destination APIC ID. This can't be done in the general

 * case for MSIs as it would be targeting real memory above 4GiB not the

 * APIC.

 */

static void dmar_msi_compose_msg(struct irq_data *data, struct msi_msg *msg)

{

	__irq_msi_compose_msg(irqd_cfg(data), msg, true);

}



static void dmar_msi_write_msg(struct irq_data *data, struct msi_msg *msg)

{

	dmar_msi_write(data->irq, msg);
@@ -288,6 +308,7 @@ static struct irq_chip dmar_msi_controller = { 
	.irq_ack		= irq_chip_ack_parent,

	.irq_set_affinity	= msi_domain_set_affinity,

	.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,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE