From: Sachin Parekh <sachinparekh@google.com>
To: gregkh@linuxfoundation.org, rafael@kernel.org, will@kernel.org,
robin.murphy@arm.com
Cc: sachinparekh@google.com, lokeshvutla@google.com,
linux-kernel@vger.kernel.org, iommu@lists.linux.dev
Subject: [RFC PATCH] driver core: platform: Call iommu_release_device in dma_cleanup
Date: Thu, 29 Aug 2024 12:05:04 +0000 [thread overview]
Message-ID: <20240829120504.2976612-1-sachinparekh@google.com> (raw)
Installing a kernel module that has an iommu node in its
device tree increments corresponding iommu kernel module
reference count during driver_register.
Removing the same kernel module doesn't decrement the
iommu reference count resulting in error while
removing the iommu kernel module
$ modprobe arm-smmu-v3
$ modprobe test_module
$ modprobe -r test_module
$ modprobe -r arm-smmu-v3
modprobe: can't unload module arm_smmu_v3: Resource temporarily unavailable
Cause:
platform_driver_register
...
-> platform_dma_configure
...
-> iommu_probe_device (Increments reference count)
platform_driver_unregister
...
-> platform_dma_cleanup
...
-> No corresponding iommu_release_device call
Fix:
Call iommu_release_device in platform_dma_cleanup to remove the
iommu from the corresponding kernel module
Signed-off-by: Sachin Parekh <sachinparekh@google.com>
---
drivers/base/platform.c | 3 +++
drivers/iommu/iommu.c | 3 +--
include/linux/iommu.h | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 4c3ee6521ba5..c8125325a5e9 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1467,6 +1467,9 @@ static void platform_dma_cleanup(struct device *dev)
if (!drv->driver_managed_dma)
iommu_device_unuse_default_domain(dev);
+
+ if (dev_of_node(dev))
+ iommu_release_device(dev);
}
static const struct dev_pm_ops platform_dev_pm_ops = {
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index ed6c5cb60c5a..495f548fd4b9 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -92,7 +92,6 @@ static const char * const iommu_group_resv_type_string[] = {
static int iommu_bus_notifier(struct notifier_block *nb,
unsigned long action, void *data);
-static void iommu_release_device(struct device *dev);
static struct iommu_domain *
__iommu_group_domain_alloc(struct iommu_group *group, unsigned int type);
static int __iommu_attach_device(struct iommu_domain *domain,
@@ -663,7 +662,7 @@ static void __iommu_group_remove_device(struct device *dev)
iommu_group_put(group);
}
-static void iommu_release_device(struct device *dev)
+void iommu_release_device(struct device *dev)
{
struct iommu_group *group = dev->iommu_group;
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 04cbdae0052e..2f9cb7d9dadf 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -1049,6 +1049,7 @@ void dev_iommu_priv_set(struct device *dev, void *priv);
extern struct mutex iommu_probe_device_lock;
int iommu_probe_device(struct device *dev);
+void iommu_release_device(struct device *dev);
int iommu_dev_enable_feature(struct device *dev, enum iommu_dev_features f);
int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features f);
--
2.46.0.295.g3b9ea8a38a-goog
next reply other threads:[~2024-08-29 12:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-29 12:05 Sachin Parekh [this message]
2024-08-29 13:52 ` Greg KH
2024-09-02 6:44 ` Sachin Parekh
2024-08-29 13:58 ` Robin Murphy
2024-09-02 6:17 ` Sachin Parekh
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=20240829120504.2976612-1-sachinparekh@google.com \
--to=sachinparekh@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=iommu@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=lokeshvutla@google.com \
--cc=rafael@kernel.org \
--cc=robin.murphy@arm.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
all inboxes | Powered by JetHome®