Skip to content

Commit faad224

Browse files
hegdevasantjoergroedel
authored andcommitted
iommu/amd: Fix clone_alias() to use the original device's devid
Currently clone_alias() assumes first argument (pdev) is always the original device pointer. This function is called by pci_for_each_dma_alias() which based on topology decides to send original or alias device details in first argument. This meant that the source devid used to look up and copy the DTE may be incorrect, leading to wrong or stale DTE entries being propagated to alias device. Fix this by passing the original pdev as the opaque data argument to both the direct clone_alias() call and pci_for_each_dma_alias(). Inside clone_alias(), retrieve the original device from data and compute devid from it. Fixes: 3332364 ("iommu/amd: Support multiple PCI DMA aliases in device table") Signed-off-by: Vasant Hegde <vasant.hegde@amd.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
1 parent 0e59645 commit faad224

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

drivers/iommu/amd/iommu.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,11 +403,12 @@ struct iommu_dev_data *search_dev_data(struct amd_iommu *iommu, u16 devid)
403403
return NULL;
404404
}
405405

406-
static int clone_alias(struct pci_dev *pdev, u16 alias, void *data)
406+
static int clone_alias(struct pci_dev *pdev_origin, u16 alias, void *data)
407407
{
408408
struct dev_table_entry new;
409409
struct amd_iommu *iommu;
410410
struct iommu_dev_data *dev_data, *alias_data;
411+
struct pci_dev *pdev = data;
411412
u16 devid = pci_dev_id(pdev);
412413
int ret = 0;
413414

@@ -454,9 +455,9 @@ static void clone_aliases(struct amd_iommu *iommu, struct device *dev)
454455
* part of the PCI DMA aliases if it's bus differs
455456
* from the original device.
456457
*/
457-
clone_alias(pdev, iommu->pci_seg->alias_table[pci_dev_id(pdev)], NULL);
458+
clone_alias(pdev, iommu->pci_seg->alias_table[pci_dev_id(pdev)], pdev);
458459

459-
pci_for_each_dma_alias(pdev, clone_alias, NULL);
460+
pci_for_each_dma_alias(pdev, clone_alias, pdev);
460461
}
461462

462463
static void setup_aliases(struct amd_iommu *iommu, struct device *dev)

0 commit comments

Comments
 (0)