Skip to content

Commit

Permalink
iommu/vt-d: Global devTLB flush when present context entry changed
Browse files Browse the repository at this point in the history
This fixes a bug in context cache clear operation. The code was not
following the correct invalidation flow. A global device TLB invalidation
should be added after the IOTLB invalidation. At the same time, it
uses the domain ID from the context entry. But in scalable mode, the
domain ID is in PASID table entry, not context entry.

Fixes: 7373a8c ("iommu/vt-d: Setup context and enable RID2PASID support")
Cc: stable@vger.kernel.org # v5.0+
Signed-off-by: Sanjay Kumar <sanjay.k.kumar@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20210712071315.3416543-1-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
skuma24 authored and joergroedel committed Jul 14, 2021
1 parent ce36c94 commit 37764b9
Showing 1 changed file with 22 additions and 9 deletions.
31 changes: 22 additions & 9 deletions drivers/iommu/intel/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -2429,10 +2429,11 @@ __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,
return 0;
}

static void domain_context_clear_one(struct intel_iommu *iommu, u8 bus, u8 devfn)
static void domain_context_clear_one(struct device_domain_info *info, u8 bus, u8 devfn)
{
unsigned long flags;
struct intel_iommu *iommu = info->iommu;
struct context_entry *context;
unsigned long flags;
u16 did_old;

if (!iommu)
Expand All @@ -2444,7 +2445,16 @@ static void domain_context_clear_one(struct intel_iommu *iommu, u8 bus, u8 devfn
spin_unlock_irqrestore(&iommu->lock, flags);
return;
}
did_old = context_domain_id(context);

if (sm_supported(iommu)) {
if (hw_pass_through && domain_type_is_si(info->domain))
did_old = FLPT_DEFAULT_DID;
else
did_old = info->domain->iommu_did[iommu->seq_id];
} else {
did_old = context_domain_id(context);
}

context_clear_entry(context);
__iommu_flush_cache(iommu, context, sizeof(*context));
spin_unlock_irqrestore(&iommu->lock, flags);
Expand All @@ -2462,6 +2472,8 @@ static void domain_context_clear_one(struct intel_iommu *iommu, u8 bus, u8 devfn
0,
0,
DMA_TLB_DSI_FLUSH);

__iommu_flush_dev_iotlb(info, 0, MAX_AGAW_PFN_WIDTH);
}

static inline void unlink_domain_info(struct device_domain_info *info)
Expand Down Expand Up @@ -4425,9 +4437,9 @@ int __init intel_iommu_init(void)

static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *opaque)
{
struct intel_iommu *iommu = opaque;
struct device_domain_info *info = opaque;

domain_context_clear_one(iommu, PCI_BUS_NUM(alias), alias & 0xff);
domain_context_clear_one(info, PCI_BUS_NUM(alias), alias & 0xff);
return 0;
}

Expand All @@ -4437,12 +4449,13 @@ static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *op
* devices, unbinding the driver from any one of them will possibly leave
* the others unable to operate.
*/
static void domain_context_clear(struct intel_iommu *iommu, struct device *dev)
static void domain_context_clear(struct device_domain_info *info)
{
if (!iommu || !dev || !dev_is_pci(dev))
if (!info->iommu || !info->dev || !dev_is_pci(info->dev))
return;

pci_for_each_dma_alias(to_pci_dev(dev), &domain_context_clear_one_cb, iommu);
pci_for_each_dma_alias(to_pci_dev(info->dev),
&domain_context_clear_one_cb, info);
}

static void __dmar_remove_one_dev_info(struct device_domain_info *info)
Expand All @@ -4466,7 +4479,7 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info)

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

Expand Down

0 comments on commit 37764b9

Please sign in to comment.