All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: gregkh@linuxfoundation.org
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 06/25] coresight: Add try_get_module() in coresight_grab_device()
Date: Mon, 28 Sep 2020 10:34:54 -0600	[thread overview]
Message-ID: <20200928163513.70169-7-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20200928163513.70169-1-mathieu.poirier@linaro.org>

From: Tingwei Zhang <tingwei@codeaurora.org>

When coresight device is in an active session, driver module of
that device should not be removed. Use try_get_module() in
coresight_grab_device() to prevent module to be unloaded.
Use get_device()/put_device() to protect device data
in the middle of active session.

Suggested-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
Tested-by: Mike Leach <mike.leach@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 drivers/hwtracing/coresight/coresight.c | 60 ++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index d1aea3a1e7b6..4faa4aa3964d 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -629,13 +629,45 @@ struct coresight_device *coresight_get_sink_by_id(u32 id)
 	return dev ? to_coresight_device(dev) : NULL;
 }
 
+/**
+ * coresight_get_ref- Helper function to increase reference count to module
+ * and device.
+ * Return true in successful case and power up the device.
+ * Return false when failed to get reference of module.
+ */
+static inline bool coresight_get_ref(struct coresight_device *csdev)
+{
+	struct device *dev = csdev->dev.parent;
+
+	/* Make sure the driver can't be removed */
+	if (!try_module_get(dev->driver->owner))
+		return false;
+	/* Make sure the device can't go away */
+	get_device(dev);
+	pm_runtime_get_sync(dev);
+	return true;
+}
+
+/**
+ * coresight_put_ref- Helper function to decrease reference count to module
+ * and device. Power off the device.
+ */
+static inline void coresight_put_ref(struct coresight_device *csdev)
+{
+	struct device *dev = csdev->dev.parent;
+
+	pm_runtime_put(dev);
+	put_device(dev);
+	module_put(dev->driver->owner);
+}
+
 /*
  * coresight_grab_device - Power up this device and any of the helper
  * devices connected to it for trace operation. Since the helper devices
  * don't appear on the trace path, they should be handled along with the
  * the master device.
  */
-static void coresight_grab_device(struct coresight_device *csdev)
+static int coresight_grab_device(struct coresight_device *csdev)
 {
 	int i;
 
@@ -644,9 +676,20 @@ static void coresight_grab_device(struct coresight_device *csdev)
 
 		child  = csdev->pdata->conns[i].child_dev;
 		if (child && child->type == CORESIGHT_DEV_TYPE_HELPER)
-			pm_runtime_get_sync(child->dev.parent);
+			if (!coresight_get_ref(child))
+				goto err;
+	}
+	if (coresight_get_ref(csdev))
+		return 0;
+err:
+	for (i--; i >= 0; i--) {
+		struct coresight_device *child;
+
+		child  = csdev->pdata->conns[i].child_dev;
+		if (child && child->type == CORESIGHT_DEV_TYPE_HELPER)
+			coresight_put_ref(child);
 	}
-	pm_runtime_get_sync(csdev->dev.parent);
+	return -ENODEV;
 }
 
 /*
@@ -657,13 +700,13 @@ static void coresight_drop_device(struct coresight_device *csdev)
 {
 	int i;
 
-	pm_runtime_put(csdev->dev.parent);
+	coresight_put_ref(csdev);
 	for (i = 0; i < csdev->pdata->nr_outport; i++) {
 		struct coresight_device *child;
 
 		child  = csdev->pdata->conns[i].child_dev;
 		if (child && child->type == CORESIGHT_DEV_TYPE_HELPER)
-			pm_runtime_put(child->dev.parent);
+			coresight_put_ref(child);
 	}
 }
 
@@ -682,7 +725,7 @@ static int _coresight_build_path(struct coresight_device *csdev,
 				 struct coresight_device *sink,
 				 struct list_head *path)
 {
-	int i;
+	int i, ret;
 	bool found = false;
 	struct coresight_node *node;
 
@@ -712,11 +755,14 @@ static int _coresight_build_path(struct coresight_device *csdev,
 	 * is tell the PM runtime core we need this element and add a node
 	 * for it.
 	 */
+	ret = coresight_grab_device(csdev);
+	if (ret)
+		return ret;
+
 	node = kzalloc(sizeof(struct coresight_node), GFP_KERNEL);
 	if (!node)
 		return -ENOMEM;
 
-	coresight_grab_device(csdev);
 	node->csdev = csdev;
 	list_add(&node->link, path);
 
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/25] coresight: Add try_get_module() in coresight_grab_device()
Date: Mon, 28 Sep 2020 10:34:54 -0600	[thread overview]
Message-ID: <20200928163513.70169-7-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20200928163513.70169-1-mathieu.poirier@linaro.org>

From: Tingwei Zhang <tingwei@codeaurora.org>

When coresight device is in an active session, driver module of
that device should not be removed. Use try_get_module() in
coresight_grab_device() to prevent module to be unloaded.
Use get_device()/put_device() to protect device data
in the middle of active session.

Suggested-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
Tested-by: Mike Leach <mike.leach@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 drivers/hwtracing/coresight/coresight.c | 60 ++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 7 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index d1aea3a1e7b6..4faa4aa3964d 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -629,13 +629,45 @@ struct coresight_device *coresight_get_sink_by_id(u32 id)
 	return dev ? to_coresight_device(dev) : NULL;
 }
 
+/**
+ * coresight_get_ref- Helper function to increase reference count to module
+ * and device.
+ * Return true in successful case and power up the device.
+ * Return false when failed to get reference of module.
+ */
+static inline bool coresight_get_ref(struct coresight_device *csdev)
+{
+	struct device *dev = csdev->dev.parent;
+
+	/* Make sure the driver can't be removed */
+	if (!try_module_get(dev->driver->owner))
+		return false;
+	/* Make sure the device can't go away */
+	get_device(dev);
+	pm_runtime_get_sync(dev);
+	return true;
+}
+
+/**
+ * coresight_put_ref- Helper function to decrease reference count to module
+ * and device. Power off the device.
+ */
+static inline void coresight_put_ref(struct coresight_device *csdev)
+{
+	struct device *dev = csdev->dev.parent;
+
+	pm_runtime_put(dev);
+	put_device(dev);
+	module_put(dev->driver->owner);
+}
+
 /*
  * coresight_grab_device - Power up this device and any of the helper
  * devices connected to it for trace operation. Since the helper devices
  * don't appear on the trace path, they should be handled along with the
  * the master device.
  */
-static void coresight_grab_device(struct coresight_device *csdev)
+static int coresight_grab_device(struct coresight_device *csdev)
 {
 	int i;
 
@@ -644,9 +676,20 @@ static void coresight_grab_device(struct coresight_device *csdev)
 
 		child  = csdev->pdata->conns[i].child_dev;
 		if (child && child->type == CORESIGHT_DEV_TYPE_HELPER)
-			pm_runtime_get_sync(child->dev.parent);
+			if (!coresight_get_ref(child))
+				goto err;
+	}
+	if (coresight_get_ref(csdev))
+		return 0;
+err:
+	for (i--; i >= 0; i--) {
+		struct coresight_device *child;
+
+		child  = csdev->pdata->conns[i].child_dev;
+		if (child && child->type == CORESIGHT_DEV_TYPE_HELPER)
+			coresight_put_ref(child);
 	}
-	pm_runtime_get_sync(csdev->dev.parent);
+	return -ENODEV;
 }
 
 /*
@@ -657,13 +700,13 @@ static void coresight_drop_device(struct coresight_device *csdev)
 {
 	int i;
 
-	pm_runtime_put(csdev->dev.parent);
+	coresight_put_ref(csdev);
 	for (i = 0; i < csdev->pdata->nr_outport; i++) {
 		struct coresight_device *child;
 
 		child  = csdev->pdata->conns[i].child_dev;
 		if (child && child->type == CORESIGHT_DEV_TYPE_HELPER)
-			pm_runtime_put(child->dev.parent);
+			coresight_put_ref(child);
 	}
 }
 
@@ -682,7 +725,7 @@ static int _coresight_build_path(struct coresight_device *csdev,
 				 struct coresight_device *sink,
 				 struct list_head *path)
 {
-	int i;
+	int i, ret;
 	bool found = false;
 	struct coresight_node *node;
 
@@ -712,11 +755,14 @@ static int _coresight_build_path(struct coresight_device *csdev,
 	 * is tell the PM runtime core we need this element and add a node
 	 * for it.
 	 */
+	ret = coresight_grab_device(csdev);
+	if (ret)
+		return ret;
+
 	node = kzalloc(sizeof(struct coresight_node), GFP_KERNEL);
 	if (!node)
 		return -ENOMEM;
 
-	coresight_grab_device(csdev);
 	node->csdev = csdev;
 	list_add(&node->link, path);
 
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-09-28 16:36 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-28 16:34 [PATCH 00/25] coresight: Next v5.9-rc7 Mathieu Poirier
2020-09-28 16:34 ` Mathieu Poirier
2020-09-28 16:34 ` [PATCH 01/25] coresight: cpu_debug: Add module name in Kconfig Mathieu Poirier
2020-09-28 16:34   ` Mathieu Poirier
2020-09-28 16:34 ` [PATCH 02/25] coresight: cpu_debug: Define MODULE_DEVICE_TABLE Mathieu Poirier
2020-09-28 16:34   ` Mathieu Poirier
2020-09-28 16:34 ` [PATCH 03/25] coresight: Use IS_ENABLED for CONFIGs that may be modules Mathieu Poirier
2020-09-28 16:34   ` Mathieu Poirier
2020-09-28 16:34 ` [PATCH 04/25] coresight: Add coresight prefix to barrier_pkt Mathieu Poirier
2020-09-28 16:34   ` Mathieu Poirier
2020-09-28 16:34 ` [PATCH 05/25] coresight: Export global symbols Mathieu Poirier
2020-09-28 16:34   ` Mathieu Poirier
2020-09-28 16:34 ` Mathieu Poirier [this message]
2020-09-28 16:34   ` [PATCH 06/25] coresight: Add try_get_module() in coresight_grab_device() Mathieu Poirier
2020-09-28 16:34 ` [PATCH 07/25] coresight: stm: Allow to build coresight-stm as a module Mathieu Poirier
2020-09-28 16:34   ` Mathieu Poirier
2020-09-28 16:34 ` [PATCH 08/25] coresight: etm: perf: Fix warning caused by etm_setup_aux failure Mathieu Poirier
2020-09-28 16:34   ` Mathieu Poirier
2020-09-28 16:34 ` [PATCH 09/25] coresight: etm3x: Allow etm3x to be built as a module Mathieu Poirier
2020-09-28 16:34   ` Mathieu Poirier
2020-09-28 16:34 ` [PATCH 10/25] coresight: etm4x: Allow etm4x " Mathieu Poirier
2020-09-28 16:34   ` Mathieu Poirier
2020-09-28 16:34 ` [PATCH 11/25] coresight: etb: Allow etb " Mathieu Poirier
2020-09-28 16:34   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 12/25] coresight: tpiu: Allow tpiu " Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 13/25] coresight: tmc: Allow tmc " Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 14/25] coresight: funnel: Allow funnel driver to be built as module Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 15/25] coresight: replicator: Allow replicator " Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 16/25] coresight: cti: Add function to register cti associate ops Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 17/25] coresight: cti: Fix remove sysfs link error Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 18/25] coresight: cti: Fix bug clearing sysfs links on callback Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 19/25] coresight: cti: Don't disable ect device if it's not enabled Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 20/25] coresight: cti: Increase reference count when enabling cti Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 21/25] coresight: cti: Allow cti to be built as a module Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 22/25] coresight: tmc-etr: Add function to register catu ops Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 23/25] coresight: catu: Allow catu drivers to be built as modules Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 24/25] coresight: core: Allow the coresight core driver to be built as a module Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier
2020-09-28 16:35 ` [PATCH 25/25] coresight: etm4x: Fix save and restore of TRCVMIDCCTLR1 register Mathieu Poirier
2020-09-28 16:35   ` Mathieu Poirier

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=20200928163513.70169-7-mathieu.poirier@linaro.org \
    --to=mathieu.poirier@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.