iommu/amd: Add multiple PCI segments support
Subsystems (3)
v2 cover iommu/amd: Add multiple PCI segments support
Newer AMD systems can support multiple PCI segments, where each segment contains one or more IOMMU instances. However, an IOMMU instance can only support a single PCI segment.
Current code assumes a system contains only one PCI segment (segment 0) and creates global data structures such as device table, rlookup table, etc.
This series introduces per-PCI-segment data structure, which contains device table, alias table, etc. For each PCI segment, all IOMMUs share the same data structure. The series also makes necessary code adjustment and logging enhancements. Finally it removes global data structures like device table, alias table, etc.
In case of system w/ single PCI segment (e.g. PCI segment ID is zero), IOMMU driver allocates one PCI segment data structure, which will be shared by all IOMMUs.
Patch 1 Updates struct iommu_dev_data defination.
Patch 2 - 13 introduce new PCI segment structure and allocate per data structures, and introduce the amd_iommu.pci_seg pointer to point to the corresponded pci_segment structure. Also, we have introduced a helper function rlookup_amd_iommu() to reverse-lookup each iommu for a particular device.
Patch 14 - 29 adopt to per PCI segment data structure and removes global data structure.
Patch 30 fixes flushing logic to flush upto last_bdf.
Patch 31 - 37 convert usages of 16-bit PCI device ID to include 16-bit segment ID.
Changes from v1 -> v2:
- Updated patch 1 to include dev_is_pci() check
v1 patchset : https://lore.kernel.org/linux-iommu/[email protected]/T/#t
Changes from RFC -> v1:
- Rebased patches on top of iommu/next tree.
- Update struct iommu_dev_data defination
- Updated few log message to print segment ID
- Fix smatch warnings
RFC patchset : https://lore.kernel.org/linux-iommu/[email protected]/T/#t
Regards,
Vasant
Suravee Suthikulpanit (21):
iommu/amd: Introduce per PCI segment device table
iommu/amd: Introduce per PCI segment rlookup table
iommu/amd: Introduce per PCI segment old_dev_tbl_cpy
iommu/amd: Introduce per PCI segment alias_table
iommu/amd: Convert to use rlookup_amd_iommu helper function
iommu/amd: Update irq_remapping_alloc to use IOMMU lookup helper function iommu/amd: Introduce struct amd_ir_data.iommu
iommu/amd: Update amd_irte_ops functions
iommu/amd: Update alloc_irq_table and alloc_irq_index
iommu/amd: Update set_dte_entry and clear_dte_entry
iommu/amd: Update iommu_ignore_device
iommu/amd: Update dump_dte_entry
iommu/amd: Update set_dte_irq_entry
iommu/amd: Update (un)init_device_table_dma()
iommu/amd: Update set_dev_entry_bit() and get_dev_entry_bit() iommu/amd: Remove global amd_iommu_dev_table
iommu/amd: Remove global amd_iommu_alias_table
iommu/amd: Introduce get_device_sbdf_id() helper function
iommu/amd: Include PCI segment ID when initialize IOMMU
iommu/amd: Specify PCI segment ID when getting pci device
iommu/amd: Add PCI segment support for ivrs_ioapic, ivrs_hpet, ivrs_acpihid commands
Vasant Hegde (16):
iommu/amd: Update struct iommu_dev_data defination iommu/amd: Introduce pci segment structure
iommu/amd: Introduce per PCI segment irq_lookup_table iommu/amd: Introduce per PCI segment dev_data_list iommu/amd: Introduce per PCI segment unity map list iommu/amd: Introduce per PCI segment last_bdf iommu/amd: Introduce per PCI segment device table size iommu/amd: Introduce per PCI segment alias table size iommu/amd: Introduce per PCI segment rlookup table size iommu/amd: Convert to use per PCI segment irq_lookup_table iommu/amd: Convert to use per PCI segment rlookup_table iommu/amd: Remove global amd_iommu_last_bdf
iommu/amd: Flush upto last_bdf only
iommu/amd: Print PCI segment ID in error log messages iommu/amd: Update device_state structure to include PCI seg ID iommu/amd: Update amd_iommu_fault structure to include PCI seg ID
.../admin-guide/kernel-parameters.txt | 34 +- drivers/iommu/amd/amd_iommu.h | 13 +- drivers/iommu/amd/amd_iommu_types.h | 127 +++- drivers/iommu/amd/init.c | 683 +++++++++++------- drivers/iommu/amd/iommu.c | 545 ++++++++------ drivers/iommu/amd/iommu_v2.c | 67 +- drivers/iommu/amd/quirks.c | 4 +- 7 files changed, 888 insertions(+), 585 deletions(-)
Signature · 5 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 1/37 iommu/amd: Update struct iommu_dev_data defination
struct iommu_dev_data contains member "pdev" to point to pci_dev. This is valid for only PCI devices and for other devices this will be NULL. This causes unnecessary "pdev != NULL" check at various places.
Replace "struct pci_dev" member with "struct device" and use to_pci_dev() to get pci device reference as needed. Also adjust setup_aliases() and clone_aliases() function.
No functional change intended.
--- drivers/iommu/amd/amd_iommu_types.h | 2 +- drivers/iommu/amd/iommu.c | 32 +++++++++++++++++------------ 2 files changed, 20 insertions(+), 14 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +1 -1
@@ -685,7 +685,7 @@ struct iommu_dev_data {struct list_head list;/* For domain->dev_list */ struct llist_node dev_data_list;/* For global dev_data_list */ struct protection_domain *domain;/* Domain the device is bound to */ -struct pci_dev *pdev; +struct device *dev;u16 devid;/* PCI Device ID */ bool iommu_v2;/* Device can make use of IOMMUv2 */ struct {
drivers/iommu/amd/iommu.c +19 -13
@@ -188,10 +188,13 @@ static int clone_alias(struct pci_dev *pdev, u16 alias, void *data)return 0 ; } -static void clone_aliases (struct pci_dev *pdev) +static void clone_aliases (struct device *dev) { -if (!pdev) +struct pci_dev *pdev; + +if (!dev_is_pci (dev))return ; + pdev =to_pci_dev (dev);/* * The IVRS alias stored in the alias table may not be
@@ -203,14 +206,14 @@ static void clone_aliases(struct pci_dev *pdev)pci_for_each_dma_alias (pdev, clone_alias,NULL ); } -static struct pci_dev *setup_aliases (struct device *dev) +static void setup_aliases (struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);u16 ivrs_alias;/* For ACPI HID devices, there are no aliases */ if (!dev_is_pci (dev)) -return NULL ; +return ;/* * Add the IVRS alias to the pci aliases if it is on the same
@@ -221,9 +224,7 @@ static struct pci_dev *setup_aliases(struct device *dev) PCI_BUS_NUM(ivrs_alias) == pdev->bus->number)pci_add_dma_alias (pdev, ivrs_alias &0xff ,1 ); -clone_aliases (pdev); - -return pdev; +clone_aliases (dev); }static struct iommu_dev_data *find_dev_data (u16 devid)
@@ -331,7 +332,8 @@ static int iommu_init_device(struct device *dev)if (!dev_data)return -ENOMEM ; - dev_data->pdev =setup_aliases (dev); + dev_data->dev = dev; +setup_aliases (dev);/* * By default we use passthrough mode for IOMMUv2 capable device.
@@ -1232,13 +1234,17 @@ static int device_flush_dte_alias(struct pci_dev *pdev, u16 alias, void *data)static int device_flush_dte (struct iommu_dev_data *dev_data) {struct amd_iommu *iommu; +struct pci_dev *pdev =NULL ;u16 alias;int ret; iommu = amd_iommu_rlookup_table[dev_data->devid]; -if (dev_data->pdev) - ret =pci_for_each_dma_alias (dev_data->pdev, +if (dev_is_pci (dev_data->dev)) + pdev =to_pci_dev (dev_data->dev); + +if (pdev) + ret =pci_for_each_dma_alias (pdev, device_flush_dte_alias, iommu);else ret =iommu_flush_dte (iommu, dev_data->devid);
@@ -1561,7 +1567,7 @@ static void do_attach(struct iommu_dev_data *dev_data,/* Update device table */ set_dte_entry (dev_data->devid, domain, ats, dev_data->iommu_v2); -clone_aliases (dev_data->pdev); +clone_aliases (dev_data->dev);device_flush_dte (dev_data); }
@@ -1577,7 +1583,7 @@ static void do_detach(struct iommu_dev_data *dev_data) dev_data->domain =NULL ;list_del (&dev_data->list);clear_dte_entry (dev_data->devid); -clone_aliases (dev_data->pdev); +clone_aliases (dev_data->dev);/* Flush the DTE entry */ device_flush_dte (dev_data);
@@ -1818,7 +1824,7 @@ static void update_device_table(struct protection_domain *domain)list_for_each_entry (dev_data, &domain->dev_list, list) {set_dte_entry (dev_data->devid, domain, dev_data->ats.enabled, dev_data->iommu_v2); -clone_aliases (dev_data->pdev); +clone_aliases (dev_data->dev); } }
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerRe: [PATCH v2 01/37] iommu/amd: Update struct iommu_dev_data defination
On Mon, Apr 25, 2022 at 05:03:39PM +0530, Vasant Hegde wrote:
Subject: iommu/amd: Update struct iommu_dev_data defination
^^^^^^^^^^ Typo
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 01/37] iommu/amd: Update struct iommu_dev_data defination
Joerg,
Quoted 5 lines · Joerg Roedel
On Mon, Apr 25, 2022 at 05:03:39PM +0530, Vasant Hegde wrote:
Subject: iommu/amd: Update struct
iommu_dev_datadefination^^^^^^^^^^ Typo
Thanks for the review. Will fix it in v3.
-Vasant
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 2/37 iommu/amd: Introduce pci segment structure
In reply to Vasant Hegde via iommuNewer AMD systems can support multiple PCI segments, where each segment contains one or more IOMMU instances. However, an IOMMU instance can only support a single PCI segment.
Current code assumes that system contains only one pci segment (segment 0) and creates global data structures such as device table, rlookup table, etc.
Introducing per PCI segment data structure, which contains segment specific data structures. This will eventually replace the global data structures.
Also update amd_iommu->pci_seg variable to point to PCI segment structure instead of PCI segment ID.
--- drivers/iommu/amd/amd_iommu_types.h | 23 ++++++++++++++- drivers/iommu/amd/init.c | 46 ++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 2 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +22 -1
@@ -452,6 +452,11 @@ extern bool amd_iommu_irq_remap;/* kmem_cache to get tables with 128 byte alignement */ extern struct kmem_cache *amd_iommu_irq_cache; +/* Make iterating over all pci segment easier */ +#define for_each_pci_segment (pci_seg) \ + list_for_each_entry((pci_seg), &amd_iommu_pci_seg_list, list) +#define for_each_pci_segment_safe (pci_seg, next) \ + list_for_each_entry_safe((pci_seg), (next), &amd_iommu_pci_seg_list, list)/* * Make iterating over all IOMMUs easier */
@@ -526,6 +531,16 @@ struct protection_domain {unsigned dev_iommu[MAX_IOMMUS ];/* per-IOMMU reference count */ }; +/* +* This structure contains information about one PCI segment in the system. +*/ +struct amd_iommu_pci_seg { +struct list_head list; + +/* PCI segment number */ +u16 id; +}; +/* * Structure where we save information about one hardware AMD IOMMU in the * system.
@@ -577,7 +592,7 @@ struct amd_iommu {u16 cap_ptr;/* pci domain of this IOMMU */ -u16 pci_seg; +struct amd_iommu_pci_seg *pci_seg;/* start of exclusion range of that IOMMU */ u64 exclusion_start;
@@ -705,6 +720,12 @@ extern struct list_head ioapic_map;extern struct list_head hpet_map;extern struct list_head acpihid_map; +/* +* List with all PCI segments in the system. This list is not locked because +* it is only written at driver initialization time +*/ +extern struct list_head amd_iommu_pci_seg_list; +/* * List with all IOMMUs in the system. This list is not locked because it is * only written and read at driver initialization or suspend time
drivers/iommu/amd/init.c +45 -1
78 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerRe: [PATCH v2 02/37] iommu/amd: Introduce pci segment structure
Hi Vasant,
drivers/iommu/amd/amd_iommu_types.h struct protection_domain { · line 538
Quoted 5 lines · Vasant Hegde
drivers/iommu/amd/amd_iommu_types.h +5
-0+/* +* This structure contains information about one PCI segment in the system. +*/ +struct amd_iommu_pci_seg { +struct list_head list;
The purpose of this list_head needs a comment.
drivers/iommu/amd/amd_iommu_types.h extern struct list_head ioapic_map; · line 727
Quoted 9 lines
drivers/iommu/amd/amd_iommu_types.h +9
-0+ +/* PCI segment number */ +u16 id; +}; +/* +* List with all PCI segments in the system. This list is not locked because +* it is only written at driver initialization time +*/ +extern struct list_head amd_iommu_pci_seg_list;
So there will never be hotplug of a PCI segment? Say together with hotplugging a CPU?
Quoted 1 line
+static void
__initfree_pci_segment(void)
This needs plural: free_pci_segments(), as it frees all segments.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 02/37] iommu/amd: Introduce pci segment structure
Joerg,
Quoted 10 lines · Joerg Roedel
Hi Vasant,
drivers/iommu/amd/amd_iommu_types.h struct protection_domain { · line 538
Quoted 5 lines · Vasant Hegde
drivers/iommu/amd/amd_iommu_types.h +5
-0+/* +* This structure contains information about one PCI segment in the system. +*/ +struct amd_iommu_pci_seg { +struct list_head list;The purpose of this
list_headneeds a comment.
Sure.
Quoted 13 lines
drivers/iommu/amd/amd_iommu_types.h extern struct list_head ioapic_map; · line 727
Quoted 10 lines
drivers/iommu/amd/amd_iommu_types.h +9
-0+ +/* PCI segment number */ +u16 id; +}; +/* +* List with all PCI segments in the system. This list is not locked because +* it is only written at driver initialization time +*/ +extern struct list_head amd_iommu_pci_seg_list;So there will never be hotplug of a PCI segment? Say together with hotplugging a CPU?
As I understood currently we don't support hotplugging.
Quoted 5 lines
Quoted 2 lines
+static void
__initfree_pci_segment(void)This needs plural:
free_pci_segments(), as it frees all segments.
Sure. Will fix it in v3.
-Vasant
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 3/37 iommu/amd: Introduce per PCI segment device table
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Introduce per PCI segment device table. All IOMMUs within the segment will share this device table. This will replace global device table i.e. amd_iommu_dev_table.
Also introduce helper function to get the device table for the given IOMMU.
--- drivers/iommu/amd/amd_iommu.h | 1 + drivers/iommu/amd/amd_iommu_types.h | 10 ++++++++++ drivers/iommu/amd/init.c | 26 ++++++++++++++++++++++++-- drivers/iommu/amd/iommu.c | 12 ++++++++++++ 4 files changed, 47 insertions(+), 2 deletions(-)
drivers/iommu/amd/amd_iommu.h +1 -0
@@ -128,4 +128,5 @@ static inline void amd_iommu_apply_ivrs_quirks(void) { }extern void amd_iommu_domain_set_pgtable (struct protection_domain *domain,u64 *root,int mode); +extern struct dev_table_entry *get_dev_table (struct amd_iommu *iommu);#endif
drivers/iommu/amd/amd_iommu_types.h +10 -0
@@ -539,6 +539,16 @@ struct amd_iommu_pci_seg {/* PCI segment number */ u16 id; + +/* +* device table virtual address +* +* Pointer to the per PCI segment device table. +* It is indexed by the PCI device id or the HT unit id and contains +* information about the domain the device belongs to as well as the +* page table root pointer. +*/ +struct dev_table_entry *dev_table; };/*
drivers/iommu/amd/init.c +24 -2
@@ -640,11 +640,29 @@ static int __init find_last_devid_acpi(struct acpi_table_header *table)* * The following functions belong to the code path which parses the ACPI table * the second time. In this ACPI parsing iteration we allocate IOMMU specific -* data structures, initialize the device/alias/rlookup table and also -* basically initialize the hardware. +* data structures, initialize the per PCI segment device/alias/rlookup table +* and also basically initialize the hardware. * ****************************************************************************/ +/* Allocate per PCI segment device table */ +static inline int __init alloc_dev_table (struct amd_iommu_pci_seg *pci_seg) +{ + pci_seg->dev_table = (void *)__get_free_pages (GFP_KERNEL | __GFP_ZERO |GFP_DMA32 , +get_order (dev_table_size)); +if (!pci_seg->dev_table) +return -ENOMEM ; + +return 0 ; +} + +static inline void free_dev_table (struct amd_iommu_pci_seg *pci_seg) +{ +free_pages ((unsigned long )pci_seg->dev_table, +get_order (dev_table_size)); + pci_seg->dev_table =NULL ; +} +/* * Allocates the command buffer. This buffer is per AMD IOMMU. We can * write commands to that buffer later and the IOMMU will execute them
@@ -1469,6 +1487,9 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id) pci_seg->id = id;list_add_tail (&pci_seg->list, &amd_iommu_pci_seg_list); +if (alloc_dev_table (pci_seg)) +return NULL ; +return pci_seg; }
@@ -1490,6 +1511,7 @@ static void __init free_pci_segment(void)for_each_pci_segment_safe (pci_seg, next) {list_del (&pci_seg->list); +free_dev_table (pci_seg);kfree (pci_seg); } }
drivers/iommu/amd/iommu.c +12 -0
@@ -134,6 +134,18 @@ static inline int get_device_id(struct device *dev)return devid; } +struct dev_table_entry *get_dev_table (struct amd_iommu *iommu) +{ +struct dev_table_entry *dev_table; +struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg; + +BUG_ON (pci_seg ==NULL ); + dev_table = pci_seg->dev_table; +BUG_ON (dev_table ==NULL ); + +return dev_table; +} +static struct protection_domain *to_pdomain (struct iommu_domain *dom) { return container_of(dom, struct protection_domain, domain);
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 4/37 iommu/amd: Introduce per PCI segment rlookup table
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
This will replace global rlookup table (amd_iommu_rlookup_table). Also add helper functions to set/get rlookup table for the given device.
--- drivers/iommu/amd/amd_iommu.h | 1 + drivers/iommu/amd/amd_iommu_types.h | 8 ++++++ drivers/iommu/amd/init.c | 23 +++++++++++++++ drivers/iommu/amd/iommu.c | 44 +++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+)
drivers/iommu/amd/amd_iommu.h +1 -0
@@ -19,6 +19,7 @@ extern int amd_iommu_init_devices(void);extern void amd_iommu_uninit_devices (void );extern void amd_iommu_init_notifier (void );extern int amd_iommu_init_api (void ); +extern void amd_iommu_set_rlookup_table (struct amd_iommu *iommu,u16 devid);#ifdef CONFIG_AMD_IOMMU_DEBUGFS void amd_iommu_debugfs_setup (struct amd_iommu *iommu);
drivers/iommu/amd/amd_iommu_types.h +8 -0
@@ -486,6 +486,7 @@ struct amd_iommu_fault { }; +struct amd_iommu ;struct iommu_domain ;struct irq_domain ;struct amd_irte_ops ;
@@ -549,6 +550,13 @@ struct amd_iommu_pci_seg {* page table root pointer. */ struct dev_table_entry *dev_table; + +/* +* The rlookup iommu table is used to find the IOMMU which is +* responsible for a specific device. It is indexed by the PCI +* device id. +*/ +struct amd_iommu **rlookup_table; };/*
drivers/iommu/amd/init.c +23 -0
@@ -663,6 +663,26 @@ static inline void free_dev_table(struct amd_iommu_pci_seg *pci_seg) pci_seg->dev_table =NULL ; } +/* Allocate per PCI segment IOMMU rlookup table. */ +static inline int __init alloc_rlookup_table (struct amd_iommu_pci_seg *pci_seg) +{ + pci_seg->rlookup_table = (void *)__get_free_pages ( +GFP_KERNEL | __GFP_ZERO, +get_order (rlookup_table_size)); +if (pci_seg->rlookup_table ==NULL ) +return -ENOMEM ; + +return 0 ; +} + +static inline void free_rlookup_table (struct amd_iommu_pci_seg *pci_seg) +{ +free_pages ((unsigned long )pci_seg->rlookup_table, +get_order (rlookup_table_size)); + pci_seg->rlookup_table =NULL ; +} + +/* * Allocates the command buffer. This buffer is per AMD IOMMU. We can * write commands to that buffer later and the IOMMU will execute them
@@ -1489,6 +1509,8 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id)if (alloc_dev_table (pci_seg))return NULL ; +if (alloc_rlookup_table (pci_seg)) +return NULL ;return pci_seg; }
@@ -1511,6 +1533,7 @@ static void __init free_pci_segment(void)for_each_pci_segment_safe (pci_seg, next) {list_del (&pci_seg->list); +free_rlookup_table (pci_seg);free_dev_table (pci_seg);kfree (pci_seg); }
drivers/iommu/amd/iommu.c +44 -0
50 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 5/37 iommu/amd: Introduce per PCI segment irq_lookup_table
In reply to Vasant Hegde via iommuThis will replace global irq lookup table (irq_lookup_table).
--- drivers/iommu/amd/amd_iommu_types.h | 6 ++++++ drivers/iommu/amd/init.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)
drivers/iommu/amd/amd_iommu_types.h +6 -0
@@ -557,6 +557,12 @@ struct amd_iommu_pci_seg {* device id. */ struct amd_iommu **rlookup_table; + +/* +* This table is used to find the irq remapping table for a given +* device id quickly. +*/ +struct irq_remap_table **irq_lookup_table; };/*
drivers/iommu/amd/init.c +27 -0
@@ -682,6 +682,26 @@ static inline void free_rlookup_table(struct amd_iommu_pci_seg *pci_seg) pci_seg->rlookup_table =NULL ; } +static inline int __init alloc_irq_lookup_table (struct amd_iommu_pci_seg *pci_seg) +{ + pci_seg->irq_lookup_table = (void *)__get_free_pages ( +GFP_KERNEL | __GFP_ZERO, +get_order (rlookup_table_size)); +kmemleak_alloc (pci_seg->irq_lookup_table, + rlookup_table_size,1 ,GFP_KERNEL ); +if (pci_seg->irq_lookup_table ==NULL ) +return -ENOMEM ; + +return 0 ; +} + +static inline void free_irq_lookup_table (struct amd_iommu_pci_seg *pci_seg) +{ +kmemleak_free (pci_seg->irq_lookup_table); +free_pages ((unsigned long )pci_seg->irq_lookup_table, +get_order (rlookup_table_size)); + pci_seg->irq_lookup_table =NULL ; +}/* * Allocates the command buffer. This buffer is per AMD IOMMU. We can
@@ -1533,6 +1553,7 @@ static void __init free_pci_segment(void)for_each_pci_segment_safe (pci_seg, next) {list_del (&pci_seg->list); +free_irq_lookup_table (pci_seg);free_rlookup_table (pci_seg);free_dev_table (pci_seg);kfree (pci_seg);
@@ -2896,6 +2917,7 @@ static int __init early_amd_iommu_init(void) amd_iommu_irq_remap =check_ioapic_information ();if (amd_iommu_irq_remap) { +struct amd_iommu_pci_seg *pci_seg;/* * Interrupt remapping enabled, create kmem_cache for the * remapping tables.
@@ -2912,6 +2934,11 @@ static int __init early_amd_iommu_init(void)if (!amd_iommu_irq_cache) goto out; +for_each_pci_segment (pci_seg) { +if (alloc_irq_lookup_table (pci_seg)) + goto out; + } + irq_lookup_table = (void *)__get_free_pages (GFP_KERNEL | __GFP_ZERO,get_order (rlookup_table_size));
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 6/37 iommu/amd: Introduce per PCI segment dev_data_list
In reply to Vasant Hegde via iommuThis will replace global dev_data_list.
--- drivers/iommu/amd/amd_iommu_types.h | 3 +++ drivers/iommu/amd/init.c | 1 + drivers/iommu/amd/iommu.c | 21 ++++++++++----------- 3 files changed, 14 insertions(+), 11 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +3 -0
@@ -538,6 +538,9 @@ struct protection_domain {struct amd_iommu_pci_seg {struct list_head list; +/* List of all available dev_data structures */ +struct llist_head dev_data_list; +/* PCI segment number */ u16 id;
drivers/iommu/amd/init.c +1 -0
@@ -1525,6 +1525,7 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id)return NULL ; pci_seg->id = id; +init_llist_head (&pci_seg->dev_data_list);list_add_tail (&pci_seg->list, &amd_iommu_pci_seg_list);if (alloc_dev_table (pci_seg))
drivers/iommu/amd/iommu.c +10 -11
@@ -62,9 +62,6 @@static DEFINE_SPINLOCK (pd_bitmap_lock); -/* List of all available dev_data structures */ -static LLIST_HEAD (dev_data_list); -LIST_HEAD (ioapic_map);LIST_HEAD (hpet_map);LIST_HEAD (acpihid_map);
@@ -195,9 +192,10 @@ static struct protection_domain *to_pdomain(struct iommu_domain *dom) return container_of(dom, struct protection_domain, domain); } -static struct iommu_dev_data *alloc_dev_data (u16 devid) +static struct iommu_dev_data *alloc_dev_data (struct amd_iommu *iommu,u16 devid) {struct iommu_dev_data *dev_data; +struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg; dev_data =kzalloc (sizeof (*dev_data),GFP_KERNEL );if (!dev_data)
@@ -207,19 +205,20 @@ static struct iommu_dev_data *alloc_dev_data(u16 devid) dev_data->devid = devid;ratelimit_default_init (&dev_data->rs); -llist_add (&dev_data->dev_data_list, &dev_data_list); +llist_add (&dev_data->dev_data_list, &pci_seg->dev_data_list);return dev_data; } -static struct iommu_dev_data *search_dev_data (u16 devid) +static struct iommu_dev_data *search_dev_data (struct amd_iommu *iommu,u16 devid) {struct iommu_dev_data *dev_data;struct llist_node *node; +struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg; -if (llist_empty (&dev_data_list)) +if (llist_empty (&pci_seg->dev_data_list))return NULL ; - node = dev_data_list.first; + node = pci_seg->dev_data_list.first;llist_for_each_entry (dev_data, node, dev_data_list) {if (dev_data->devid == devid)return dev_data;
@@ -288,10 +287,10 @@ static struct iommu_dev_data *find_dev_data(u16 devid)struct iommu_dev_data *dev_data;struct amd_iommu *iommu = amd_iommu_rlookup_table[devid]; - dev_data =search_dev_data (devid); + dev_data =search_dev_data (iommu, devid);if (dev_data ==NULL ) { - dev_data =alloc_dev_data (devid); + dev_data =alloc_dev_data (iommu, devid);if (!dev_data)return NULL ;
@@ -3464,7 +3463,7 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)struct vcpu_data *vcpu_pi_info = pi_data->vcpu_data;struct amd_ir_data *ir_data = data->chip_data;struct irq_2_irte *irte_info = &ir_data->irq_2_irte; -struct iommu_dev_data *dev_data =search_dev_data (irte_info->devid); +struct iommu_dev_data *dev_data =search_dev_data (NULL , irte_info->devid);/* Note: * This device has never been set up for guest mode.
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 7/37 iommu/amd: Introduce per PCI segment old_dev_tbl_cpy
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
It will remove global old_dev_tbl_cpy. Also update copy_device_table() copy device table for all PCI segments.
--- drivers/iommu/amd/amd_iommu_types.h | 6 ++ drivers/iommu/amd/init.c | 109 ++++++++++++++++------------ 2 files changed, 70 insertions(+), 45 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +6 -0
@@ -566,6 +566,12 @@ struct amd_iommu_pci_seg {* device id quickly. */ struct irq_remap_table **irq_lookup_table; + +/* +* Pointer to a device table which the content of old device table +* will be copied to. It's only be used in kdump kernel. +*/ +struct dev_table_entry *old_dev_tbl_cpy; };/*
drivers/iommu/amd/init.c +64 -45
183 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 8/37 iommu/amd: Introduce per PCI segment alias_table
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
This will replace global alias table (amd_iommu_alias_table).
--- drivers/iommu/amd/amd_iommu_types.h | 7 +++++ drivers/iommu/amd/init.c | 41 ++++++++++++++++++++++------- drivers/iommu/amd/iommu.c | 41 ++++++++++++++++++----------- 3 files changed, 64 insertions(+), 25 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +7 -0
@@ -572,6 +572,13 @@ struct amd_iommu_pci_seg {* will be copied to. It's only be used in kdump kernel. */ struct dev_table_entry *old_dev_tbl_cpy; + +/* +* The alias table is a driver specific data structure which contains the +* mappings of the PCI device ids to the actual requestor ids on the IOMMU. +* More than one device can share the same requestor id. +*/ +u16 *alias_table; };/*
drivers/iommu/amd/init.c +32 -9
89 lines not on this page · raw message
drivers/iommu/amd/iommu.c +25 -16
151 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 9/37 iommu/amd: Introduce per PCI segment unity map list
In reply to Vasant Hegde via iommuNewer AMD systems can support multiple PCI segments. In order to support multiple PCI segments IVMD table in IVRS structure is enhanced to include pci segment id. Update ivmd_header structure to include "pci_seg".
Also introduce per PCI segment unity map list. It will replace global amd_iommu_unity_map list.
Note that we have used "reserved" field in IVMD table to include "pci_seg id" which was set to zero. It will take care of backward compatibility (new kernel will work fine on older systems).
--- drivers/iommu/amd/amd_iommu_types.h | 13 +++++++------ drivers/iommu/amd/init.c | 30 +++++++++++++++++++---------- drivers/iommu/amd/iommu.c | 8 +++++++- 3 files changed, 34 insertions(+), 17 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +7 -6
@@ -579,6 +579,13 @@ struct amd_iommu_pci_seg {* More than one device can share the same requestor id. */ u16 *alias_table; + +/* +* A list of required unity mappings we find in ACPI. It is not locked +* because as runtime it is only read. It is created at ACPI table +* parsing time. +*/ +struct list_head unity_map; };/*
@@ -805,12 +812,6 @@ struct unity_map_entry {int prot; }; -/* -* List of all unity mappings. It is not locked because as runtime it is only -* read. It is created at ACPI table parsing time. -*/ -extern struct list_head amd_iommu_unity_map; -/* * Data structures for device handling */
drivers/iommu/amd/init.c +20 -10
@@ -142,7 +142,8 @@ struct ivmd_header {u16 length;u16 devid;u16 aux; -u64 resv; +u16 pci_seg; +u8 resv[6 ];u64 range_start;u64 range_length; } __attribute__((packed));
@@ -162,8 +163,6 @@ static int amd_iommu_target_ivhd_type;u16 amd_iommu_last_bdf;/* largest PCI device id we have to handle */ -LIST_HEAD (amd_iommu_unity_map);/* a list of required unity mappings -we find in ACPI */ LIST_HEAD (amd_iommu_pci_seg_list);/* list of all PCI segments */ LIST_HEAD (amd_iommu_list);/* list of all AMD IOMMUs in the
@@ -1562,6 +1561,7 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id) pci_seg->id = id;init_llist_head (&pci_seg->dev_data_list); +INIT_LIST_HEAD (&pci_seg->unity_map);list_add_tail (&pci_seg->list, &amd_iommu_pci_seg_list);if (alloc_dev_table (pci_seg))
@@ -2397,10 +2397,13 @@ static int iommu_init_irq(struct amd_iommu *iommu)static void __init free_unity_maps (void ) {struct unity_map_entry *entry, *next; +struct amd_iommu_pci_seg *p, *pci_seg; -list_for_each_entry_safe (entry, next, &amd_iommu_unity_map, list) { -list_del (&entry->list); -kfree (entry); +for_each_pci_segment_safe (pci_seg, p) { +list_for_each_entry_safe (entry, next, &pci_seg->unity_map, list) { +list_del (&entry->list); +kfree (entry); + } } }
@@ -2408,8 +2411,13 @@ static void __init free_unity_maps(void)static int __init init_unity_map_range (struct ivmd_header *m) {struct unity_map_entry *e =NULL ; +struct amd_iommu_pci_seg *pci_seg;char *s; + pci_seg =get_pci_segment (m->pci_seg); +if (pci_seg ==NULL ) +return -ENOMEM ; + e =kzalloc (sizeof (*e),GFP_KERNEL );if (e ==NULL )return -ENOMEM ;
@@ -2447,14 +2455,16 @@ static int __init init_unity_map_range(struct ivmd_header *m)if (m->flags &IVMD_FLAG_EXCL_RANGE ) e->prot = (IVMD_FLAG_IW |IVMD_FLAG_IR ) >>1 ; -DUMP_printk ("%s devid_start: %02x:%02x.%x devid_end: %02x:%02x.%x" -" range_start: %016llx range_end: %016llx flags: %x\n" , s, +DUMP_printk ("%s devid_start: %04x:%02x:%02x.%x devid_end: " +"%04x:%02x:%02x.%x range_start: %016llx range_end: %016llx" +" flags: %x\n" , s, m->pci_seg,PCI_BUS_NUM (e->devid_start),PCI_SLOT (e->devid_start), -PCI_FUNC (e->devid_start),PCI_BUS_NUM (e->devid_end), +PCI_FUNC (e->devid_start), m->pci_seg, +PCI_BUS_NUM (e->devid_end),PCI_SLOT (e->devid_end),PCI_FUNC (e->devid_end), e->address_start, e->address_end, m->flags); -list_add_tail (&e->list, &amd_iommu_unity_map); +list_add_tail (&e->list, &pci_seg->unity_map);return 0 ; }
drivers/iommu/amd/iommu.c +7 -1
@@ -2242,13 +2242,19 @@ static void amd_iommu_get_resv_regions(struct device *dev, {struct iommu_resv_region *region;struct unity_map_entry *entry; +struct amd_iommu *iommu; +struct amd_iommu_pci_seg *pci_seg;int devid; devid =get_device_id (dev);if (devid <0 )return ; + iommu =rlookup_amd_iommu (dev); +if (!iommu) +return ; + pci_seg = iommu->pci_seg; -list_for_each_entry (entry, &amd_iommu_unity_map, list) { +list_for_each_entry (entry, &pci_seg->unity_map, list) {int type, prot =0 ;size_t length;
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 10/37 iommu/amd: Introduce per PCI segment last_bdf
In reply to Vasant Hegde via iommuCurrent code uses global "amd_iommu_last_bdf" to track the last bdf supported by the system. This value is used for various memory allocation, device data flushing, etc.
Introduce per PCI segment last_bdf which will be used to track last bdf supported by the given PCI segment and use this value for all per segment memory allocations. Eventually it will replace global "amd_iommu_last_bdf".
--- drivers/iommu/amd/amd_iommu_types.h | 3 ++ drivers/iommu/amd/init.c | 68 ++++++++++++++++++----------- 2 files changed, 45 insertions(+), 26 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +3 -0
@@ -544,6 +544,9 @@ struct amd_iommu_pci_seg {/* PCI segment number */ u16 id; +/* Largest PCI device id we expect translation requests for */ +u16 last_bdf; +/* * device table virtual address *
drivers/iommu/amd/init.c +42 -26
176 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerRe: [PATCH v2 10/37] iommu/amd: Introduce per PCI segment last_bdf
drivers/iommu/amd/amd_iommu_types.h struct amd_iommu_pci_seg { · line 548
Quoted 2 lines · Vasant Hegde
drivers/iommu/amd/amd_iommu_types.h +2
-0+/* Largest PCI device id we expect translation requests for */ +u16 last_bdf;
How does the IVRS table look like on these systems? Do they still enumerate the whole PCI Bus/Dev/Fn space? If so I am fine with getting rid of last_bdf alltogether and just allocate the data structures with their maximum size.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 10/37] iommu/amd: Introduce per PCI segment last_bdf
Joerg,
Quoted 9 lines · Joerg Roedel
drivers/iommu/amd/amd_iommu_types.h struct amd_iommu_pci_seg { · line 548
Quoted 2 lines · Vasant Hegde
drivers/iommu/amd/amd_iommu_types.h +2
-0+/* Largest PCI device id we expect translation requests for */ +u16 last_bdf;How does the IVRS table look like on these systems? Do they still enumerate the whole PCI Bus/Dev/Fn space? If so I am fine with getting rid of
last_bdfalltogether and just allocate the data structures with their maximum size.
We still need to parse IVHD to find max devices supported by each PCI segment (same as the way its doing it today). Hence we need all these variables.
-Vasant
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerRe: [PATCH v2 10/37] iommu/amd: Introduce per PCI segment last_bdf
Hi Vasant,
Quoted 2 lines · Vasant Hegde
We still need to parse IVHD to find max devices supported by each PCI segment (same as the way its doing it today). Hence we need all these variables.
From what I have seen since a few years the IVRS tables enumerate the whole PCI segment, up to device ff:1f.7. This results in the maximum being allocated for all data structures anyway. Therefore we can probably think about skipping the scan to find the largest bdf and just assume it is ff:1f.7, saving us all the size-tracking variables?
Regards,
Joerg
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 10/37] iommu/amd: Introduce per PCI segment last_bdf
Hi Joerg,
Quoted 11 lines · Joerg Roedel
Hi Vasant,
Quoted 2 lines · Vasant Hegde
We still need to parse IVHD to find max devices supported by each PCI segment (same as the way its doing it today). Hence we need all these variables.
From what I have seen since a few years the IVRS tables enumerate the whole PCI segment, up to device ff:1f.7. This results in the maximum being allocated for all data structures anyway. Therefore we can probably think about skipping the scan to find the largest bdf and just assume it is ff:1f.7, saving us all the size-tracking variables?
With PCI segment, I think we will have segments with less than ff:1f:7. Hence we need these variables.
-Vasant
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 11/37 iommu/amd: Introduce per PCI segment device table size
In reply to Vasant Hegde via iommuWith multiple pci segment support, number of BDF supported by each segment may differ. Hence introduce per segment device table size which depends on last_bdf. This will replace global "device_table_size" variable.
--- drivers/iommu/amd/amd_iommu_types.h | 3 +++ drivers/iommu/amd/init.c | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +3 -0
@@ -547,6 +547,9 @@ struct amd_iommu_pci_seg {/* Largest PCI device id we expect translation requests for */ u16 last_bdf; +/* Size of the device table */ +u32 dev_table_size; +/* * device table virtual address *
drivers/iommu/amd/init.c +10 -8
@@ -414,6 +414,7 @@ static void iommu_set_cwwb_range(struct amd_iommu *iommu)static void iommu_set_device_table (struct amd_iommu *iommu) {u64 entry; +u32 dev_table_size = iommu->pci_seg->dev_table_size;BUG_ON (iommu->mmio_base ==NULL );
@@ -651,7 +652,7 @@ static int __init find_last_devid_acpi(struct acpi_table_header *table, u16 pci_static inline int __init alloc_dev_table (struct amd_iommu_pci_seg *pci_seg) { pci_seg->dev_table = (void *)__get_free_pages (GFP_KERNEL | __GFP_ZERO |GFP_DMA32 , -get_order (dev_table_size)); +get_order (pci_seg->dev_table_size));if (!pci_seg->dev_table)return -ENOMEM ;
@@ -661,7 +662,7 @@ static inline int __init alloc_dev_table(struct amd_iommu_pci_seg *pci_seg)static inline void free_dev_table (struct amd_iommu_pci_seg *pci_seg) {free_pages ((unsigned long )pci_seg->dev_table, -get_order (dev_table_size)); +get_order (pci_seg->dev_table_size)); pci_seg->dev_table =NULL ; }
@@ -1034,7 +1035,7 @@ static bool __copy_device_table(struct amd_iommu *iommu) entry = (((u64 ) hi) <<32 ) + lo; old_devtb_size = ((entry & ~PAGE_MASK ) +1 ) <<12 ; -if (old_devtb_size != dev_table_size) { +if (old_devtb_size != pci_seg->dev_table_size) {pr_err ("The device table size of IOMMU:%d is not expected!\n" , iommu->index);return false;
@@ -1053,15 +1054,15 @@ static bool __copy_device_table(struct amd_iommu *iommu) } old_devtb = (cc_platform_has (CC_ATTR_HOST_MEM_ENCRYPT ) &&is_kdump_kernel ()) ? (__force void *)ioremap_encrypted (old_devtb_phys, - dev_table_size) - :memremap (old_devtb_phys, dev_table_size,MEMREMAP_WB ); + pci_seg->dev_table_size) + :memremap (old_devtb_phys, pci_seg->dev_table_size,MEMREMAP_WB );if (!old_devtb)return false; gfp_flag =GFP_KERNEL | __GFP_ZERO |GFP_DMA32 ; pci_seg->old_dev_tbl_cpy = (void *)__get_free_pages (gfp_flag, -get_order (dev_table_size)); +get_order (pci_seg->dev_table_size));if (pci_seg->old_dev_tbl_cpy ==NULL ) {pr_err ("Failed to allocate memory for copying old device table!\n" );memunmap (old_devtb);
@@ -1580,6 +1581,7 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id, pci_seg->last_bdf = last_bdf;DUMP_printk ("PCI segment : 0x%0x, last bdf : 0x%04x\n" , id, last_bdf); + pci_seg->dev_table_size =tbl_size (DEV_TABLE_ENTRY_SIZE ); pci_seg->id = id;init_llist_head (&pci_seg->dev_data_list);
@@ -2675,7 +2677,7 @@ static void early_enable_iommus(void)for_each_pci_segment (pci_seg) {if (pci_seg->old_dev_tbl_cpy !=NULL ) {free_pages ((unsigned long )pci_seg->old_dev_tbl_cpy, -get_order (dev_table_size)); +get_order (pci_seg->dev_table_size)); pci_seg->old_dev_tbl_cpy =NULL ; } }
@@ -2689,7 +2691,7 @@ static void early_enable_iommus(void)for_each_pci_segment (pci_seg) {free_pages ((unsigned long )pci_seg->dev_table, -get_order (dev_table_size)); +get_order (pci_seg->dev_table_size)); pci_seg->dev_table = pci_seg->old_dev_tbl_cpy; }
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerRe: [PATCH v2 11/37] iommu/amd: Introduce per PCI segment device table size
drivers/iommu/amd/amd_iommu_types.h struct amd_iommu_pci_seg { · line 551
Quoted 2 lines · Vasant Hegde
drivers/iommu/amd/amd_iommu_types.h +2
-0+/* Size of the device table */ +u32 dev_table_size;
Same here and with all other size indicators. If they are always going to have their maximum value anyways, we can drop them.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 12/37 iommu/amd: Introduce per PCI segment alias table size
In reply to Vasant Hegde via iommuIt will replace global "alias_table_size" variable.
--- drivers/iommu/amd/amd_iommu_types.h | 3 +++ drivers/iommu/amd/init.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +3 -0
@@ -550,6 +550,9 @@ struct amd_iommu_pci_seg {/* Size of the device table */ u32 dev_table_size; +/* Size of the alias table */ +u32 alias_table_size; +/* * device table virtual address *
drivers/iommu/amd/init.c +3 -2
@@ -711,7 +711,7 @@ static int __init alloc_alias_table(struct amd_iommu_pci_seg *pci_seg)int i; pci_seg->alias_table = (void *)__get_free_pages (GFP_KERNEL , -get_order (alias_table_size)); +get_order (pci_seg->alias_table_size));if (!pci_seg->alias_table)return -ENOMEM ;
@@ -727,7 +727,7 @@ static int __init alloc_alias_table(struct amd_iommu_pci_seg *pci_seg)static void __init free_alias_table (struct amd_iommu_pci_seg *pci_seg) {free_pages ((unsigned long )pci_seg->alias_table, -get_order (alias_table_size)); +get_order (pci_seg->alias_table_size)); pci_seg->alias_table =NULL ; }
@@ -1582,6 +1582,7 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id, pci_seg->last_bdf = last_bdf;DUMP_printk ("PCI segment : 0x%0x, last bdf : 0x%04x\n" , id, last_bdf); pci_seg->dev_table_size =tbl_size (DEV_TABLE_ENTRY_SIZE ); + pci_seg->alias_table_size =tbl_size (ALIAS_TABLE_ENTRY_SIZE ); pci_seg->id = id;init_llist_head (&pci_seg->dev_data_list);
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 13/37 iommu/amd: Introduce per PCI segment rlookup table size
In reply to Vasant Hegde via iommuIt will replace global "rlookup_table_size" variable.
--- drivers/iommu/amd/amd_iommu_types.h | 3 +++ drivers/iommu/amd/init.c | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +3 -0
@@ -553,6 +553,9 @@ struct amd_iommu_pci_seg {/* Size of the alias table */ u32 alias_table_size; +/* Size of the rlookup table */ +u32 rlookup_table_size; +/* * device table virtual address *
drivers/iommu/amd/init.c +6 -5
@@ -671,7 +671,7 @@ static inline int __init alloc_rlookup_table(struct amd_iommu_pci_seg *pci_seg) { pci_seg->rlookup_table = (void *)__get_free_pages (GFP_KERNEL | __GFP_ZERO, -get_order (rlookup_table_size)); +get_order (pci_seg->rlookup_table_size));if (pci_seg->rlookup_table ==NULL )return -ENOMEM ;
@@ -681,7 +681,7 @@ static inline int __init alloc_rlookup_table(struct amd_iommu_pci_seg *pci_seg)static inline void free_rlookup_table (struct amd_iommu_pci_seg *pci_seg) {free_pages ((unsigned long )pci_seg->rlookup_table, -get_order (rlookup_table_size)); +get_order (pci_seg->rlookup_table_size)); pci_seg->rlookup_table =NULL ; }
@@ -689,9 +689,9 @@ static inline int __init alloc_irq_lookup_table(struct amd_iommu_pci_seg *pci_se { pci_seg->irq_lookup_table = (void *)__get_free_pages (GFP_KERNEL | __GFP_ZERO, -get_order (rlookup_table_size)); +get_order (pci_seg->rlookup_table_size));kmemleak_alloc (pci_seg->irq_lookup_table, - rlookup_table_size,1 ,GFP_KERNEL ); + pci_seg->rlookup_table_size,1 ,GFP_KERNEL );if (pci_seg->irq_lookup_table ==NULL )return -ENOMEM ;
@@ -702,7 +702,7 @@ static inline void free_irq_lookup_table(struct amd_iommu_pci_seg *pci_seg) {kmemleak_free (pci_seg->irq_lookup_table);free_pages ((unsigned long )pci_seg->irq_lookup_table, -get_order (rlookup_table_size)); +get_order (pci_seg->rlookup_table_size)); pci_seg->irq_lookup_table =NULL ; }
@@ -1583,6 +1583,7 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id,DUMP_printk ("PCI segment : 0x%0x, last bdf : 0x%04x\n" , id, last_bdf); pci_seg->dev_table_size =tbl_size (DEV_TABLE_ENTRY_SIZE ); pci_seg->alias_table_size =tbl_size (ALIAS_TABLE_ENTRY_SIZE ); + pci_seg->rlookup_table_size =tbl_size (RLOOKUP_TABLE_ENTRY_SIZE ); pci_seg->id = id;init_llist_head (&pci_seg->dev_data_list);
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 14/37 iommu/amd: Convert to use per PCI segment irq_lookup_table
In reply to Vasant Hegde via iommuThen, remove the global irq_lookup_table.
--- drivers/iommu/amd/amd_iommu_types.h | 2 -- drivers/iommu/amd/init.c | 19 --------------- drivers/iommu/amd/iommu.c | 36 ++++++++++++++++++----------- 3 files changed, 23 insertions(+), 34 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +0 -2
@@ -444,8 +444,6 @@ struct irq_remap_table {u32 *table; }; -extern struct irq_remap_table **irq_lookup_table; -/* Interrupt remapping feature used? */ extern bool amd_iommu_irq_remap;
drivers/iommu/amd/init.c +0 -19
@@ -206,12 +206,6 @@ u16 *amd_iommu_alias_table;*/ struct amd_iommu **amd_iommu_rlookup_table; -/* -* This table is used to find the irq remapping table for a given device id -* quickly. -*/ -struct irq_remap_table **irq_lookup_table; -/* * AMD IOMMU allows up to 2^16 different protection domains. This is a bitmap * to know which ones are already in use.
@@ -2786,11 +2780,6 @@ static struct syscore_ops amd_iommu_syscore_ops = {static void __init free_iommu_resources (void ) { -kmemleak_free (irq_lookup_table); -free_pages ((unsigned long )irq_lookup_table, -get_order (rlookup_table_size)); - irq_lookup_table =NULL ; -kmem_cache_destroy (amd_iommu_irq_cache); amd_iommu_irq_cache =NULL ;
@@ -3011,14 +3000,6 @@ static int __init early_amd_iommu_init(void)if (alloc_irq_lookup_table (pci_seg)) goto out; } - - irq_lookup_table = (void *)__get_free_pages ( -GFP_KERNEL | __GFP_ZERO, -get_order (rlookup_table_size)); -kmemleak_alloc (irq_lookup_table, rlookup_table_size, -1 ,GFP_KERNEL ); -if (!irq_lookup_table) - goto out; } ret =init_memory_definitions (ivrs_base);
drivers/iommu/amd/iommu.c +23 -13
@@ -2730,16 +2730,18 @@ static void set_dte_irq_entry(u16 devid, struct irq_remap_table *table) amd_iommu_dev_table[devid].data[2 ] = dte; } -static struct irq_remap_table *get_irq_table (u16 devid) +static struct irq_remap_table *get_irq_table (struct amd_iommu *iommu,u16 devid) {struct irq_remap_table *table; +struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg;if (WARN_ONCE (!amd_iommu_rlookup_table[devid],"%s: no iommu for devid %x\n" , __func__, devid))return NULL ; - table = irq_lookup_table[devid]; -if (WARN_ONCE (!table,"%s: no table for devid %x\n" , __func__, devid)) + table = pci_seg->irq_lookup_table[devid]; +if (WARN_ONCE (!table,"%s: no table for devid %x:%x\n" , + __func__, pci_seg->id, devid))return NULL ;return table;
@@ -2772,7 +2774,9 @@ static struct irq_remap_table *__alloc_irq_table(void)static void set_remap_table_entry (struct amd_iommu *iommu,u16 devid,struct irq_remap_table *table) { - irq_lookup_table[devid] = table; +struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg; + + pci_seg->irq_lookup_table[devid] = table;set_dte_irq_entry (devid, table);iommu_flush_dte (iommu, devid); }
@@ -2781,8 +2785,14 @@ static int set_remap_table_entry_alias(struct pci_dev *pdev, u16 alias, void *data) {struct irq_remap_table *table = data; +struct amd_iommu_pci_seg *pci_seg; +struct amd_iommu *iommu =rlookup_amd_iommu (&pdev->dev); - irq_lookup_table[alias] = table; +if (!iommu) +return -EINVAL ; + + pci_seg = iommu->pci_seg; + pci_seg->irq_lookup_table[alias] = table;set_dte_irq_entry (alias, table);iommu_flush_dte (amd_iommu_rlookup_table[alias], alias);
@@ -2806,12 +2816,12 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, struct pci_dev *pdev) goto out_unlock; pci_seg = iommu->pci_seg; - table = irq_lookup_table[devid]; + table = pci_seg->irq_lookup_table[devid];if (table) goto out_unlock; alias = pci_seg->alias_table[devid]; - table = irq_lookup_table[alias]; + table = pci_seg->irq_lookup_table[alias];if (table) {set_remap_table_entry (iommu, devid, table); goto out_wait;
@@ -2825,11 +2835,11 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, struct pci_dev *pdev)spin_lock_irqsave (&iommu_table_lock, flags); - table = irq_lookup_table[devid]; + table = pci_seg->irq_lookup_table[devid];if (table) goto out_unlock; - table = irq_lookup_table[alias]; + table = pci_seg->irq_lookup_table[alias];if (table) {set_remap_table_entry (iommu, devid, table); goto out_wait;
@@ -2923,7 +2933,7 @@ static int modify_irte_ga(u16 devid, int index, struct irte_ga *irte,if (iommu ==NULL )return -EINVAL ; - table =get_irq_table (devid); + table =get_irq_table (iommu, devid);if (!table)return -ENOMEM ;
@@ -2964,7 +2974,7 @@ static int modify_irte(u16 devid, int index, union irte *irte)if (iommu ==NULL )return -EINVAL ; - table =get_irq_table (devid); + table =get_irq_table (iommu, devid);if (!table)return -ENOMEM ;
@@ -2988,7 +2998,7 @@ static void free_irte(u16 devid, int index)if (iommu ==NULL )return ; - table =get_irq_table (devid); + table =get_irq_table (iommu, devid);if (!table)return ;
@@ -3623,7 +3633,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data)if (!iommu)return -ENODEV ; - table =get_irq_table (devid); + table =get_irq_table (iommu, devid);if (!table)return -ENODEV ;
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 15/37 iommu/amd: Convert to use rlookup_amd_iommu helper function
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Use rlookup_amd_iommu() helper function which will give per PCI segment rlookup_table.
--- drivers/iommu/amd/iommu.c | 64 +++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 26 deletions(-)
drivers/iommu/amd/iommu.c +38 -26
@@ -229,13 +229,17 @@ static struct iommu_dev_data *search_dev_data(struct amd_iommu *iommu, u16 devidstatic int clone_alias (struct pci_dev *pdev,u16 alias,void *data) { +struct amd_iommu *iommu;u16 devid =pci_dev_id (pdev);if (devid == alias)return 0 ; - amd_iommu_rlookup_table[alias] = - amd_iommu_rlookup_table[devid]; + iommu =rlookup_amd_iommu (&pdev->dev); +if (!iommu) +return 0 ; + +amd_iommu_set_rlookup_table (iommu, alias);memcpy (amd_iommu_dev_table[alias].data, amd_iommu_dev_table[devid].data,sizeof (amd_iommu_dev_table[alias].data));
@@ -366,7 +370,7 @@ static bool check_device(struct device *dev)if (devid > amd_iommu_last_bdf)return false; -if (amd_iommu_rlookup_table[devid] ==NULL ) +if (rlookup_amd_iommu (dev) ==NULL )return false;return true;
@@ -1270,7 +1274,9 @@ static int device_flush_iotlb(struct iommu_dev_data *dev_data,int qdep; qdep = dev_data->ats.qdep; - iommu = amd_iommu_rlookup_table[dev_data->devid]; + iommu =rlookup_amd_iommu (dev_data->dev); +if (!iommu) +return -EINVAL ;build_inv_iotlb_pages (&cmd, dev_data->devid, qdep, address, size);
@@ -1295,7 +1301,9 @@ static int device_flush_dte(struct iommu_dev_data *dev_data)u16 alias;int ret; - iommu = amd_iommu_rlookup_table[dev_data->devid]; + iommu =rlookup_amd_iommu (dev_data->dev); +if (!iommu) +return -EINVAL ;if (dev_is_pci (dev_data->dev)) pdev =to_pci_dev (dev_data->dev);
@@ -1525,8 +1533,8 @@ static void free_gcr3_table(struct protection_domain *domain)free_page ((unsigned long )domain->gcr3_tbl); } -static void set_dte_entry (u16 devid,struct protection_domain *domain, -bool ats,bool ppr) +static void set_dte_entry (struct amd_iommu *iommu,u16 devid, +struct protection_domain *domain,bool ats,bool ppr) {u64 pte_root =0 ;u64 flags =0 ;
@@ -1545,8 +1553,6 @@ static void set_dte_entry(u16 devid, struct protection_domain *domain, flags |=DTE_FLAG_IOTLB ;if (ppr) { -struct amd_iommu *iommu = amd_iommu_rlookup_table[devid]; -if (iommu_feature (iommu,FEATURE_EPHSUP )) pte_root |=1ULL <<DEV_ENTRY_PPR ; }
@@ -1590,8 +1596,6 @@ static void set_dte_entry(u16 devid, struct protection_domain *domain,* entries for the old domain ID that is being overwritten */ if (old_domid) { -struct amd_iommu *iommu = amd_iommu_rlookup_table[devid]; -amd_iommu_flush_tlb_domid (iommu, old_domid); } }
@@ -1611,7 +1615,9 @@ static void do_attach(struct iommu_dev_data *dev_data,struct amd_iommu *iommu;bool ats; - iommu = amd_iommu_rlookup_table[dev_data->devid]; + iommu =rlookup_amd_iommu (dev_data->dev); +if (!iommu) +return ; ats = dev_data->ats.enabled;/* Update data structures */
@@ -1623,7 +1629,7 @@ static void do_attach(struct iommu_dev_data *dev_data, domain->dev_cnt +=1 ;/* Update device table */ -set_dte_entry (dev_data->devid, domain, +set_dte_entry (iommu, dev_data->devid, domain, ats, dev_data->iommu_v2);clone_aliases (iommu, dev_data->dev);
@@ -1635,7 +1641,9 @@ static void do_detach(struct iommu_dev_data *dev_data)struct protection_domain *domain = dev_data->domain;struct amd_iommu *iommu; - iommu = amd_iommu_rlookup_table[dev_data->devid]; + iommu =rlookup_amd_iommu (dev_data->dev); +if (!iommu) +return ;/* Update data structures */ dev_data->domain =NULL ;
@@ -1813,13 +1821,14 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) {struct iommu_device *iommu_dev;struct amd_iommu *iommu; -int ret, devid; +int ret;if (!check_device (dev))return ERR_PTR (-ENODEV ); - devid =get_device_id (dev); - iommu = amd_iommu_rlookup_table[devid]; + iommu =rlookup_amd_iommu (dev); +if (!iommu) +return ERR_PTR (-ENODEV );if (dev_iommu_priv_get (dev))return &iommu->iommu;
@@ -1849,13 +1858,14 @@ static void amd_iommu_probe_finalize(struct device *dev)static void amd_iommu_release_device (struct device *dev) { -int devid =get_device_id (dev);struct amd_iommu *iommu;if (!check_device (dev))return ; - iommu = amd_iommu_rlookup_table[devid]; + iommu =rlookup_amd_iommu (dev); +if (!iommu) +return ;amd_iommu_uninit_device (dev);iommu_completion_wait (iommu);
@@ -1884,7 +1894,7 @@ static void update_device_table(struct protection_domain *domain)if (!iommu)continue ; -set_dte_entry (dev_data->devid, domain, +set_dte_entry (iommu, dev_data->devid, domain, dev_data->ats.enabled, dev_data->iommu_v2);clone_aliases (iommu, dev_data->dev); }
@@ -2079,7 +2089,6 @@ static void amd_iommu_detach_device(struct iommu_domain *dom, struct device *dev) {struct iommu_dev_data *dev_data =dev_iommu_priv_get (dev); -int devid =get_device_id (dev);struct amd_iommu *iommu;if (!check_device (dev))
@@ -2088,7 +2097,7 @@ static void amd_iommu_detach_device(struct iommu_domain *dom,if (dev_data->domain !=NULL )detach_device (dev); - iommu = amd_iommu_rlookup_table[devid]; + iommu =rlookup_amd_iommu (dev);if (!iommu)return ;
@@ -2115,7 +2124,7 @@ static int amd_iommu_attach_device(struct iommu_domain *dom, dev_data =dev_iommu_priv_get (dev); dev_data->defer_attach = false; - iommu = amd_iommu_rlookup_table[dev_data->devid]; + iommu =rlookup_amd_iommu (dev);if (!iommu)return -EINVAL ;
@@ -2491,8 +2500,9 @@ static int __flush_pasid(struct protection_domain *domain, u32 pasid,continue ; qdep = dev_data->ats.qdep; - iommu = amd_iommu_rlookup_table[dev_data->devid]; - + iommu =rlookup_amd_iommu (dev_data->dev); +if (!iommu) +continue ;build_inv_iotlb_pasid (&cmd, dev_data->devid, pasid, qdep, address, size);
@@ -2654,7 +2664,9 @@ int amd_iommu_complete_ppr(struct pci_dev *pdev, u32 pasid,struct iommu_cmd cmd; dev_data =dev_iommu_priv_get (&pdev->dev); - iommu = amd_iommu_rlookup_table[dev_data->devid]; + iommu =rlookup_amd_iommu (&pdev->dev); +if (!iommu) +return -ENODEV ;build_complete_ppr (&cmd, dev_data->devid, pasid, status, tag, dev_data->pri_tlp);
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 16/37 iommu/amd: Update irq_remapping_alloc to use IOMMU lookup helper function
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
To allow IOMMU rlookup using both PCI segment and device ID.
--- drivers/iommu/amd/iommu.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/iommu/amd/iommu.c +10 -5
@@ -3244,8 +3244,9 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,struct irq_alloc_info *info = arg;struct irq_data *irq_data;struct amd_ir_data *data =NULL ; +struct amd_iommu *iommu;struct irq_cfg *cfg; -int i, ret, devid; +int i, ret, devid, seg, sbdf;int index;if (!info)
@@ -3261,8 +3262,14 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,if (info->type ==X86_IRQ_ALLOC_TYPE_PCI_MSI ) info->flags &= ~X86_IRQ_ALLOC_CONTIGUOUS_VECTORS ; - devid =get_devid (info); -if (devid <0 ) + sbdf =get_devid (info); +if (sbdf <0 ) +return -EINVAL ; + + seg = sbdf >>16 ; + devid = sbdf &0xffff ; + iommu =__rlookup_amd_iommu (seg, devid); +if (!iommu)return -EINVAL ; ret =irq_domain_alloc_irqs_parent (domain, virq, nr_irqs, arg);
@@ -3271,7 +3278,6 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,if (info->type ==X86_IRQ_ALLOC_TYPE_IOAPIC ) {struct irq_remap_table *table; -struct amd_iommu *iommu; table =alloc_irq_table (devid,NULL );if (table) {
@@ -3281,7 +3287,6 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,* interrupts. */ table->min_index =32 ; - iommu = amd_iommu_rlookup_table[devid];for (i =0 ; i <32 ; ++i) iommu->irte_ops->set_allocated (table, i); }
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 17/37 iommu/amd: Introduce struct amd_ir_data.iommu
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Add a pointer to struct amd_iommu to amd_ir_data structure, which can be used to correlate interrupt remapping data to a per-PCI-segment interrupt remapping table.
--- drivers/iommu/amd/amd_iommu_types.h | 1 + drivers/iommu/amd/iommu.c | 34 +++++++++++++---------------- 2 files changed, 16 insertions(+), 19 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +1 -0
@@ -981,6 +981,7 @@ struct irq_2_irte {struct amd_ir_data {u32 cached_ga_tag; +struct amd_iommu *iommu;struct irq_2_irte irq_2_irte;struct msi_msg msi_entry;void *entry;/* Pointer to union irte or struct irte_ga */
drivers/iommu/amd/iommu.c +15 -19
@@ -3000,16 +3000,11 @@ static int modify_irte(u16 devid, int index, union irte *irte)return 0 ; } -static void free_irte (u16 devid,int index) +static void free_irte (struct amd_iommu *iommu,u16 devid,int index) {struct irq_remap_table *table; -struct amd_iommu *iommu;unsigned long flags; - iommu = amd_iommu_rlookup_table[devid]; -if (iommu ==NULL ) -return ; - table =get_irq_table (iommu, devid);if (!table)return ;
@@ -3193,7 +3188,7 @@ static void irq_remapping_prepare_irte(struct amd_ir_data *data, int devid, int index, int sub_handle) { struct irq_2_irte *irte_info = &data->irq_2_irte; -struct amd_iommu *iommu = amd_iommu_rlookup_table[devid]; +struct amd_iommu *iommu = data->iommu;if (!iommu)return ;
@@ -3334,6 +3329,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq, goto out_free_data; } + data->iommu = iommu; irq_data->hwirq = (devid <<16 ) + i; irq_data->chip_data = data; irq_data->chip = &amd_ir_chip;
@@ -3350,7 +3346,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,kfree (irq_data->chip_data); }for (i =0 ; i < nr_irqs; i++) -free_irte (devid, index + i); +free_irte (iommu, devid, index + i); out_free_parent:irq_domain_free_irqs_common (domain, virq, nr_irqs);return ret;
@@ -3369,7 +3365,7 @@ static void irq_remapping_free(struct irq_domain *domain, unsigned int virq,if (irq_data && irq_data->chip_data) { data = irq_data->chip_data; irte_info = &data->irq_2_irte; -free_irte (irte_info->devid, irte_info->index); +free_irte (data->iommu, irte_info->devid, irte_info->index);kfree (data->entry);kfree (data); }
@@ -3387,7 +3383,7 @@ static int irq_remapping_activate(struct irq_domain *domain, {struct amd_ir_data *data = irq_data->chip_data;struct irq_2_irte *irte_info = &data->irq_2_irte; -struct amd_iommu *iommu = amd_iommu_rlookup_table[irte_info->devid]; +struct amd_iommu *iommu = data->iommu;struct irq_cfg *cfg =irqd_cfg (irq_data);if (!iommu)
@@ -3404,7 +3400,7 @@ static void irq_remapping_deactivate(struct irq_domain *domain, {struct amd_ir_data *data = irq_data->chip_data;struct irq_2_irte *irte_info = &data->irq_2_irte; -struct amd_iommu *iommu = amd_iommu_rlookup_table[irte_info->devid]; +struct amd_iommu *iommu = data->iommu;if (iommu) iommu->irte_ops->deactivate(data->entry, irte_info->devid,
@@ -3500,12 +3496,16 @@ EXPORT_SYMBOL(amd_iommu_deactivate_guest_mode);static int amd_ir_set_vcpu_affinity (struct irq_data *data,void *vcpu_info) {int ret; -struct amd_iommu *iommu;struct amd_iommu_pi_data *pi_data = vcpu_info;struct vcpu_data *vcpu_pi_info = pi_data->vcpu_data;struct amd_ir_data *ir_data = data->chip_data;struct irq_2_irte *irte_info = &ir_data->irq_2_irte; -struct iommu_dev_data *dev_data =search_dev_data (NULL , irte_info->devid); +struct iommu_dev_data *dev_data; + +if (ir_data->iommu ==NULL ) +return -EINVAL ; + + dev_data =search_dev_data (ir_data->iommu, irte_info->devid);/* Note: * This device has never been set up for guest mode.
@@ -3527,10 +3527,6 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info) pi_data->is_guest_mode = false; } - iommu = amd_iommu_rlookup_table[irte_info->devid]; -if (iommu ==NULL ) -return -EINVAL ; - pi_data->prev_ga_tag = ir_data->cached_ga_tag;if (pi_data->is_guest_mode) { ir_data->ga_root_ptr = (pi_data->base >>12 );
@@ -3576,7 +3572,7 @@ static int amd_ir_set_affinity(struct irq_data *data,struct irq_2_irte *irte_info = &ir_data->irq_2_irte;struct irq_cfg *cfg =irqd_cfg (data);struct irq_data *parent = data->parent_data; -struct amd_iommu *iommu = amd_iommu_rlookup_table[irte_info->devid]; +struct amd_iommu *iommu = ir_data->iommu;int ret;if (!iommu)
@@ -3646,7 +3642,7 @@ int amd_iommu_update_ga(int cpu, bool is_run, void *data) !ref || !entry || !entry->lo.fields_vapic.guest_mode)return 0 ; - iommu = amd_iommu_rlookup_table[devid]; + iommu = ir_data->iommu;if (!iommu)return -ENODEV ;
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 18/37 iommu/amd: Update amd_irte_ops functions
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Pass amd_iommu structure as one of the parameter to amd_irte_ops functions since its needed to activate/deactivate the iommu.
--- drivers/iommu/amd/amd_iommu_types.h | 6 ++-- drivers/iommu/amd/iommu.c | 51 ++++++++++++----------------- 2 files changed, 24 insertions(+), 33 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +3 -3
@@ -999,9 +999,9 @@ struct amd_ir_data {struct amd_irte_ops {void (*prepare)(void *,u32 ,bool ,u8 ,u32 ,int ); -void (*activate)(void *,u16 ,u16 ); -void (*deactivate)(void *,u16 ,u16 ); -void (*set_affinity)(void *,u16 ,u16 ,u8 ,u32 ); +void (*activate)(struct amd_iommu *iommu,void *,u16 ,u16 ); +void (*deactivate)(struct amd_iommu *iommu,void *,u16 ,u16 ); +void (*set_affinity)(struct amd_iommu *iommu,void *,u16 ,u16 ,u8 ,u32 );void *(*get)(struct irq_remap_table *,int );void (*set_allocated)(struct irq_remap_table *,int );bool (*is_allocated)(struct irq_remap_table *,int );
drivers/iommu/amd/iommu.c +21 -30
147 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 19/37 iommu/amd: Update alloc_irq_table and alloc_irq_index
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Pass amd_iommu structure as one of the parameter to these functions as its needed to retrieve variable tables inside these functions.
--- drivers/iommu/amd/iommu.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-)
drivers/iommu/amd/iommu.c +9 -17
@@ -2812,21 +2812,17 @@ static int set_remap_table_entry_alias(struct pci_dev *pdev, u16 alias,return 0 ; } -static struct irq_remap_table *alloc_irq_table (u16 devid,struct pci_dev *pdev) +static struct irq_remap_table *alloc_irq_table (struct amd_iommu *iommu, +u16 devid,struct pci_dev *pdev) {struct irq_remap_table *table =NULL ;struct irq_remap_table *new_table =NULL ;struct amd_iommu_pci_seg *pci_seg; -struct amd_iommu *iommu;unsigned long flags;u16 alias;spin_lock_irqsave (&iommu_table_lock, flags); - iommu = amd_iommu_rlookup_table[devid]; -if (!iommu) - goto out_unlock; - pci_seg = iommu->pci_seg; table = pci_seg->irq_lookup_table[devid];if (table)
@@ -2882,18 +2878,14 @@ static struct irq_remap_table *alloc_irq_table(u16 devid, struct pci_dev *pdev)return table; } -static int alloc_irq_index (u16 devid,int count,bool align, -struct pci_dev *pdev) +static int alloc_irq_index (struct amd_iommu *iommu,u16 devid,int count, +bool align,struct pci_dev *pdev) {struct irq_remap_table *table;int index, c, alignment =1 ;unsigned long flags; -struct amd_iommu *iommu = amd_iommu_rlookup_table[devid]; - -if (!iommu) -return -ENODEV ; - table =alloc_irq_table (devid, pdev); + table =alloc_irq_table (iommu, devid, pdev);if (!table)return -ENODEV ;
@@ -3265,7 +3257,7 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq,if (info->type ==X86_IRQ_ALLOC_TYPE_IOAPIC ) {struct irq_remap_table *table; - table =alloc_irq_table (devid,NULL ); + table =alloc_irq_table (iommu, devid,NULL );if (table) {if (!table->min_index) {/*
@@ -3285,10 +3277,10 @@ static int irq_remapping_alloc(struct irq_domain *domain, unsigned int virq, info->type == X86_IRQ_ALLOC_TYPE_PCI_MSIX) { bool align = (info->type == X86_IRQ_ALLOC_TYPE_PCI_MSI); - index = alloc_irq_index(devid, nr_irqs, align, + index = alloc_irq_index(iommu, devid, nr_irqs, align, msi_desc_to_pci_dev(info->desc)); } else { - index =alloc_irq_index (devid, nr_irqs, false,NULL ); + index =alloc_irq_index (iommu, devid, nr_irqs, false,NULL ); }if (index <0 ) {
@@ -3414,8 +3406,8 @@ static int irq_remapping_select(struct irq_domain *d, struct irq_fwspec *fwspec,if (devid <0 )return 0 ; + iommu =__rlookup_amd_iommu ((devid >>16 ), (devid &0xffff )); - iommu = amd_iommu_rlookup_table[devid];return iommu && iommu->ir_domain == d; }
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 20/37 iommu/amd: Convert to use per PCI segment rlookup_table
In reply to Vasant Hegde via iommuThen, remove the global amd_iommu_rlookup_table and rlookup_table_size.
--- drivers/iommu/amd/amd_iommu_types.h | 5 ----- drivers/iommu/amd/init.c | 23 ++--------------------- drivers/iommu/amd/iommu.c | 19 +++++++++---------- 3 files changed, 11 insertions(+), 36 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +0 -5
@@ -838,11 +838,6 @@ extern struct dev_table_entry *amd_iommu_dev_table;*/ extern u16 *amd_iommu_alias_table; -/* -* Reverse lookup table to find the IOMMU which translates a specific device. -*/ -extern struct amd_iommu **amd_iommu_rlookup_table; -/* size of the dma_ops aperture as power of 2 */ extern unsigned amd_iommu_aperture_order;
drivers/iommu/amd/init.c +2 -21
@@ -200,12 +200,6 @@ struct dev_table_entry *amd_iommu_dev_table;*/ u16 *amd_iommu_alias_table; -/* -* The rlookup table is used to find the IOMMU which is responsible -* for a specific device. It is also indexed by the PCI device id. -*/ -struct amd_iommu **amd_iommu_rlookup_table; -/* * AMD IOMMU allows up to 2^16 different protection domains. This is a bitmap * to know which ones are already in use.
@@ -214,7 +208,6 @@ unsigned long *amd_iommu_pd_alloc_bitmap;static u32 dev_table_size;/* size of the device table */ static u32 alias_table_size;/* size of the alias table */ -static u32 rlookup_table_size;/* size if the rlookup table */ enum iommu_init_state {IOMMU_START_STATE ,
@@ -1143,7 +1136,7 @@ void amd_iommu_apply_erratum_63(u16 devid)/* Writes the specific IOMMU for a device into the rlookup table */ static void __init set_iommu_for_device (struct amd_iommu *iommu,u16 devid) { - amd_iommu_rlookup_table[devid] = iommu; + iommu->pci_seg->rlookup_table[devid] = iommu; }/*
@@ -1825,7 +1818,7 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h,* Make sure IOMMU is not considered to translate itself. The IVRS * table tells us so, but this is a lie! */ - amd_iommu_rlookup_table[iommu->devid] =NULL ; + pci_seg->rlookup_table[iommu->devid] =NULL ;return 0 ; }
@@ -2783,10 +2776,6 @@ static void __init free_iommu_resources(void)kmem_cache_destroy (amd_iommu_irq_cache); amd_iommu_irq_cache =NULL ; -free_pages ((unsigned long )amd_iommu_rlookup_table, -get_order (rlookup_table_size)); - amd_iommu_rlookup_table =NULL ; -free_pages ((unsigned long )amd_iommu_alias_table,get_order (alias_table_size)); amd_iommu_alias_table =NULL ;
@@ -2925,7 +2914,6 @@ static int __init early_amd_iommu_init(void) dev_table_size =tbl_size (DEV_TABLE_ENTRY_SIZE ); alias_table_size =tbl_size (ALIAS_TABLE_ENTRY_SIZE ); - rlookup_table_size =tbl_size (RLOOKUP_TABLE_ENTRY_SIZE );/* Device table - directly used by all IOMMUs */ ret = -ENOMEM ;
@@ -2944,13 +2932,6 @@ static int __init early_amd_iommu_init(void)if (amd_iommu_alias_table ==NULL ) goto out; -/* IOMMU rlookup table - find the IOMMU for a specific device */ - amd_iommu_rlookup_table = (void *)__get_free_pages ( -GFP_KERNEL | __GFP_ZERO, -get_order (rlookup_table_size)); -if (amd_iommu_rlookup_table ==NULL ) - goto out; - amd_iommu_pd_alloc_bitmap = (void *)__get_free_pages (GFP_KERNEL | __GFP_ZERO,get_order (MAX_DOMAIN_ID /8 ));
drivers/iommu/amd/iommu.c +9 -10
@@ -287,10 +287,9 @@ static void setup_aliases(struct amd_iommu *iommu, struct device *dev)clone_aliases (iommu, dev); } -static struct iommu_dev_data *find_dev_data (u16 devid) +static struct iommu_dev_data *find_dev_data (struct amd_iommu *iommu,u16 devid) {struct iommu_dev_data *dev_data; -struct amd_iommu *iommu = amd_iommu_rlookup_table[devid]; dev_data =search_dev_data (iommu, devid);
@@ -388,7 +387,7 @@ static int iommu_init_device(struct amd_iommu *iommu, struct device *dev)if (devid <0 )return devid; - dev_data =find_dev_data (devid); + dev_data =find_dev_data (iommu, devid);if (!dev_data)return -ENOMEM ;
@@ -403,9 +402,6 @@ static int iommu_init_device(struct amd_iommu *iommu, struct device *dev)*/ if ((iommu_default_passthrough () || !amd_iommu_force_isolation) &&dev_is_pci (dev) &&pci_iommuv2_capable (to_pci_dev (dev))) { -struct amd_iommu *iommu; - - iommu = amd_iommu_rlookup_table[dev_data->devid]; dev_data->iommu_v2 = iommu->is_iommu_v2; }
@@ -416,13 +412,15 @@ static int iommu_init_device(struct amd_iommu *iommu, struct device *dev)static void iommu_ignore_device (struct amd_iommu *iommu,struct device *dev) { +struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg;int devid; devid =get_device_id (dev);if (devid <0 )return ; - amd_iommu_rlookup_table[devid] =NULL ; + + pci_seg->rlookup_table[devid] =NULL ;memset (&amd_iommu_dev_table[devid],0 ,sizeof (struct dev_table_entry ));setup_aliases (iommu, dev);
@@ -2747,8 +2745,9 @@ static struct irq_remap_table *get_irq_table(struct amd_iommu *iommu, u16 devid)struct irq_remap_table *table;struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg; -if (WARN_ONCE (!amd_iommu_rlookup_table[devid], -"%s: no iommu for devid %x\n" , __func__, devid)) +if (WARN_ONCE (!pci_seg->rlookup_table[devid], +"%s: no iommu for devid %x:%x\n" , + __func__, pci_seg->id, devid))return NULL ; table = pci_seg->irq_lookup_table[devid];
@@ -2807,7 +2806,7 @@ static int set_remap_table_entry_alias(struct pci_dev *pdev, u16 alias, pci_seg->irq_lookup_table[alias] = table;set_dte_irq_entry (alias, table); -iommu_flush_dte (amd_iommu_rlookup_table[alias], alias); +iommu_flush_dte (pci_seg->rlookup_table[alias], alias);return 0 ; }
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 21/37 iommu/amd: Update set_dte_entry and clear_dte_entry
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Start using per PCI segment data structures instead of global data structures.
--- drivers/iommu/amd/iommu.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/iommu/amd/iommu.c +11 -8
@@ -1537,6 +1537,7 @@ static void set_dte_entry(struct amd_iommu *iommu, u16 devid,u64 pte_root =0 ;u64 flags =0 ;u32 old_domid; +struct dev_table_entry *dev_table =get_dev_table (iommu);if (domain->iop.mode !=PAGE_MODE_NONE ) pte_root =iommu_virt_to_phys (domain->iop.root);
@@ -1545,7 +1546,7 @@ static void set_dte_entry(struct amd_iommu *iommu, u16 devid, << DEV_ENTRY_MODE_SHIFT; pte_root |=DTE_FLAG_IR |DTE_FLAG_IW |DTE_FLAG_V |DTE_FLAG_TV ; - flags = amd_iommu_dev_table[devid].data[1 ]; + flags = dev_table[devid].data[1 ];if (ats) flags |=DTE_FLAG_IOTLB ;
@@ -1584,9 +1585,9 @@ static void set_dte_entry(struct amd_iommu *iommu, u16 devid, flags &= ~DEV_DOMID_MASK ; flags |= domain->id; - old_domid = amd_iommu_dev_table[devid].data[1 ] &DEV_DOMID_MASK ; - amd_iommu_dev_table[devid].data[1 ] = flags; - amd_iommu_dev_table[devid].data[0 ] = pte_root; + old_domid = dev_table[devid].data[1 ] &DEV_DOMID_MASK ; + dev_table[devid].data[1 ] = flags; + dev_table[devid].data[0 ] = pte_root;/* * A kdump kernel might be replacing a domain ID that was copied from
@@ -1598,11 +1599,13 @@ static void set_dte_entry(struct amd_iommu *iommu, u16 devid, } } -static void clear_dte_entry (u16 devid) +static void clear_dte_entry (struct amd_iommu *iommu,u16 devid) { +struct dev_table_entry *dev_table =get_dev_table (iommu); +/* remove entry from the device table seen by the hardware */ - amd_iommu_dev_table[devid].data[0 ] =DTE_FLAG_V |DTE_FLAG_TV ; - amd_iommu_dev_table[devid].data[1 ] &=DTE_FLAG_MASK ; + dev_table[devid].data[0 ] =DTE_FLAG_V |DTE_FLAG_TV ; + dev_table[devid].data[1 ] &=DTE_FLAG_MASK ;amd_iommu_apply_erratum_63 (devid); }
@@ -1646,7 +1649,7 @@ static void do_detach(struct iommu_dev_data *dev_data)/* Update data structures */ dev_data->domain =NULL ;list_del (&dev_data->list); -clear_dte_entry (dev_data->devid); +clear_dte_entry (iommu, dev_data->devid);clone_aliases (iommu, dev_data->dev);/* Flush the DTE entry */
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 22/37 iommu/amd: Update iommu_ignore_device
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Start using per PCI segment device table instead of global device table.
--- drivers/iommu/amd/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/amd/iommu.c +3 -3
@@ -413,15 +413,15 @@ static int iommu_init_device(struct amd_iommu *iommu, struct device *dev)static void iommu_ignore_device (struct amd_iommu *iommu,struct device *dev) {struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg; +struct dev_table_entry *dev_table =get_dev_table (iommu);int devid; - devid =get_device_id (dev); + devid = (get_device_id (dev)) &0xffff ;if (devid <0 )return ; - pci_seg->rlookup_table[devid] =NULL ; -memset (&amd_iommu_dev_table[devid],0 ,sizeof (struct dev_table_entry )); +memset (&dev_table[devid],0 ,sizeof (struct dev_table_entry ));setup_aliases (iommu, dev); }
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 23/37 iommu/amd: Update dump_dte_entry
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Start using per PCI segment device table instead of global device table.
--- drivers/iommu/amd/iommu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iommu/amd/iommu.c +4 -4
@@ -451,13 +451,13 @@ static void amd_iommu_uninit_device(struct device *dev)* ****************************************************************************/ -static void dump_dte_entry (u16 devid) +static void dump_dte_entry (struct amd_iommu *iommu,u16 devid) {int i; +struct dev_table_entry *dev_table =get_dev_table (iommu);for (i =0 ; i <4 ; ++i) -pr_err ("DTE[%d]: %016llx\n" , i, - amd_iommu_dev_table[devid].data[i]); +pr_err ("DTE[%d]: %016llx\n" , i, dev_table[devid].data[i]); }static void dump_command (unsigned long phys_addr)
@@ -618,7 +618,7 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)dev_err (dev,"Event logged [ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n" ,PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), pasid, address, flags); -dump_dte_entry (devid); +dump_dte_entry (iommu, devid);break ;case EVENT_TYPE_DEV_TAB_ERR : dev_err(dev, "Event logged [DEV_TAB_HARDWARE_ERROR device=%02x:%02x.%x "
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 24/37 iommu/amd: Update set_dte_irq_entry
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Start using per PCI segment device table instead of global device table.
--- drivers/iommu/amd/iommu.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/iommu/amd/iommu.c +7 -6
@@ -2729,18 +2729,20 @@ EXPORT_SYMBOL(amd_iommu_device_info);static struct irq_chip amd_ir_chip;static DEFINE_SPINLOCK (iommu_table_lock); -static void set_dte_irq_entry (u16 devid,struct irq_remap_table *table) +static void set_dte_irq_entry (struct amd_iommu *iommu,u16 devid, +struct irq_remap_table *table) {u64 dte; +struct dev_table_entry *dev_table =get_dev_table (iommu); - dte = amd_iommu_dev_table[devid].data[2 ]; + dte = dev_table[devid].data[2 ]; dte &= ~DTE_IRQ_PHYS_ADDR_MASK ; dte |=iommu_virt_to_phys (table->table); dte |=DTE_IRQ_REMAP_INTCTL ; dte |=DTE_INTTABLEN ; dte |=DTE_IRQ_REMAP_ENABLE ; - amd_iommu_dev_table[devid].data[2 ] = dte; + dev_table[devid].data[2 ] = dte; }static struct irq_remap_table *get_irq_table (struct amd_iommu *iommu,u16 devid)
@@ -2791,7 +2793,7 @@ static void set_remap_table_entry(struct amd_iommu *iommu, u16 devid,struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg; pci_seg->irq_lookup_table[devid] = table; -set_dte_irq_entry (devid, table); +set_dte_irq_entry (iommu, devid, table);iommu_flush_dte (iommu, devid); }
@@ -2807,8 +2809,7 @@ static int set_remap_table_entry_alias(struct pci_dev *pdev, u16 alias, pci_seg = iommu->pci_seg; pci_seg->irq_lookup_table[alias] = table; -set_dte_irq_entry (alias, table); - +set_dte_irq_entry (iommu, alias, table);iommu_flush_dte (pci_seg->rlookup_table[alias], alias);return 0 ;
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 25/37 iommu/amd: Update (un)init_device_table_dma()
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Include struct amd_iommu_pci_seg as a function parameter since we need to access per PCI segment device table.
--- drivers/iommu/amd/init.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
drivers/iommu/amd/init.c +20 -7
@@ -238,7 +238,7 @@ static enum iommu_init_state init_state = IOMMU_START_STATE;static int amd_iommu_enable_interrupts (void );static int __init iommu_go_to_state (enum iommu_init_state state); -static void init_device_table_dma (void ); +static void init_device_table_dma (struct amd_iommu_pci_seg *pci_seg);static bool amd_iommu_pre_enabled = true;
@@ -2115,6 +2115,7 @@ static void print_iommu_info(void)static int __init amd_iommu_init_pci (void ) {struct amd_iommu *iommu; +struct amd_iommu_pci_seg *pci_seg;int ret;for_each_iommu (iommu) {
@@ -2145,7 +2146,8 @@ static int __init amd_iommu_init_pci(void) goto out; } -init_device_table_dma (); +for_each_pci_segment (pci_seg) +init_device_table_dma (pci_seg);for_each_iommu (iommu)iommu_flush_all_caches (iommu);
@@ -2508,9 +2510,13 @@ static int __init init_memory_definitions(struct acpi_table_header *table)/* * Init the device table to not allow DMA access for devices */ -static void init_device_table_dma (void ) +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 ) +return ;for (devid =0 ; devid <= amd_iommu_last_bdf; ++devid) {set_dev_entry_bit (devid,DEV_ENTRY_VALID );
@@ -2518,13 +2524,17 @@ static void init_device_table_dma(void) } } -static void __init uninit_device_table_dma (void ) +static void __init uninit_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 ) +return ;for (devid =0 ; devid <= amd_iommu_last_bdf; ++devid) { - amd_iommu_dev_table[devid].data[0 ] =0ULL ; - amd_iommu_dev_table[devid].data[1 ] =0ULL ; + dev_table[devid].data[0 ] =0ULL ; + dev_table[devid].data[1 ] =0ULL ; } }
@@ -3117,8 +3127,11 @@ static int __init state_next(void)free_iommu_resources (); }else {struct amd_iommu *iommu; +struct amd_iommu_pci_seg *pci_seg; + +for_each_pci_segment (pci_seg) +uninit_device_table_dma (pci_seg); -uninit_device_table_dma ();for_each_iommu (iommu)iommu_flush_all_caches (iommu); }
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 26/37 iommu/amd: Update set_dev_entry_bit() and get_dev_entry_bit()
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
To include a pointer to per PCI segment device table.
Also include struct amd_iommu as one of the function parameter to amd_iommu_apply_erratum_63() since it is needed when setting up DTE.
--- drivers/iommu/amd/amd_iommu.h | 2 +- drivers/iommu/amd/init.c | 59 +++++++++++++++++++++++------------ drivers/iommu/amd/iommu.c | 2 +- 3 files changed, 41 insertions(+), 22 deletions(-)
drivers/iommu/amd/amd_iommu.h +1 -1
@@ -13,7 +13,7 @@extern irqreturn_t amd_iommu_int_thread (int irq,void *data);extern irqreturn_t amd_iommu_int_handler (int irq,void *data); -extern void amd_iommu_apply_erratum_63 (u16 devid); +extern void amd_iommu_apply_erratum_63 (struct amd_iommu *iommu,u16 devid);extern void amd_iommu_restart_event_logging (struct amd_iommu *iommu);extern int amd_iommu_init_devices (void );extern void amd_iommu_uninit_devices (void );
drivers/iommu/amd/init.c +39 -20
118 lines not on this page · raw message
drivers/iommu/amd/iommu.c +1 -1
@@ -1607,7 +1607,7 @@ static void clear_dte_entry(struct amd_iommu *iommu, u16 devid) dev_table[devid].data[0 ] =DTE_FLAG_V |DTE_FLAG_TV ; dev_table[devid].data[1 ] &=DTE_FLAG_MASK ; -amd_iommu_apply_erratum_63 (devid); +amd_iommu_apply_erratum_63 (iommu, devid); } static void do_attach(struct iommu_dev_data *dev_data,
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 27/37 iommu/amd: Remove global amd_iommu_dev_table
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Replace global amd_iommu_dev_table with per PCI segment device table. Also remove "dev_table_size".
--- drivers/iommu/amd/amd_iommu_types.h | 6 ------ drivers/iommu/amd/init.c | 30 +++-------------------------- drivers/iommu/amd/iommu.c | 8 +++++--- 3 files changed, 8 insertions(+), 36 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +0 -6
@@ -826,12 +826,6 @@ struct unity_map_entry {* Data structures for device handling */ -/* -* Device table used by hardware. Read and write accesses by software are -* locked with the amd_iommu_pd_table lock. -*/ -extern struct dev_table_entry *amd_iommu_dev_table; -/* * Alias table to find requestor ids to device ids. Not locked because only * read on runtime.
drivers/iommu/amd/init.c +3 -27
@@ -185,14 +185,6 @@ static bool amd_iommu_pc_present __read_mostly;bool amd_iommu_force_isolation__read_mostly ; -/* -* Pointer to the device table which is shared by all AMD IOMMUs -* it is indexed by the PCI device id or the HT unit id and contains -* information about the domain the device belongs to as well as the -* page table root pointer. -*/ -struct dev_table_entry *amd_iommu_dev_table; -/* * The alias table is a driver specific data structure which contains the * mappings of the PCI device ids to the actual requestor ids on the IOMMU.
@@ -206,7 +198,6 @@ u16 *amd_iommu_alias_table;*/ unsigned long *amd_iommu_pd_alloc_bitmap; -static u32 dev_table_size;/* size of the device table */ static u32 alias_table_size;/* size of the alias table */ enum iommu_init_state {
@@ -402,10 +393,11 @@ static void iommu_set_device_table(struct amd_iommu *iommu) {u64 entry;u32 dev_table_size = iommu->pci_seg->dev_table_size; +void *dev_table = (void *)get_dev_table (iommu);BUG_ON (iommu->mmio_base ==NULL ); - entry =iommu_virt_to_phys (amd_iommu_dev_table); + entry =iommu_virt_to_phys (dev_table); entry |= (dev_table_size >>12 ) -1 ;memcpy_toio (iommu->mmio_base +MMIO_DEV_TABLE_OFFSET , &entry,sizeof (entry));
@@ -1148,12 +1140,6 @@ void amd_iommu_apply_erratum_63(struct amd_iommu *iommu, u16 devid)set_dev_entry_bit (iommu, devid,DEV_ENTRY_IW ); } -/* Writes the specific IOMMU for a device into the rlookup table */ -static void __init set_iommu_for_device (struct amd_iommu *iommu,u16 devid) -{ - iommu->pci_seg->rlookup_table[devid] = iommu; -} -/* * This function takes the device specific flags read from the ACPI * table and sets up the device table entry with that information
@@ -1178,7 +1164,7 @@ static void __init set_dev_entry_from_acpi(struct amd_iommu *iommu,amd_iommu_apply_erratum_63 (iommu, devid); -set_iommu_for_device (iommu, devid); +amd_iommu_set_rlookup_table (iommu, devid); }int __init add_special_device (u8 type,u8 id,u16 *devid,bool cmd_line)
@@ -2809,10 +2795,6 @@ static void __init free_iommu_resources(void) get_order(alias_table_size)); amd_iommu_alias_table =NULL ; -free_pages ((unsigned long )amd_iommu_dev_table, -get_order (dev_table_size)); - amd_iommu_dev_table =NULL ; -free_iommu_all ();free_pci_segment (); }
@@ -2941,16 +2923,10 @@ static int __init early_amd_iommu_init(void) amd_iommu_target_ivhd_type =get_highest_supported_ivhd_type (ivrs_base);DUMP_printk ("Using IVHD type %#x\n" , amd_iommu_target_ivhd_type); - dev_table_size =tbl_size (DEV_TABLE_ENTRY_SIZE ); alias_table_size =tbl_size (ALIAS_TABLE_ENTRY_SIZE );/* Device table - directly used by all IOMMUs */ ret = -ENOMEM ; - amd_iommu_dev_table = (void *)__get_free_pages ( -GFP_KERNEL | __GFP_ZERO |GFP_DMA32 , -get_order (dev_table_size)); -if (amd_iommu_dev_table ==NULL ) - goto out;/* * Alias table - map PCI Bus/Dev/Func to Bus/Dev/Func the
drivers/iommu/amd/iommu.c +5 -3
@@ -230,6 +230,7 @@ static struct iommu_dev_data *search_dev_data(struct amd_iommu *iommu, u16 devidstatic int clone_alias (struct pci_dev *pdev,u16 alias,void *data) {struct amd_iommu *iommu; +struct dev_table_entry *dev_table;u16 devid =pci_dev_id (pdev);if (devid == alias)
@@ -240,9 +241,10 @@ static int clone_alias(struct pci_dev *pdev, u16 alias, void *data)return 0 ;amd_iommu_set_rlookup_table (iommu, alias); -memcpy (amd_iommu_dev_table[alias].data, - amd_iommu_dev_table[devid].data, -sizeof (amd_iommu_dev_table[alias].data)); + dev_table =get_dev_table (iommu); +memcpy (dev_table[alias].data, + dev_table[devid].data, +sizeof (dev_table[alias].data));return 0 ; }
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerRe: [PATCH v2 27/37] iommu/amd: Remove global amd_iommu_dev_table
Quoted 8 lines · Vasant Hegde
From: Suravee Suthikulpanit <[email protected]>
Replace global
amd_iommu_dev_tablewith per PCI segment device table. Also remove "dev_table_size".Co-developed-by Vasant Hegde <[email protected]>Signed-off-by Vasant Hegde <[email protected]>Signed-off-by Suravee Suthikulpanit <[email protected]>
Patches 27-29 can be merged into one.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 27/37] iommu/amd: Remove global amd_iommu_dev_table
Quoted 12 lines · Joerg Roedel
Quoted 8 lines · Vasant Hegde
From: Suravee Suthikulpanit <[email protected]>
Replace global
amd_iommu_dev_tablewith per PCI segment device table. Also remove "dev_table_size".Co-developed-by Vasant Hegde <[email protected]>Signed-off-by Vasant Hegde <[email protected]>Signed-off-by Suravee Suthikulpanit <[email protected]>Patches 27-29 can be merged into one.
Yeah. We can merge them into one. It will become slightly bigger change in one patch. But these are related changes. So I guess that's fine.
-Vasant
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 28/37 iommu/amd: Remove global amd_iommu_alias_table
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
This is replaced by the per PCI segment alias table. Also remove alias_table_size variable.
--- drivers/iommu/amd/amd_iommu_types.h | 6 ------ drivers/iommu/amd/init.c | 24 ------------------------ 2 files changed, 30 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +0 -6
@@ -826,12 +826,6 @@ struct unity_map_entry {* Data structures for device handling */ -/* -* Alias table to find requestor ids to device ids. Not locked because only -* read on runtime. -*/ -extern u16 *amd_iommu_alias_table; -/* size of the dma_ops aperture as power of 2 */ extern unsigned amd_iommu_aperture_order;
drivers/iommu/amd/init.c +0 -24
@@ -185,21 +185,12 @@ static bool amd_iommu_pc_present __read_mostly;bool amd_iommu_force_isolation__read_mostly ; -/* -* The alias table is a driver specific data structure which contains the -* mappings of the PCI device ids to the actual requestor ids on the IOMMU. -* More than one device can share the same requestor id. -*/ -u16 *amd_iommu_alias_table; -/* * AMD IOMMU allows up to 2^16 different protection domains. This is a bitmap * to know which ones are already in use. */ unsigned long *amd_iommu_pd_alloc_bitmap; -static u32 alias_table_size;/* size of the alias table */ -enum iommu_init_state {IOMMU_START_STATE ,IOMMU_IVRS_DETECTED ,
@@ -2791,10 +2782,6 @@ static void __init free_iommu_resources(void)kmem_cache_destroy (amd_iommu_irq_cache); amd_iommu_irq_cache =NULL ; -free_pages ((unsigned long )amd_iommu_alias_table, -get_order (alias_table_size)); - amd_iommu_alias_table =NULL ; -free_iommu_all ();free_pci_segment (); }
@@ -2923,20 +2910,9 @@ static int __init early_amd_iommu_init(void) amd_iommu_target_ivhd_type =get_highest_supported_ivhd_type (ivrs_base);DUMP_printk ("Using IVHD type %#x\n" , amd_iommu_target_ivhd_type); - alias_table_size =tbl_size (ALIAS_TABLE_ENTRY_SIZE ); -/* Device table - directly used by all IOMMUs */ ret = -ENOMEM ; -/* -* Alias table - map PCI Bus/Dev/Func to Bus/Dev/Func the -* IOMMU see for that device -*/ - amd_iommu_alias_table = (void *)__get_free_pages (GFP_KERNEL , -get_order (alias_table_size)); -if (amd_iommu_alias_table ==NULL ) - goto out; - amd_iommu_pd_alloc_bitmap = (void *)__get_free_pages (GFP_KERNEL | __GFP_ZERO,get_order (MAX_DOMAIN_ID /8 ));
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 29/37 iommu/amd: Remove global amd_iommu_last_bdf
In reply to Vasant Hegde via iommuReplace it with per PCI segment last_bdf variable.
--- drivers/iommu/amd/amd_iommu_types.h | 3 --- drivers/iommu/amd/init.c | 35 ++++++++++------------------- drivers/iommu/amd/iommu.c | 10 ++++++--- 3 files changed, 19 insertions(+), 29 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +0 -3
@@ -829,9 +829,6 @@ struct unity_map_entry {/* size of the dma_ops aperture as power of 2 */ extern unsigned amd_iommu_aperture_order; -/* largest PCI device id we expect translation requests for */ -extern u16 amd_iommu_last_bdf; -/* allocation bitmap for domain ids */ extern unsigned long *amd_iommu_pd_alloc_bitmap;
drivers/iommu/amd/init.c +12 -23
@@ -161,9 +161,6 @@ static bool amd_iommu_disabled __initdata;static bool amd_iommu_force_enable__initdata ;static int amd_iommu_target_ivhd_type; -u16 amd_iommu_last_bdf;/* largest PCI device id we have -to handle */ -LIST_HEAD (amd_iommu_pci_seg_list);/* list of all PCI segments */ LIST_HEAD (amd_iommu_list);/* list of all AMD IOMMUs in the system */
@@ -245,16 +242,10 @@ static void init_translation_status(struct amd_iommu *iommu) iommu->flags |=AMD_IOMMU_FLAG_TRANS_PRE_ENABLED ; } -static inline void update_last_devid (u16 devid) -{ -if (devid > amd_iommu_last_bdf) - amd_iommu_last_bdf = devid; -} - -static inline unsigned long tbl_size (int entry_size) +static inline unsigned long tbl_size (int entry_size,int last_bdf) {unsigned shift =PAGE_SHIFT + -get_order (((int )amd_iommu_last_bdf +1 ) * entry_size); +get_order ((last_bdf +1 ) * entry_size);return 1UL << shift; }
@@ -538,7 +529,6 @@ static int __init find_last_devid_from_ivhd(struct ivhd_header *h)switch (dev->type) {case IVHD_DEV_ALL :/* Use maximum BDF value for DEV_ALL */ -update_last_devid (0xffff );return 0xffff ;break ;case IVHD_DEV_SELECT :
@@ -546,7 +536,6 @@ static int __init find_last_devid_from_ivhd(struct ivhd_header *h)case IVHD_DEV_ALIAS :case IVHD_DEV_EXT_SELECT :/* all the above subfield types refer to device ids */ -update_last_devid (dev->devid);if (dev->devid > last_devid) last_devid = dev->devid;break ;
@@ -688,7 +677,7 @@ static int __init alloc_alias_table(struct amd_iommu_pci_seg *pci_seg)/* * let all alias entries point to itself */ -for (i =0 ; i <= amd_iommu_last_bdf; ++i) +for (i =0 ; i <= pci_seg->last_bdf; ++i) pci_seg->alias_table[i] = i;return 0 ;
@@ -1054,7 +1043,7 @@ static bool __copy_device_table(struct amd_iommu *iommu)return false; } -for (devid =0 ; devid <= amd_iommu_last_bdf; ++devid) { +for (devid =0 ; devid <= pci_seg->last_bdf; ++devid) { pci_seg->old_dev_tbl_cpy[devid] = old_devtb[devid]; dom_id = old_devtb[devid].data[1 ] &DEV_DOMID_MASK ; dte_v = old_devtb[devid].data[0 ] &DTE_FLAG_V ;
@@ -1315,7 +1304,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,DUMP_printk (" DEV_ALL\t\t\tflags: %02x\n" , e->flags); -for (dev_i =0 ; dev_i <= amd_iommu_last_bdf; ++dev_i) +for (dev_i =0 ; dev_i <= pci_seg->last_bdf; ++dev_i)set_dev_entry_from_acpi (iommu, dev_i, e->flags,0 );break ;case IVHD_DEV_SELECT :
@@ -1560,9 +1549,9 @@ static struct amd_iommu_pci_seg *__init alloc_pci_segment(u16 id, pci_seg->last_bdf = last_bdf;DUMP_printk ("PCI segment : 0x%0x, last bdf : 0x%04x\n" , id, last_bdf); - pci_seg->dev_table_size =tbl_size (DEV_TABLE_ENTRY_SIZE ); - pci_seg->alias_table_size =tbl_size (ALIAS_TABLE_ENTRY_SIZE ); - pci_seg->rlookup_table_size =tbl_size (RLOOKUP_TABLE_ENTRY_SIZE ); + pci_seg->dev_table_size =tbl_size (DEV_TABLE_ENTRY_SIZE , last_bdf); + pci_seg->alias_table_size =tbl_size (ALIAS_TABLE_ENTRY_SIZE , last_bdf); + pci_seg->rlookup_table_size =tbl_size (RLOOKUP_TABLE_ENTRY_SIZE , last_bdf); pci_seg->id = id;init_llist_head (&pci_seg->dev_data_list);
@@ -2443,7 +2432,7 @@ static int __init init_unity_map_range(struct ivmd_header *m,case ACPI_IVMD_TYPE_ALL : s ="IVMD_TYPE_ALL\t\t" ; e->devid_start =0 ; - e->devid_end = amd_iommu_last_bdf; + e->devid_end = pci_seg->last_bdf;break ;case ACPI_IVMD_TYPE_RANGE : s ="IVMD_TYPE_RANGE\t\t" ;
@@ -2510,7 +2499,7 @@ static void init_device_table_dma(struct amd_iommu_pci_seg *pci_seg)if (dev_table ==NULL )return ; -for (devid =0 ; devid <= amd_iommu_last_bdf; ++devid) { +for (devid =0 ; devid <= pci_seg->last_bdf; ++devid) {__set_dev_entry_bit (dev_table, devid,DEV_ENTRY_VALID );__set_dev_entry_bit (dev_table, devid,DEV_ENTRY_TRANSLATION ); }
@@ -2524,7 +2513,7 @@ static void __init uninit_device_table_dma(struct amd_iommu_pci_seg *pci_seg)if (dev_table ==NULL )return ; -for (devid =0 ; devid <= amd_iommu_last_bdf; ++devid) { +for (devid =0 ; devid <= pci_seg->last_bdf; ++devid) { dev_table[devid].data[0 ] =0ULL ; dev_table[devid].data[1 ] =0ULL ; }
@@ -2539,7 +2528,7 @@ static void init_device_table(void)return ;for_each_pci_segment (pci_seg) { -for (devid =0 ; devid <= amd_iommu_last_bdf; ++devid) +for (devid =0 ; devid <= pci_seg->last_bdf; ++devid)__set_dev_entry_bit (pci_seg->dev_table, devid,DEV_ENTRY_IRQ_TBL_EN ); }
drivers/iommu/amd/iommu.c +7 -3
@@ -358,6 +358,8 @@ static bool pci_iommuv2_capable(struct pci_dev *pdev)*/ static bool check_device (struct device *dev) { +struct amd_iommu_pci_seg *pci_seg; +struct amd_iommu *iommu;int devid;if (!dev)
@@ -367,11 +369,13 @@ static bool check_device(struct device *dev)if (devid <0 )return false; -/* Out of our scope? */ -if (devid > amd_iommu_last_bdf) + iommu =rlookup_amd_iommu (dev); +if (!iommu)return false; -if (rlookup_amd_iommu (dev) ==NULL ) +/* Out of our scope? */ + pci_seg = iommu->pci_seg; +if ((devid &0xffff ) > pci_seg->last_bdf)return false;return true;
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 30/37 iommu/amd: Flush upto last_bdf only
In reply to Vasant Hegde via iommuFix amd_iommu_flush_dte_all() and amd_iommu_flush_tlb_all() to flush upto last_bdf only.
--- drivers/iommu/amd/iommu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/iommu/amd/iommu.c +6 -3
@@ -1191,8 +1191,9 @@ static int iommu_flush_dte(struct amd_iommu *iommu, u16 devid)static void amd_iommu_flush_dte_all (struct amd_iommu *iommu) {u32 devid; +u16 last_bdf = iommu->pci_seg->last_bdf; -for (devid =0 ; devid <=0xffff ; ++devid) +for (devid =0 ; devid <= last_bdf; ++devid)iommu_flush_dte (iommu, devid);iommu_completion_wait (iommu);
@@ -1205,8 +1206,9 @@ static void amd_iommu_flush_dte_all(struct amd_iommu *iommu)static void amd_iommu_flush_tlb_all (struct amd_iommu *iommu) {u32 dom_id; +u16 last_bdf = iommu->pci_seg->last_bdf; -for (dom_id =0 ; dom_id <=0xffff ; ++dom_id) { +for (dom_id =0 ; dom_id <= last_bdf; ++dom_id) {struct iommu_cmd cmd;build_inv_iommu_pages (&cmd,0 ,CMD_INV_IOMMU_ALL_PAGES_ADDRESS , dom_id,1 );
@@ -1249,8 +1251,9 @@ static void iommu_flush_irt(struct amd_iommu *iommu, u16 devid)static void amd_iommu_flush_irt_all (struct amd_iommu *iommu) {u32 devid; +u16 last_bdf = iommu->pci_seg->last_bdf; -for (devid =0 ; devid <=MAX_DEV_TABLE_ENTRIES ; devid++) +for (devid =0 ; devid <= last_bdf; devid++)iommu_flush_irt (iommu, devid);iommu_completion_wait (iommu);
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 31/37 iommu/amd: Introduce get_device_sbdf_id() helper function
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Current get_device_id() only provide 16-bit PCI device ID (i.e. BDF). With multiple PCI segment support, we need to extend the helper function to include PCI segment ID.
So, introduce a new helper function get_device_sbdf_id() to replace the current get_pci_device_id().
--- drivers/iommu/amd/amd_iommu.h | 7 ++++++ drivers/iommu/amd/iommu.c | 40 +++++++++++++++++------------------ 2 files changed, 27 insertions(+), 20 deletions(-)
drivers/iommu/amd/amd_iommu.h +7 -0
@@ -115,6 +115,13 @@ void amd_iommu_domain_clr_pt_root(struct protection_domain *domain)amd_iommu_domain_set_pt_root (domain,0 ); } +static inline int get_pci_sbdf_id (struct pci_dev *pdev) +{ +int seg =pci_domain_nr (pdev->bus); +u16 devid =pci_dev_id (pdev); + +return ((seg <<16 ) | (devid &0xffff )); +}extern bool translation_pre_enabled (struct amd_iommu *iommu);extern bool amd_iommu_is_attach_deferred (struct device *dev);
drivers/iommu/amd/iommu.c +20 -20
@@ -92,13 +92,6 @@ static void detach_device(struct device *dev);* ****************************************************************************/ -static inline u16 get_pci_device_id (struct device *dev) -{ -struct pci_dev *pdev =to_pci_dev (dev); - -return pci_dev_id (pdev); -} -static inline int get_acpihid_device_id (struct device *dev,struct acpihid_map_entry **entry) {
@@ -119,16 +112,16 @@ static inline int get_acpihid_device_id(struct device *dev,return -EINVAL ; } -static inline int get_device_id (struct device *dev) +static inline int get_device_sbdf_id (struct device *dev) { -int devid; +int sbdf;if (dev_is_pci (dev)) - devid =get_pci_device_id (dev); + sbdf =get_pci_sbdf_id (to_pci_dev (dev));else - devid =get_acpihid_device_id (dev,NULL ); + sbdf =get_acpihid_device_id (dev,NULL ); -return devid; +return sbdf; }struct dev_table_entry *get_dev_table (struct amd_iommu *iommu)
@@ -182,9 +175,11 @@ static struct amd_iommu *__rlookup_amd_iommu(u16 seg, u16 devid)static struct amd_iommu *rlookup_amd_iommu (struct device *dev) {u16 seg =get_device_segment (dev); -u16 devid =get_device_id (dev); +int devid =get_device_sbdf_id (dev); -return __rlookup_amd_iommu (seg, devid); +if (devid <0 ) +return NULL ; +return __rlookup_amd_iommu (seg, (devid &0xffff )); }static struct protection_domain *to_pdomain (struct iommu_domain *dom)
@@ -365,9 +360,10 @@ static bool check_device(struct device *dev)if (!dev)return false; - devid =get_device_id (dev); + devid =get_device_sbdf_id (dev);if (devid <0 )return false; + devid &=0xffff ; iommu =rlookup_amd_iommu (dev);if (!iommu)
@@ -375,7 +371,7 @@ static bool check_device(struct device *dev)/* Out of our scope? */ pci_seg = iommu->pci_seg; -if ((devid &0xffff ) > pci_seg->last_bdf) +if (devid > pci_seg->last_bdf)return false;return true;
@@ -389,10 +385,11 @@ static int iommu_init_device(struct amd_iommu *iommu, struct device *dev)if (dev_iommu_priv_get (dev))return 0 ; - devid =get_device_id (dev); + devid =get_device_sbdf_id (dev);if (devid <0 )return devid; + devid &=0xffff ; dev_data =find_dev_data (iommu, devid);if (!dev_data)return -ENOMEM ;
@@ -422,10 +419,11 @@ static void iommu_ignore_device(struct amd_iommu *iommu, struct device *dev)struct dev_table_entry *dev_table =get_dev_table (iommu);int devid; - devid = (get_device_id (dev)) &0xffff ; + devid =get_device_sbdf_id (dev);if (devid <0 )return ; + devid &=0xffff ; pci_seg->rlookup_table[devid] =NULL ;memset (&dev_table[devid],0 ,sizeof (struct dev_table_entry ));
@@ -2265,9 +2263,11 @@ static void amd_iommu_get_resv_regions(struct device *dev,struct amd_iommu_pci_seg *pci_seg;int devid; - devid =get_device_id (dev); + devid =get_device_sbdf_id (dev);if (devid <0 )return ; + devid &=0xffff ; + iommu =rlookup_amd_iommu (dev);if (!iommu)return ;
@@ -3154,7 +3154,7 @@ static int get_devid(struct irq_alloc_info *info)return get_hpet_devid (info->devid);case X86_IRQ_ALLOC_TYPE_PCI_MSI :case X86_IRQ_ALLOC_TYPE_PCI_MSIX : -return get_device_id (msi_desc_to_dev (info->desc)); +return get_device_sbdf_id (msi_desc_to_dev (info->desc));default :WARN_ON_ONCE (1 );return -1 ;
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 32/37 iommu/amd: Include PCI segment ID when initialize IOMMU
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Extend current device ID variables to 32-bit to include the 16-bit segment ID when parsing device information from IVRS table to initialize each IOMMU.
--- drivers/iommu/amd/amd_iommu.h | 2 +- drivers/iommu/amd/amd_iommu_types.h | 6 ++-- drivers/iommu/amd/init.c | 56 +++++++++++++++-------------- drivers/iommu/amd/quirks.c | 4 +-- 4 files changed, 35 insertions(+), 33 deletions(-)
drivers/iommu/amd/amd_iommu.h +1 -1
@@ -125,7 +125,7 @@ static inline int get_pci_sbdf_id(struct pci_dev *pdev)extern bool translation_pre_enabled (struct amd_iommu *iommu);extern bool amd_iommu_is_attach_deferred (struct device *dev); -extern int __init add_special_device (u8 type,u8 id,u16 *devid, +extern int __init add_special_device (u8 type,u8 id,u32 *devid,bool cmd_line);#ifdef CONFIG_DMI
drivers/iommu/amd/amd_iommu_types.h +3 -3
@@ -734,8 +734,8 @@ struct acpihid_map_entry {struct list_head list;u8 uid[ACPIHID_UID_LEN ];u8 hid[ACPIHID_HID_LEN ]; -u16 devid; -u16 root_devid; +u32 devid; +u32 root_devid;bool cmd_line;struct iommu_group *group; };
@@ -743,7 +743,7 @@ struct acpihid_map_entry {struct devid_map {struct list_head list;u8 id; -u16 devid; +u32 devid;bool cmd_line; };
drivers/iommu/amd/init.c +29 -27
156 lines not on this page · raw message
drivers/iommu/amd/quirks.c +2 -2
@@ -15,7 +15,7 @@struct ivrs_quirk_entry {u8 id; -u16 devid; +u32 devid; };enum {
@@ -49,7 +49,7 @@ static int __init ivrs_ioapic_quirk_cb(const struct dmi_system_id *d)const struct ivrs_quirk_entry *i;for (i = d->driver_data; i->id !=0 && i->devid !=0 ; i++) -add_special_device (IVHD_SPECIAL_IOAPIC , i->id, (u16 *)&i->devid,0 ); +add_special_device (IVHD_SPECIAL_IOAPIC , i->id, (u32 *)&i->devid,0 );return 0 ; }
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 33/37 iommu/amd: Specify PCI segment ID when getting pci device
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
Upcoming AMD systems can have multiple PCI segments. Hence pass PCI segment ID to pci_get_domain_bus_and_slot() instead of '0'.
--- drivers/iommu/amd/init.c | 6 ++++-- drivers/iommu/amd/iommu.c | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-)
drivers/iommu/amd/init.c +4 -2
@@ -1961,7 +1961,8 @@ static int __init iommu_init_pci(struct amd_iommu *iommu)int cap_ptr = iommu->cap_ptr;int ret; - iommu->dev =pci_get_domain_bus_and_slot (0 ,PCI_BUS_NUM (iommu->devid), + iommu->dev =pci_get_domain_bus_and_slot (iommu->pci_seg->id, +PCI_BUS_NUM (iommu->devid), iommu->devid &0xff );if (!iommu->dev)return -ENODEV ;
@@ -2024,7 +2025,8 @@ static int __init iommu_init_pci(struct amd_iommu *iommu)int i, j; iommu->root_pdev = -pci_get_domain_bus_and_slot (0 , iommu->dev->bus->number, +pci_get_domain_bus_and_slot (iommu->pci_seg->id, + iommu->dev->bus->number,PCI_DEVFN (0 ,0 ));/*
drivers/iommu/amd/iommu.c +10 -9
@@ -473,7 +473,7 @@ static void dump_command(unsigned long phys_addr)pr_err ("CMD[%d]: %08x\n" , i, cmd->data[i]); } -static void amd_iommu_report_rmp_hw_error (volatile u32 *event) +static void amd_iommu_report_rmp_hw_error (struct amd_iommu *iommu,volatile u32 *event) {struct iommu_dev_data *dev_data =NULL ;int devid, vmg_tag, flags;
@@ -485,7 +485,7 @@ static void amd_iommu_report_rmp_hw_error(volatile u32 *event) flags = (event[1 ] >>EVENT_FLAGS_SHIFT ) &EVENT_FLAGS_MASK ; spa = ((u64 )event[3 ] <<32 ) | (event[2 ] &0xFFFFFFF8 ); - pdev =pci_get_domain_bus_and_slot (0 ,PCI_BUS_NUM (devid), + pdev =pci_get_domain_bus_and_slot (iommu->pci_seg->id,PCI_BUS_NUM (devid), devid &0xff );if (pdev) dev_data =dev_iommu_priv_get (&pdev->dev);
@@ -505,7 +505,7 @@ static void amd_iommu_report_rmp_hw_error(volatile u32 *event)pci_dev_put (pdev); } -static void amd_iommu_report_rmp_fault (volatile u32 *event) +static void amd_iommu_report_rmp_fault (struct amd_iommu *iommu,volatile u32 *event) {struct iommu_dev_data *dev_data =NULL ;int devid, flags_rmp, vmg_tag, flags;
@@ -518,7 +518,7 @@ static void amd_iommu_report_rmp_fault(volatile u32 *event) flags = (event[1 ] >>EVENT_FLAGS_SHIFT ) &EVENT_FLAGS_MASK ; gpa = ((u64 )event[3 ] <<32 ) | event[2 ]; - pdev =pci_get_domain_bus_and_slot (0 ,PCI_BUS_NUM (devid), + pdev =pci_get_domain_bus_and_slot (iommu->pci_seg->id,PCI_BUS_NUM (devid), devid &0xff );if (pdev) dev_data =dev_iommu_priv_get (&pdev->dev);
@@ -544,13 +544,14 @@ static void amd_iommu_report_rmp_fault(volatile u32 *event)#define IS_WRITE_REQUEST (flags) \ ((flags) & EVENT_FLAG_RW) -static void amd_iommu_report_page_fault (u16 devid,u16 domain_id, +static void amd_iommu_report_page_fault (struct amd_iommu *iommu, +u16 devid,u16 domain_id,u64 address,int flags) {struct iommu_dev_data *dev_data =NULL ;struct pci_dev *pdev; - pdev =pci_get_domain_bus_and_slot (0 ,PCI_BUS_NUM (devid), + pdev =pci_get_domain_bus_and_slot (iommu->pci_seg->id,PCI_BUS_NUM (devid), devid &0xff );if (pdev) dev_data =dev_iommu_priv_get (&pdev->dev);
@@ -613,7 +614,7 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt) }if (type ==EVENT_TYPE_IO_FAULT ) { -amd_iommu_report_page_fault (devid, pasid, address, flags); +amd_iommu_report_page_fault (iommu, devid, pasid, address, flags);return ; }
@@ -654,10 +655,10 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt) pasid, address, flags);break ;case EVENT_TYPE_RMP_FAULT : -amd_iommu_report_rmp_fault (event); +amd_iommu_report_rmp_fault (iommu, event);break ;case EVENT_TYPE_RMP_HW_ERR : -amd_iommu_report_rmp_hw_error (event); +amd_iommu_report_rmp_hw_error (iommu, event);break ;case EVENT_TYPE_INV_PPR_REQ : pasid =PPR_PASID (*((u64 *)__evt));
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 34/37 iommu/amd: Add PCI segment support for ivrs_ioapic, ivrs_hpet, ivrs_acpihid commands
In reply to Vasant Hegde via iommuFrom: Suravee Suthikulpanit <[email protected]>
By default, PCI segment is zero and can be omitted. To support system with non-zero PCI segment ID, modify the parsing functions to allow PCI segment ID.
--- .../admin-guide/kernel-parameters.txt | 34 +++++++++++---- drivers/iommu/amd/init.c | 41 ++++++++++++------- 2 files changed, 51 insertions(+), 24 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +25 -9
@@ -2208,23 +2208,39 @@ ivrs_ioapic [HW,X86-64] Provide an override to the IOAPIC-ID<->DEVICE-ID - mapping provided in the IVRS ACPI table. For - example, to map IOAPIC-ID decimal 10 to - PCI device 00:14.0 write the parameter as: + mapping provided in the IVRS ACPI table. + By default, PCI segment is 0, and can be omitted. + For example: + * To map IOAPIC-ID decimal 10 to PCI device 00:14.0 + write the parameter as: ivrs_ioapic[10]=00:14.0 + * To map IOAPIC-ID decimal 10 to PCI segment 0x1 and + PCI device 00:14.0 write the parameter as: + ivrs_ioapic[10]=0001:00:14.0 ivrs_hpet [HW,X86-64] Provide an override to the HPET-ID<->DEVICE-ID - mapping provided in the IVRS ACPI table. For - example, to map HPET-ID decimal 0 to - PCI device 00:14.0 write the parameter as: + mapping provided in the IVRS ACPI table. + By default, PCI segment is 0, and can be omitted. + For example: + * To map HPET-ID decimal 0 to PCI device 00:14.0 + write the parameter as: ivrs_hpet[0]=00:14.0 + * To map HPET-ID decimal 10 to PCI segment 0x1 and + PCI device 00:14.0 write the parameter as: + ivrs_ioapic[10]=0001:00:14.0 ivrs_acpihid [HW,X86-64] Provide an override to the ACPI-HID:UID<->DEVICE-ID - mapping provided in the IVRS ACPI table. For - example, to map UART-HID:UID AMD0020:0 to - PCI device 00:14.5 write the parameter as: + mapping provided in the IVRS ACPI table. + + For example, to map UART-HID:UID AMD0020:0 to + PCI segment 0x1 and PCI device ID 00:14.5, + write the parameter as: + ivrs_acpihid[0001:00:14.5]=AMD0020:0 + + By default, PCI segment is 0, and can be omitted. + For example, PCI device 00:14.5 write the parameter as: ivrs_acpihid[00:14.5]=AMD0020:0 js= [HW,JOY] Analog joystick
drivers/iommu/amd/init.c +26 -15
93 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 35/37 iommu/amd: Print PCI segment ID in error log messages
In reply to Vasant Hegde via iommuPrint pci segment ID along with bdf. Useful for debugging.
--- drivers/iommu/amd/init.c | 10 +++++----- drivers/iommu/amd/iommu.c | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 23 deletions(-)
drivers/iommu/amd/init.c +5 -5
@@ -1850,11 +1850,11 @@ static int __init init_iommu_all(struct acpi_table_header *table) h = (struct ivhd_header *)p;if (*p == amd_iommu_target_ivhd_type) { -DUMP_printk ("device: %02x:%02x.%01x cap: %04x " -"seg: %d flags: %01x info %04x\n" , -PCI_BUS_NUM (h->devid),PCI_SLOT (h->devid), -PCI_FUNC (h->devid), h->cap_ptr, - h->pci_seg, h->flags, h->info); +DUMP_printk ("device: %04x:%02x:%02x.%01x cap: %04x " +"flags: %01x info %04x\n" , + h->pci_seg,PCI_BUS_NUM (h->devid), +PCI_SLOT (h->devid),PCI_FUNC (h->devid), + h->cap_ptr, h->flags, h->info);DUMP_printk (" mmio-addr: %016llx\n" , h->mmio_phys);
drivers/iommu/amd/iommu.c +18 -18
@@ -496,8 +496,8 @@ static void amd_iommu_report_rmp_hw_error(struct amd_iommu *iommu, volatile u32 vmg_tag, spa, flags); } }else { -pr_err_ratelimited ("Event logged [RMP_HW_ERROR device=%02x:%02x.%x, vmg_tag=0x%04x, spa=0x%llx, flags=0x%04x]\n" , -PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), +pr_err_ratelimited ("Event logged [RMP_HW_ERROR device=%04x:%02x:%02x.%x, vmg_tag=0x%04x, spa=0x%llx, flags=0x%04x]\n" , + iommu->pci_seg->id,PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), vmg_tag, spa, flags); }
@@ -529,8 +529,8 @@ static void amd_iommu_report_rmp_fault(struct amd_iommu *iommu, volatile u32 *ev vmg_tag, gpa, flags_rmp, flags); } }else { -pr_err_ratelimited ("Event logged [RMP_PAGE_FAULT device=%02x:%02x.%x, vmg_tag=0x%04x, gpa=0x%llx, flags_rmp=0x%04x, flags=0x%04x]\n" , -PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), +pr_err_ratelimited ("Event logged [RMP_PAGE_FAULT device=%04x:%02x:%02x.%x, vmg_tag=0x%04x, gpa=0x%llx, flags_rmp=0x%04x, flags=0x%04x]\n" , + iommu->pci_seg->id,PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), vmg_tag, gpa, flags_rmp, flags); }
@@ -576,8 +576,8 @@ static void amd_iommu_report_page_fault(struct amd_iommu *iommu, domain_id, address, flags); } }else { -pr_err_ratelimited ("Event logged [IO_PAGE_FAULT device=%02x:%02x.%x domain=0x%04x address=0x%llx flags=0x%04x]\n" , -PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), +pr_err_ratelimited ("Event logged [IO_PAGE_FAULT device=%04x:%02x:%02x.%x domain=0x%04x address=0x%llx flags=0x%04x]\n" , + iommu->pci_seg->id,PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), domain_id, address, flags); }
@@ -620,20 +620,20 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)switch (type) {case EVENT_TYPE_ILL_DEV : -dev_err (dev,"Event logged [ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n" , -PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), +dev_err (dev,"Event logged [ILLEGAL_DEV_TABLE_ENTRY device=%04x:%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n" , + iommu->pci_seg->id,PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), pasid, address, flags);dump_dte_entry (iommu, devid);break ;case EVENT_TYPE_DEV_TAB_ERR : -dev_err (dev,"Event logged [DEV_TAB_HARDWARE_ERROR device=%02x:%02x.%x " +dev_err (dev,"Event logged [DEV_TAB_HARDWARE_ERROR device=%04x:%02x:%02x.%x " "address=0x%llx flags=0x%04x]\n" , -PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), + iommu->pci_seg->id,PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), address, flags);break ;case EVENT_TYPE_PAGE_TAB_ERR : -dev_err (dev,"Event logged [PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x pasid=0x%04x address=0x%llx flags=0x%04x]\n" , -PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), +dev_err (dev,"Event logged [PAGE_TAB_HARDWARE_ERROR device=%04x:%02x:%02x.%x pasid=0x%04x address=0x%llx flags=0x%04x]\n" , + iommu->pci_seg->id,PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), pasid, address, flags);break ;case EVENT_TYPE_ILL_CMD :
@@ -645,13 +645,13 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt) address, flags);break ;case EVENT_TYPE_IOTLB_INV_TO : -dev_err (dev,"Event logged [IOTLB_INV_TIMEOUT device=%02x:%02x.%x address=0x%llx]\n" , -PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), +dev_err (dev,"Event logged [IOTLB_INV_TIMEOUT device=%04x:%02x:%02x.%x address=0x%llx]\n" , + iommu->pci_seg->id,PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), address);break ;case EVENT_TYPE_INV_DEV_REQ : -dev_err (dev,"Event logged [INVALID_DEVICE_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n" , -PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), +dev_err (dev,"Event logged [INVALID_DEVICE_REQUEST device=%04x:%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x]\n" , + iommu->pci_seg->id,PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), pasid, address, flags);break ;case EVENT_TYPE_RMP_FAULT :
@@ -663,8 +663,8 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)case EVENT_TYPE_INV_PPR_REQ : pasid =PPR_PASID (*((u64 *)__evt)); tag = event[1 ] &0x03FF ; -dev_err (dev,"Event logged [INVALID_PPR_REQUEST device=%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x tag=0x%03x]\n" , -PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), +dev_err (dev,"Event logged [INVALID_PPR_REQUEST device=%04x:%02x:%02x.%x pasid=0x%05x address=0x%llx flags=0x%04x tag=0x%03x]\n" , + iommu->pci_seg->id,PCI_BUS_NUM (devid),PCI_SLOT (devid),PCI_FUNC (devid), pasid, address, flags, tag);break ;default :
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 36/37 iommu/amd: Update device_state structure to include PCI seg ID
In reply to Vasant Hegde via iommuRename struct device_state.devid variable to struct device_state.sbdf and extend it to 32-bit to include the 16-bit PCI segment ID via the helper function get_pci_sbdf_id().
--- drivers/iommu/amd/iommu_v2.c | 58 +++++++++++++++--------------------- 1 file changed, 24 insertions(+), 34 deletions(-)
drivers/iommu/amd/iommu_v2.c +24 -34
@@ -51,7 +51,7 @@ struct pasid_state {struct device_state {struct list_head list; -u16 devid; +u32 sbdf;atomic_t count;struct pci_dev *pdev;struct pasid_state **states;
@@ -83,35 +83,25 @@ static struct workqueue_struct *iommu_wq;static void free_pasid_states (struct device_state *dev_state); -static u16 device_id (struct pci_dev *pdev) -{ -u16 devid; - - devid = pdev->bus->number; - devid = (devid <<8 ) | pdev->devfn; - -return devid; -} - -static struct device_state *__get_device_state (u16 devid) +static struct device_state *__get_device_state (u32 sbdf) {struct device_state *dev_state;list_for_each_entry (dev_state, &state_list, list) { -if (dev_state->devid == devid) +if (dev_state->sbdf == sbdf)return dev_state; }return NULL ; } -static struct device_state *get_device_state (u16 devid) +static struct device_state *get_device_state (u32 sbdf) {struct device_state *dev_state;unsigned long flags;spin_lock_irqsave (&state_lock, flags); - dev_state =__get_device_state (devid); + dev_state =__get_device_state (sbdf);if (dev_state !=NULL )atomic_inc (&dev_state->count);spin_unlock_irqrestore (&state_lock, flags);
@@ -609,7 +599,7 @@ int amd_iommu_bind_pasid(struct pci_dev *pdev, u32 pasid,struct pasid_state *pasid_state;struct device_state *dev_state;struct mm_struct *mm; -u16 devid; +u32 sbdf;int ret;might_sleep ();
@@ -617,8 +607,8 @@ int amd_iommu_bind_pasid(struct pci_dev *pdev, u32 pasid,if (!amd_iommu_v2_supported ())return -ENODEV ; - devid =device_id (pdev); - dev_state =get_device_state (devid); + sbdf =get_pci_sbdf_id (pdev); + dev_state =get_device_state (sbdf);if (dev_state ==NULL )return -EINVAL ;
@@ -692,15 +682,15 @@ void amd_iommu_unbind_pasid(struct pci_dev *pdev, u32 pasid) {struct pasid_state *pasid_state;struct device_state *dev_state; -u16 devid; +u32 sbdf;might_sleep ();if (!amd_iommu_v2_supported ())return ; - devid =device_id (pdev); - dev_state =get_device_state (devid); + sbdf =get_pci_sbdf_id (pdev); + dev_state =get_device_state (sbdf);if (dev_state ==NULL )return ;
@@ -742,7 +732,7 @@ int amd_iommu_init_device(struct pci_dev *pdev, int pasids)struct iommu_group *group;unsigned long flags;int ret, tmp; -u16 devid; +u32 sbdf;might_sleep ();
@@ -759,7 +749,7 @@ int amd_iommu_init_device(struct pci_dev *pdev, int pasids)if (pasids <=0 || pasids > (PASID_MASK +1 ))return -EINVAL ; - devid =device_id (pdev); + sbdf =get_pci_sbdf_id (pdev); dev_state =kzalloc (sizeof (*dev_state),GFP_KERNEL );if (dev_state ==NULL )
@@ -768,7 +758,7 @@ int amd_iommu_init_device(struct pci_dev *pdev, int pasids)spin_lock_init (&dev_state->lock);init_waitqueue_head (&dev_state->wq); dev_state->pdev = pdev; - dev_state->devid = devid; + dev_state->sbdf = sbdf; tmp = pasids;for (dev_state->pasid_levels =0 ; (tmp -1 ) & ~0x1ff ; tmp >>=9 )
@@ -806,7 +796,7 @@ int amd_iommu_init_device(struct pci_dev *pdev, int pasids)spin_lock_irqsave (&state_lock, flags); -if (__get_device_state (devid) !=NULL ) { +if (__get_device_state (sbdf) !=NULL ) {spin_unlock_irqrestore (&state_lock, flags); ret = -EBUSY ; goto out_free_domain;
@@ -838,16 +828,16 @@ void amd_iommu_free_device(struct pci_dev *pdev) {struct device_state *dev_state;unsigned long flags; -u16 devid; +u32 sbdf;if (!amd_iommu_v2_supported ())return ; - devid =device_id (pdev); + sbdf =get_pci_sbdf_id (pdev);spin_lock_irqsave (&state_lock, flags); - dev_state =__get_device_state (devid); + dev_state =__get_device_state (sbdf);if (dev_state ==NULL ) {spin_unlock_irqrestore (&state_lock, flags);return ;
@@ -867,18 +857,18 @@ int amd_iommu_set_invalid_ppr_cb(struct pci_dev *pdev, {struct device_state *dev_state;unsigned long flags; -u16 devid; +u32 sbdf;int ret;if (!amd_iommu_v2_supported ())return -ENODEV ; - devid =device_id (pdev); + sbdf =get_pci_sbdf_id (pdev);spin_lock_irqsave (&state_lock, flags); ret = -EINVAL ; - dev_state =__get_device_state (devid); + dev_state =__get_device_state (sbdf);if (dev_state ==NULL ) goto out_unlock;
@@ -898,18 +888,18 @@ int amd_iommu_set_invalidate_ctx_cb(struct pci_dev *pdev, {struct device_state *dev_state;unsigned long flags; -u16 devid; +u32 sbdf;int ret;if (!amd_iommu_v2_supported ())return -ENODEV ; - devid =device_id (pdev); + sbdf =get_pci_sbdf_id (pdev);spin_lock_irqsave (&state_lock, flags); ret = -EINVAL ; - dev_state =__get_device_state (devid); + dev_state =__get_device_state (sbdf);if (dev_state ==NULL ) goto out_unlock;
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 37/37 iommu/amd: Update amd_iommu_fault structure to include PCI seg ID
In reply to Vasant Hegde via iommuRename 'device_id' as 'sbdf' and extend it to 32bit so that we can pass PCI segment ID to ppr_notifier(). Also pass PCI segment ID to pci_get_domain_bus_and_slot() instead of default value.
--- drivers/iommu/amd/amd_iommu_types.h | 2 +- drivers/iommu/amd/iommu.c | 2 +- drivers/iommu/amd/iommu_v2.c | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/iommu/amd/amd_iommu_types.h +1 -1
@@ -477,7 +477,7 @@ extern struct kmem_cache *amd_iommu_irq_cache;struct amd_iommu_fault {u64 address;/* IO virtual address of the fault*/ u32 pasid;/* Address space identifier */ -u16 device_id;/* Originating PCI device id */ +u32 sbdf;/* Originating PCI device id */ u16 tag;/* PPR tag */ u16 flags;/* Fault flags */
drivers/iommu/amd/iommu.c +1 -1
@@ -701,7 +701,7 @@ static void iommu_handle_ppr_entry(struct amd_iommu *iommu, u64 *raw) fault.address = raw[1 ]; fault.pasid =PPR_PASID (raw[0 ]); - fault.device_id =PPR_DEVID (raw[0 ]); + fault.sbdf = (iommu->pci_seg->id <<16 ) |PPR_DEVID (raw[0 ]); fault.tag =PPR_TAG (raw[0 ]); fault.flags =PPR_FLAGS (raw[0 ]);
drivers/iommu/amd/iommu_v2.c +5 -4
@@ -518,15 +518,16 @@ static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data)unsigned long flags;struct fault *fault;bool finish; -u16 tag, devid; +u16 tag, devid, seg_id;int ret; iommu_fault = data; tag = iommu_fault->tag &0x1ff ; finish = (iommu_fault->tag >>9 ) &1 ; - devid = iommu_fault->device_id; - pdev =pci_get_domain_bus_and_slot (0 ,PCI_BUS_NUM (devid), + seg_id = (iommu_fault->sbdf >>16 ) &0xffff ; + devid = iommu_fault->sbdf &0xffff ; + pdev =pci_get_domain_bus_and_slot (seg_id,PCI_BUS_NUM (devid), devid &0xff );if (!pdev)return -ENODEV ;
@@ -540,7 +541,7 @@ static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data) goto out; } - dev_state =get_device_state (iommu_fault->device_id); + dev_state =get_device_state (iommu_fault->sbdf);if (dev_state ==NULL ) goto out;
Signature · 6 lines
2.27.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerRe: [PATCH v2 37/37] iommu/amd: Update amd_iommu_fault structure to include PCI seg ID
drivers/iommu/amd/iommu_v2.c static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data) · line 529
Quoted 2 lines · Vasant Hegde
drivers/iommu/amd/iommu_v2.c +2
-0+ seg_id = (iommu_fault->sbdf >>16 ) &0xffff ; + devid = iommu_fault->sbdf &0xffff ;
This deserves some macros for readability.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v2 37/37] iommu/amd: Update amd_iommu_fault structure to include PCI seg ID
Joerg,
Quoted 5 lines · Joerg Roedel
drivers/iommu/amd/iommu_v2.c static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data) · line 529
Quoted 2 lines · Vasant Hegde
drivers/iommu/amd/iommu_v2.c +2
-0+ seg_id = (iommu_fault->sbdf >>16 ) &0xffff ; + devid = iommu_fault->sbdf &0xffff ;This deserves some macros for readability.
Sure. Will add macros in next version.
-Vasant
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerHi Vasant, Hi Suravee,
Quoted 3 lines · Vasant Hegde
Newer AMD systems can support multiple PCI segments, where each segment contains one or more IOMMU instances. However, an IOMMU instance can only support a single PCI segment.
Thanks for doing this, making the AMD IOMMU driver multi-segment aware has been on my todo list for a while too. Overall the series looks good to me, just some minor comments to some patches.
Regards,
Joerg
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg,
Quoted 10 lines · Joerg Roedel
Hi Vasant, Hi Suravee,
Quoted 3 lines · Vasant Hegde
Newer AMD systems can support multiple PCI segments, where each segment contains one or more IOMMU instances. However, an IOMMU instance can only support a single PCI segment.
Thanks for doing this, making the AMD IOMMU driver multi-segment aware has been on my todo list for a while too. Overall the series looks good to me, just some minor comments to some patches.
Thanks for the review. Will address review comments in v3.
-Vasant
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu