From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>
Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 16/25] iommu/vt-d: Check device list of domain in domain free path
Date: Tue, 12 Jul 2022 08:08:59 +0800 [thread overview]
Message-ID: <20220712000908.3431936-17-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20220712000908.3431936-1-baolu.lu@linux.intel.com>
When the IOMMU domain is about to be freed, it should not be set on any
device. Instead of silently dealing with some bug cases, it's better to
trigger a warning to report and fix any potential bugs at the first time.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Link: https://lore.kernel.org/r/20220706025524.2904370-9-baolu.lu@linux.intel.com
---
drivers/iommu/intel/iommu.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 3d53de8c7634..a94fb69e1f9a 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -294,7 +294,6 @@ static LIST_HEAD(dmar_satc_units);
/* bitmap for indexing intel_iommus */
static int g_num_of_iommus;
-static void domain_remove_dev_info(struct dmar_domain *domain);
static void dmar_remove_one_dev_info(struct device *dev);
static void __dmar_remove_one_dev_info(struct device_domain_info *info);
@@ -1841,10 +1840,6 @@ static inline int guestwidth_to_adjustwidth(int gaw)
static void domain_exit(struct dmar_domain *domain)
{
-
- /* Remove associated devices and clear attached or cached domains */
- domain_remove_dev_info(domain);
-
if (domain->pgd) {
LIST_HEAD(freelist);
@@ -1852,6 +1847,9 @@ static void domain_exit(struct dmar_domain *domain)
put_pages_list(&freelist);
}
+ if (WARN_ON(!list_empty(&domain->devices)))
+ return;
+
kfree(domain);
}
@@ -2333,16 +2331,6 @@ static void domain_context_clear_one(struct device_domain_info *info, u8 bus, u8
__iommu_flush_dev_iotlb(info, 0, MAX_AGAW_PFN_WIDTH);
}
-static void domain_remove_dev_info(struct dmar_domain *domain)
-{
- struct device_domain_info *info, *tmp;
-
- spin_lock(&device_domain_lock);
- list_for_each_entry_safe(info, tmp, &domain->devices, link)
- __dmar_remove_one_dev_info(info);
- spin_unlock(&device_domain_lock);
-}
-
static int domain_setup_first_level(struct intel_iommu *iommu,
struct dmar_domain *domain,
struct device *dev,
--
2.25.1
next prev parent reply other threads:[~2022-07-12 0:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-12 0:08 [PATCH 00/25] [PULL REQUEST] Intel IOMMU updates for Linux v5.20 Lu Baolu
2022-07-12 0:08 ` [PATCH 01/25] iommu/vt-d: Move trace/events/intel_iommu.h under iommu Lu Baolu
2022-07-12 0:08 ` [PATCH 02/25] agp/intel: Use per device iommu check Lu Baolu
2022-07-12 0:08 ` [PATCH 03/25] iommu/vt-d: Remove unnecessary exported symbol Lu Baolu
2022-07-12 0:08 ` [PATCH 04/25] drm/i915: Remove unnecessary include Lu Baolu
2022-07-12 0:08 ` [PATCH 05/25] KVM: x86: " Lu Baolu
2022-07-12 0:08 ` [PATCH 06/25] x86/boot/tboot: Move tboot_force_iommu() to Intel IOMMU Lu Baolu
2022-07-12 0:08 ` [PATCH 07/25] iommu/vt-d: Move include/linux/intel-iommu.h under iommu Lu Baolu
2022-07-12 0:08 ` [PATCH 08/25] iommu/vt-d: Remove unused iovad from dmar_domain Lu Baolu
2022-07-12 0:08 ` [PATCH 09/25] iommu/vt-d: debugfs: Remove device_domain_lock usage Lu Baolu
2022-07-12 0:08 ` [PATCH 10/25] iommu/vt-d: Remove clearing translation data in disable_dmar_iommu() Lu Baolu
2022-07-12 0:08 ` [PATCH 11/25] iommu/vt-d: Use pci_get_domain_bus_and_slot() in pgtable_walk() Lu Baolu
2022-07-12 0:08 ` [PATCH 12/25] iommu/vt-d: Unnecessary spinlock for root table alloc and free Lu Baolu
2022-07-12 0:08 ` [PATCH 13/25] iommu/vt-d: Replace spin_lock_irqsave() with spin_lock() Lu Baolu
2022-07-12 0:08 ` [PATCH 14/25] iommu/vt-d: Acquiring lock in domain ID allocation helpers Lu Baolu
2022-07-12 0:08 ` [PATCH 15/25] iommu/vt-d: Acquiring lock in pasid manipulation helpers Lu Baolu
2022-07-12 0:08 ` Lu Baolu [this message]
2022-07-12 0:09 ` [PATCH 17/25] iommu/vt-d: Fold __dmar_remove_one_dev_info() into its caller Lu Baolu
2022-07-12 0:09 ` [PATCH 18/25] iommu/vt-d: Use device_domain_lock accurately Lu Baolu
2022-07-12 0:09 ` [PATCH 19/25] iommu/vt-d: Convert global spinlock into per domain lock Lu Baolu
2022-07-12 0:09 ` [PATCH 20/25] iommu/vt-d: Remove unused domain_get_iommu() Lu Baolu
2022-07-12 0:09 ` [PATCH 21/25] iommu/vt-d: Use IDA interface to manage iommu sequence id Lu Baolu
2022-07-12 0:09 ` [PATCH 22/25] iommu/vt-d: Refactor iommu information of each domain Lu Baolu
2022-07-12 0:09 ` [PATCH 23/25] iommu/vt-d: Remove unnecessary check in intel_iommu_add() Lu Baolu
2022-07-12 0:09 ` [PATCH 24/25] iommu/vt-d: Remove global g_iommus array Lu Baolu
2022-07-12 0:09 ` [PATCH 25/25] iommu/vt-d: Make DMAR_UNITS_SUPPORTED default 1024 Lu Baolu
2022-07-15 8:22 ` [PATCH 00/25] [PULL REQUEST] Intel IOMMU updates for Linux v5.20 Joerg Roedel
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=20220712000908.3431936-17-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.