iommu: fixes for interrupt remapping enabling
cover iommu: fixes for interrupt remapping enabling
Hello,
The following series contain two fixes for issues found when enabling interrupt remapping and the IO-APIC already has unmasked pins. While I'm not aware of any system malfunctioning (apart from reporting IOMMU interrupt remapping faults) I think it would be nice to have those in 4.13.
Thanks, Roger.
Roger Pau Monne (2):
x2APIC: translate IO-APIC entries when enabling the IOMMU
iommu: translate IO-APIC pins when enabling interrupt remapping
xen/arch/x86/apic.c | 12 ++- xen/arch/x86/io_apic.c | 5 +- xen/drivers/passthrough/amd/iommu_init.c | 11 ++- xen/drivers/passthrough/amd/iommu_intr.c | 90 +------------------ xen/drivers/passthrough/x86/iommu.c | 34 ++++++- xen/include/asm-x86/hvm/svm/amd-iommu-proto.h | 1 + xen/include/asm-x86/io_apic.h | 3 +- 7 files changed, 55 insertions(+), 101 deletions(-)
Signature · 7 lines
2.23.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 1/2 x2APIC: translate IO-APIC entries when enabling the IOMMU
When interrupt remapping is enabled as part of enabling x2APIC the IO-APIC entries also need to be translated to the new format and added to the interrupt remapping table.
This prevents IOMMU interrupt remapping faults when booting on hardware that has unmasked IO-APIC pins.
---
Cc: Juergen Gross <[email protected]>
--- xen/arch/x86/apic.c | 12 ++++++++++-- xen/arch/x86/io_apic.c | 5 +++-- xen/include/asm-x86/io_apic.h | 3 ++- 3 files changed, 15 insertions(+), 5 deletions(-)
xen/arch/x86/apic.c +10 -2
@@ -515,7 +515,7 @@ static void resume_x2apic(void)iommu_enable_x2apic ();__enable_x2apic (); -restore_IO_APIC_setup (ioapic_entries); +restore_IO_APIC_setup (ioapic_entries, true);unmask_8259A (); out:
@@ -887,6 +887,7 @@ void __init x2apic_bsp_setup(void) {struct IO_APIC_route_entry **ioapic_entries =NULL ;const char *orig_name; +bool iommu_enabled = true;if ( !cpu_has_x2apic )return ;
@@ -934,6 +935,7 @@ void __init x2apic_bsp_setup(void)if ( !x2apic_enabled ) {printk ("Not enabling x2APIC (upon firmware request)\n" ); + iommu_enabled = false; goto restore_out; }/* fall through */
@@ -944,6 +946,7 @@ void __init x2apic_bsp_setup(void)printk (XENLOG_ERR "Failed to enable Interrupt Remapping: Will not enable x2APIC.\n" ); + iommu_enabled = false; goto restore_out; }
@@ -961,7 +964,12 @@ void __init x2apic_bsp_setup(void)printk ("Switched to APIC driver %s\n" , genapic.name); restore_out: -restore_IO_APIC_setup (ioapic_entries); +/* +* NB: do not use raw mode when restoring entries if the iommu has been +* enabled during the process, because the entries need to be translated +* and added to the remapping table in that case. +*/ +restore_IO_APIC_setup (ioapic_entries, !iommu_enabled);unmask_8259A (); out:
xen/arch/x86/io_apic.c +3 -2
@@ -379,7 +379,8 @@ void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries)/* * Restore IO APIC entries which was saved in ioapic_entries. */ -int restore_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries) +int restore_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries, +bool raw) {int apic, pin;
@@ -394,7 +395,7 @@ int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries)return -ENOMEM ;for (pin =0 ; pin < nr_ioapic_entries[apic]; pin++) -ioapic_write_entry (apic, pin,1 , ioapic_entries[apic][pin]); +ioapic_write_entry (apic, pin, raw, ioapic_entries[apic][pin]); }return 0 ;
xen/include/asm-x86/io_apic.h +2 -1
@@ -197,7 +197,8 @@ extern struct IO_APIC_route_entry **alloc_ioapic_entries(void);extern void free_ioapic_entries (struct IO_APIC_route_entry **ioapic_entries);extern int save_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries);extern void mask_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries); -extern int restore_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries); +extern int restore_IO_APIC_setup (struct IO_APIC_route_entry **ioapic_entries, +bool raw);unsigned highest_gsi (void );
Signature · 7 lines
2.23.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 1/2] x2APIC: translate IO-APIC entries when enabling the IOMMU
Quoted 31 lines · Roger Pau Monne
When interrupt remapping is enabled as part of enabling x2APIC the IO-APIC entries also need to be translated to the new format and added to the interrupt remapping table.
This prevents IOMMU interrupt remapping faults when booting on hardware that has unmasked IO-APIC pins.
Reported-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>---
Cc: Juergen Gross <[email protected]>--- xen/arch/x86/apic.c | 12 ++++++++++-- xen/arch/x86/io_apic.c | 5 +++-- xen/include/asm-x86/io_apic.h | 3 ++- 3 files changed, 15 insertions(+), 5 deletions(-)xen/arch/x86/apic.c +1
-1@@ -515,7 +515,7 @@ static void resume_x2apic(void)iommu_enable_x2apic ();__enable_x2apic (); -restore_IO_APIC_setup (ioapic_entries); +restore_IO_APIC_setup (ioapic_entries, true);unmask_8259A (); out:
xen/arch/x86/apic.c void __init x2apic_bsp_setup(void) · line 890
Quoted 4 lines
xen/arch/x86/apic.c +1
-0@@ -887,6 +887,7 @@ void __init x2apic_bsp_setup(void) {struct IO_APIC_route_entry **ioapic_entries =NULL ;const char *orig_name; +bool iommu_enabled = true;
There's no need for this local variable, x2apic_enabled can be used instead.
Will send a new version, sorry.
Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 2/2 iommu: translate IO-APIC pins when enabling interrupt remapping
In reply to Roger Pau MonneOn Intel hardware there's currently no translation of already enabled IO-APIC pins when interrupt remapping is enabled on the IOMMU, hence introduce a logic similar to the one used in x2apic_bsp_setup in order to save and mask all IO-APIC pins, and then translate and restore them after interrupt remapping has been enabled.
With this change the AMD specific logic to deal with enabled pins (amd_iommu_setup_ioapic_remapping) can be removed, thus unifying the handling of IO-APIC when enabling interrupt remapping regardless of the IOMMU vendor.
---
Cc: Juergen Gross <[email protected]>
--- xen/drivers/passthrough/amd/iommu_init.c | 11 ++- xen/drivers/passthrough/amd/iommu_intr.c | 90 +------------------ xen/drivers/passthrough/x86/iommu.c | 34 ++++++- xen/include/asm-x86/hvm/svm/amd-iommu-proto.h | 1 + 4 files changed, 40 insertions(+), 96 deletions(-)
xen/drivers/passthrough/amd/iommu_init.c +5 -6
@@ -19,6 +19,7 @@#include <xen/errno.h> #include <xen/acpi.h> +#include <xen/keyhandler.h> #include <xen/pci.h> #include <xen/pci_regs.h> #include <xen/irq.h>
@@ -1435,12 +1436,6 @@ int __init amd_iommu_init(bool xt)if ( rc ) goto error_out; -/* initialize io-apic interrupt remapping entries */ -if ( iommu_intremap ) - rc =amd_iommu_setup_ioapic_remapping (); -if ( rc ) - goto error_out; -/* Allocate and initialize device table(s). */ pci_init = !xt; rc =iterate_ivrs_mappings (amd_iommu_setup_device_table);
@@ -1469,6 +1464,10 @@ int __init amd_iommu_init(bool xt) goto error_out; } +if ( iommu_intremap ) +register_keyhandler ('V' , &amd_iommu_dump_intremap_tables, +"dump IOMMU intremap tables" ,0 ); +return 0 ; error_out:
xen/drivers/passthrough/amd/iommu_intr.c +1 -89
114 lines not on this page · raw message
xen/drivers/passthrough/x86/iommu.c +33 -1
@@ -21,6 +21,7 @@#include <xsm/xsm.h> #include <asm/hvm/io.h> +#include <asm/io_apic.h> #include <asm/setup.h> const struct iommu_init_ops *__initdata iommu_init_ops;
@@ -28,6 +29,7 @@ struct iommu_ops __read_mostly iommu_ops;int __init iommu_hardware_setup (void ) { +struct IO_APIC_route_entry **ioapic_entries =NULL ;int rc;if ( !iommu_init_ops )
@@ -43,7 +45,37 @@ int __init iommu_hardware_setup(void)/* x2apic setup may have previously initialised the struct. */ ASSERT (iommu_ops.init == iommu_init_ops->ops->init); -return iommu_init_ops->setup (); +if ( !x2apic_enabled && iommu_intremap ) + { +/* +* If x2APIC is enabled interrupt remapping is already enabled, so +* there's no need to mess with the IO-APIC because the remapping +* entries are already correctly setup by x2apic_bsp_setup. +*/ + ioapic_entries =alloc_ioapic_entries (); +if ( !ioapic_entries ) +return -ENOMEM ; + rc =save_IO_APIC_setup (ioapic_entries); +if ( rc ) + { +free_ioapic_entries (ioapic_entries); +return rc; + } + +mask_8259A (); +mask_IO_APIC_setup (ioapic_entries); + } + + rc = iommu_init_ops->setup (); + +if ( ioapic_entries ) + { +restore_IO_APIC_setup (ioapic_entries, rc); +unmask_8259A (); +free_ioapic_entries (ioapic_entries); + } + +return rc; }int iommu_enable_x2apic (void )
xen/include/asm-x86/hvm/svm/amd-iommu-proto.h +1 -0
@@ -114,6 +114,7 @@ int amd_iommu_msi_msg_update_ire(void amd_iommu_read_msi_from_ire (struct msi_desc *msi_desc,struct msi_msg *msg);int amd_setup_hpet_msi (struct msi_desc *msi_desc); +void amd_iommu_dump_intremap_tables (unsigned char key); extern struct ioapic_sbdf { u16 bdf, seg;
Signature · 7 lines
2.23.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel