From: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>
To: Yaohan Li <shunsheng1218@gmail.com>
Cc: rafael@kernel.org, daniel.lezcano@kernel.org,
rui.zhang@intel.com, lukasz.luba@arm.com,
geert+renesas@glider.be, magnus.damm@gmail.com,
linux-renesas-soc@vger.kernel.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org, edubezval@gmail.com
Subject: Re: [PATCH v2] thermal/drivers/rcar_thermal: disable the work before masking the interrupt
Date: Thu, 19 Nov 2026 07:22:03 +0100 [thread overview]
Message-ID: <20261119062203.GC2300348@ragnatech.se> (raw)
In-Reply-To: <20261119022903.1493494-1-shunsheng1218@gmail.com>
Hi Yaohan,
Thanks for your work.
On 2026-11-19 10:29:03 +0800, Yaohan Li wrote:
> rcar_thermal_remove() masks the interrupt sources and then cancels the
> delayed work of each sensor. rcar_thermal_irq() drops common->lock before
> it walks the sensors and queues priv->work for those whose status changed,
> so a handler that read the status before the mask was written can still
> queue the work after cancel_delayed_work_sync() has returned. The work
> then runs after ->remove() has finished and devres has freed common, priv
> and the thermal zone.
>
> Waiting for the handler alone is not enough either: rcar_thermal_work()
> re-enables its interrupt source once it has updated the temperature, so a
> work that is still running when the removal starts undoes the mask that
> ->remove() has just written.
>
> Disable the work before the source is masked. That makes the
> queue_delayed_work() calls in rcar_thermal_irq() no-ops and guarantees
> that the re-enable in rcar_thermal_work() has already happened, so the
> mask that follows cannot be undone.
>
> The interrupt line is shared, so waiting for the handler once does not keep
> it from running again later; unregister it in ->remove() instead of only
> calling synchronize_irq(). devm_free_irq() waits for a handler that is
> running right now as well, and the slot is marked unused so that the probe
> failure path, which also ends here, cannot release it twice.
>
> Every sensor that the removal walks has been through INIT_DELAYED_WORK()
> before it is linked into common->head, so no uninitialised work is touched.
> The interrupt numbers are recorded in an array whose unused slots stay
> negative, instead of being counted separately.
>
> Fixes: 697ee786f15d ("thermal: rcar_thermal: Prevent doing work after unbind")
> Signed-off-by: Yaohan Li <shunsheng1218@gmail.com>
>
> ---
> Prepared against v7.4-rc1-1969-g666539eecdf4.
>
> Compile tested only: arm64, aarch64-linux-gnu-gcc 11.4, CONFIG_RCAR_THERMAL=y.
> No hardware was available, so the removal path was not exercised and no race
> injection was run.
Ohh, could you test this please. It's a rather large change and while it
looks correct it could behave differently then expected.
>
> AI assistance: prepared with Claude (Anthropic) as a coding assistant; the
> author reviewed the reasoning and takes responsibility for the content.
>
> Changes in v2:
> - Drop the shutdown flag and the separate IRQ count. Niklas asked for less
> state, so the removal now disables the delayed work before the source is
> masked and unregisters the shared IRQ instead of waiting for it once.
> - Keep the interrupt numbers in an array whose unused slots stay negative.
> ---
> drivers/thermal/renesas/rcar_thermal.c | 37 ++++++++++++++++++++++++--
> 1 file changed, 35 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/thermal/renesas/rcar_thermal.c b/drivers/thermal/renesas/rcar_thermal.c
> index af6d09a75bb6..3310ed4a8bda 100644
> --- a/drivers/thermal/renesas/rcar_thermal.c
> +++ b/drivers/thermal/renesas/rcar_thermal.c
> @@ -39,11 +39,15 @@
> /* THSSR */
> #define CTEMP 0x3f
>
> +/* .nirqs of every supported chip is at most this */
.nirqs is not really needed here. Just say something along the line of
max number of supported interrupts or some such.
> +#define RCAR_THERMAL_MAX_IRQ 2
> +
> struct rcar_thermal_common {
> void __iomem *base;
> struct device *dev;
> struct list_head head;
> spinlock_t lock;
> + int irqs[RCAR_THERMAL_MAX_IRQ];
> };
>
> struct rcar_thermal_chip {
> @@ -376,10 +380,34 @@ static void rcar_thermal_remove(struct platform_device *pdev)
> struct rcar_thermal_common *common = platform_get_drvdata(pdev);
> struct device *dev = &pdev->dev;
> struct rcar_thermal_priv *priv;
> + int i;
unsigned.
>
> - rcar_thermal_for_each_priv(priv, common) {
> + /*
> + * Stop the work from being queued again and wait for a running one to
> + * finish before the interrupt source is masked: rcar_thermal_work()
> + * re-enables its source when it is done, so it has to be gone before
> + * the source is disabled for good.
I think you can make this less verbose and more to the point.
> + */
> + rcar_thermal_for_each_priv(priv, common)
> + disable_delayed_work_sync(&priv->work);
> +
> + rcar_thermal_for_each_priv(priv, common)
> rcar_thermal_irq_disable(priv);
> - cancel_delayed_work_sync(&priv->work);
> +
> + /*
> + * The handler is shared, so waiting for it once is not enough: another
> + * user of the line can invoke it again after that, when the zones and
line?
> + * the sensors it walks are already gone. Unregister it here; that
> + * waits for a handler that is running right now as well.
I don't understand this.
> + */
> + for (i = 0; i < RCAR_THERMAL_MAX_IRQ; i++) {
Please declare the loop variable in the for () statement to reduce
scope.
> + if (common->irqs[i] < 0)
> + continue;
> + devm_free_irq(dev, common->irqs[i], common);
> + common->irqs[i] = -ENOENT;
> + }
> +
> + rcar_thermal_for_each_priv(priv, common) {
> if (priv->chip->use_of_thermal)
> thermal_remove_hwmon_sysfs(priv->zone);
> else
> @@ -413,6 +441,9 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> spin_lock_init(&common->lock);
> common->dev = dev;
>
> + for (i = 0; i < RCAR_THERMAL_MAX_IRQ; i++)
Here you can't declare the loop variable as the function already
declares it at the function level. This is likely because this function
pre-dates when it was OK to declare it directly in the loop definition.
No need to update old tested code en-mass, but lets use the better way
in new code.
> + common->irqs[i] = -ENOENT;
> +
> pm_runtime_enable(dev);
> pm_runtime_get_sync(dev);
>
> @@ -449,6 +480,8 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> if (ret)
> goto error_unregister;
>
> + common->irqs[i] = irq;
> +
> /* update ENR bits */
> if (chip->irq_per_ch)
> enr_bits |= 1 << i;
> --
> 2.34.1
>
--
Kind Regards,
Niklas Söderlund
next prev parent reply other threads:[~2026-11-19 6:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 7:23 [PATCH] thermal/drivers/rcar_thermal: wait for IRQs before cancelling work Yaohan Li
2026-11-18 9:00 ` Niklas Söderlund
2026-11-19 2:29 ` [PATCH v2] thermal/drivers/rcar_thermal: disable the work before masking the interrupt Yaohan Li
2026-11-19 6:22 ` Niklas Söderlund [this message]
2026-11-19 11:18 ` Yaohan Li
2026-11-19 16:25 ` Niklas Söderlund
2026-11-20 4:27 ` Yaohan Li
2026-11-20 7:30 ` Niklas Söderlund
2026-11-20 9:43 ` Yaohan Li
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=20261119062203.GC2300348@ragnatech.se \
--to=niklas.soderlund@ragnatech.se \
--cc=daniel.lezcano@kernel.org \
--cc=edubezval@gmail.com \
--cc=geert+renesas@glider.be \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=magnus.damm@gmail.com \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
--cc=shunsheng1218@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 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.