| Message ID | 20230306100722.28485-1-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| Headers | show |
| Series | drm/msm: fix bind error handling | expand |
On Mon, Mar 06, 2023 at 11:07:12AM +0100, Johan Hovold wrote: > I had reasons to look closer at the MSM DRM driver error handling and > realised that it had suffered from a fair amount of bit rot over the > years. > > Unfortunately, I started fixing this in my 6.2 branch and failed to > notice two partial and, as it turned out, broken attempts to address > this that are now in 6.3-rc1. > > Instead of trying to salvage this incrementally, I'm reverting the two > broken commits so that clean and backportable fixes can be added in > their place. > > Included are also two related cleanups. Any further comments to these patches (except for 9/10, which should be dropped)? As the patches being reverted here were first added in 6.3-rc1 there is still time to get this into 6.3-rc (e.g. before AUTOSEL starts trying to backport them). Johan > Johan Hovold (10): > Revert "drm/msm: Add missing check and destroy for > alloc_ordered_workqueue" > Revert "drm/msm: Fix failure paths in msm_drm_init()" > drm/msm: fix NULL-deref on snapshot tear down > drm/msm: fix NULL-deref on irq uninstall > drm/msm: fix drm device leak on bind errors > drm/msm: fix vram leak on bind errors > drm/msm: fix missing wq allocation error handling > drm/msm: fix workqueue leak on bind errors > drm/msm: use drmm_mode_config_init() > drm/msm: move include directive > > drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 3 - > drivers/gpu/drm/msm/msm_drv.c | 67 +++++++++++++------- > 2 files changed, 44 insertions(+), 26 deletions(-)
On 21/03/2023 15:02, Johan Hovold wrote: > On Mon, Mar 06, 2023 at 11:07:12AM +0100, Johan Hovold wrote: >> I had reasons to look closer at the MSM DRM driver error handling and >> realised that it had suffered from a fair amount of bit rot over the >> years. >> >> Unfortunately, I started fixing this in my 6.2 branch and failed to >> notice two partial and, as it turned out, broken attempts to address >> this that are now in 6.3-rc1. >> >> Instead of trying to salvage this incrementally, I'm reverting the two >> broken commits so that clean and backportable fixes can be added in >> their place. >> >> Included are also two related cleanups. > > Any further comments to these patches (except for 9/10, which should be > dropped)? > > As the patches being reverted here were first added in 6.3-rc1 there is > still time to get this into 6.3-rc (e.g. before AUTOSEL starts trying to > backport them). I will take a look at the patches. Additional question, as you have been looking into this area. We have plenty of code which is only called under the `if (kms)` condition. Could you hopefully move these parts to separate functions, so that the error handling is also simpler? If not, I'll put this to my todo list, but it might take some time before I have time for that. > > Johan > >> Johan Hovold (10): >> Revert "drm/msm: Add missing check and destroy for >> alloc_ordered_workqueue" >> Revert "drm/msm: Fix failure paths in msm_drm_init()" >> drm/msm: fix NULL-deref on snapshot tear down >> drm/msm: fix NULL-deref on irq uninstall >> drm/msm: fix drm device leak on bind errors >> drm/msm: fix vram leak on bind errors >> drm/msm: fix missing wq allocation error handling >> drm/msm: fix workqueue leak on bind errors >> drm/msm: use drmm_mode_config_init() >> drm/msm: move include directive >> >> drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 3 - >> drivers/gpu/drm/msm/msm_drv.c | 67 +++++++++++++------- >> 2 files changed, 44 insertions(+), 26 deletions(-)
On Tue, Mar 21, 2023 at 05:21:56PM +0200, Dmitry Baryshkov wrote: > On 21/03/2023 15:02, Johan Hovold wrote: > > On Mon, Mar 06, 2023 at 11:07:12AM +0100, Johan Hovold wrote: > >> I had reasons to look closer at the MSM DRM driver error handling and > >> realised that it had suffered from a fair amount of bit rot over the > >> years. > >> > >> Unfortunately, I started fixing this in my 6.2 branch and failed to > >> notice two partial and, as it turned out, broken attempts to address > >> this that are now in 6.3-rc1. > >> > >> Instead of trying to salvage this incrementally, I'm reverting the two > >> broken commits so that clean and backportable fixes can be added in > >> their place. > >> > >> Included are also two related cleanups. > > > > Any further comments to these patches (except for 9/10, which should be > > dropped)? > > > > As the patches being reverted here were first added in 6.3-rc1 there is > > still time to get this into 6.3-rc (e.g. before AUTOSEL starts trying to > > backport them). > > I will take a look at the patches. Additional question, as you have been > looking into this area. We have plenty of code which is only called > under the `if (kms)` condition. Could you hopefully move these parts to > separate functions, so that the error handling is also simpler? If not, > I'll put this to my todo list, but it might take some time before I have > time for that. There's definitely room for cleaning up the bind/unbind paths further, but for this series I focus on correctness while maintaining symmetry (e.g. if an allocation was done under if (kms), then the release should be done under the same). I don't think I will have time to look at this further for a few weeks either, but I'll add it to my list of future work as well and I'll check in with you before actually working on it. Johan
On Mon, 06 Mar 2023 11:07:12 +0100, Johan Hovold wrote: > I had reasons to look closer at the MSM DRM driver error handling and > realised that it had suffered from a fair amount of bit rot over the > years. > > Unfortunately, I started fixing this in my 6.2 branch and failed to > notice two partial and, as it turned out, broken attempts to address > this that are now in 6.3-rc1. > > [...] Applied, thanks! [01/10] Revert "drm/msm: Add missing check and destroy for alloc_ordered_workqueue" https://gitlab.freedesktop.org/lumag/msm/-/commit/ebf761d6a02f [02/10] Revert "drm/msm: Fix failure paths in msm_drm_init()" https://gitlab.freedesktop.org/lumag/msm/-/commit/35a08e19a1c6 [03/10] drm/msm: fix NULL-deref on snapshot tear down https://gitlab.freedesktop.org/lumag/msm/-/commit/d3234fe12b3b [04/10] drm/msm: fix NULL-deref on irq uninstall https://gitlab.freedesktop.org/lumag/msm/-/commit/0b5ffe5be6fd [05/10] drm/msm: fix drm device leak on bind errors https://gitlab.freedesktop.org/lumag/msm/-/commit/6a44f0dbd141 [06/10] drm/msm: fix vram leak on bind errors https://gitlab.freedesktop.org/lumag/msm/-/commit/e6091a855649 [07/10] drm/msm: fix missing wq allocation error handling https://gitlab.freedesktop.org/lumag/msm/-/commit/9c6027d5a3f4 [08/10] drm/msm: fix workqueue leak on bind errors https://gitlab.freedesktop.org/lumag/msm/-/commit/023691129696 [10/10] drm/msm: move include directive https://gitlab.freedesktop.org/lumag/msm/-/commit/110fd0d5b032 Best regards,
I had reasons to look closer at the MSM DRM driver error handling and realised that it had suffered from a fair amount of bit rot over the years. Unfortunately, I started fixing this in my 6.2 branch and failed to notice two partial and, as it turned out, broken attempts to address this that are now in 6.3-rc1. Instead of trying to salvage this incrementally, I'm reverting the two broken commits so that clean and backportable fixes can be added in their place. Included are also two related cleanups. Johan Johan Hovold (10): Revert "drm/msm: Add missing check and destroy for alloc_ordered_workqueue" Revert "drm/msm: Fix failure paths in msm_drm_init()" drm/msm: fix NULL-deref on snapshot tear down drm/msm: fix NULL-deref on irq uninstall drm/msm: fix drm device leak on bind errors drm/msm: fix vram leak on bind errors drm/msm: fix missing wq allocation error handling drm/msm: fix workqueue leak on bind errors drm/msm: use drmm_mode_config_init() drm/msm: move include directive drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 3 - drivers/gpu/drm/msm/msm_drv.c | 67 +++++++++++++------- 2 files changed, 44 insertions(+), 26 deletions(-)