From: Jason Gunthorpe <jgg@nvidia.com>
To: acpica-devel@lists.linux.dev, Andy Gross <agross@kernel.org>,
Alim Akhtar <alim.akhtar@samsung.com>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>,
Bjorn Andersson <andersson@kernel.org>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
asahi@lists.linux.dev,
Baolin Wang <baolin.wang@linux.alibaba.com>,
devicetree@vger.kernel.org, Frank Rowand <frowand.list@gmail.com>,
Hanjun Guo <guohanjun@huawei.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
iommu@lists.linux.dev,
Jean-Philippe Brucker <jean-philippe@linaro.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Joerg Roedel <joro@8bytes.org>, Kees Cook <keescook@chromium.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Len Brown <lenb@kernel.org>,
linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org, linux-hardening@vger.kernel.org,
linux-mediatek@lists.infradead.org,
linux-rockchip@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev,
linux-tegra@vger.kernel.org,
Lorenzo Pieralisi <lpieralisi@kernel.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Hector Martin <marcan@marcan.st>,
Matthias Brugger <matthias.bgg@gmail.com>,
Orson Zhai <orsonzhai@gmail.com>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Rob Clark <robdclark@gmail.com>,
Robert Moore <robert.moore@intel.com>,
Rob Herring <robh+dt@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Samuel Holland <samuel@sholland.org>,
Sudeep Holla <sudeep.holla@arm.com>,
Sven Peter <sven@svenpeter.dev>,
Thierry Reding <thierry.reding@gmail.com>,
Krishna Reddy <vdumpa@nvidia.com>,
virtualization@lists.linux.dev, Chen-Yu Tsai <wens@csie.org>,
Will Deacon <will@kernel.org>, Yong Wu <yong.wu@mediatek.com>,
Chunyan Zhang <zhang.lyra@gmail.com>
Cc: "André Draszik" <andre.draszik@linaro.org>, patches@lists.linux.dev
Subject: [PATCH 14/30] iommu/exynos: Move to iommu_of_xlate()
Date: Wed, 29 Nov 2023 21:10:21 -0400 [thread overview]
Message-ID: <14-v1-f82a05539a64+5042-iommu_fwspec_p2_jgg@nvidia.com> (raw)
In-Reply-To: <0-v1-f82a05539a64+5042-iommu_fwspec_p2_jgg@nvidia.com>
exynos allocates a per-device struct in the of_xlate() that can point to
multiple instances of the iommu. It looks like each iommu instance can
point to only one device however.
Move the allocation of the per-device struct to the top of probe and use
iommu_of_xlate() to fill in the linked list. Rely on the core code to
locate the iommu.
Solve a few issues:
- A bus probe was failing by accident because the of_xlate not being
called left a NULL owner in the priv, and other code tended to free the
dev->iommu. iommu_of_xlate() will fail bus probe directly
- Missing validation that the node in the iommus instance is actually
pointing at this driver
- Don't leak the owner. It is allocated during probe, freed on probe
failure, and freed in release_device() on probe success. Previously it
would allocate it in of_xlate and leak it in some possible error flows.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
drivers/iommu/exynos-iommu.c | 79 +++++++++++++++++-------------------
1 file changed, 38 insertions(+), 41 deletions(-)
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index 2c6e9094f1e979..c301aa87fe0ff0 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -13,6 +13,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <linux/iommu.h>
+#include <linux/iommu-driver.h>
#include <linux/interrupt.h>
#include <linux/kmemleak.h>
#include <linux/list.h>
@@ -26,6 +27,9 @@ typedef u32 sysmmu_iova_t;
typedef u32 sysmmu_pte_t;
static struct iommu_domain exynos_identity_domain;
+static int exynos_iommu_of_xlate(struct iommu_device *iommu,
+ struct of_phandle_args *args, void *priv);
+
/* We do not consider super section mapping (16MB) */
#define SECT_ORDER 20
#define LPAGE_ORDER 16
@@ -168,8 +172,6 @@ static u32 lv2ent_offset(sysmmu_iova_t iova)
#define REG_V7_CAPA1 0x874
#define REG_V7_CTRL_VM 0x8000
-#define has_sysmmu(dev) (dev_iommu_priv_get(dev) != NULL)
-
static struct device *dma_dev;
static struct kmem_cache *lv2table_kmem_cache;
static sysmmu_pte_t *zero_lv2_table;
@@ -779,8 +781,6 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
if (ret)
return ret;
- platform_set_drvdata(pdev, data);
-
if (PG_ENT_SHIFT < 0) {
if (MMU_MAJ_VER(data->version) < 5) {
PG_ENT_SHIFT = SYSMMU_PG_ENT_SHIFT;
@@ -1393,15 +1393,29 @@ static phys_addr_t exynos_iommu_iova_to_phys(struct iommu_domain *iommu_domain,
return phys;
}
-static struct iommu_device *exynos_iommu_probe_device(struct device *dev)
+static struct iommu_device *
+exynos_iommu_probe_device(struct iommu_probe_info *pinf)
{
- struct exynos_iommu_owner *owner = dev_iommu_priv_get(dev);
+ struct exynos_iommu_owner *owner;
+ struct device *dev = pinf->dev;
struct sysmmu_drvdata *data;
+ int ret;
- if (!has_sysmmu(dev))
- return ERR_PTR(-ENODEV);
+ owner = kzalloc(sizeof(*owner), GFP_KERNEL);
+ if (!owner)
+ return ERR_PTR(-ENOMEM);
+
+ INIT_LIST_HEAD(&owner->controllers);
+ mutex_init(&owner->rpm_lock);
+ owner->domain = &exynos_identity_domain;
+
+ ret = iommu_of_xlate(pinf, &exynos_iommu_ops, -1,
+ &exynos_iommu_of_xlate, owner);
+ if (ret)
+ goto err_free;
list_for_each_entry(data, &owner->controllers, owner_node) {
+ data->master = dev;
/*
* SYSMMU will be runtime activated via device link
* (dependency) to its master device, so there are no
@@ -1412,11 +1426,17 @@ static struct iommu_device *exynos_iommu_probe_device(struct device *dev)
DL_FLAG_PM_RUNTIME);
}
- /* There is always at least one entry, see exynos_iommu_of_xlate() */
+ /* iommu_of_xlate() fails if there are no entries */
data = list_first_entry(&owner->controllers,
struct sysmmu_drvdata, owner_node);
+ dev_iommu_priv_set(dev, owner);
+
return &data->iommu;
+
+err_free:
+ kfree(owner);
+ return ERR_PTR(ret);
}
static void exynos_iommu_release_device(struct device *dev)
@@ -1430,42 +1450,19 @@ static void exynos_iommu_release_device(struct device *dev)
device_link_del(data->link);
}
-static int exynos_iommu_of_xlate(struct device *dev,
- struct of_phandle_args *spec)
+static int exynos_iommu_of_xlate(struct iommu_device *iommu,
+ struct of_phandle_args *args, void *priv)
{
- struct platform_device *sysmmu = of_find_device_by_node(spec->np);
- struct exynos_iommu_owner *owner = dev_iommu_priv_get(dev);
- struct sysmmu_drvdata *data, *entry;
-
- if (!sysmmu)
- return -ENODEV;
-
- data = platform_get_drvdata(sysmmu);
- if (!data) {
- put_device(&sysmmu->dev);
- return -ENODEV;
- }
-
- if (!owner) {
- owner = kzalloc(sizeof(*owner), GFP_KERNEL);
- if (!owner) {
- put_device(&sysmmu->dev);
- return -ENOMEM;
- }
-
- INIT_LIST_HEAD(&owner->controllers);
- mutex_init(&owner->rpm_lock);
- owner->domain = &exynos_identity_domain;
- dev_iommu_priv_set(dev, owner);
- }
+ struct sysmmu_drvdata *data =
+ container_of(iommu, struct sysmmu_drvdata, iommu);
+ struct exynos_iommu_owner *owner = priv;
+ struct sysmmu_drvdata *entry;
+ /* FIXME this relies on iommu_probe_device_lock */
list_for_each_entry(entry, &owner->controllers, owner_node)
if (entry == data)
return 0;
-
list_add_tail(&data->owner_node, &owner->controllers);
- data->master = dev;
-
return 0;
}
@@ -1473,10 +1470,10 @@ static const struct iommu_ops exynos_iommu_ops = {
.identity_domain = &exynos_identity_domain,
.domain_alloc_paging = exynos_iommu_domain_alloc_paging,
.device_group = generic_device_group,
- .probe_device = exynos_iommu_probe_device,
+ .probe_device_pinf = exynos_iommu_probe_device,
.release_device = exynos_iommu_release_device,
.pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,
- .of_xlate = exynos_iommu_of_xlate,
+ .of_xlate = iommu_dummy_of_xlate,
.default_domain_ops = &(const struct iommu_domain_ops) {
.attach_dev = exynos_iommu_attach_device,
.map_pages = exynos_iommu_map,
--
2.42.0
next prev parent reply other threads:[~2023-11-30 1:10 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-30 1:10 [PATCH 00/30] Make a new API for drivers to use to get their FW Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 01/30] iommu/of: Make a of_iommu_for_each_id() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 02/30] ACPI: VIOT: Make a viot_iommu_for_each_id() Jason Gunthorpe
2023-11-30 13:22 ` Rafael J. Wysocki
2023-11-30 1:10 ` [PATCH 03/30] ACPI: IORT: Make a iort_iommu_for_each_id() Jason Gunthorpe
2023-11-30 13:21 ` Rafael J. Wysocki
2023-11-30 1:10 ` [PATCH 04/30] ACPI: IORT: Remove fwspec from the reserved region code Jason Gunthorpe
2023-11-30 13:23 ` Rafael J. Wysocki
2023-11-30 1:10 ` [PATCH 05/30] iommu: Add iommu_probe_info Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 06/30] iommu: Make iommu_ops_from_fwnode() return the iommu_device Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 07/30] iommu/of: Call of_iommu_get_resv_regions() directly Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 08/30] iommu/of: Add iommu_of_get_single_iommu() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 09/30] iommu/rockchip: Move to iommu_of_get_single_iommu() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 10/30] iommu/sprd: " Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 11/30] iommu/sun50i: " Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 12/30] iommu/of: Add iommu_of_xlate() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 13/30] iommu/dart: Move to iommu_of_xlate() Jason Gunthorpe
2023-11-30 1:10 ` Jason Gunthorpe [this message]
2023-11-30 1:10 ` [PATCH 15/30] iommu/msm: " Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 16/30] iommu/tegra: Route tegra_dev_iommu_get_stream_id() through an op Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 17/30] iommu: Add iommu_fw_alloc_per_device_ids() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 18/30] iommu/tegra: Move to iommu_fw_alloc_per_device_ids() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 19/30] iommu/mtk: " Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 20/30] iommu/ipmmu-vmsa: " Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 21/30] iommu/mtk_v1: " Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 22/30] iommu/qcom: " Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 23/30] iommu/viot: Add iommu_viot_get_single_iommu() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 24/30] iommu/virtio: Move to iommu_fw_alloc_per_device_ids() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 25/30] iommu/iort: Add iommu_iort_get_single_iommu() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 26/30] iommu/arm-smmu-v3: Move to iommu_fw_alloc_per_device_ids() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 27/30] iommu/arm-smmu: Move to iommu_of_xlate() Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 28/30] iommu: Call all drivers if there is no fwspec Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 29/30] iommu: Check for EPROBE_DEFER using the new FW parsers Jason Gunthorpe
2023-11-30 1:10 ` [PATCH 30/30] iommu: Remove fwspec and related Jason Gunthorpe
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=14-v1-f82a05539a64+5042-iommu_fwspec_p2_jgg@nvidia.com \
--to=jgg@nvidia.com \
--cc=acpica-devel@lists.linux.dev \
--cc=agross@kernel.org \
--cc=alim.akhtar@samsung.com \
--cc=alyssa@rosenzweig.io \
--cc=andersson@kernel.org \
--cc=andre.draszik@linaro.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=asahi@lists.linux.dev \
--cc=baolin.wang@linux.alibaba.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=guohanjun@huawei.com \
--cc=gustavoars@kernel.org \
--cc=heiko@sntech.de \
--cc=iommu@lists.linux.dev \
--cc=jean-philippe@linaro.org \
--cc=jernej.skrabec@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--cc=keescook@chromium.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=linux-tegra@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=marcan@marcan.st \
--cc=matthias.bgg@gmail.com \
--cc=orsonzhai@gmail.com \
--cc=patches@lists.linux.dev \
--cc=rafael@kernel.org \
--cc=robdclark@gmail.com \
--cc=robert.moore@intel.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=samuel@sholland.org \
--cc=sudeep.holla@arm.com \
--cc=sven@svenpeter.dev \
--cc=thierry.reding@gmail.com \
--cc=vdumpa@nvidia.com \
--cc=virtualization@lists.linux.dev \
--cc=wens@csie.org \
--cc=will@kernel.org \
--cc=yong.wu@mediatek.com \
--cc=zhang.lyra@gmail.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 read-only IMAP folder(s) and NNTP newsgroup(s).