From: Jonathan Cameron <jic23@kernel.org>
To: "Nuno Sá" <nuno.sa@analog.com>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-rockchip@lists.infradead.org>,
<linux-amlogic@lists.infradead.org>, <linux-imx@nxp.com>,
<linux-iio@vger.kernel.org>, Chunyan Zhang <zhang.lyra@gmail.com>,
Michael Hennerich <Michael.Hennerich@analog.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Cixi Geng <cixi.geng1@unisoc.com>,
Kevin Hilman <khilman@baylibre.com>,
Vladimir Zapolskiy <vz@mleia.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Alexandru Ardelean <aardelean@deviqon.com>,
"Fabio Estevam" <festevam@gmail.com>,
Andriy Tryshnivskyy <andriy.tryshnivskyy@opensynergy.com>,
Haibo Chen <haibo.chen@nxp.com>,
"Shawn Guo" <shawnguo@kernel.org>,
Hans de Goede <hdegoede@redhat.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Jerome Brunet <jbrunet@baylibre.com>,
"Heiko Stuebner" <heiko@sntech.de>,
Florian Boor <florian.boor@kernelconcepts.de>,
Ciprian Regus <ciprian.regus@analog.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Neil Armstrong <narmstrong@baylibre.com>,
"Baolin Wang" <baolin.wang@linux.alibaba.com>,
Jyoti Bhayana <jbhayana@google.com>, Chen-Yu Tsai <wens@csie.org>,
Orson Zhai <orsonzhai@gmail.com>
Subject: Re: [PATCH 11/15] iio: common: scmi_iio: do not use internal iio_dev lock
Date: Sat, 24 Sep 2022 16:42:06 +0100 [thread overview]
Message-ID: <20220924164206.37a26d50@jic23-huawei> (raw)
In-Reply-To: <20220920112821.975359-12-nuno.sa@analog.com>
On Tue, 20 Sep 2022 13:28:17 +0200
Nuno Sá <nuno.sa@analog.com> wrote:
> The iio_device lock is only meant for internal use. Hence define a
> device local lock to protect against concurrent accesses.
>
> Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Ouch - this driver is fairly new and I missed that it was using mlock.
I guess this is a good example of why we need to finishing hiding it away!
Patch looks fine to me - I'll pick up in v2.
Jonathan
> ---
> drivers/iio/common/scmi_sensors/scmi_iio.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/common/scmi_sensors/scmi_iio.c b/drivers/iio/common/scmi_sensors/scmi_iio.c
> index 54ccf19ab2bb..d92f7f651f7b 100644
> --- a/drivers/iio/common/scmi_sensors/scmi_iio.c
> +++ b/drivers/iio/common/scmi_sensors/scmi_iio.c
> @@ -15,6 +15,7 @@
> #include <linux/kernel.h>
> #include <linux/kthread.h>
> #include <linux/module.h>
> +#include <linux/mutex.h>
> #include <linux/scmi_protocol.h>
> #include <linux/time.h>
> #include <linux/types.h>
> @@ -27,6 +28,8 @@ struct scmi_iio_priv {
> struct scmi_protocol_handle *ph;
> const struct scmi_sensor_info *sensor_info;
> struct iio_dev *indio_dev;
> + /* lock to protect against multiple access to the device */
> + struct mutex lock;
> /* adding one additional channel for timestamp */
> s64 iio_buf[SCMI_IIO_NUM_OF_AXIS + 1];
> struct notifier_block sensor_update_nb;
> @@ -198,13 +201,14 @@ static int scmi_iio_write_raw(struct iio_dev *iio_dev,
> struct iio_chan_spec const *chan, int val,
> int val2, long mask)
> {
> + struct scmi_iio_priv *sensor = iio_priv(iio_dev);
> int err;
>
> switch (mask) {
> case IIO_CHAN_INFO_SAMP_FREQ:
> - mutex_lock(&iio_dev->mlock);
> + mutex_lock(&sensor->lock);
> err = scmi_iio_set_odr_val(iio_dev, val, val2);
> - mutex_unlock(&iio_dev->mlock);
> + mutex_unlock(&sensor->lock);
> return err;
> default:
> return -EINVAL;
> @@ -586,6 +590,7 @@ scmi_alloc_iiodev(struct scmi_device *sdev,
> sensor->sensor_info = sensor_info;
> sensor->sensor_update_nb.notifier_call = scmi_iio_sensor_update_cb;
> sensor->indio_dev = iiodev;
> + mutex_init(&sensor->lock);
>
> /* adding one additional channel for timestamp */
> iiodev->num_channels = sensor_info->num_axis + 1;
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2022-09-24 15:44 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-20 11:28 [PATCH 00/15] Make 'mlock' really private Nuno Sá
2022-09-20 11:28 ` [PATCH 01/15] iio: adc: ad_sigma_delta: do not use internal iio_dev lock Nuno Sá
2022-09-20 11:54 ` Miquel Raynal
2022-09-24 14:22 ` Jonathan Cameron
2022-09-20 11:28 ` [PATCH 02/15] iio: adc: ad799x: " Nuno Sá
2022-09-24 14:45 ` Jonathan Cameron
2022-09-26 11:22 ` Nuno Sá
2022-09-20 11:28 ` [PATCH 03/15] iio: adc: axp288_adc: " Nuno Sá
2022-09-20 13:13 ` Andy Shevchenko
2022-09-20 13:18 ` Sa, Nuno
2022-09-20 13:37 ` Andy Shevchenko
2022-09-20 13:39 ` Andy Shevchenko
2022-09-20 13:46 ` Sa, Nuno
2022-09-20 15:12 ` Andy Shevchenko
2022-09-21 9:07 ` Nuno Sá
2022-09-24 15:23 ` Jonathan Cameron
2022-09-24 15:24 ` Jonathan Cameron
2022-09-20 11:28 ` [PATCH 04/15] iio: adc: imx7d_adc: " Nuno Sá
2022-09-24 15:26 ` Jonathan Cameron
2022-09-20 11:28 ` [PATCH 05/15] iio: adc: lpc32xx_adc: " Nuno Sá
2022-09-24 15:27 ` Jonathan Cameron
2022-09-20 11:28 ` [PATCH 06/15] iio: adc: ltc2947-core: " Nuno Sá
2022-09-20 11:28 ` [PATCH 07/15] iio: adc: meson_saradc: " Nuno Sá
2022-09-25 20:38 ` Martin Blumenstingl
2022-09-20 11:28 ` [PATCH 08/15] iio: adc: rockchip_saradc: " Nuno Sá
2022-09-20 11:28 ` [PATCH 09/15] iio: adc: sc27xx_adc: " Nuno Sá
2022-09-20 11:28 ` [PATCH 10/15] iio: adc: vf610_adc: " Nuno Sá
2022-09-24 15:37 ` Jonathan Cameron
2022-09-20 11:28 ` [PATCH 11/15] iio: common: scmi_iio: " Nuno Sá
2022-09-24 15:42 ` Jonathan Cameron [this message]
2022-09-20 11:28 ` [PATCH 12/15] iio: fyro: itg3200_core: " Nuno Sá
2022-09-24 15:43 ` Jonathan Cameron
2022-09-24 15:46 ` Jonathan Cameron
2022-09-20 11:28 ` [PATCH 13/15] iio: health: max30100: " Nuno Sá
2022-09-20 12:23 ` Miquel Raynal
2022-09-20 12:44 ` Sa, Nuno
2022-09-20 12:55 ` Miquel Raynal
2022-09-20 13:15 ` Sa, Nuno
2022-09-20 13:53 ` Miquel Raynal
2022-09-20 14:56 ` Nuno Sá
2022-09-20 15:10 ` Miquel Raynal
2022-09-24 15:53 ` Jonathan Cameron
2022-09-26 10:06 ` Nuno Sá
2022-10-02 11:03 ` Jonathan Cameron
2022-10-04 7:57 ` Nuno Sá
2022-09-20 11:28 ` [PATCH 14/15] iio: health: max30102: " Nuno Sá
2022-09-24 15:54 ` Jonathan Cameron
2022-09-30 10:04 ` Nuno Sá
2022-10-02 11:08 ` Jonathan Cameron
2022-10-04 7:53 ` Nuno Sá
2022-09-20 11:28 ` [PATCH 15/15] iio: core: move 'mlock' to 'struct iio_dev_opaque' Nuno Sá
2022-09-24 15:56 ` Jonathan Cameron
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=20220924164206.37a26d50@jic23-huawei \
--to=jic23@kernel.org \
--cc=Michael.Hennerich@analog.com \
--cc=aardelean@deviqon.com \
--cc=andriy.tryshnivskyy@opensynergy.com \
--cc=andy.shevchenko@gmail.com \
--cc=baolin.wang@linux.alibaba.com \
--cc=ciprian.regus@analog.com \
--cc=cixi.geng1@unisoc.com \
--cc=festevam@gmail.com \
--cc=florian.boor@kernelconcepts.de \
--cc=haibo.chen@nxp.com \
--cc=hdegoede@redhat.com \
--cc=heiko@sntech.de \
--cc=jbhayana@google.com \
--cc=jbrunet@baylibre.com \
--cc=kernel@pengutronix.de \
--cc=khilman@baylibre.com \
--cc=lars@metafoo.de \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-rockchip@lists.infradead.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=miquel.raynal@bootlin.com \
--cc=narmstrong@baylibre.com \
--cc=nuno.sa@analog.com \
--cc=orsonzhai@gmail.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=vz@mleia.com \
--cc=wens@csie.org \
--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 NNTP newsgroup(s).