Commit c12b08eb authored by Yu Zhao's avatar Yu Zhao Committed by Joerg Roedel

iommu/amd: Fix amd_iommu=force_isolation

The parameter is still there but it's ignored. We need to check its
value before deciding to go into passthrough mode for AMD IOMMU v2
capable device.

We occasionally use this parameter to force v2 capable device into
translation mode to debug memory corruption that we suspect is
caused by DMA writes.

To address the following comment from Joerg Roedel on the first
version, v2 capability of device is completely ignored.
> This breaks the iommu_v2 use-case, as it needs a direct mapping for the
> devices that support it.

And from Documentation/admin-guide/kernel-parameters.txt:
  This option does not override iommu=pt

Fixes: aafd8ba0 ("iommu/amd: Implement add_device and remove_device")
Signed-off-by: default avatarYu Zhao <yuzhao@google.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 6f5086a6
...@@ -440,7 +440,14 @@ static int iommu_init_device(struct device *dev) ...@@ -440,7 +440,14 @@ static int iommu_init_device(struct device *dev)
dev_data->alias = get_alias(dev); dev_data->alias = get_alias(dev);
if (dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) { /*
* By default we use passthrough mode for IOMMUv2 capable device.
* But if amd_iommu=force_isolation is set (e.g. to debug DMA to
* invalid address), we ignore the capability for the device so
* it'll be forced to go into translation mode.
*/
if ((iommu_pass_through || !amd_iommu_force_isolation) &&
dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) {
struct amd_iommu *iommu; struct amd_iommu *iommu;
iommu = amd_iommu_rlookup_table[dev_data->devid]; iommu = amd_iommu_rlookup_table[dev_data->devid];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment