From: "Tian, Kevin" <kevin.tian@intel.com>
To: Lu Baolu <baolu.lu@linux.intel.com>,
Joerg Roedel <joro@8bytes.org>,
"Raj, Ashok" <ashok.raj@intel.com>,
Christoph Hellwig <hch@infradead.org>,
"Jason Gunthorpe" <jgg@nvidia.com>
Cc: Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
"Liu, Yi L" <yi.l.liu@intel.com>,
"Pan, Jacob jun" <jacob.jun.pan@intel.com>,
"iommu@lists.linux-foundation.org"
<iommu@lists.linux-foundation.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v2 10/12] iommu/vt-d: Fold __dmar_remove_one_dev_info() into its caller
Date: Tue, 14 Jun 2022 07:07:12 +0000 [thread overview]
Message-ID: <BN9PR11MB527646793F6DFD18145A455D8CAA9@BN9PR11MB5276.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20220614025137.1632762-11-baolu.lu@linux.intel.com>
> From: Lu Baolu <baolu.lu@linux.intel.com>
> Sent: Tuesday, June 14, 2022 10:52 AM
>
> Fold __dmar_remove_one_dev_info() into dmar_remove_one_dev_info()
> which
> is its only caller. Make the spin lock critical range only cover the
> device list change code and remove some unnecessary checks.
>
> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
> ---
> drivers/iommu/intel/iommu.c | 34 +++++++++-------------------------
> 1 file changed, 9 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
> index af22690f44c8..8345e0c0824c 100644
> --- a/drivers/iommu/intel/iommu.c
> +++ b/drivers/iommu/intel/iommu.c
> @@ -295,7 +295,6 @@ static LIST_HEAD(dmar_satc_units);
> static int g_num_of_iommus;
>
> static void dmar_remove_one_dev_info(struct device *dev);
> -static void __dmar_remove_one_dev_info(struct device_domain_info *info);
>
> int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON);
> int intel_iommu_sm =
> IS_ENABLED(CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON);
> @@ -4141,20 +4140,14 @@ static void domain_context_clear(struct
> device_domain_info *info)
> &domain_context_clear_one_cb, info);
> }
>
> -static void __dmar_remove_one_dev_info(struct device_domain_info *info)
> +static void dmar_remove_one_dev_info(struct device *dev)
> {
> - struct dmar_domain *domain;
> - struct intel_iommu *iommu;
> -
> - assert_spin_locked(&device_domain_lock);
> -
> - if (WARN_ON(!info))
> - return;
> -
> - iommu = info->iommu;
> - domain = info->domain;
> + struct device_domain_info *info = dev_iommu_priv_get(dev);
> + struct dmar_domain *domain = info->domain;
this local variable is not required as there is just one reference
to info->domain.
btw I didn't see info->domain is cleared in this path. Is it correct?
> + struct intel_iommu *iommu = info->iommu;
> + unsigned long flags;
>
> - if (info->dev && !dev_is_real_dma_subdevice(info->dev)) {
> + if (!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);
> @@ -4164,20 +4157,11 @@ static void
> __dmar_remove_one_dev_info(struct device_domain_info *info)
> intel_pasid_free_table(info->dev);
> }
>
> - list_del(&info->link);
> - domain_detach_iommu(domain, iommu);
> -}
> -
> -static void dmar_remove_one_dev_info(struct device *dev)
> -{
> - struct device_domain_info *info;
> - unsigned long flags;
> -
> spin_lock_irqsave(&device_domain_lock, flags);
> - info = dev_iommu_priv_get(dev);
> - if (info)
> - __dmar_remove_one_dev_info(info);
> + list_del(&info->link);
> spin_unlock_irqrestore(&device_domain_lock, flags);
> +
> + domain_detach_iommu(domain, iommu);
> }
>
> static int md_domain_init(struct dmar_domain *domain, int guest_width)
> --
> 2.25.1
next prev parent reply other threads:[~2022-06-14 7:07 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 2:51 [PATCH v2 00/12] iommu/vt-d: Optimize the use of locks Lu Baolu
2022-06-14 2:51 ` [PATCH v2 01/12] iommu/vt-d: debugfs: Remove device_domain_lock usage Lu Baolu
2022-06-14 6:43 ` Tian, Kevin
2022-06-14 7:15 ` Baolu Lu
2022-06-15 1:53 ` Baolu Lu
2022-06-15 6:13 ` Tian, Kevin
2022-06-15 13:02 ` Baolu Lu
2022-06-14 2:51 ` [PATCH v2 02/12] iommu/vt-d: Remove for_each_device_domain() Lu Baolu
2022-06-14 2:51 ` [PATCH v2 03/12] iommu/vt-d: Remove clearing translation data in disable_dmar_iommu() Lu Baolu
2022-06-14 6:49 ` Tian, Kevin
2022-06-14 7:21 ` Baolu Lu
2022-06-15 6:22 ` Tian, Kevin
2022-06-15 13:10 ` Baolu Lu
2022-06-16 4:00 ` Tian, Kevin
2022-06-14 2:51 ` [PATCH v2 04/12] iommu/vt-d: Use pci_get_domain_bus_and_slot() in pgtable_walk() Lu Baolu
2022-06-14 2:51 ` [PATCH v2 05/12] iommu/vt-d: Unnecessary spinlock for root table alloc and free Lu Baolu
2022-06-14 2:51 ` [PATCH v2 06/12] iommu/vt-d: Acquiring lock in domain ID allocation helpers Lu Baolu
2022-06-14 6:52 ` Tian, Kevin
2022-06-14 7:22 ` Baolu Lu
2022-06-14 2:51 ` [PATCH v2 07/12] iommu/vt-d: Acquiring lock in pasid manipulation helpers Lu Baolu
2022-06-14 2:51 ` [PATCH v2 08/12] iommu/vt-d: Replace spin_lock_irqsave() with spin_lock() Lu Baolu
2022-06-14 6:56 ` Tian, Kevin
2022-06-14 2:51 ` [PATCH v2 09/12] iommu/vt-d: Check device list of domain in domain free path Lu Baolu
2022-06-14 6:57 ` Tian, Kevin
2022-06-14 2:51 ` [PATCH v2 10/12] iommu/vt-d: Fold __dmar_remove_one_dev_info() into its caller Lu Baolu
2022-06-14 7:07 ` Tian, Kevin [this message]
2022-06-14 7:44 ` Baolu Lu
2022-06-14 2:51 ` [PATCH v2 11/12] iommu/vt-d: Use device_domain_lock accurately Lu Baolu
2022-06-14 7:16 ` Tian, Kevin
2022-06-14 7:47 ` Baolu Lu
2022-06-14 2:51 ` [PATCH v2 12/12] iommu/vt-d: Convert global spinlock into per domain ones Lu Baolu
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=BN9PR11MB527646793F6DFD18145A455D8CAA9@BN9PR11MB5276.namprd11.prod.outlook.com \
--to=kevin.tian@intel.com \
--cc=ashok.raj@intel.com \
--cc=baolu.lu@linux.intel.com \
--cc=hch@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jacob.jun.pan@intel.com \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
--cc=yi.l.liu@intel.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).