* [Xen-devel] [PATCH 0/2] iommu: fixes for interrupt remapping enabling
@ 2019-10-10 11:03 Roger Pau Monne
2019-10-10 11:03 ` [Xen-devel] [PATCH 1/2] x2APIC: translate IO-APIC entries when enabling the IOMMU Roger Pau Monne
2019-10-10 11:03 ` [Xen-devel] [PATCH 2/2] iommu: translate IO-APIC pins when enabling interrupt remapping Roger Pau Monne
0 siblings, 2 replies; 4+ messages in thread
From: Roger Pau Monne @ 2019-10-10 11:03 UTC (permalink / raw)
To: xen-devel
Cc: Juergen Gross, Jan Beulich, Wei Liu, Andrew Cooper,
Suravee Suthikulpanit, Roger Pau Monne
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(-)
--
2.23.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Xen-devel] [PATCH 1/2] x2APIC: translate IO-APIC entries when enabling the IOMMU
2019-10-10 11:03 [Xen-devel] [PATCH 0/2] iommu: fixes for interrupt remapping enabling Roger Pau Monne
@ 2019-10-10 11:03 ` Roger Pau Monne
2019-10-10 11:24 ` Roger Pau Monné
2019-10-10 11:03 ` [Xen-devel] [PATCH 2/2] iommu: translate IO-APIC pins when enabling interrupt remapping Roger Pau Monne
1 sibling, 1 reply; 4+ messages in thread
From: Roger Pau Monne @ 2019-10-10 11:03 UTC (permalink / raw)
To: xen-devel
Cc: Juergen Gross, Andrew Cooper, Wei Liu, Jan Beulich, 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 <andrew.cooper3@citrix.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Juergen Gross <jgross@suse.com>
---
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(-)
diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index 6cdb50cf41..9810de7473 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -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:
diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 5d25862bd8..37eabc16c9 100644
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -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;
diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h
index 0b041f0565..998905186b 100644
--- a/xen/include/asm-x86/io_apic.h
+++ b/xen/include/asm-x86/io_apic.h
@@ -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);
--
2.23.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Xen-devel] [PATCH 2/2] iommu: translate IO-APIC pins when enabling interrupt remapping
2019-10-10 11:03 [Xen-devel] [PATCH 0/2] iommu: fixes for interrupt remapping enabling Roger Pau Monne
2019-10-10 11:03 ` [Xen-devel] [PATCH 1/2] x2APIC: translate IO-APIC entries when enabling the IOMMU Roger Pau Monne
@ 2019-10-10 11:03 ` Roger Pau Monne
1 sibling, 0 replies; 4+ messages in thread
From: Roger Pau Monne @ 2019-10-10 11:03 UTC (permalink / raw)
To: xen-devel
Cc: Juergen Gross, Suravee Suthikulpanit, Wei Liu, Andrew Cooper,
Jan Beulich, Roger Pau Monne
On 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.
Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Juergen Gross <jgross@suse.com>
---
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(-)
diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c
index 6f53c7ec08..3c244619b9 100644
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -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:
diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c
index fb71073c84..1eed60f265 100644
--- a/xen/drivers/passthrough/amd/iommu_intr.c
+++ b/xen/drivers/passthrough/amd/iommu_intr.c
@@ -21,7 +21,6 @@
#include <asm/amd-iommu.h>
#include <asm/hvm/svm/amd-iommu-proto.h>
#include <asm/io_apic.h>
-#include <xen/keyhandler.h>
#include <xen/softirq.h>
union irte32 {
@@ -79,8 +78,6 @@ unsigned long *shared_intremap_inuse;
static DEFINE_SPINLOCK(shared_intremap_lock);
unsigned int nr_ioapic_sbdf;
-static void dump_intremap_tables(unsigned char key);
-
#define intremap_page_order(irt) PFN_ORDER(virt_to_page(irt))
unsigned int amd_iommu_intremap_table_order(
@@ -354,91 +351,6 @@ static int update_intremap_entry_from_ioapic(
return 0;
}
-int __init amd_iommu_setup_ioapic_remapping(void)
-{
- struct IO_APIC_route_entry rte;
- unsigned long flags;
- union irte_ptr entry;
- int apic, pin;
- u8 delivery_mode, dest, vector, dest_mode;
- u16 seg, bdf, req_id;
- struct amd_iommu *iommu;
- spinlock_t *lock;
- unsigned int offset;
-
- /* Read ioapic entries and update interrupt remapping table accordingly */
- for ( apic = 0; apic < nr_ioapics; apic++ )
- {
- for ( pin = 0; pin < nr_ioapic_entries[apic]; pin++ )
- {
- unsigned int idx;
-
- rte = __ioapic_read_entry(apic, pin, 1);
- if ( rte.mask == 1 )
- continue;
-
- /* get device id of ioapic devices */
- idx = ioapic_id_to_index(IO_APIC_ID(apic));
- if ( idx == MAX_IO_APICS )
- return -EINVAL;
-
- bdf = ioapic_sbdf[idx].bdf;
- seg = ioapic_sbdf[idx].seg;
- iommu = find_iommu_for_device(seg, bdf);
- if ( !iommu )
- {
- AMD_IOMMU_DEBUG("Fail to find iommu for ioapic "
- "device id = %04x:%04x\n", seg, bdf);
- continue;
- }
-
- req_id = get_intremap_requestor_id(iommu->seg, bdf);
- lock = get_intremap_lock(iommu->seg, req_id);
-
- delivery_mode = rte.delivery_mode;
- vector = rte.vector;
- dest_mode = rte.dest_mode;
- dest = rte.dest.logical.logical_dest;
-
- if ( iommu->ctrl.xt_en )
- {
- /*
- * In x2APIC mode we have no way of discovering the high 24
- * bits of the destination of an already enabled interrupt.
- * We come here earlier than for xAPIC mode, so no interrupts
- * should have been set up before.
- */
- AMD_IOMMU_DEBUG("Unmasked IO-APIC#%u entry %u in x2APIC mode\n",
- IO_APIC_ID(apic), pin);
- }
-
- spin_lock_irqsave(lock, flags);
- offset = alloc_intremap_entry(iommu, req_id, 1);
- BUG_ON(offset >= INTREMAP_MAX_ENTRIES);
- entry = get_intremap_entry(iommu, req_id, offset);
- update_intremap_entry(iommu, entry, vector,
- delivery_mode, dest_mode, dest);
- spin_unlock_irqrestore(lock, flags);
-
- set_rte_index(&rte, offset);
- ioapic_sbdf[idx].pin_2_idx[pin] = offset;
- __ioapic_write_entry(apic, pin, 1, rte);
-
- if ( iommu->enabled )
- {
- spin_lock_irqsave(&iommu->lock, flags);
- amd_iommu_flush_intremap(iommu, req_id);
- spin_unlock_irqrestore(&iommu->lock, flags);
- }
- }
- }
-
- register_keyhandler('V', &dump_intremap_tables,
- "dump IOMMU intremap tables", 0);
-
- return 0;
-}
-
void amd_iommu_ioapic_update_ire(
unsigned int apic, unsigned int reg, unsigned int value)
{
@@ -982,7 +894,7 @@ static int dump_intremap_mapping(const struct amd_iommu *iommu,
return 0;
}
-static void dump_intremap_tables(unsigned char key)
+void amd_iommu_dump_intremap_tables(unsigned char key)
{
if ( !shared_intremap_table )
{
diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c
index 59905629e1..2cf528e760 100644
--- a/xen/drivers/passthrough/x86/iommu.c
+++ b/xen/drivers/passthrough/x86/iommu.c
@@ -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)
diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
index 07d25a585d..8ed9482791 100644
--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
@@ -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;
--
2.23.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Xen-devel] [PATCH 1/2] x2APIC: translate IO-APIC entries when enabling the IOMMU
2019-10-10 11:03 ` [Xen-devel] [PATCH 1/2] x2APIC: translate IO-APIC entries when enabling the IOMMU Roger Pau Monne
@ 2019-10-10 11:24 ` Roger Pau Monné
0 siblings, 0 replies; 4+ messages in thread
From: Roger Pau Monné @ 2019-10-10 11:24 UTC (permalink / raw)
To: xen-devel; +Cc: Juergen Gross, Andrew Cooper, Wei Liu, Jan Beulich
On Thu, Oct 10, 2019 at 01:03:38PM +0200, Roger Pau Monne wrote:
> 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 <andrew.cooper3@citrix.com>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> ---
> Cc: Juergen Gross <jgross@suse.com>
> ---
> 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(-)
>
> diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
> index 6cdb50cf41..9810de7473 100644
> --- a/xen/arch/x86/apic.c
> +++ b/xen/arch/x86/apic.c
> @@ -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;
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
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-10 11:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-10 11:03 [Xen-devel] [PATCH 0/2] iommu: fixes for interrupt remapping enabling Roger Pau Monne
2019-10-10 11:03 ` [Xen-devel] [PATCH 1/2] x2APIC: translate IO-APIC entries when enabling the IOMMU Roger Pau Monne
2019-10-10 11:24 ` Roger Pau Monné
2019-10-10 11:03 ` [Xen-devel] [PATCH 2/2] iommu: translate IO-APIC pins when enabling interrupt remapping Roger Pau Monne
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).