From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: aiyengar1990@gmail.com
Cc: Badhri Jagan Sridharan <badhri@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Guenter Roeck <linux@roeck-us.net>, Xu Yang <xu.yang_2@nxp.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] usb: typec: tcpm: Cancel the timers before destroying the worker too
Date: Tue, 17 Nov 2026 11:01:28 +0100 [thread overview]
Message-ID: <avwl-MUOQA1ucpvC@black.igk.intel.com> (raw)
In-Reply-To: <20261112-tcpm-unregister-timers-v1-1-7230fda5612b@gmail.com>
On Thu, Nov 12, 2026 at 04:28:13AM +0000, Arun Iyengar via B4 Relay wrote:
> From: Arun Iyengar <aiyengar1990@gmail.com>
>
> tcpm_unregister_port() clears port->registered, destroys the kthread
> worker and only then cancels the hrtimers. A timer handler running on
> another CPU that has already seen port->registered set can still call
> kthread_queue_work() once the worker is freed, or with port->wq
> already NULL:
>
> CPU0 CPU1
> tcpm_unregister_port() state_machine_timer_handler()
> if (port->registered)
> port->registered = false;
> kthread_destroy_worker(port->wq);
> port->wq = NULL;
> kthread_queue_work(port->wq, ...);
>
> The timers are cancelled after the worker is destroyed on purpose:
> works that run while the worker is flushed can start a timer again
> (see the commit in Fixes). Cancelling only before would bring that
> back, so cancel them on both sides. hrtimer_cancel() waits for a
> handler that is running, so after the first round no handler that
> missed the cleared flag is left; the second round removes a timer that
> a work started during the flush. tcpm_reset_port(), called later, only
> cancels.
>
> Fixes: ca4d8344a72b ("usb: typec: tcpm: fix tcpm unregister port but leave a pending timer")
> Reported-by: Sashiko <sashiko-bot@kernel.org>
> Closes: https://lore.kernel.org/all/sashiko-outbox-206898@kernel.org/
> Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> Sashiko found this while reviewing an unrelated tcpm patch of mine:
> https://lore.kernel.org/all/sashiko-outbox-206898@kernel.org/
> Its suggestion was to cancel the timers before destroying the worker
> instead of after; that would undo the commit in Fixes, hence both.
>
> Compile-tested only (arm64 W=1): the window is a few instructions in
> the unbind path and I have no reproducer.
>
> This patch was developed with Claude (Anthropic) as a coding assistant:
> it wrote the change and the commit message, and I reviewed it.
> ---
> drivers/usb/typec/tcpm/tcpm.c | 21 ++++++++++++++++-----
> 1 file changed, 16 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
> index d721baef5210..c7e0e09b1cbe 100644
> --- a/drivers/usb/typec/tcpm/tcpm.c
> +++ b/drivers/usb/typec/tcpm/tcpm.c
> @@ -8987,18 +8987,29 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
> }
> EXPORT_SYMBOL_GPL(tcpm_register_port);
>
> +static void tcpm_cancel_timers(struct tcpm_port *port)
> +{
> + hrtimer_cancel(&port->vdm_discovery_timer);
> + hrtimer_cancel(&port->enable_frs_timer);
> + hrtimer_cancel(&port->vdm_state_machine_timer);
> + hrtimer_cancel(&port->state_machine_timer);
> +}
> +
> void tcpm_unregister_port(struct tcpm_port *port)
> {
> int i;
>
> port->registered = false;
> + /*
> + * A timer handler that saw port->registered still set may queue
> + * work: wait for it before the worker goes away. Works that run
> + * while the worker is flushed may start a timer again, so cancel
> + * the timers once more afterwards.
> + */
> + tcpm_cancel_timers(port);
> kthread_destroy_worker(port->wq);
> port->wq = NULL;
> -
> - hrtimer_cancel(&port->vdm_discovery_timer);
> - hrtimer_cancel(&port->enable_frs_timer);
> - hrtimer_cancel(&port->vdm_state_machine_timer);
> - hrtimer_cancel(&port->state_machine_timer);
> + tcpm_cancel_timers(port);
>
> power_supply_put_system_batteries(port->fixed_batt, port->fixed_batt_cnt);
> tcpm_reset_port(port);
>
> ---
> base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
> change-id: 20261112-tcpm-unregister-timers-2fd159480999
>
> Best regards,
> --
> Arun Iyengar <aiyengar1990@gmail.com>
>
--
heikki
prev parent reply other threads:[~2026-11-17 10:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-12 4:28 [PATCH] usb: typec: tcpm: Cancel the timers before destroying the worker too Arun Iyengar via B4 Relay
2026-11-12 4:28 ` Arun Iyengar
2026-11-12 4:38 ` sashiko-bot
2026-11-17 10:01 ` Heikki Krogerus [this message]
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=avwl-MUOQA1ucpvC@black.igk.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=aiyengar1990@gmail.com \
--cc=badhri@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=xu.yang_2@nxp.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.