From: "Kun(llfl)" <llfl@linux.alibaba.com>
To: Jiangbo Wu <jiangbo.wu@intel.com>
Cc: Xu Yu <xuyu@linux.alibaba.com>, Kun <llfl@linux.alibaba.com>,
Sanjay Kumar <sanjay.k.kumar@intel.com>,
stable@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH 05/19] iommu/vt-d: Global devTLB flush when present context entry changed
Date: Fri, 6 May 2022 20:00:43 +0800 [thread overview]
Message-ID: <20220506120057.77320-5-llfl@linux.alibaba.com> (raw)
In-Reply-To: <20220506120057.77320-1-llfl@linux.alibaba.com>
From: Sanjay Kumar <sanjay.k.kumar@intel.com>
ANBZ: #1105
commit 37764b952e1b39053defc7ebe5dcd8c4e3e78de9 upstream.
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: 7373a8cc38197 ("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>
Signed-off-by: Kun(llfl) <llfl@linux.alibaba.com>
---
drivers/iommu/intel/iommu.c | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index a5160d350f91..1a0027da6dad 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -2527,10 +2527,11 @@ static inline int domain_pfn_mapping(struct dmar_domain *domain, unsigned long i
return domain_mapping(domain, iov_pfn, NULL, phys_pfn, nr_pages, prot);
}
-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)
@@ -2542,7 +2543,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);
@@ -2560,6 +2570,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)
@@ -5079,9 +5091,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;
}
@@ -5091,12 +5103,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)
@@ -5120,7 +5133,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);
}
--
2.32.0 (Apple Git-132)
next parent reply other threads:[~2022-05-06 12:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220506120057.77320-1-llfl@linux.alibaba.com>
2022-05-06 12:00 ` Kun(llfl) [this message]
2022-05-06 14:52 ` [PATCH 05/19] iommu/vt-d: Global devTLB flush when present context entry changed Greg KH
[not found] ` <2fa72980-d94f-3257-1ea4-5ff9c77f8b59@linux.alibaba.com>
2022-05-07 11:29 ` Greg KH
2022-05-06 12:00 ` [PATCH 06/19] iommu/vt-d: Fix clearing real DMA device's scalable-mode context entries Kun(llfl)
2022-05-06 14:52 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220506120057.77320-5-llfl@linux.alibaba.com \
--to=llfl@linux.alibaba.com \
--cc=baolu.lu@linux.intel.com \
--cc=jiangbo.wu@intel.com \
--cc=sanjay.k.kumar@intel.com \
--cc=stable@vger.kernel.org \
--cc=xuyu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).