Thank you for your contribution! Sashiko AI review found 2 potential issues to consider: - [Critical] drm/atomic: amdgpu_dm refcount underflow and BUG_ON on DRM_MODE_ATOMIC_RESET - [High] drm/atomic: cross-lease state corruption and events in prepare_signaling() --
commit cf481361f08f3389a3c97bbb841a8f197b13651d Author: Sebastian Wick <[email protected]> drm/atomic-uapi: Add DRM_MODE_ATOMIC_RESET flag This commit introduces the DRM_MODE_ATOMIC_RESET flag and DRM_CAP_ATOMIC_RESET capability to reset all KMS object states in a commit to their defaults before applying the requested property changes. > diff --git a/drivers/gpu/drm/drm_atomic_uapi.c > b/drivers/gpu/drm/drm_atomic_uapi.c > index 1eebcf6f5e05b..77d0713c7e2d6 100644 > --- a/drivers/gpu/drm/drm_atomic_uapi.c > +++ b/drivers/gpu/drm/drm_atomic_uapi.c > @@ -1440,10 +1440,29 @@ static int prepare_signaling(struct drm_device *dev, > > for_each_new_crtc_in_state(state, crtc, crtc_state, i) { > s32 __user *fence_ptr; > + bool page_flip_event; > > fence_ptr = get_out_fence_for_crtc(crtc_state->state, crtc); > > - if (arg->flags & DRM_MODE_PAGE_FLIP_EVENT || fence_ptr) { > + page_flip_event = arg->flags & DRM_MODE_PAGE_FLIP_EVENT; > + > + /* > + * A commit with the DRM_MODE_ATOMIC_RESET flag contains > + * every CRTC of the device or lease, even the ones that are > + * disabled before and after the commit. Those can't report > + * a page flip, and drm_atomic_crtc_check() would reject the > + * whole commit, so don't attach any event to them. > + */ > + if (page_flip_event && !fence_ptr && > + (arg->flags & DRM_MODE_ATOMIC_RESET) && > + !crtc_state->active) { > + struct drm_crtc_state *old_crtc_state; > + > + old_crtc_state = drm_atomic_get_old_crtc_state(state, > crtc); > + page_flip_event = old_crtc_state->active; > + } [Severity: High] Can prepare_signaling() attach a page-flip event to an active unleased CRTC when a lessee submits a DRM_MODE_ATOMIC_RESET commit? When a leased plane or connector is bound to an active unleased CRTC, drm_atomic_commit_fill_with_defaults() pulls that unleased CRTC into the commit with its duplicated active state. Because prepare_signaling() does not check drm_lease_held(file_priv, crtc->base.id), crtc_state->active is true and a vblank event is queued on the unleased CRTC for the lessee's file_priv, leaking flip events across the lease, bypassing the c == 0 check when all leased CRTCs stay disabled, or failing the lessee's commit with -EBUSY if the lessor has a flip in flight. Cross-lease bindings also leave the commit state inconsistent during drm_atomic_commit_fill_with_defaults(): - In drm_atomic_commit_fill_connector_with_defaults(), an unleased connector bound to a leased CRTC has its state duplicated with connector_state->crtc and best_encoder still set while the leased CRTC is reset to disabled with connector_mask == 0, which triggers WARN_ONs in mode_fixup() and drm_atomic_helper_update_legacy_modeset_state() if the lessee re-enables that CRTC on a shared encoder. - drm_atomic_commit_fill_with_defaults() skips unleased planes bound to a leased CRTC, so drm_atomic_add_affected_planes() later pulls them in still bound to the disabled CRTC and drm_atomic_helper_check_plane_state() rejects the reset with -EINVAL. - When a leased connector was the sole connector on an enabled unleased CRTC, clearing it from crtc_state->connector_mask leaves the unleased CRTC with enable == true and connector_mask == 0, which drm_atomic_helper_check_modeset() rejects with -EINVAL. [ ... ] > @@ -1688,6 +1715,17 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, > fence_state = NULL; > num_fences = 0; > > + if (arg->flags & DRM_MODE_ATOMIC_RESET) { > + if (!drm_atomic_implements_create_state(dev)) { > + ret = -EOPNOTSUPP; > + goto out; > + } > + > + ret = drm_atomic_commit_fill_with_defaults(file_priv, state); > + if (ret) > + goto out; > + } [Severity: Critical] Does exposing drm_atomic_commit_fill_with_defaults() on amdgpu_dm cause dc_stream_state and dc_plane_state refcount underflows and a BUG_ON()? amdgpu_dm implements atomic_create_state on all planes, CRTCs and connectors, so DRM_CAP_ATOMIC_RESET is advertised and DRM_MODE_ATOMIC_RESET is accepted. However, amdgpu_dm_crtc_create_state() and amdgpu_dm_plane_drm_plane_create_state() leave dm_new_crtc_state->stream and dm_new_plane_state->dc_state NULL without retaining the references that atomic_duplicate_state() normally takes from the current state. When an active CRTC or plane is disabled by the reset (even in a DRM_MODE_ATOMIC_TEST_ONLY check), dm_update_crtc_state() and dm_update_plane_state() assume the new state holds a duplicated reference and unconditionally release the old state's reference: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c:dm_update_crtc_state() { ... if (!dm_old_crtc_state->stream) goto skip_modeset; dc_stream_release(dm_old_crtc_state->stream); dm_new_crtc_state->stream = NULL; ... } This drops the reference owned by the live state and leads to use-after-free on active dc_stream_state and dc_plane_state objects. In addition, if the DRM_MODE_ATOMIC_RESET commit keeps an active CRTC enabled with the same mode and connector so that drm_atomic_crtc_needs_modeset() is false, dm_update_crtc_state() jumps to skip_modeset with dm_new_crtc_state->stream still NULL and hits BUG_ON(dm_new_crtc_state->stream == NULL). -- Sashiko AI review ยท https://sashiko.dev/#/patchset/[email protected]?part=6
