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 12/15] iommu: Add iommu_set_dev_dma_opt_size()
Date: Mon, 10 May 2021 22:17:26 +0800 [thread overview]
Message-ID: <1620656249-68890-13-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1620656249-68890-1-git-send-email-john.garry@huawei.com>
Add a function which allows the max optimised IOMMU DMA size to be set.
When set successfully, return -EPROBE_DEFER to inform the caller that the
device driver needs to be reprobed to take effect.
Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/iommu/iommu.c | 47 +++++++++++++++++++++++++++++++++++++++++++
include/linux/iommu.h | 7 +++++++
2 files changed, 54 insertions(+)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index bdb9aa47dfca..263d78e26c48 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -3058,6 +3058,53 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
}
EXPORT_SYMBOL_GPL(iommu_sva_get_pasid);
+int iommu_set_dev_dma_opt_size(struct device *dev, size_t size)
+{
+ struct iommu_group *group = iommu_group_get(dev);
+ struct group_device *grp_dev;
+ struct device *_dev;
+ int ret, group_count;
+
+ if (!group)
+ return 0;
+
+ mutex_lock(&group->mutex);
+
+ /*
+ * If already set, then ignore. We may have been set via sysfs, so
+ * honour that.
+ */
+ if (group->max_opt_dma_size) {
+ ret = 0;
+ goto out;
+ }
+
+ group_count = iommu_group_device_count(group);
+ if (group_count != 1) {
+ dev_err_ratelimited(dev, "Cannot change DMA opt size: Group has more than one device group_count=%d\n",
+ group_count);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ /* Since group has only one device */
+ grp_dev = list_first_entry(&group->devices, struct group_device, list);
+ _dev = grp_dev->dev;
+
+ if (_dev != dev) {
+ dev_err_ratelimited(dev, "Cannot set DMA max opt size - device has changed\n");
+ ret = -EBUSY;
+ goto out;
+ }
+
+ group->max_opt_dma_size = size;
+ ret = -EPROBE_DEFER;
+out:
+ mutex_unlock(&group->mutex);
+ iommu_group_put(group);
+ return ret;
+}
+
/*
* Changes the default domain of an iommu group that has *only* one device
*
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 6e187746af0f..36871e8ae636 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -428,6 +428,7 @@ extern void iommu_get_resv_regions(struct device *dev, struct list_head *list);
extern void iommu_put_resv_regions(struct device *dev, struct list_head *list);
extern void generic_iommu_put_resv_regions(struct device *dev,
struct list_head *list);
+extern int iommu_set_dev_dma_opt_size(struct device *dev, size_t size);
extern void iommu_set_default_passthrough(bool cmd_line);
extern void iommu_set_default_translated(bool cmd_line);
extern bool iommu_default_passthrough(void);
@@ -740,6 +741,12 @@ static inline int iommu_get_group_resv_regions(struct iommu_group *group,
return -ENODEV;
}
+static inline int iommu_set_dev_dma_opt_size(struct device *dev,
+ size_t size)
+{
+ return -ENODEV;
+}
+
static inline void iommu_set_default_passthrough(bool cmd_line)
{
}
--
2.26.2
next prev parent reply other threads:[~2021-05-10 14:25 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 ` [PATCH v2 08/15] dma-iommu: Add iommu_reconfig_dev_group_dma() John Garry
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 ` John Garry [this message]
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-13-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