From: Tingwei Zhang <tingweiz@codeaurora•org>
To: Mathieu Poirier <mathieu.poirier@linaro•org>
Cc: tsoni@codeaurora•org,
Sai Prakash Ranjan <saiprakash.ranjan@codeaurora•org>,
Kim Phillips <kim.phillips@arm•com>,
Mao Jinlong <jinlmao@codeaurora•org>,
Suzuki K Poulose <suzuki.poulose@arm•com>,
Alexander Shishkin <alexander.shishkin@linux•intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
coresight@lists•linaro.org, Randy Dunlap <rdunlap@infradead•org>,
Mian Yousaf Kaukab <ykaukab@suse•de>,
Russell King <linux@armlinux•org.uk>,
Tingwei Zhang <tingwei@codeaurora•org>,
Leo Yan <leo.yan@linaro•org>,
linux-arm-kernel@lists•infradead.org,
Mike Leach <mike.leach@linaro•org>
Subject: Re: [PATCH v8 06/24] coresight: add try_get_module() in coresight_grab_device()
Date: Thu, 13 Aug 2020 15:37:20 +0800 [thread overview]
Message-ID: <20200813073720.GA10706@codeaurora.org> (raw)
In-Reply-To: <20200812193612.GE3393195@xps15>
On Thu, Aug 13, 2020 at 03:36:12AM +0800, Mathieu Poirier wrote:
> On Fri, Aug 07, 2020 at 07:11:35PM +0800, Tingwei Zhang wrote:
> > 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.
> >
> > Signed-off-by: Tingwei Zhang <tingwei@codeaurora•org>
> > Tested-by: Mike Leach <mike.leach@linaro•org>
> > Suggested-by: Suzuki K Poulose <suzuki.poulose@arm•com>
> > ---
> > drivers/hwtracing/coresight/coresight.c | 61 ++++++++++++++++++++++---
> > 1 file changed, 54 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/hwtracing/coresight/coresight.c
> b/drivers/hwtracing/coresight/coresight.c
> > index b7151c5f81b1..0b0e31577b9b 100644
> > --- a/drivers/hwtracing/coresight/coresight.c
> > +++ b/drivers/hwtracing/coresight/coresight.c
> > @@ -634,13 +634,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;
> >
> > @@ -649,9 +681,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;
> > }
> >
> > /*
> > @@ -662,13 +705,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);
> > }
> > }
> >
> > @@ -687,7 +730,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;
> >
> > @@ -721,7 +764,11 @@ static int _coresight_build_path(struct
> coresight_device *csdev,
> > if (!node)
> > return -ENOMEM;
> >
> > - coresight_grab_device(csdev);
> > + ret = coresight_grab_device(csdev);
>
> I suggest trying to grab the device before allocating memory for the node.
> If
> grabing the device fails memory doesn't have to be allocated and released
> needlessly.
>
Agree. I'll fix in next revision.
Thanks,
Tingwei
> I will likely come back to this patch later after reviewing the rest the
> this
> set.
>
> Thanks,
> Mathieu
>
> > + if (ret) {
> > + kfree(node);
> > + return ret;
> > + }
> > node->csdev = csdev;
> > list_add(&node->link, path);
> >
> > --
> > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
> Forum,
> > a Linux Foundation Collaborative Project
> >
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-08-13 7:39 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-07 11:11 [PATCH v8 00/24] coresight: allow to build coresight as modules Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 01/24] coresight: cpu_debug: add module name in Kconfig Tingwei Zhang
2020-08-12 17:16 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 02/24] coresight: cpu_debug: define MODULE_DEVICE_TABLE Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 03/24] coresight: use IS_ENABLED for CONFIGs that may be modules Tingwei Zhang
2020-08-12 17:54 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 04/24] coresight: add coresight prefix to barrier_pkt Tingwei Zhang
2020-08-12 17:58 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 05/24] coresight: export global symbols Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 06/24] coresight: add try_get_module() in coresight_grab_device() Tingwei Zhang
2020-08-12 19:36 ` Mathieu Poirier
2020-08-13 7:37 ` Tingwei Zhang [this message]
2020-08-07 11:11 ` [PATCH v8 07/24] coresight: stm: allow to build coresight-stm as a module Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 08/24] coresight: etm: perf: Fix warning caused by etm_setup_aux failure Tingwei Zhang
2020-08-12 20:48 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 09/24] coresight: etm3x: allow etm3x to be built as a module Tingwei Zhang
2020-08-12 20:47 ` Mathieu Poirier
2020-08-13 2:16 ` Tingwei Zhang
2020-08-13 9:47 ` Suzuki K Poulose
2020-08-13 10:56 ` Tingwei Zhang
2020-08-13 17:00 ` Mathieu Poirier
2020-08-13 23:44 ` Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 10/24] coresight: etm4x: allow etm4x " Tingwei Zhang
2020-08-13 19:39 ` Mathieu Poirier
2020-08-13 23:46 ` Suzuki K Poulose
2020-08-14 9:52 ` Tingwei Zhang
2020-08-14 10:42 ` Suzuki K Poulose
2020-08-14 11:00 ` Tingwei Zhang
2020-08-14 11:18 ` Suzuki K Poulose
2020-08-13 19:40 ` Mathieu Poirier
2020-08-13 23:58 ` Tingwei Zhang
2020-08-13 19:45 ` Mathieu Poirier
2020-08-13 23:57 ` Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 11/24] coresight: etb: allow etb " Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 12/24] coresight: tpiu: allow tpiu " Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 13/24] coresight: tmc: allow tmc " Tingwei Zhang
2020-08-13 20:36 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 14/24] coresight: allow funnel driver to be built as module Tingwei Zhang
2020-08-13 20:15 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 15/24] coresight: allow replicator " Tingwei Zhang
2020-08-13 20:35 ` Mathieu Poirier
2020-08-14 0:08 ` Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 16/24] coresight: cti: add function to register cti associate ops Tingwei Zhang
2020-08-17 16:02 ` Mathieu Poirier
2020-08-17 18:49 ` Mike Leach
2020-08-18 17:16 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 17/24] coresight: cti: Fix remove sysfs link error Tingwei Zhang
2020-08-17 16:15 ` Mathieu Poirier
2020-08-17 22:48 ` Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 18/24] coresight: cti: Fix bug clearing sysfs links on callback Tingwei Zhang
2020-08-17 16:21 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 19/24] coresight: cti: don't disable ect device if it's not enabled Tingwei Zhang
2020-08-17 16:38 ` Mathieu Poirier
2020-08-17 19:04 ` Mike Leach
2020-08-18 17:39 ` Mathieu Poirier
2020-08-19 1:55 ` Tingwei Zhang
2020-08-19 19:50 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 20/24] coresight: cti: increase reference count when enabling cti Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 21/24] coresight: cti: allow cti to be built as a module Tingwei Zhang
2020-08-17 17:13 ` Mathieu Poirier
2020-08-17 19:14 ` Mike Leach
2020-08-18 17:42 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 22/24] coresight: tmc-etr: add function to register catu ops Tingwei Zhang
2020-08-07 11:11 ` [PATCH v8 23/24] coresight: catu: allow catu drivers to be built as modules Tingwei Zhang
2020-08-17 17:39 ` Mathieu Poirier
2020-08-07 11:11 ` [PATCH v8 24/24] coresight: allow the coresight core driver to be built as a module Tingwei Zhang
2020-08-17 17:47 ` Mathieu Poirier
2020-08-17 22:56 ` Tingwei Zhang
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=20200813073720.GA10706@codeaurora.org \
--to=tingweiz@codeaurora$(echo .)org \
--cc=alexander.shishkin@linux$(echo .)intel.com \
--cc=coresight@lists$(echo .)linaro.org \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jinlmao@codeaurora$(echo .)org \
--cc=kim.phillips@arm$(echo .)com \
--cc=leo.yan@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=mathieu.poirier@linaro$(echo .)org \
--cc=mike.leach@linaro$(echo .)org \
--cc=rdunlap@infradead$(echo .)org \
--cc=saiprakash.ranjan@codeaurora$(echo .)org \
--cc=suzuki.poulose@arm$(echo .)com \
--cc=tingwei@codeaurora$(echo .)org \
--cc=tsoni@codeaurora$(echo .)org \
--cc=ykaukab@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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