Skip to content

Commit

Permalink
iommu/vt-d: Fix clearing real DMA device's scalable-mode context entries
Browse files Browse the repository at this point in the history
commit 474dd1c upstream.

The commit 2b0140c ("iommu/vt-d: Use pci_real_dma_dev() for mapping")
fixes an issue of "sub-device is removed where the context entry is cleared
for all aliases". But this commit didn't consider the PASID entry and PASID
table in VT-d scalable mode. This fix increases the coverage of scalable
mode.

Suggested-by: Sanjay Kumar <sanjay.k.kumar@intel.com>
Fixes: 8038bdb ("iommu/vt-d: Only clear real DMA device's context entries")
Fixes: 2b0140c ("iommu/vt-d: Use pci_real_dma_dev() for mapping")
Cc: stable@vger.kernel.org # v5.6+
Cc: Jon Derrick <jonathan.derrick@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20210712071712.3416949-1-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
LuBaolu authored and gregkh committed Jul 20, 2021
1 parent 948ec6d commit 7e6a4c3
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/iommu/intel/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -4483,14 +4483,13 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info)
iommu = info->iommu;
domain = info->domain;

if (info->dev) {
if (info->dev && !dev_is_real_dma_subdevice(info->dev)) {
if (dev_is_pci(info->dev) && sm_supported(iommu))
intel_pasid_tear_down_entry(iommu, info->dev,
PASID_RID2PASID, false);

iommu_disable_dev_iotlb(info);
if (!dev_is_real_dma_subdevice(info->dev))
domain_context_clear(info);
domain_context_clear(info);
intel_pasid_free_table(info->dev);
}

Expand Down

0 comments on commit 7e6a4c3

Please sign in to comment.