From: Johan Hovold <johan@kernel.org>
To: Bjorn Andersson <quic_bjorande@quicinc.com>
Cc: Sebastian Reichel <sre@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Neil Armstrong <neil.armstrong@linaro.org>,
Johan Hovold <johan+linaro@kernel.org>,
Chris Lew <quic_clew@quicinc.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Stephen Boyd <swboyd@chromium.org>,
Amit Pundir <amit.pundir@linaro.org>,
linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH v2 2/3] usb: typec: ucsi: Move unregister out of atomic section
Date: Tue, 20 Aug 2024 08:43:03 +0200 [thread overview]
Message-ID: <ZsQ696Jq5aO8IMKG@hovoldconsulting.com> (raw)
In-Reply-To: <20240819-pmic-glink-v6-11-races-v2-2-88fe3ab1f0e2@quicinc.com>
On Mon, Aug 19, 2024 at 01:07:46PM -0700, Bjorn Andersson wrote:
> Commit '635ce0db8956 ("soc: qcom: pmic_glink: don't traverse clients
Looks like you copied the wrong SHA again. This should be
9329933699b3 ("soc: qcom: pmic_glink: Make client-lock non-sleeping")
as we discussed.
> list without a lock")' moved the pmic_glink client list under a
> spinlock, as it is accessed by the rpmsg/glink callback, which in turn
> is invoked from IRQ context.
>
> This means that ucsi_unregister() is now called from IRQ context, which
And this should be "atomic context" as pdr notifications are done from
a worker thread.
> isn't feasible as it's expecting a sleepable context. An effort is under
> way to get GLINK to invoke its callbacks in a sleepable context, but
> until then lets schedule the unregistration.
>
> A side effect of this is that ucsi_unregister() can now happen
> after the remote processor, and thereby the communication link with it, is
> gone. pmic_glink_send() is amended with a check to avoid the resulting NULL
> pointer dereference.
> This does however result in the user being informed about this error by
> the following entry in the kernel log:
>
> ucsi_glink.pmic_glink_ucsi pmic_glink.ucsi.0: failed to send UCSI write request: -5
>
> Fixes: 635ce0db8956 ("soc: qcom: pmic_glink: don't traverse clients list without a lock")
Fixes: 9329933699b3 ("soc: qcom: pmic_glink: Make client-lock non-sleeping")
> Cc: stable@vger.kernel.org
> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Tested-by: Amit Pundir <amit.pundir@linaro.org>
> Signed-off-by: Bjorn Andersson <quic_bjorande@quicinc.com>
> @@ -269,11 +284,12 @@ static void pmic_glink_ucsi_callback(const void *data, size_t len, void *priv)
> static void pmic_glink_ucsi_pdr_notify(void *priv, int state)
> {
> struct pmic_glink_ucsi *ucsi = priv;
> + unsigned long flags;
>
> - if (state == SERVREG_SERVICE_STATE_UP)
> - schedule_work(&ucsi->register_work);
> - else if (state == SERVREG_SERVICE_STATE_DOWN)
> - ucsi_unregister(ucsi->ucsi);
> + spin_lock_irqsave(&ucsi->state_lock, flags);
> + ucsi->pd_running = state == SERVREG_SERVICE_STATE_UP;
Add parentheses for readability?
> + spin_unlock_irqrestore(&ucsi->state_lock, flags);
> + schedule_work(&ucsi->register_work);
> }
>
> static void pmic_glink_ucsi_destroy(void *data)
> @@ -320,6 +336,7 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev,
> INIT_WORK(&ucsi->register_work, pmic_glink_ucsi_register);
> init_completion(&ucsi->read_ack);
> init_completion(&ucsi->write_ack);
> + spin_lock_init(&ucsi->state_lock);
> mutex_init(&ucsi->lock);
>
> ucsi->ucsi = ucsi_create(dev, &pmic_glink_ucsi_ops);
Looks good otherwise:
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Johan
next prev parent reply other threads:[~2024-08-20 6:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-19 20:07 [PATCH v2 0/3] soc: qcom: pmic_glink: v6.11-rc bug fixes Bjorn Andersson
2024-08-19 20:07 ` [PATCH v2 1/3] soc: qcom: pmic_glink: Fix race during initialization Bjorn Andersson
2024-08-19 22:36 ` Sebastian Reichel
2024-08-20 6:53 ` Johan Hovold
2024-08-19 20:07 ` [PATCH v2 2/3] usb: typec: ucsi: Move unregister out of atomic section Bjorn Andersson
2024-08-20 6:43 ` Johan Hovold [this message]
2024-08-19 20:07 ` [PATCH v2 3/3] soc: qcom: pmic_glink: Actually communicate with remote goes down Bjorn Andersson
2024-08-20 7:07 ` Johan Hovold
2024-08-20 7:35 ` Johan Hovold
2024-08-20 7:12 ` [PATCH v2 0/3] soc: qcom: pmic_glink: v6.11-rc bug fixes Johan Hovold
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=ZsQ696Jq5aO8IMKG@hovoldconsulting.com \
--to=johan@kernel.org \
--cc=amit.pundir@linaro.org \
--cc=andersson@kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=johan+linaro@kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=quic_bjorande@quicinc.com \
--cc=quic_clew@quicinc.com \
--cc=sre@kernel.org \
--cc=stable@vger.kernel.org \
--cc=swboyd@chromium.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox