linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Garry <john.garry@huawei.com>
To: <joro@8bytes.org>, <will@kernel.org>, <robin.murphy@arm.com>,
	<hch@lst.de>, <m.szyprowski@samsung.com>
Cc: <iommu@lists.linux-foundation.org>, <baolu.lu@linux.intel.com>,
	<linux-kernel@vger.kernel.org>, <linux-scsi@vger.kernel.org>,
	<linuxarm@huawei.com>, <sai.praneeth.prakhya@intel.com>,
	John Garry <john.garry@huawei.com>
Subject: [PATCH v2 08/15] dma-iommu: Add iommu_reconfig_dev_group_dma()
Date: Mon, 10 May 2021 22:17:22 +0800	[thread overview]
Message-ID: <1620656249-68890-9-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1620656249-68890-1-git-send-email-john.garry@huawei.com>

Add a function to reconfigure the IOMMU group for a device, if necessary.

IOVAs are cached in power-of-2 granules, so there is no point in allocating
a new IOMMU domain if the current range is suitable.

Signed-off-by: John Garry <john.garry@huawei.com>
---
 drivers/iommu/dma-iommu.c | 25 +++++++++++++++++++++++++
 include/linux/dma-iommu.h |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index f6d3302bb829..4fb82c554ede 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -315,6 +315,31 @@ static bool dev_is_untrusted(struct device *dev)
 	return dev_is_pci(dev) && to_pci_dev(dev)->untrusted;
 }
 
+void iommu_reconfig_dev_group_dma(struct device *dev)
+{
+	struct iommu_domain *domain = iommu_get_domain_for_dev(dev);
+	struct iommu_dma_cookie *cookie = domain->iova_cookie;
+	unsigned long shift, iova_len;
+	struct iova_domain *iovad;
+	size_t max_opt_dma_size;
+
+	if (!cookie || cookie->type != IOMMU_DMA_IOVA_COOKIE)
+		return;
+
+	max_opt_dma_size = iommu_group_get_max_opt_dma_size(dev->iommu_group);
+	if (!max_opt_dma_size)
+		return;
+
+	iovad = &cookie->iovad;
+	shift = iova_shift(iovad);
+	iova_len = max_opt_dma_size >> shift;
+
+	if (iova_domain_len_is_cached(iovad, iova_len))
+		return;
+
+	iommu_realloc_dev_group(dev);
+}
+
 /**
  * iommu_dma_init_domain - Initialise a DMA mapping domain
  * @domain: IOMMU domain previously prepared by iommu_get_dma_cookie()
diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h
index 6e75a2d689b4..097398b76dcc 100644
--- a/include/linux/dma-iommu.h
+++ b/include/linux/dma-iommu.h
@@ -20,6 +20,7 @@ void iommu_put_dma_cookie(struct iommu_domain *domain);
 
 /* Setup call for arch DMA mapping code */
 void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size);
+void iommu_reconfig_dev_group_dma(struct device *dev);
 
 /* The DMA API isn't _quite_ the whole story, though... */
 /*
@@ -53,6 +54,9 @@ static inline void iommu_setup_dma_ops(struct device *dev, u64 dma_base,
 		u64 size)
 {
 }
+static inline void iommu_reconfig_dev_group_dma(struct device *dev)
+{
+}
 
 static inline int iommu_get_dma_cookie(struct iommu_domain *domain)
 {
-- 
2.26.2


  parent reply	other threads:[~2021-05-10 14:30 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-10 14:17 [PATCH v2 00/15] dma mapping/iommu: Allow IOMMU IOVA rcache range to be configured John Garry
2021-05-10 14:17 ` [PATCH v2 01/15] iommu: Reactor iommu_group_store_type() John Garry
2021-05-10 14:17 ` [PATCH v2 02/15] iova: Allow rcache range upper limit to be flexible John Garry
2021-05-10 14:17 ` [PATCH v2 03/15] iommu: Allow max opt DMA len be set for a group via sysfs John Garry
2021-05-10 14:17 ` [PATCH v2 04/15] iommu: Add iommu_group_get_max_opt_dma_size() John Garry
2021-05-10 14:17 ` [PATCH v2 05/15] iova: Add iova_domain_len_is_cached() John Garry
2021-05-10 14:17 ` [PATCH v2 06/15] iommu: Allow iommu_change_dev_def_domain() realloc default domain for same type John Garry
2021-05-10 14:17 ` [PATCH v2 07/15] iommu: Add iommu_realloc_dev_group() John Garry
2021-05-10 14:17 ` John Garry [this message]
2021-05-10 14:17 ` [PATCH v2 09/15] iova: Add init_iova_domain_ext() John Garry
2021-05-10 17:50   ` kernel test robot
2021-05-10 17:50   ` [RFC PATCH] iova: __init_iova_domain can be static kernel test robot
2021-05-10 14:17 ` [PATCH v2 10/15] dma-iommu: Use init_iova_domain_ext() for IOVA domain init John Garry
2021-05-10 14:17 ` [PATCH v2 11/15] dma-iommu: Reconfig group domain John Garry
2021-05-10 14:17 ` [PATCH v2 12/15] iommu: Add iommu_set_dev_dma_opt_size() John Garry
2021-05-10 14:17 ` [PATCH v2 13/15] dma-mapping: Add dma_set_max_opt_size() John Garry
2021-05-10 14:17 ` [PATCH v2 14/15] dma-iommu: Add iommu_dma_set_opt_size() John Garry
2021-05-10 14:17 ` [PATCH v2 15/15] scsi: hisi_sas: Set max optimal DMA size for v3 hw John Garry
2021-05-20  8:28 ` [PATCH v2 00/15] dma mapping/iommu: Allow IOMMU IOVA rcache range to be configured John Garry

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=1620656249-68890-9-git-send-email-john.garry@huawei.com \
    --to=john.garry@huawei.com \
    --cc=baolu.lu@linux.intel.com \
    --cc=hch@lst.de \
    --cc=iommu@lists.linux-foundation.org \
    --cc=joro@8bytes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=m.szyprowski@samsung.com \
    --cc=robin.murphy@arm.com \
    --cc=sai.praneeth.prakhya@intel.com \
    --cc=will@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 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).