* [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 11:04 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2019-10-25 11:04 UTC (permalink / raw) To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Cc: David (ChunMing) Zhou, David Airlie, linux-kernel-u79uwXL29TY76Z2rM5mHXA, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Nicolas Waisman, Daniel Vetter, Alex Deucher, Will Deacon, Christian König In the highly unlikely event that we fail to allocate the "radeon-crtc" workqueue, we should bail cleanly rather than blindly march on with a NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' structure. This was reported previously by Nicolas, but I don't think his fix was correct: Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Reported-by: Nicolas Waisman <nico@semmle.com> Link: https://lore.kernel.org/lkml/CADJ_3a8WFrs5NouXNqS5WYe7rebFP+_A5CheeqAyD_p7DFJJcg@mail.gmail.com/ Signed-off-by: Will Deacon <will@kernel.org> --- Compile-tested only. drivers/gpu/drm/radeon/radeon_display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index e81b01f8db90..3e4ef1380fca 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -672,17 +672,25 @@ static void radeon_crtc_init(struct drm_device *dev, int index) { struct radeon_device *rdev = dev->dev_private; struct radeon_crtc *radeon_crtc; + struct workqueue_struct *wq; int i; radeon_crtc = kzalloc(sizeof(struct radeon_crtc) + (RADEONFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL); if (radeon_crtc == NULL) return; + wq = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + if (unlikely(!wq)) { + kfree(radeon_crtc); + return; + } + drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs); drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256); radeon_crtc->crtc_id = index; - radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + radeon_crtc->flip_queue = wq; + rdev->mode_info.crtcs[index] = radeon_crtc; if (rdev->family >= CHIP_BONAIRE) { -- 2.24.0.rc0.303.g954a862665-goog _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 11:04 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2019-10-25 11:04 UTC (permalink / raw) To: amd-gfx Cc: dri-devel, linux-kernel, Will Deacon, Alex Deucher, Christian König, David (ChunMing) Zhou, David Airlie, Daniel Vetter, Nicolas Waisman In the highly unlikely event that we fail to allocate the "radeon-crtc" workqueue, we should bail cleanly rather than blindly march on with a NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' structure. This was reported previously by Nicolas, but I don't think his fix was correct: Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Reported-by: Nicolas Waisman <nico@semmle.com> Link: https://lore.kernel.org/lkml/CADJ_3a8WFrs5NouXNqS5WYe7rebFP+_A5CheeqAyD_p7DFJJcg@mail.gmail.com/ Signed-off-by: Will Deacon <will@kernel.org> --- Compile-tested only. drivers/gpu/drm/radeon/radeon_display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index e81b01f8db90..3e4ef1380fca 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -672,17 +672,25 @@ static void radeon_crtc_init(struct drm_device *dev, int index) { struct radeon_device *rdev = dev->dev_private; struct radeon_crtc *radeon_crtc; + struct workqueue_struct *wq; int i; radeon_crtc = kzalloc(sizeof(struct radeon_crtc) + (RADEONFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL); if (radeon_crtc == NULL) return; + wq = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + if (unlikely(!wq)) { + kfree(radeon_crtc); + return; + } + drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs); drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256); radeon_crtc->crtc_id = index; - radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + radeon_crtc->flip_queue = wq; + rdev->mode_info.crtcs[index] = radeon_crtc; if (rdev->family >= CHIP_BONAIRE) { -- 2.24.0.rc0.303.g954a862665-goog ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 11:04 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2019-10-25 11:04 UTC (permalink / raw) To: amd-gfx Cc: David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Will Deacon, Christian König In the highly unlikely event that we fail to allocate the "radeon-crtc" workqueue, we should bail cleanly rather than blindly march on with a NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' structure. This was reported previously by Nicolas, but I don't think his fix was correct: Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Reported-by: Nicolas Waisman <nico@semmle.com> Link: https://lore.kernel.org/lkml/CADJ_3a8WFrs5NouXNqS5WYe7rebFP+_A5CheeqAyD_p7DFJJcg@mail.gmail.com/ Signed-off-by: Will Deacon <will@kernel.org> --- Compile-tested only. drivers/gpu/drm/radeon/radeon_display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index e81b01f8db90..3e4ef1380fca 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -672,17 +672,25 @@ static void radeon_crtc_init(struct drm_device *dev, int index) { struct radeon_device *rdev = dev->dev_private; struct radeon_crtc *radeon_crtc; + struct workqueue_struct *wq; int i; radeon_crtc = kzalloc(sizeof(struct radeon_crtc) + (RADEONFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL); if (radeon_crtc == NULL) return; + wq = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + if (unlikely(!wq)) { + kfree(radeon_crtc); + return; + } + drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs); drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256); radeon_crtc->crtc_id = index; - radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + radeon_crtc->flip_queue = wq; + rdev->mode_info.crtcs[index] = radeon_crtc; if (rdev->family >= CHIP_BONAIRE) { -- 2.24.0.rc0.303.g954a862665-goog _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 11:04 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2019-10-25 11:04 UTC (permalink / raw) To: amd-gfx Cc: David (ChunMing) Zhou, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Daniel Vetter, Alex Deucher, Will Deacon, Christian König In the highly unlikely event that we fail to allocate the "radeon-crtc" workqueue, we should bail cleanly rather than blindly march on with a NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' structure. This was reported previously by Nicolas, but I don't think his fix was correct: Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Reported-by: Nicolas Waisman <nico@semmle.com> Link: https://lore.kernel.org/lkml/CADJ_3a8WFrs5NouXNqS5WYe7rebFP+_A5CheeqAyD_p7DFJJcg@mail.gmail.com/ Signed-off-by: Will Deacon <will@kernel.org> --- Compile-tested only. drivers/gpu/drm/radeon/radeon_display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index e81b01f8db90..3e4ef1380fca 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -672,17 +672,25 @@ static void radeon_crtc_init(struct drm_device *dev, int index) { struct radeon_device *rdev = dev->dev_private; struct radeon_crtc *radeon_crtc; + struct workqueue_struct *wq; int i; radeon_crtc = kzalloc(sizeof(struct radeon_crtc) + (RADEONFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL); if (radeon_crtc == NULL) return; + wq = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + if (unlikely(!wq)) { + kfree(radeon_crtc); + return; + } + drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs); drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256); radeon_crtc->crtc_id = index; - radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + radeon_crtc->flip_queue = wq; + rdev->mode_info.crtcs[index] = radeon_crtc; if (rdev->family >= CHIP_BONAIRE) { -- 2.24.0.rc0.303.g954a862665-goog _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 16:06 ` Michel Dänzer 0 siblings, 0 replies; 16+ messages in thread From: Michel Dänzer @ 2019-10-25 16:06 UTC (permalink / raw) To: Will Deacon Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On 2019-10-25 1:04 p.m., Will Deacon wrote: > In the highly unlikely event that we fail to allocate the "radeon-crtc" > workqueue, we should bail cleanly rather than blindly march on with a > NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' > structure. > > This was reported previously by Nicolas, but I don't think his fix was > correct: Neither is this one I'm afraid. See my feedback on https://patchwork.freedesktop.org/patch/331534/ . -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 16:06 ` Michel Dänzer 0 siblings, 0 replies; 16+ messages in thread From: Michel Dänzer @ 2019-10-25 16:06 UTC (permalink / raw) To: Will Deacon Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On 2019-10-25 1:04 p.m., Will Deacon wrote: > In the highly unlikely event that we fail to allocate the "radeon-crtc" > workqueue, we should bail cleanly rather than blindly march on with a > NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' > structure. > > This was reported previously by Nicolas, but I don't think his fix was > correct: Neither is this one I'm afraid. See my feedback on https://patchwork.freedesktop.org/patch/331534/ . -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 16:06 ` Michel Dänzer 0 siblings, 0 replies; 16+ messages in thread From: Michel Dänzer @ 2019-10-25 16:06 UTC (permalink / raw) To: Will Deacon Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On 2019-10-25 1:04 p.m., Will Deacon wrote: > In the highly unlikely event that we fail to allocate the "radeon-crtc" > workqueue, we should bail cleanly rather than blindly march on with a > NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' > structure. > > This was reported previously by Nicolas, but I don't think his fix was > correct: Neither is this one I'm afraid. See my feedback on https://patchwork.freedesktop.org/patch/331534/ . -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 16:18 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2019-10-25 16:18 UTC (permalink / raw) To: Michel Dänzer Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On Fri, Oct 25, 2019 at 06:06:26PM +0200, Michel Dänzer wrote: > On 2019-10-25 1:04 p.m., Will Deacon wrote: > > In the highly unlikely event that we fail to allocate the "radeon-crtc" > > workqueue, we should bail cleanly rather than blindly march on with a > > NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' > > structure. > > > > This was reported previously by Nicolas, but I don't think his fix was > > correct: > > Neither is this one I'm afraid. See my feedback on > https://patchwork.freedesktop.org/patch/331534/ . Thanks. Although I agree with you wrt the original patch, I don't think the workqueue allocation failure is distinguishable from the CRTC allocation failure with my patch. Are you saying that the error path there is broken too? Will ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 16:18 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2019-10-25 16:18 UTC (permalink / raw) To: Michel Dänzer Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On Fri, Oct 25, 2019 at 06:06:26PM +0200, Michel Dänzer wrote: > On 2019-10-25 1:04 p.m., Will Deacon wrote: > > In the highly unlikely event that we fail to allocate the "radeon-crtc" > > workqueue, we should bail cleanly rather than blindly march on with a > > NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' > > structure. > > > > This was reported previously by Nicolas, but I don't think his fix was > > correct: > > Neither is this one I'm afraid. See my feedback on > https://patchwork.freedesktop.org/patch/331534/ . Thanks. Although I agree with you wrt the original patch, I don't think the workqueue allocation failure is distinguishable from the CRTC allocation failure with my patch. Are you saying that the error path there is broken too? Will _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 16:18 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2019-10-25 16:18 UTC (permalink / raw) To: Michel Dänzer Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On Fri, Oct 25, 2019 at 06:06:26PM +0200, Michel Dänzer wrote: > On 2019-10-25 1:04 p.m., Will Deacon wrote: > > In the highly unlikely event that we fail to allocate the "radeon-crtc" > > workqueue, we should bail cleanly rather than blindly march on with a > > NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' > > structure. > > > > This was reported previously by Nicolas, but I don't think his fix was > > correct: > > Neither is this one I'm afraid. See my feedback on > https://patchwork.freedesktop.org/patch/331534/ . Thanks. Although I agree with you wrt the original patch, I don't think the workqueue allocation failure is distinguishable from the CRTC allocation failure with my patch. Are you saying that the error path there is broken too? Will _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 16:20 ` Michel Dänzer 0 siblings, 0 replies; 16+ messages in thread From: Michel Dänzer @ 2019-10-25 16:20 UTC (permalink / raw) To: Will Deacon Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On 2019-10-25 6:18 p.m., Will Deacon wrote: > On Fri, Oct 25, 2019 at 06:06:26PM +0200, Michel Dänzer wrote: >> On 2019-10-25 1:04 p.m., Will Deacon wrote: >>> In the highly unlikely event that we fail to allocate the "radeon-crtc" >>> workqueue, we should bail cleanly rather than blindly march on with a >>> NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' >>> structure. >>> >>> This was reported previously by Nicolas, but I don't think his fix was >>> correct: >> >> Neither is this one I'm afraid. See my feedback on >> https://patchwork.freedesktop.org/patch/331534/ . > > Thanks. Although I agree with you wrt the original patch, I don't think > the workqueue allocation failure is distinguishable from the CRTC allocation > failure with my patch. Are you saying that the error path there is broken > too? The driver won't actually work if radeon_crtc_init bails silently, it'll just fall over at some later point. -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 16:20 ` Michel Dänzer 0 siblings, 0 replies; 16+ messages in thread From: Michel Dänzer @ 2019-10-25 16:20 UTC (permalink / raw) To: Will Deacon Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On 2019-10-25 6:18 p.m., Will Deacon wrote: > On Fri, Oct 25, 2019 at 06:06:26PM +0200, Michel Dänzer wrote: >> On 2019-10-25 1:04 p.m., Will Deacon wrote: >>> In the highly unlikely event that we fail to allocate the "radeon-crtc" >>> workqueue, we should bail cleanly rather than blindly march on with a >>> NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' >>> structure. >>> >>> This was reported previously by Nicolas, but I don't think his fix was >>> correct: >> >> Neither is this one I'm afraid. See my feedback on >> https://patchwork.freedesktop.org/patch/331534/ . > > Thanks. Although I agree with you wrt the original patch, I don't think > the workqueue allocation failure is distinguishable from the CRTC allocation > failure with my patch. Are you saying that the error path there is broken > too? The driver won't actually work if radeon_crtc_init bails silently, it'll just fall over at some later point. -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-25 16:20 ` Michel Dänzer 0 siblings, 0 replies; 16+ messages in thread From: Michel Dänzer @ 2019-10-25 16:20 UTC (permalink / raw) To: Will Deacon Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On 2019-10-25 6:18 p.m., Will Deacon wrote: > On Fri, Oct 25, 2019 at 06:06:26PM +0200, Michel Dänzer wrote: >> On 2019-10-25 1:04 p.m., Will Deacon wrote: >>> In the highly unlikely event that we fail to allocate the "radeon-crtc" >>> workqueue, we should bail cleanly rather than blindly march on with a >>> NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' >>> structure. >>> >>> This was reported previously by Nicolas, but I don't think his fix was >>> correct: >> >> Neither is this one I'm afraid. See my feedback on >> https://patchwork.freedesktop.org/patch/331534/ . > > Thanks. Although I agree with you wrt the original patch, I don't think > the workqueue allocation failure is distinguishable from the CRTC allocation > failure with my patch. Are you saying that the error path there is broken > too? The driver won't actually work if radeon_crtc_init bails silently, it'll just fall over at some later point. -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-31 16:54 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2019-10-31 16:54 UTC (permalink / raw) To: Michel Dänzer Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On Fri, Oct 25, 2019 at 06:20:01PM +0200, Michel Dänzer wrote: > On 2019-10-25 6:18 p.m., Will Deacon wrote: > > On Fri, Oct 25, 2019 at 06:06:26PM +0200, Michel Dänzer wrote: > >> On 2019-10-25 1:04 p.m., Will Deacon wrote: > >>> In the highly unlikely event that we fail to allocate the "radeon-crtc" > >>> workqueue, we should bail cleanly rather than blindly march on with a > >>> NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' > >>> structure. > >>> > >>> This was reported previously by Nicolas, but I don't think his fix was > >>> correct: > >> > >> Neither is this one I'm afraid. See my feedback on > >> https://patchwork.freedesktop.org/patch/331534/ . > > > > Thanks. Although I agree with you wrt the original patch, I don't think > > the workqueue allocation failure is distinguishable from the CRTC allocation > > failure with my patch. Are you saying that the error path there is broken > > too? > > The driver won't actually work if radeon_crtc_init bails silently, it'll > just fall over at some later point. Ok, so how about fleshing it out as per below? Will --->8 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index e81b01f8db90..177acee06620 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -668,21 +668,29 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = { .page_flip_target = radeon_crtc_page_flip_target, }; -static void radeon_crtc_init(struct drm_device *dev, int index) +static int radeon_crtc_init(struct drm_device *dev, int index) { struct radeon_device *rdev = dev->dev_private; struct radeon_crtc *radeon_crtc; + struct workqueue_struct *wq; int i; radeon_crtc = kzalloc(sizeof(struct radeon_crtc) + (RADEONFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL); if (radeon_crtc == NULL) - return; + return -ENOMEM; + + wq = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + if (unlikely(!wq)) { + kfree(radeon_crtc); + return - ENOMEM; + } drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs); drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256); radeon_crtc->crtc_id = index; - radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + radeon_crtc->flip_queue = wq; + rdev->mode_info.crtcs[index] = radeon_crtc; if (rdev->family >= CHIP_BONAIRE) { @@ -711,6 +719,8 @@ static void radeon_crtc_init(struct drm_device *dev, int index) radeon_atombios_init_crtc(dev, radeon_crtc); else radeon_legacy_init_crtc(dev, radeon_crtc); + + return 0; } static const char *encoder_names[38] = { @@ -1602,9 +1612,8 @@ int radeon_modeset_init(struct radeon_device *rdev) rdev->ddev->mode_config.fb_base = rdev->mc.aper_base; ret = radeon_modeset_create_props(rdev); - if (ret) { - return ret; - } + if (ret) + goto err_drm_mode_config_cleanup; /* init i2c buses */ radeon_i2c_init(rdev); @@ -1617,7 +1626,9 @@ int radeon_modeset_init(struct radeon_device *rdev) /* allocate crtcs */ for (i = 0; i < rdev->num_crtc; i++) { - radeon_crtc_init(rdev->ddev, i); + ret = radeon_crtc_init(rdev->ddev, i); + if (ret) + goto err_drm_mode_config_cleanup; } /* okay we should have all the bios connectors */ @@ -1645,6 +1656,10 @@ int radeon_modeset_init(struct radeon_device *rdev) ret = radeon_pm_late_init(rdev); return 0; + +err_drm_mode_config_cleanup: + drm_mode_config_cleanup(rdev->ddev); + return ret; } void radeon_modeset_fini(struct radeon_device *rdev) ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-31 16:54 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2019-10-31 16:54 UTC (permalink / raw) To: Michel Dänzer Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On Fri, Oct 25, 2019 at 06:20:01PM +0200, Michel Dänzer wrote: > On 2019-10-25 6:18 p.m., Will Deacon wrote: > > On Fri, Oct 25, 2019 at 06:06:26PM +0200, Michel Dänzer wrote: > >> On 2019-10-25 1:04 p.m., Will Deacon wrote: > >>> In the highly unlikely event that we fail to allocate the "radeon-crtc" > >>> workqueue, we should bail cleanly rather than blindly march on with a > >>> NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' > >>> structure. > >>> > >>> This was reported previously by Nicolas, but I don't think his fix was > >>> correct: > >> > >> Neither is this one I'm afraid. See my feedback on > >> https://patchwork.freedesktop.org/patch/331534/ . > > > > Thanks. Although I agree with you wrt the original patch, I don't think > > the workqueue allocation failure is distinguishable from the CRTC allocation > > failure with my patch. Are you saying that the error path there is broken > > too? > > The driver won't actually work if radeon_crtc_init bails silently, it'll > just fall over at some later point. Ok, so how about fleshing it out as per below? Will --->8 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index e81b01f8db90..177acee06620 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -668,21 +668,29 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = { .page_flip_target = radeon_crtc_page_flip_target, }; -static void radeon_crtc_init(struct drm_device *dev, int index) +static int radeon_crtc_init(struct drm_device *dev, int index) { struct radeon_device *rdev = dev->dev_private; struct radeon_crtc *radeon_crtc; + struct workqueue_struct *wq; int i; radeon_crtc = kzalloc(sizeof(struct radeon_crtc) + (RADEONFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL); if (radeon_crtc == NULL) - return; + return -ENOMEM; + + wq = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + if (unlikely(!wq)) { + kfree(radeon_crtc); + return - ENOMEM; + } drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs); drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256); radeon_crtc->crtc_id = index; - radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + radeon_crtc->flip_queue = wq; + rdev->mode_info.crtcs[index] = radeon_crtc; if (rdev->family >= CHIP_BONAIRE) { @@ -711,6 +719,8 @@ static void radeon_crtc_init(struct drm_device *dev, int index) radeon_atombios_init_crtc(dev, radeon_crtc); else radeon_legacy_init_crtc(dev, radeon_crtc); + + return 0; } static const char *encoder_names[38] = { @@ -1602,9 +1612,8 @@ int radeon_modeset_init(struct radeon_device *rdev) rdev->ddev->mode_config.fb_base = rdev->mc.aper_base; ret = radeon_modeset_create_props(rdev); - if (ret) { - return ret; - } + if (ret) + goto err_drm_mode_config_cleanup; /* init i2c buses */ radeon_i2c_init(rdev); @@ -1617,7 +1626,9 @@ int radeon_modeset_init(struct radeon_device *rdev) /* allocate crtcs */ for (i = 0; i < rdev->num_crtc; i++) { - radeon_crtc_init(rdev->ddev, i); + ret = radeon_crtc_init(rdev->ddev, i); + if (ret) + goto err_drm_mode_config_cleanup; } /* okay we should have all the bios connectors */ @@ -1645,6 +1656,10 @@ int radeon_modeset_init(struct radeon_device *rdev) ret = radeon_pm_late_init(rdev); return 0; + +err_drm_mode_config_cleanup: + drm_mode_config_cleanup(rdev->ddev); + return ret; } void radeon_modeset_fini(struct radeon_device *rdev) _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH] drm/radeon: Handle workqueue allocation failure @ 2019-10-31 16:54 ` Will Deacon 0 siblings, 0 replies; 16+ messages in thread From: Will Deacon @ 2019-10-31 16:54 UTC (permalink / raw) To: Michel Dänzer Cc: amd-gfx, David Airlie, linux-kernel, dri-devel, Nicolas Waisman, Alex Deucher, Christian König On Fri, Oct 25, 2019 at 06:20:01PM +0200, Michel Dänzer wrote: > On 2019-10-25 6:18 p.m., Will Deacon wrote: > > On Fri, Oct 25, 2019 at 06:06:26PM +0200, Michel Dänzer wrote: > >> On 2019-10-25 1:04 p.m., Will Deacon wrote: > >>> In the highly unlikely event that we fail to allocate the "radeon-crtc" > >>> workqueue, we should bail cleanly rather than blindly march on with a > >>> NULL pointer installed for the 'flip_queue' field of the 'radeon_crtc' > >>> structure. > >>> > >>> This was reported previously by Nicolas, but I don't think his fix was > >>> correct: > >> > >> Neither is this one I'm afraid. See my feedback on > >> https://patchwork.freedesktop.org/patch/331534/ . > > > > Thanks. Although I agree with you wrt the original patch, I don't think > > the workqueue allocation failure is distinguishable from the CRTC allocation > > failure with my patch. Are you saying that the error path there is broken > > too? > > The driver won't actually work if radeon_crtc_init bails silently, it'll > just fall over at some later point. Ok, so how about fleshing it out as per below? Will --->8 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index e81b01f8db90..177acee06620 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -668,21 +668,29 @@ static const struct drm_crtc_funcs radeon_crtc_funcs = { .page_flip_target = radeon_crtc_page_flip_target, }; -static void radeon_crtc_init(struct drm_device *dev, int index) +static int radeon_crtc_init(struct drm_device *dev, int index) { struct radeon_device *rdev = dev->dev_private; struct radeon_crtc *radeon_crtc; + struct workqueue_struct *wq; int i; radeon_crtc = kzalloc(sizeof(struct radeon_crtc) + (RADEONFB_CONN_LIMIT * sizeof(struct drm_connector *)), GFP_KERNEL); if (radeon_crtc == NULL) - return; + return -ENOMEM; + + wq = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + if (unlikely(!wq)) { + kfree(radeon_crtc); + return - ENOMEM; + } drm_crtc_init(dev, &radeon_crtc->base, &radeon_crtc_funcs); drm_mode_crtc_set_gamma_size(&radeon_crtc->base, 256); radeon_crtc->crtc_id = index; - radeon_crtc->flip_queue = alloc_workqueue("radeon-crtc", WQ_HIGHPRI, 0); + radeon_crtc->flip_queue = wq; + rdev->mode_info.crtcs[index] = radeon_crtc; if (rdev->family >= CHIP_BONAIRE) { @@ -711,6 +719,8 @@ static void radeon_crtc_init(struct drm_device *dev, int index) radeon_atombios_init_crtc(dev, radeon_crtc); else radeon_legacy_init_crtc(dev, radeon_crtc); + + return 0; } static const char *encoder_names[38] = { @@ -1602,9 +1612,8 @@ int radeon_modeset_init(struct radeon_device *rdev) rdev->ddev->mode_config.fb_base = rdev->mc.aper_base; ret = radeon_modeset_create_props(rdev); - if (ret) { - return ret; - } + if (ret) + goto err_drm_mode_config_cleanup; /* init i2c buses */ radeon_i2c_init(rdev); @@ -1617,7 +1626,9 @@ int radeon_modeset_init(struct radeon_device *rdev) /* allocate crtcs */ for (i = 0; i < rdev->num_crtc; i++) { - radeon_crtc_init(rdev->ddev, i); + ret = radeon_crtc_init(rdev->ddev, i); + if (ret) + goto err_drm_mode_config_cleanup; } /* okay we should have all the bios connectors */ @@ -1645,6 +1656,10 @@ int radeon_modeset_init(struct radeon_device *rdev) ret = radeon_pm_late_init(rdev); return 0; + +err_drm_mode_config_cleanup: + drm_mode_config_cleanup(rdev->ddev); + return ret; } void radeon_modeset_fini(struct radeon_device *rdev) _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2019-10-31 16:55 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-10-25 11:04 [PATCH] drm/radeon: Handle workqueue allocation failure Will Deacon 2019-10-25 11:04 ` Will Deacon 2019-10-25 11:04 ` Will Deacon 2019-10-25 11:04 ` Will Deacon 2019-10-25 16:06 ` Michel Dänzer 2019-10-25 16:06 ` Michel Dänzer 2019-10-25 16:06 ` Michel Dänzer 2019-10-25 16:18 ` Will Deacon 2019-10-25 16:18 ` Will Deacon 2019-10-25 16:18 ` Will Deacon 2019-10-25 16:20 ` Michel Dänzer 2019-10-25 16:20 ` Michel Dänzer 2019-10-25 16:20 ` Michel Dänzer 2019-10-31 16:54 ` Will Deacon 2019-10-31 16:54 ` Will Deacon 2019-10-31 16:54 ` Will Deacon
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.