[PATCH] drm/msm/dp: move link_ready out of HPD event thread
Johan Hovold
johan at kernel.org
Thu Mar 21 16:41:05 UTC 2024
On Mon, Mar 18, 2024 at 11:01:25AM -0700, Abhinav Kumar wrote:
> On 3/15/2024 8:57 AM, Johan Hovold wrote:
> > On Thu, Mar 14, 2024 at 09:30:57AM -0700, Abhinav Kumar wrote:
> >> The race condition is between the time we get disconnect event and set
> >> link_ready to false, a commit can come in. Because setting link_ready to
> >> false happens in the event thread so it could be slightly delayed.
> >
> > I get this part, just not why, or rather when, that becomes a problem.
> >
> > Once the disconnect event is processed, dp_hpd_unplug_handle() will
> > update the state to ST_DISCONNECT_PENDING, and queue a notification
> > event. link_ready is (before this patch) still set to 1.
> This is the case I am thinking of:
>
> 1) Disconnect event happens which will call dp_hpd_unplug_handle() but
> link_ready is not false yet.
>
> 2) There is a commit with a modeset, which shall trigger
> atomic_disable() followed by an atomic_enable()
>
> atomic_disable() will go through disable clocks and set hpd_state to
> ST_DISCONNECTED.
>
> 3) atomic_enable() will not go through because we will bail out because
> state was ST_DISCONNECTED.
>
> if (state != ST_DISPLAY_OFF && state != ST_MAINLINK_READY) {
> mutex_unlock(&dp_display->event_mutex);
> return;
> }
>
> 4) Now, if there is another commit with a modeset, it will go and crash
> at atomic_disable()
Right, that's what I described in the mail you replied to but that still
doesn't answer what triggers those mode sets.
> > Here a commit comes in; what exactly are you suggesting would trigger
> > that? And in such a way that it breaks the state machine?
> Like we have seen, the commit can either come directly from userspace as
> one last frame (the original bug I had given the link to) or from the
> __drm_fb_helper_restore_fbdev_mode_unlocked() which happened in
> sc8280xp's case. This is totally independent of the hpd_thread() with no
> mutual exclusion.
Right . Still not sure about the details about "that last frame" issue,
that you saw in the past, and if that's still an issue or not. You
claimed that you had fixed that, right?
> This commit() can come before the link_ready was set to false. If it had
> come after link_ready was set to false, atomic_check() would have failed
> and no issue would have been seen.
>
> My change is making the link_ready false sooner in the disconnect case.
Yes, but again, and as you have confirmed, you're only papering over the
issue at such a mode set can still come in before you set link_state to
false.
> > One way this could cause trouble is if you end up with a call to
> > dp_bridge_atomic_post_disable() which updates the state to
> > ST_DISCONNECTED. (1)
> >
> > This would then need to be followed by another call to
> > dp_bridge_atomic_enable() which bails out early with the link clock
> > disabled. (2) (And if link_ready were to be set to 0 sooner, the
> > likelihood of this is reduced.)
> >
> > This in turn, would trigger a reset when dp_bridge_atomic_disable() is
> > later called.
> Yes, this is exactly what I have written above.
Thanks for confirming.
> > This is the kind of description of the race I expect to see in the
> > commit message, and I'm still not sure what would trigger the call to
> > dp_bridge_atomic_post_disable() and dp_bridge_atomic_enable() (i.e. (1)
> > and (2) above) and whether this is a real issue or not.
>
> I have explained what triggers the disable/enable call below.
>
> > Also note that the above scenario is quite different from the one I've
> > hit and described earlier.
> Why is that so? Eventually it will also translate to the same scenario.
> I would like to understand why this is different. I think in your case,
> probably we do not know what triggers the modeset, but its a minor
> detail like I have written before.
The state transitions are different and the enable event comes in
before the bridge has been fully tore down unlike in the scenario we
outlined above.
And it's certainly not a minor detail, as in the sc8280xp VT case,
those spurious hotplug events that trigger the atomic_enable would not
have caused any trouble if it wasn't for the case that the bridge was
stuck in the ST_MAINLINK_READY state.
That explains why the hotplug notification revert in rc7 made a
difference on sc8280xp.
You're talking about an entirely different and, as far as I can tell,
hypothetical scenario where are user executes a modeset while pulling
the plug. This is certainly not why we had a number of user suddenly
starting to hit this crash after they upgraded to 6.8-rc1.
And, just to be clear, we know what triggers the modeset in the VT case,
and I posted a detailed explanation with a strack trace here:
https://lore.kernel.org/lkml/Ze8Ke_M2xHyPYCu-@hovoldconsulting.com/
> >> It will be hard to reproduce this. Only way I can think of is to delay
> >> the EV_NOTIFICATION for sometime and see in dp_bridge_hpd_notify()
> >>
> >> else if (dp_display->link_ready && status ==
> >> connector_status_disconnected)
> >> dp_add_event(dp, EV_HPD_UNPLUG_INT, 0, 0);
> >>
> >> as dp_add_event() will add the event, then wakeup the event_q.
> >
> > Sure that would increase the race window with the current code, but that
> > alone isn't enough to trigger the bug AFAICT.
> >
> >> Before the event thread wakes up and processes this unplug event, the
> >> commit can come in. This is the race condition i was thinking of.
> >
> > Yes, but what triggers the commit? And why would it lead to a mode set
> > that disables the bridge?
> Commit was triggered from the userspace as it did not process the
> disconnect event on time and the userspace was triggering a couple of
> modesets by by changing the mode on the CRTC from 1080P to NONE to 1080P.
>
> [drm:drm_atomic_helper_check_modeset] [CRTC:60:crtc-1] mode changed
But *why* would user space do that? Pushing out another frame would
generally not trigger a modeset, right?
And as I've alluded to repeatedly, your patch only seems concerned with
something like the above, where a hypothetical user space is triggering
modesets after receiving a notification.
And we know that that is not relevant for the crashes I've seen as there
is no user space processing any events in my VT or X setup.
Johan
More information about the dri-devel
mailing list