iommu/amd: Support for HATdis and HATS features
Subsystems (2)
v2 cover iommu/amd: Support for HATdis and HATS features
This series comprises two features:
HATDis: When host address translation is not supported by the IOMMU, the IVHD->attr[HATDis] bit is set. For instance, QEMU emulated vIOMMU does not support DMA translation for VFIO passthrough device. Support has been added to check this bit and switch to guest page table mode, if supported. This feature is useful for cases where only interrupt remapping is required.
EFR[HATS]: These bits indicate the maximum level supported for host page table by the IOMMU. Modifications have been made to adjust the maximum host page table level, starting with level 4. If these bits are set to 11b, the driver will attempt to use the guest page table.
If guest page table mode is not supported, the driver will fail to probe devices for DMA translations.
The interrupt remapping will continue to be supported.
---
Changes since v1:
- Addressed comments from Vasant:
- Added/Modified comments and logs.
- Removed v1 page table assignment hunk.
- Link: https://lore.kernel.org/linux-iommu/[email protected]/T/#t
Ankit Soni (2):
iommu/amd: Add HATDis feature support iommu/amd: Add efr[HATS] max v1 page table level
drivers/iommu/amd/amd_iommu.h | 2 ++ drivers/iommu/amd/amd_iommu_types.h | 7 +++++- drivers/iommu/amd/init.c | 37 ++++++++++++++++++++++++++++- drivers/iommu/amd/io_pgtable.c | 4 ++-- drivers/iommu/amd/iommu.c | 15 +++++++++++- 5 files changed, 60 insertions(+), 5 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/2 iommu/amd: Add HATDis feature support
Current AMD IOMMU assumes Host Address Translation (HAT) is always supported, and Linux kernel enables this capability by default. However, in case of emulated and virtualized IOMMU, this might not be the case. For example,current QEMU-emulated AMD vIOMMU does not support host translation for VFIO pass-through device, but the interrupt remapping support is required for x2APIC (i.e. kvm-msi-ext-dest-id is also not supported by the guest OS). This would require the guest kernel to boot with guest kernel option iommu=pt to by-pass the initialization of host (v1) table.
The AMD I/O Virtualization Technology (IOMMU) Specification Rev 3.10 [1] introduces a new flag 'HATDis' in the IVHD 11h IOMMU attributes to indicate that HAT is not supported on a particular IOMMU instance.
Therefore, modifies the AMD IOMMU driver to detect the new HATDis attributes, and disable host translation and switch to use guest translation if it is available. Otherwise, the driver will disable DMA translation.
[1] https://www.amd.com/content/dam/amd/en/documents/processor-tech-docs/specifications/48882_IOMMU.pdf
--- drivers/iommu/amd/amd_iommu.h | 1 + drivers/iommu/amd/amd_iommu_types.h | 6 +++++- drivers/iommu/amd/init.c | 21 ++++++++++++++++++++- drivers/iommu/amd/iommu.c | 13 +++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-)
drivers/iommu/amd/amd_iommu.h +1 -0
@@ -43,6 +43,7 @@ extern int amd_iommu_guest_ir;extern enum protection_domain_mode amd_iommu_pgtable;extern int amd_iommu_gpt_level;extern unsigned long amd_iommu_pgsize_bitmap; +extern bool amd_iommu_hatdis;/* Protection domain ops */ void amd_iommu_init_identity_domain (void );
drivers/iommu/amd/amd_iommu_types.h +5 -1
@@ -460,6 +460,9 @@/* IOMMU Feature Reporting Field (for IVHD type 10h */ #define IOMMU_FEAT_GASUP_SHIFT 6 +/* IOMMU HATDIS for IVHD type 11h and 40h */ +#define IOMMU_IVHD_ATTR_HATDIS_SHIFT 0 +/* IOMMU Extended Feature Register (EFR) */ #define IOMMU_EFR_XTSUP_SHIFT 2#define IOMMU_EFR_GASUP_SHIFT 7
@@ -558,7 +561,8 @@ struct amd_io_pgtable { };enum protection_domain_mode { -PD_MODE_V1 =1 , +PD_MODE_NONE , +PD_MODE_V1 ,PD_MODE_V2 , };
drivers/iommu/amd/init.c +20 -1
@@ -168,6 +168,9 @@ static int amd_iommu_target_ivhd_type;u64 amd_iommu_efr;u64 amd_iommu_efr2; +/* Host (v1) page table is not supported*/ +bool amd_iommu_hatdis; +/* SNP is enabled on the system? */ bool amd_iommu_snp_en;EXPORT_SYMBOL (amd_iommu_snp_en);
@@ -1798,6 +1801,11 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h,if (h->efr_reg &BIT (IOMMU_EFR_XTSUP_SHIFT )) amd_iommu_xt_mode =IRQ_REMAP_X2APIC_MODE ; +if (h->efr_attr &BIT (IOMMU_IVHD_ATTR_HATDIS_SHIFT )) { +pr_warn_once ("Host Address Translation is not supported.\n" ); + amd_iommu_hatdis = true; + } +early_iommu_features_init (iommu, h);break ;
@@ -2582,7 +2590,7 @@ static void init_device_table_dma(struct amd_iommu_pci_seg *pci_seg)u32 devid;struct dev_table_entry *dev_table = pci_seg->dev_table; -if (dev_table ==NULL ) +if (!dev_table || amd_iommu_pgtable ==PD_MODE_NONE )return ;for (devid =0 ; devid <= pci_seg->last_bdf; ++devid) {
@@ -3095,6 +3103,17 @@ static int __init early_amd_iommu_init(void) } } +if (amd_iommu_hatdis) { +/* +* Host (v1) page table is not available. Attempt to use +* Guest (v2) page table. +*/ +if (amd_iommu_v2_pgtbl_supported ()) + amd_iommu_pgtable =PD_MODE_V2 ; +else + amd_iommu_pgtable =PD_MODE_NONE ; + } +/* Disable any previously enabled IOMMUs */ if (!is_kdump_kernel () || amd_iommu_disabled)disable_iommus ();
drivers/iommu/amd/iommu.c +13 -0
@@ -2393,6 +2393,13 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) pci_max_pasids(to_pci_dev(dev))); } +if (amd_iommu_pgtable ==PD_MODE_NONE ) { +pr_warn_once ("%s: DMA translation not supported by iommu.\n" , + __func__); + iommu_dev =ERR_PTR (-ENODEV ); + goto out_err; + } + out_err:iommu_completion_wait (iommu);
@@ -2480,6 +2487,9 @@ static int pdom_setup_pgtable(struct protection_domain *domain,case PD_MODE_V2 : fmt =AMD_IOMMU_V2 ;break ; +case PD_MODE_NONE : +WARN_ON_ONCE (1 ); +return -EPERM ; } domain->iop.pgtbl.cfg.amd.nid =dev_to_node (dev);
@@ -2501,6 +2511,9 @@ static inline u64 dma_max_address(enum protection_domain_mode pgtable)static bool amd_iommu_hd_support (struct amd_iommu *iommu) { +if (amd_iommu_hatdis) +return false; +return iommu && (iommu->features &FEATURE_HDSUP ); }
Signature · 1 line
2.43.0
Re: [PATCH v2 1/2] iommu/amd: Add HATDis feature support
Quoted 93 lines · Ankit Soni
Current AMD IOMMU assumes Host Address Translation (HAT) is always supported, and Linux kernel enables this capability by default. However, in case of emulated and virtualized IOMMU, this might not be the case. For example,current QEMU-emulated AMD vIOMMU does not support host translation for VFIO pass-through device, but the interrupt remapping support is required for x2APIC (i.e. kvm-msi-ext-dest-id is also not supported by the guest OS). This would require the guest kernel to boot with guest kernel option iommu=pt to by-pass the initialization of host (v1) table.
The AMD I/O Virtualization Technology (IOMMU) Specification Rev 3.10 [1] introduces a new flag 'HATDis' in the IVHD 11h IOMMU attributes to indicate that HAT is not supported on a particular IOMMU instance.
Therefore, modifies the AMD IOMMU driver to detect the new HATDis attributes, and disable host translation and switch to use guest translation if it is available. Otherwise, the driver will disable DMA translation.
[1] https://www.amd.com/content/dam/amd/en/documents/processor-tech-docs/specifications/48882_IOMMU.pdf
Reviewed-by Suravee Suthikulpanit <[email protected]>Signed-off-by Ankit Soni <[email protected]>--- drivers/iommu/amd/amd_iommu.h | 1 + drivers/iommu/amd/amd_iommu_types.h | 6 +++++- drivers/iommu/amd/init.c | 21 ++++++++++++++++++++- drivers/iommu/amd/iommu.c | 13 +++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-)drivers/iommu/amd/amd_iommu.h +1
-0@@ -43,6 +43,7 @@ extern int amd_iommu_guest_ir;extern enum protection_domain_mode amd_iommu_pgtable;extern int amd_iommu_gpt_level;extern unsigned long amd_iommu_pgsize_bitmap; +extern bool amd_iommu_hatdis;/* Protection domain ops */ void amd_iommu_init_identity_domain (void );drivers/iommu/amd/amd_iommu_types.h +5
-1@@ -460,6 +460,9 @@/* IOMMU Feature Reporting Field (for IVHD type 10h */ #define IOMMU_FEAT_GASUP_SHIFT 6 +/* IOMMU HATDIS for IVHD type 11h and 40h */ +#define IOMMU_IVHD_ATTR_HATDIS_SHIFT 0 +/* IOMMU Extended Feature Register (EFR) */ #define IOMMU_EFR_XTSUP_SHIFT 2#define IOMMU_EFR_GASUP_SHIFT 7@@ -558,7 +561,8 @@ struct amd_io_pgtable { };enum protection_domain_mode { -PD_MODE_V1 =1 , +PD_MODE_NONE , +PD_MODE_V1 ,PD_MODE_V2 , };drivers/iommu/amd/init.c +8
-0@@ -168,6 +168,9 @@ static int amd_iommu_target_ivhd_type;u64 amd_iommu_efr;u64 amd_iommu_efr2; +/* Host (v1) page table is not supported*/ +bool amd_iommu_hatdis; +/* SNP is enabled on the system? */ bool amd_iommu_snp_en;EXPORT_SYMBOL (amd_iommu_snp_en);@@ -1798,6 +1801,11 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h,if (h->efr_reg &BIT (IOMMU_EFR_XTSUP_SHIFT )) amd_iommu_xt_mode =IRQ_REMAP_X2APIC_MODE ; +if (h->efr_attr &BIT (IOMMU_IVHD_ATTR_HATDIS_SHIFT )) { +pr_warn_once ("Host Address Translation is not supported.\n" ); + amd_iommu_hatdis = true; + } +early_iommu_features_init (iommu, h);break ;
drivers/iommu/amd/init.c static void init_device_table_dma(struct amd_iommu_pci_seg *pci_seg) · line 2595
Quoted 7 lines
drivers/iommu/amd/init.c +1
-1@@ -2582,7 +2590,7 @@ static void init_device_table_dma(struct amd_iommu_pci_seg *pci_seg)u32 devid;struct dev_table_entry *dev_table = pci_seg->dev_table; -if (dev_table ==NULL ) +if (!dev_table || amd_iommu_pgtable ==PD_MODE_NONE )return ;
My suggestion in the past in the past has been to do:
if (!amd_iommu_hatdis || amd_iommu_pgtable != PD_MODE_NONE) {
ret = iommu_device_sysfs_add(...)
if (ret)
return ret;
}if (!amd_iommu_hatdis || amd_iommu_pgtable != PD_MODE_NONE)
iommu_device_register(&iommu->iommu, &amd_iommu_ops, NULL);
Also as a to simplify the attach/probe path i.e. remove the chunks in amd_iommu_probe_device/init_device_table_dma.
Or is it that the generation of an ILLEGAL_DEVICE_TABLE_ENTRY event means we still need to be careful here?
Quoted 24 lines
drivers/iommu/amd/init.c +11
-0for (devid =0 ; devid <= pci_seg->last_bdf; ++devid) {@@ -3095,6 +3103,17 @@ static int __init early_amd_iommu_init(void) } } +if (amd_iommu_hatdis) { +/* +* Host (v1) page table is not available. Attempt to use +* Guest (v2) page table. +*/ +if (amd_iommu_v2_pgtbl_supported ()) + amd_iommu_pgtable =PD_MODE_V2 ; +else + amd_iommu_pgtable =PD_MODE_NONE ; + } +/* Disable any previously enabled IOMMUs */ if (!is_kdump_kernel () || amd_iommu_disabled)disable_iommus ();drivers/iommu/amd/iommu.c +0
-0
drivers/iommu/amd/iommu.c static struct iommu_device *amd_iommu_probe_device(struct device *dev) · line 2402
Quoted 10 lines
drivers/iommu/amd/iommu.c +7
-0@@ -2393,6 +2393,13 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) pci_max_pasids(to_pci_dev(dev))); } +if (amd_iommu_pgtable ==PD_MODE_NONE ) { +pr_warn_once ("%s: DMA translation not supported by iommu.\n" , + __func__); + iommu_dev =ERR_PTR (-ENODEV ); + goto out_err; + } +
Strange place to put it after all the initialization has been done. Shouldn't it be at the top of the function?
drivers/iommu/amd/iommu.c static int pdom_setup_pgtable(struct protection_domain *domain, · line 2495
Quoted 13 lines
drivers/iommu/amd/iommu.c +3
-0out_err:iommu_completion_wait (iommu);@@ -2480,6 +2487,9 @@ static int pdom_setup_pgtable(struct protection_domain *domain,case PD_MODE_V2 : fmt =AMD_IOMMU_V2 ;break ; +case PD_MODE_NONE : +WARN_ON_ONCE (1 ); +return -EPERM ; } domain->iop.pgtbl.cfg.amd.nid = dev_to_node(dev);> @@ -2501,6 +2511,9 @@
static inline u64 dma_max_address(enum protection_domain_mode pgtable)
drivers/iommu/amd/iommu.c static inline u64 dma_max_address(enum protection_domain_mode pgtable) · line 2518
Quoted 9 lines
static bool
amd_iommu_hd_support(struct amd_iommu *iommu){drivers/iommu/amd/iommu.c +3
-0+if (amd_iommu_hatdis) +return false; +return iommu && (iommu->features &FEATURE_HDSUP ); }
If there's no IOMMU group, how can we allocate a paging domain with dirty support for host/v1 pgtable? I don't think you need this part?
Re: [PATCH v2 1/2] iommu/amd: Add HATDis feature support
Hi Joao,
Quoted 19 lines · Joao Martins
drivers/iommu/amd/init.c static void init_device_table_dma(struct amd_iommu_pci_seg *pci_seg) · line 2595
Quoted 10 lines
drivers/iommu/amd/init.c +1
-1break ;@@ -2582,7 +2590,7 @@ static void init_device_table_dma(struct amd_iommu_pci_seg *pci_seg)u32 devid;struct dev_table_entry *dev_table = pci_seg->dev_table; -if (dev_table ==NULL ) +if (!dev_table || amd_iommu_pgtable ==PD_MODE_NONE )return ;My suggestion in the past in the past has been to do:
if (!amd_iommu_hatdis || amd_iommu_pgtable != PD_MODE_NONE) { ret = iommu_device_sysfs_add(...) if (ret) return ret; }
Quoted 9 lines
if (!amd_iommu_hatdis ||
amd_iommu_pgtable!=PD_MODE_NONE)iommu_device_register(&iommu->iommu, &amd_iommu_ops, NULL);Also as a to simplify the attach/probe path i.e. remove the chunks in amd_iommu_probe_device/init_device_table_dma.
Or is it that the generation of an
ILLEGAL_DEVICE_TABLE_ENTRYevent means we still need to be careful here?
Correction in my last statement, with above check in iommu_device_register(), machine is not booting and INVALID_DEVICE_REQUEST is generated continuously. so iommu_device_register() needs to be called.
Quoted 8 lines
Quoted 8 lines
drivers/iommu/amd/iommu.c +0
-0@@ -2393,6 +2393,13 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) pci_max_pasids(to_pci_dev(dev))); }
Quoted 11 lines
drivers/iommu/amd/iommu.c static struct iommu_device *amd_iommu_probe_device(struct device *dev) · line 2402
Quoted 7 lines
drivers/iommu/amd/iommu.c +7
-0+if (amd_iommu_pgtable ==PD_MODE_NONE ) { +pr_warn_once ("%s: DMA translation not supported by iommu.\n" , + __func__); + iommu_dev =ERR_PTR (-ENODEV ); + goto out_err; + } +Strange place to put it after all the initialization has been done. Shouldn't it be at the top of the function?
In amd_iommu_probe_device() driver is setting ir domain with amd_iommu_set_pci_msi_domain(), hence i had chosen this place for return.
Quoted 15 lines
drivers/iommu/amd/iommu.c static int pdom_setup_pgtable(struct protection_domain *domain, · line 2495
Quoted 13 lines
drivers/iommu/amd/iommu.c +3
-0out_err:iommu_completion_wait (iommu);@@ -2480,6 +2487,9 @@ static int pdom_setup_pgtable(struct protection_domain *domain,case PD_MODE_V2 : fmt =AMD_IOMMU_V2 ;break ; +case PD_MODE_NONE : +WARN_ON_ONCE (1 ); +return -EPERM ; } domain->iop.pgtbl.cfg.amd.nid = dev_to_node(dev);> @@ -2501,6 +2511,9 @@static inline u64
dma_max_address(enum protection_domain_mode pgtable)Quoted 1 line
Quoted 11 lines
drivers/iommu/amd/iommu.c static inline u64 dma_max_address(enum protection_domain_mode pgtable) · line 2518
Quoted 8 lines
static bool
amd_iommu_hd_support(struct amd_iommu *iommu){drivers/iommu/amd/iommu.c +3
-0+if (amd_iommu_hatdis) +return false; +return iommu && (iommu->features &FEATURE_HDSUP ); }If there's no IOMMU group, how can we allocate a paging domain with dirty support for host/v1 pgtable? I don't think you need this part?
This check is for when amd_iommu_hatdis is set and driver has set v2 page table, then driver driver need to take care about dirty support.
PATCH v2 2/2 iommu/amd: Add efr[HATS] max v1 page table level
In reply to Ankit SoniThe EFR[HATS] bits indicate maximum host translation level supported by IOMMU. Adding support to set the maximum host page table level as indicated by EFR[HATS]. If the HATS=11b (reserved), the driver will attempt to use guest page table for DMA API.
--- drivers/iommu/amd/amd_iommu.h | 1 + drivers/iommu/amd/amd_iommu_types.h | 1 + drivers/iommu/amd/init.c | 16 ++++++++++++++++ drivers/iommu/amd/io_pgtable.c | 4 ++-- drivers/iommu/amd/iommu.c | 2 +- 5 files changed, 21 insertions(+), 3 deletions(-)
drivers/iommu/amd/amd_iommu.h +1 -0
@@ -42,6 +42,7 @@ int amd_iommu_enable_faulting(unsigned int cpu);extern int amd_iommu_guest_ir;extern enum protection_domain_mode amd_iommu_pgtable;extern int amd_iommu_gpt_level; +extern u8 amd_iommu_hpt_level;extern unsigned long amd_iommu_pgsize_bitmap;extern bool amd_iommu_hatdis;
drivers/iommu/amd/amd_iommu_types.h +1 -0
@@ -96,6 +96,7 @@#define FEATURE_GA BIT_ULL(7)#define FEATURE_HE BIT_ULL(8)#define FEATURE_PC BIT_ULL(9) +#define FEATURE_HATS GENMASK_ULL(11, 10)#define FEATURE_GATS GENMASK_ULL(13, 12)#define FEATURE_GLX GENMASK_ULL(15, 14)#define FEATURE_GAM_VAPIC BIT_ULL(21)
drivers/iommu/amd/init.c +16 -0
@@ -152,6 +152,8 @@ bool amd_iommu_dump;bool amd_iommu_irq_remap__read_mostly ;enum protection_domain_mode amd_iommu_pgtable =PD_MODE_V1 ; +/* Host page table level */ +u8 amd_iommu_hpt_level;/* Guest page table level */ int amd_iommu_gpt_level =PAGE_MODE_4_LEVEL ;
@@ -3052,6 +3054,7 @@ static int __init early_amd_iommu_init(void)struct acpi_table_header *ivrs_base;int ret;acpi_status status; +u8 efr_hats;if (!amd_iommu_detected)return -ENODEV ;
@@ -3096,6 +3099,19 @@ static int __init early_amd_iommu_init(void) FIELD_GET(FEATURE_GATS, amd_iommu_efr) == GUEST_PGTABLE_5_LEVEL) amd_iommu_gpt_level =PAGE_MODE_5_LEVEL ; + efr_hats =FIELD_GET (FEATURE_HATS , amd_iommu_efr); +if (efr_hats !=0x3 ) { +/* +* efr[HATS] bits specify the maximum host translation level +* supported, with LEVEL 4 being initial max level. +*/ + amd_iommu_hpt_level = efr_hats +PAGE_MODE_4_LEVEL ; + }else { +pr_warn_once (FW_BUG "Disable host address translation due to invalid translation level (%#x).\n" , + efr_hats); + amd_iommu_hatdis = true; + } +if (amd_iommu_pgtable ==PD_MODE_V2 ) {if (!amd_iommu_v2_pgtbl_supported ()) {pr_warn ("Cannot enable v2 page table for DMA-API. Fallback to v1.\n" );
drivers/iommu/amd/io_pgtable.c +2 -2
@@ -132,7 +132,7 @@ static bool increase_address_space(struct amd_io_pgtable *pgtable, goto out; ret = false; -if (WARN_ON_ONCE (pgtable->mode ==PAGE_MODE_6_LEVEL )) +if (WARN_ON_ONCE (pgtable->mode == amd_iommu_hpt_level)) goto out; *pte =PM_LEVEL_PDE (pgtable->mode,iommu_virt_to_phys (pgtable->root));
@@ -531,7 +531,7 @@ static void v1_free_pgtable(struct io_pgtable *iop)/* Page-table is not visible to IOMMU anymore, so free it */ BUG_ON (pgtable->mode <PAGE_MODE_NONE || - pgtable->mode >PAGE_MODE_6_LEVEL ); + pgtable->mode > amd_iommu_hpt_level);free_sub_pt (pgtable->root, pgtable->mode, &freelist);iommu_put_pages_list (&freelist);
drivers/iommu/amd/iommu.c +1 -1
@@ -2503,7 +2503,7 @@ static int pdom_setup_pgtable(struct protection_domain *domain,static inline u64 dma_max_address (enum protection_domain_mode pgtable) {if (pgtable ==PD_MODE_V1 ) -return ~0ULL ; +return PM_LEVEL_SIZE (amd_iommu_hpt_level);/* V2 with 4/5 level page table */ return ((1ULL <<PM_LEVEL_SHIFT (amd_iommu_gpt_level)) -1 );
Signature · 1 line
2.43.0