Add VT-d Posted-Interrupts support - IOMMU part
v8 cover Add VT-d Posted-Interrupts support - IOMMU part
VT-d Posted-Interrupts is an enhancement to CPU side Posted-Interrupt. With VT-d Posted-Interrupts enabled, external interrupts from direct-assigned devices can be delivered to guests without VMM intervention when guest is running in non-root mode.
You can find the VT-d Posted-Interrtups Spec. in the following URL:
http://www.intel.com/content/www/us/en/intelligent-systems/intel-technology/vt-directed-io-spec.html
This series was part of http://thread.gmane.org/gmane.linux.kernel.iommu/7708. To make things clear, send out IOMMU part here.
This patch-set is based on the lastest x86/apic branch of tip tree.
Divide the whole series which contain multiple components into three parts:
- Prerequisite changes to irq subsystem (already merged in tip tree x86/apic branch)
- IOMMU part (in this series)
- KVM and VFIO parts (will send out this part once the first two parts are accepted)
v7->v8:
* Save the irq mode (posted or remapped) of an IRTE in struct irq_2_iommu.
* Use this new mode to decide whether update the hardware when modifying irte in intel_ir_set_affinity().
v6->v7:
* Add an static inline helper function set_irq_posting_cap() to set the PI capability.
* Add some comments for the new member "ir_data->irte_pi_entry".
v5->v6:
* Extend 'struct irte' for VT-d Posted-Interrupts, combine remapped and posted mode into one irte structure.
v4->v5:
* Abstract modify_irte() to accept two format of irte.
v3->v4:
* Change capability to a int variant flags instead of a function call.
* Add hotplug case for VT-d PI.
Feng Wu (8):
iommu: Add new member capability to struct irq_remap_ops iommu, x86: Implement irq_set_vcpu_affinity for intel_ir_chip iommu, x86: Save the mode (posted or remapped) of an IRTE iommu, x86: No need to migrating irq for VT-d Posted-Interrupts iommu, x86: Add cap_pi_support() to detect VT-d PI capability iommu, x86: Setup Posted-Interrupts capability for Intel iommu iommu, x86: define irq_remapping_cap()
iommu, x86: Properly handler PI for IOMMU hotplug
Thomas Gleixner (1):
iommu: dmar: Extend struct irte for VT-d Posted-Interrupts
arch/x86/include/asm/irq_remapping.h | 11 +++++ drivers/iommu/intel_irq_remapping.c | 93 +++++++++++++++++++++++++++++++++++- drivers/iommu/irq_remapping.c | 11 +++++ drivers/iommu/irq_remapping.h | 6 +++ include/linux/dmar.h | 70 +++++++++++++++++++++------ include/linux/intel-iommu.h | 1 + 6 files changed, 176 insertions(+), 16 deletions(-)
Signature · 1 line
2.1.0
PATCH v8 1/9 iommu: Add new member capability to struct irq_remap_ops
This patch adds a new member capability to struct irq_remap_ops, this new function ops can be used to check whether some features are supported, such as VT-d Posted-Interrupts.
--- arch/x86/include/asm/irq_remapping.h | 4 ++++ drivers/iommu/irq_remapping.h | 3 +++ 2 files changed, 7 insertions(+)
arch/x86/include/asm/irq_remapping.h +4 -0
@@ -31,6 +31,10 @@ struct irq_alloc_info;#ifdef CONFIG_IRQ_REMAP +enum irq_remap_cap { +IRQ_POSTING_CAP =0 , +}; +extern void set_irq_remapping_broken (void );extern int irq_remapping_prepare (void );extern int irq_remapping_enable (void );
drivers/iommu/irq_remapping.h +3 -0
@@ -35,6 +35,9 @@ extern int no_x2apic_optout;extern int irq_remapping_enabled;struct irq_remap_ops { +/* The supported capabilities */ +int capability; +/* Initializes hardware and makes it ready for remapping interrupts */ int (*prepare)(void );
Signature · 1 line
2.1.0
PATCH v8 2/9 iommu: dmar: Extend struct irte for VT-d Posted-Interrupts
In reply to Feng WuFrom: Thomas Gleixner <[email protected]>
The IRTE (Interrupt Remapping Table Entry) is either an entry for remapped or for posted interrupts. The hardware distiguishes between remapped and posted entries by bit 15 in the low 64 bit of the IRTE. If cleared the entry is remapped, if set it's posted.
The entries have common fields and dependent on the posted bit fields with different meanings.
Extend struct irte to handle the differences between remap and posted mode by having three structs in the unions:
- Shared
- Remapped
- Posted
--- include/linux/dmar.h | 70 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 15 deletions(-)
include/linux/dmar.h +55 -15
@@ -185,33 +185,73 @@ static inline int dmar_device_remove(void *handle)struct irte {union { +/* Shared between remapped and posted mode*/ struct { -__u64 present :1 , - fpd :1 , - dst_mode :1 , - redir_hint :1 , - trigger_mode :1 , - dlvry_mode :3 , - avail :4 , - __reserved_1 :4 , - vector :8 , - __reserved_2 :8 , - dest_id :32 ; +__u64 present :1 ,/* 0 */ + fpd :1 ,/* 1 */ + __res0 :6 ,/* 2 - 6 */ + avail :4 ,/* 8 - 11 */ + __res1 :3 ,/* 12 - 14 */ + pst :1 ,/* 15 */ + vector :8 ,/* 16 - 23 */ + __res2 :40 ;/* 24 - 63 */ + }; + +/* Remapped mode */ +struct { +__u64 r_present :1 ,/* 0 */ + r_fpd :1 ,/* 1 */ + dst_mode :1 ,/* 2 */ + redir_hint :1 ,/* 3 */ + trigger_mode :1 ,/* 4 */ + dlvry_mode :3 ,/* 5 - 7 */ + r_avail :4 ,/* 8 - 11 */ + r_res0 :4 ,/* 12 - 15 */ + r_vector :8 ,/* 16 - 23 */ + r_res1 :8 ,/* 24 - 31 */ + dest_id :32 ;/* 32 - 63 */ + }; + +/* Posted mode */ +struct { +__u64 p_present :1 ,/* 0 */ + p_fpd :1 ,/* 1 */ + p_res0 :6 ,/* 2 - 7 */ + p_avail :4 ,/* 8 - 11 */ + p_res1 :2 ,/* 12 - 13 */ + p_urgent :1 ,/* 14 */ + p_pst :1 ,/* 15 */ + p_vector :8 ,/* 16 - 23 */ + p_res2 :14 ,/* 24 - 37 */ + pda_l :26 ;/* 38 - 63 */ };__u64 low; };union { +/* Shared between remapped and posted mode*/ struct { -__u64 sid :16 , - sq :2 , - svt :2 , - __reserved_3 :44 ; +__u64 sid :16 ,/* 64 - 79 */ + sq :2 ,/* 80 - 81 */ + svt :2 ,/* 82 - 83 */ + __res3 :44 ;/* 84 - 127 */ + }; + +/* Posted mode*/ +struct { +__u64 p_sid :16 ,/* 64 - 79 */ + p_sq :2 ,/* 80 - 81 */ + p_svt :2 ,/* 82 - 83 */ + p_res3 :12 ,/* 84 - 95 */ + pda_h :32 ;/* 96 - 127 */ };__u64 high; }; }; +#define PDA_LOW_BIT 26 +#define PDA_HIGH_BIT 32 +enum {IRQ_REMAP_XAPIC_MODE ,IRQ_REMAP_X2APIC_MODE ,
Signature · 1 line
2.1.0
PATCH v8 3/9 iommu, x86: Implement irq_set_vcpu_affinity for intel_ir_chip
In reply to Feng WuImplement irq_set_vcpu_affinity for intel_ir_chip.
--- arch/x86/include/asm/irq_remapping.h | 5 ++++ drivers/iommu/intel_irq_remapping.c | 46 ++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+)
arch/x86/include/asm/irq_remapping.h +5 -0
@@ -57,6 +57,11 @@ static inline struct irq_domain *arch_get_ir_parent_domain(void) return x86_vector_domain; } +struct vcpu_data { +u64 pi_desc_addr;/* Physical address of PI Descriptor */ +u32 vector;/* Guest vector of the interrupt */ +}; +#else /* CONFIG_IRQ_REMAP */ static inline void set_irq_remapping_broken (void ) { }
drivers/iommu/intel_irq_remapping.c +46 -0
62 lines not on this page · raw message
Signature · 1 line
2.1.0
Re: [v8 3/9] iommu, x86: Implement irq_set_vcpu_affinity for intel_ir_chip
drivers/iommu/intel_irq_remapping.c static void intel_ir_compose_msi_msg(struct irq_data *irq_data, · line 1032
Quoted 10 lines · Feng Wu
drivers/iommu/intel_irq_remapping.c +10
-0+/* stop posting interrupts, back to remapping mode */ +if (!vcpu_info) { +modify_irte (&ir_data->irq_2_iommu, &ir_data->irte_entry); + }else { + vcpu_pi_info = (struct vcpu_data *)vcpu_info; + +/* +* "ir_data->irte_entry" saves the remapped format of IRTE, +* which being a cached irte is still updated when setting +* the affinity even when we are in posted mode. So this make
s/make/makes/
drivers/iommu/intel_irq_remapping.c static void intel_ir_compose_msi_msg(struct irq_data *irq_data, · line 1036
Quoted 4 lines
drivers/iommu/intel_irq_remapping.c +4
-0+* it possible to switch back to remapped mode from posted mode, +* we can just set "ir_data->irte_entry" to hardware for that +* purpose. Here we store the posted format of IRTE in another +* new member "ir_data->irte_pi_entry" to not corrupt
Remove the 'another new member' please. That member is not longer new once that patch is applied.
Now there is another question. Are we actually using that pi_entry cached value for anything else than this code here? If not, we can do this on the stack and avoid the extra storage in ir_data.
Thanks,
tglx
RE: [v8 3/9] iommu, x86: Implement irq_set_vcpu_affinity for intel_ir_chip
Quoted 33 lines
-----Original Message-----
From: Thomas Gleixner [mailto:[email protected]]
Sent: Tuesday, June 02, 2015 9:59 PM
To: Wu, Feng
Cc: [email protected]; [email protected]; jiang.liu-VuQAYsv1563Yd54FQh9/[email protected]; iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org; [email protected]
Subject: Re: [v8 3/9] iommu, x86: Implementirq_set_vcpu_affinityforintel_ir_chipdrivers/iommu/intel_irq_remapping.c static void intel_ir_compose_msi_msg(struct irq_data *irq_data, · line 1032
Quoted 10 lines · Feng Wu
drivers/iommu/intel_irq_remapping.c +10
-0+/* stop posting interrupts, back to remapping mode */ +if (!vcpu_info) { +modify_irte (&ir_data->irq_2_iommu, &ir_data->irte_entry); + }else { + vcpu_pi_info = (struct vcpu_data *)vcpu_info; + +/* +* "ir_data->irte_entry" saves the remapped format of IRTE, +* which being a cached irte is still updated when setting +* the affinity even when we are in posted mode. So this make s/make/makes/
drivers/iommu/intel_irq_remapping.c static void intel_ir_compose_msi_msg(struct irq_data *irq_data, · line 1036
Quoted 4 lines
drivers/iommu/intel_irq_remapping.c +4
-0+* it possible to switch back to remapped mode from posted mode, +* we can just set "ir_data->irte_entry" to hardware for that +* purpose. Here we store the posted format of IRTE in another +* new member "ir_data->irte_pi_entry" to not corrupt Remove the 'another new member' please. That member is not longer new once that patch is applied.
Quoted 4 lines
Now there is another question. Are we actually using that
pi_entrycached value for anything else than this code here? If not, we can do this on the stack and avoid the extra storage inir_data.
That's a good comments. I also thought about this before. Right now the cached value is only used here in this function, but I am not sure whether we need it in future. Anyway, I think we can delete it now.
Thanks,
Feng
Quoted 3 lines
Thanks,
tglx
PATCH v8 4/9 iommu, x86: Save the mode (posted or remapped) of an IRTE
In reply to Feng WuThis patch adds a new field in struct irq_2_iommu, which can capture whether the entry is in posted mode or remapped mode.
--- drivers/iommu/intel_irq_remapping.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/iommu/intel_irq_remapping.c +9 -0
@@ -18,6 +18,11 @@#include "irq_remapping.h" +enum irq_mode { +IRQ_REMAPPING , +IRQ_POSTING , +}; +struct ioapic_scope {struct intel_iommu *iommu;unsigned int id;
@@ -37,6 +42,7 @@ struct irq_2_iommu {u16 irte_index;u16 sub_handle;u8 irte_mask; +enum irq_mode mode; };struct intel_ir_data {
@@ -105,6 +111,7 @@ static int alloc_irte(struct intel_iommu *iommu, int irq, irq_iommu->irte_index = index; irq_iommu->sub_handle =0 ; irq_iommu->irte_mask = mask; + irq_iommu->mode =IRQ_REMAPPING ; }raw_spin_unlock_irqrestore (&irq_2_ir_lock, flags);
@@ -145,6 +152,8 @@ static int modify_irte(struct irq_2_iommu *irq_iommu,__iommu_flush_cache (iommu, irte,sizeof (*irte)); rc =qi_flush_iec (iommu, index,0 ); + + irq_iommu->mode = irte->pst ?IRQ_POSTING :IRQ_REMAPPING ;raw_spin_unlock_irqrestore (&irq_2_ir_lock, flags);return rc;
Signature · 1 line
2.1.0
PATCH v8 5/9 iommu, x86: No need to migrating irq for VT-d Posted-Interrupts
In reply to Feng WuWe don't need to migrate the irqs for VT-d Posted-Interrupts here. When 'pst' is set in IRTE, the associated irq will be posted to guests instead of interrupt remapping. The destination of the interrupt is set in Posted-Interrupts Descriptor, and the migration happens during vCPU scheduling.
However, we still update the cached irte here, which can be used when changing back to remapping mode.
--- drivers/iommu/intel_irq_remapping.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iommu/intel_irq_remapping.c +4 -1
@@ -1003,7 +1003,10 @@ intel_ir_set_affinity(struct irq_data *data, const struct cpumask *mask,*/ irte->vector = cfg->vector; irte->dest_id =IRTE_DEST (cfg->dest_apicid); -modify_irte (&ir_data->irq_2_iommu, irte); + +/* Update the hardware only if the interrupt is in remapped mode. */ +if (ir_data->irq_2_iommu.mode ==IRQ_REMAPPING ) +modify_irte (&ir_data->irq_2_iommu, irte);/* * After this point, all the interrupts will start arriving
Signature · 1 line
2.1.0
PATCH v8 6/9 iommu, x86: Add cap_pi_support() to detect VT-d PI capability
In reply to Feng WuAdd helper function to detect VT-d Posted-Interrupts capability.
--- include/linux/intel-iommu.h | 1 + 1 file changed, 1 insertion(+)
include/linux/intel-iommu.h +1 -0
@@ -87,6 +87,7 @@ static inline void dmar_writeq(void __iomem *addr, u64 val)/* * Decoding Capability Register */ +#define cap_pi_support (c) (((c) >> 59) & 1)#define cap_read_drain (c) (((c) >> 55) & 1)#define cap_write_drain (c) (((c) >> 54) & 1)#define cap_max_amask_val (c) (((c) >> 48) & 0x3f)
Signature · 1 line
2.1.0
PATCH v8 7/9 iommu, x86: Setup Posted-Interrupts capability for Intel iommu
In reply to Feng WuSet Posted-Interrupts capability for Intel iommu when IR is enabled, clear it when IR is disabled.
--- drivers/iommu/intel_irq_remapping.c | 30 ++++++++++++++++++++++++++++++ drivers/iommu/irq_remapping.c | 2 ++ drivers/iommu/irq_remapping.h | 3 +++ 3 files changed, 35 insertions(+)
drivers/iommu/intel_irq_remapping.c +30 -0
@@ -581,6 +581,26 @@ error:return -ENODEV ; } +/* +* Set Posted-Interrupts capability. +*/ +static inline void set_irq_posting_cap (void ) +{ +struct dmar_drhd_unit *drhd; +struct intel_iommu *iommu; + +if (!disable_irq_post) { + intel_irq_remap_ops.capability |=1 <<IRQ_POSTING_CAP ; + +for_each_iommu (iommu, drhd) +if (!cap_pi_support (iommu->cap)) { + intel_irq_remap_ops.capability &= + ~(1 <<IRQ_POSTING_CAP ); +break ; + } + } +} +static int __init intel_enable_irq_remapping (void ) {struct dmar_drhd_unit *drhd;
@@ -656,6 +676,8 @@ static int __init intel_enable_irq_remapping(void) irq_remapping_enabled =1 ; +set_irq_posting_cap (); +pr_info ("Enabled IRQ remapping in %s mode\n" , eim ?"x2apic" :"xapic" );return eim ?IRQ_REMAP_X2APIC_MODE :IRQ_REMAP_XAPIC_MODE ;
@@ -856,6 +878,12 @@ static void disable_irq_remapping(void)iommu_disable_irq_remapping (iommu); } + +/* +* Clear Posted-Interrupts capability. +*/ +if (!disable_irq_post) + intel_irq_remap_ops.capability &= ~(1 <<IRQ_POSTING_CAP ); }static int reenable_irq_remapping (int eim)
@@ -883,6 +911,8 @@ static int reenable_irq_remapping(int eim)if (!setup) goto error; +set_irq_posting_cap (); +return 0 ; error:
drivers/iommu/irq_remapping.c +2 -0
@@ -22,6 +22,8 @@ int irq_remap_broken;int disable_sourceid_checking;int no_x2apic_optout; +int disable_irq_post =1 ; +static int disable_irq_remap;static struct irq_remap_ops *remap_ops;
drivers/iommu/irq_remapping.h +3 -0
@@ -34,6 +34,8 @@ extern int disable_sourceid_checking;extern int no_x2apic_optout;extern int irq_remapping_enabled; +extern int disable_irq_post; +struct irq_remap_ops {/* The supported capabilities */ int capability;
@@ -69,6 +71,7 @@ extern void ir_ack_apic_edge(struct irq_data *data);#define irq_remapping_enabled 0#define irq_remap_broken 0 +#define disable_irq_post 1#endif /* CONFIG_IRQ_REMAP */
Signature · 1 line
2.1.0
PATCH v8 8/9 iommu, x86: define irq_remapping_cap()
In reply to Feng WuThis patch adds a new interface irq_remapping_cap() to detect whether irq remapping supports new features, such as VT-d Posted-Interrupts. We export this function out, so that KVM code can check this and use this mechanism properly.
--- arch/x86/include/asm/irq_remapping.h | 2 ++ drivers/iommu/irq_remapping.c | 9 +++++++++ 2 files changed, 11 insertions(+)
arch/x86/include/asm/irq_remapping.h +2 -0
@@ -35,6 +35,7 @@ enum irq_remap_cap { IRQ_POSTING_CAP = 0, }; +extern bool irq_remapping_cap (enum irq_remap_cap cap);extern void set_irq_remapping_broken (void );extern int irq_remapping_prepare (void );extern int irq_remapping_enable (void );
@@ -64,6 +65,7 @@ struct vcpu_data {#else /* CONFIG_IRQ_REMAP */ +static bool irq_remapping_cap (enum irq_remap_cap cap) {return 0 ; }static inline void set_irq_remapping_broken (void ) { }static inline int irq_remapping_prepare (void ) {return -ENODEV ; }static inline int irq_remapping_enable (void ) {return -ENODEV ; }
drivers/iommu/irq_remapping.c +9 -0
@@ -81,6 +81,15 @@ void set_irq_remapping_broken(void) irq_remap_broken =1 ; } +bool irq_remapping_cap (enum irq_remap_cap cap) +{ +if (!remap_ops || disable_irq_post) +return 0 ; + +return (remap_ops->capability & (1 << cap)); +} +EXPORT_SYMBOL_GPL (irq_remapping_cap); +int __init irq_remapping_prepare (void ) {if (disable_irq_remap)
Signature · 1 line
2.1.0
PATCH v8 9/9 iommu, x86: Properly handler PI for IOMMU hotplug
In reply to Feng WuReturn error when inserting a new IOMMU which doesn't support PI if PI is currently in use.
--- drivers/iommu/intel_irq_remapping.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/intel_irq_remapping.c +3 -0
@@ -1363,6 +1363,9 @@ int dmar_ir_hotplug(struct dmar_drhd_unit *dmaru, bool insert)return -EINVAL ;if (!ecap_ir_support (iommu->ecap))return 0 ; +if (irq_remapping_cap (IRQ_POSTING_CAP ) && + !cap_pi_support (iommu->cap)) +return -EBUSY ;if (insert) {if (!iommu->ir_table)
Signature · 1 line
2.1.0
Hi Joerg,
Any comments about this new version? Thanks a lot!
Thanks,
Feng
Quoted 75 lines
-----Original Message-----
From: Wu, Feng
Sent: Wednesday, May 27, 2015 12:06 PM
To: [email protected]; [email protected]
Cc: [email protected]; jiang.liu-VuQAYsv1563Yd54FQh9/[email protected]; iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org; [email protected]; Wu, Feng
Subject: [v8 0/9] Add VT-d Posted-Interrupts support - IOMMU partVT-d Posted-Interrupts is an enhancement to CPU side Posted-Interrupt. With VT-d Posted-Interrupts enabled, external interrupts from direct-assigned devices can be delivered to guests without VMM intervention when guest is running in non-root mode.
You can find the VT-d Posted-Interrtups Spec. in the following URL:
http://www.intel.com/content/www/us/en/intelligent-systems/intel-technolog
y/vt-directed-io-spec.htmlThis series was part of
http://thread.gmane.org/gmane.linux.kernel.iommu/7708. To make things clear, send out IOMMU part here.This patch-set is based on the lastest x86/apic branch of tip tree.
Divide the whole series which contain multiple components into three parts:
- Prerequisite changes to irq subsystem (already merged in tip tree x86/apic branch)
- IOMMU part (in this series)
- KVM and VFIO parts (will send out this part once the first two parts are accepted)
v7->v8:
* Save the irq mode (posted or remapped) of an IRTE in structirq_2_iommu.
* Use this new mode to decide whether update the hardware when modifying irte inintel_ir_set_affinity().
v6->v7:
* Add an static inline helper functionset_irq_posting_cap()to set the PI capability.
* Add some comments for the new member "ir_data->irte_pi_entry".
v5->v6:
* Extend 'struct irte' for VT-d Posted-Interrupts, combine remapped and posted mode into one irte structure.
v4->v5:
* Abstractmodify_irte()to accept two format of irte.
v3->v4:
* Change capability to a int variant flags instead of a function call.
* Add hotplug case for VT-d PI.Feng Wu (8):
iommu: Add new member capability to structirq_remap_opsiommu, x86: Implementirq_set_vcpu_affinityforintel_ir_chipiommu, x86: Save the mode (posted or remapped) of an IRTE iommu, x86: No need to migrating irq for VT-d Posted-Interrupts iommu, x86: Addcap_pi_support()to detect VT-d PI capability iommu, x86: Setup Posted-Interrupts capability for Intel iommu iommu, x86: defineirq_remapping_cap()
iommu, x86: Properly handler PI for IOMMU hotplugThomas Gleixner (1):
iommu: dmar: Extend struct irte for VT-d Posted-Interruptsarch/x86/include/asm/irq_remapping.h | 11 +++++ drivers/iommu/intel_irq_remapping.c | 93 +++++++++++++++++++++++++++++++++++- drivers/iommu/irq_remapping.c | 11 +++++ drivers/iommu/irq_remapping.h | 6 +++ include/linux/dmar.h | 70 +++++++++++++++++++++------ include/linux/intel-iommu.h | 1 + 6 files changed, 176 insertions(+), 16 deletions(-)--
2.1.0