drm/msm/a6xx: Avoid freeing gmu resources multiple times
Subsystems (4)
Sean Paul
reviewerPATCH v2 1/6 drm/msm/a6xx: Avoid freeing gmu resources multiple times
From: Sean Paul <[email protected]>
The driver checks for gmu->mmio as a sign that the device has been initialized, however there are failures in probe below the mmio init. If one of those is hit, mmio will be non-null but freed.
In that case, a6xx_gmu_probe will return an error to a6xx_gpu_init which will in turn call a6xx_gmu_remove which checks gmu->mmio and tries to free resources for a second time. This causes a great boom.
Fix this by adding an initialized member to gmu which is set on successful probe and cleared on removal.
Changes in v2:
- None
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 14 +++++++++----- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +9 -5
@@ -74,7 +74,7 @@ bool a6xx_gmu_sptprac_is_on(struct a6xx_gmu *gmu)u32 val;/* This can be called from gpu state code so make sure GMU is valid */ -if (IS_ERR_OR_NULL (gmu->mmio)) +if (!gmu->initialized)return false; val =gmu_read (gmu,REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS );
@@ -90,7 +90,7 @@ bool a6xx_gmu_gx_is_on(struct a6xx_gmu *gmu)u32 val;/* This can be called from gpu state code so make sure GMU is valid */ -if (IS_ERR_OR_NULL (gmu->mmio)) +if (!gmu->initialized)return false; val =gmu_read (gmu,REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS );
@@ -695,7 +695,7 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu)struct a6xx_gmu *gmu = &a6xx_gpu->gmu;int status, ret; -if (WARN (!gmu->mmio,"The GMU is not set up yet\n" )) +if (WARN (!gmu->initialized,"The GMU is not set up yet\n" ))return 0 ; gmu->hung = false;
@@ -765,7 +765,7 @@ bool a6xx_gmu_isidle(struct a6xx_gmu *gmu) {u32 reg; -if (!gmu->mmio) +if (!gmu->initialized)return true; reg =gmu_read (gmu,REG_A6XX_GPU_GMU_AO_GPU_CX_BUSY_STATUS );
@@ -1227,7 +1227,7 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu) {struct a6xx_gmu *gmu = &a6xx_gpu->gmu; -if (IS_ERR_OR_NULL (gmu->mmio)) +if (!gmu->initialized)return ;a6xx_gmu_stop (a6xx_gpu);
@@ -1245,6 +1245,8 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)iommu_detach_device (gmu->domain, gmu->dev);iommu_domain_free (gmu->domain); + + gmu->initialized = false; }int a6xx_gmu_probe (struct a6xx_gpu *a6xx_gpu,struct device_node *node)
@@ -1309,6 +1311,8 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)/* Set up the HFI queues */ a6xx_hfi_init (gmu); + gmu->initialized = true; +return 0 ; err:a6xx_gmu_memory_free (gmu, gmu->hfi);
drivers/gpu/drm/msm/adreno/a6xx_gmu.h +1 -0
@@ -75,6 +75,7 @@ struct a6xx_gmu {struct a6xx_hfi_queue queues[2 ]; +bool initialized;bool hung; };
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 20190523171653.138678-1-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org
PATCH v2 2/6 drm/msm/a6xx: Remove duplicate irq disable from remove
From: Sean Paul <[email protected]>
a6xx_gmu_stop() already calls this function via shutdown or force_stop, so it's not necessary to call it twice. Previously this would have knocked the irq refcount out of sync, but now with the irqs_enabled flag it's just housekeeping.
Changes in v2:
- None
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +0 -1
@@ -1239,7 +1239,6 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)dev_pm_domain_detach (gmu->gxpd, false); } -a6xx_gmu_irq_disable (gmu);a6xx_gmu_memory_free (gmu, gmu->hfi);iommu_detach_device (gmu->domain, gmu->dev);
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20190523171653.138678-2-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org
Jordan Crouse
Reviewed-byRe: [PATCH v2 2/6] drm/msm/a6xx: Remove duplicate irq disable from remove
Quoted 7 lines · Sean Paul
From: Sean Paul <[email protected]>
a6xx_gmu_stop()already calls this function via shutdown orforce_stop, so it's not necessary to call it twice. Previously this would have knocked the irq refcount out of sync, but now with theirqs_enabledflag it's just housekeeping.
Quoted 5 lines
Changes in v2:
- NoneCc Jordan Crouse <[email protected]>Signed-off-by Sean Paul <[email protected]>
Quoted 19 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 1 - 1 file changed, 1 deletion(-)drivers/gpu/drm/msm/adreno/a6xx_gmu.c +0
-1@@ -1239,7 +1239,6 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)dev_pm_domain_detach (gmu->gxpd, false); } -a6xx_gmu_irq_disable (gmu);a6xx_gmu_memory_free (gmu, gmu->hfi);iommu_detach_device (gmu->domain, gmu->dev);Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v2 3/6 drm/msm/a6xx: Check for ERR or NULL before iounmap
In reply to a message not in the archiveFrom: Sean Paul <[email protected]>
pdcptr and seqptr aren't necessarily valid, check them before trying to unmap them.
Changes in v2:
- None
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +4 -2
@@ -504,8 +504,10 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)wmb (); err: -devm_iounmap (gmu->dev, pdcptr); -devm_iounmap (gmu->dev, seqptr); +if (!IS_ERR_OR_NULL (pdcptr)) +devm_iounmap (gmu->dev, pdcptr); +if (!IS_ERR_OR_NULL (seqptr)) +devm_iounmap (gmu->dev, seqptr); }/*
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [PATCH v2 3/6] drm/msm/a6xx: Check for ERR or NULL before iounmap
Quoted 10 lines · Sean Paul
From: Sean Paul <[email protected]>
pdcptr and seqptr aren't necessarily valid, check them before trying to unmap them.
Changes in v2:
- NoneCc Jordan Crouse <[email protected]>Signed-off-by Sean Paul <[email protected]>
It has always been sad to me that iounmap() has chosen to not check for NULL.
Quoted 24 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gmu.c +4
-2@@ -504,8 +504,10 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)wmb (); err: -devm_iounmap (gmu->dev, pdcptr); -devm_iounmap (gmu->dev, seqptr); +if (!IS_ERR_OR_NULL (pdcptr)) +devm_iounmap (gmu->dev, pdcptr); +if (!IS_ERR_OR_NULL (seqptr)) +devm_iounmap (gmu->dev, seqptr); }/* Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 4/6 drm/msm/a6xx: Remove devm calls from gmu driver
In reply to a message not in the archiveFrom: Sean Paul <[email protected]>
The gmu driver is initialized and cleaned up with calls from the gpu driver. As such, the platform device stays valid after a6xx_gmu_remove is called and the device managed resources are not freed. In the case of gpu probe failures or unbind, these resources will remain managed.
If the gpu bind is run again (eg: if there's a probe defer somewhere in msm), these resources will be initialized again for the same device, creating multiple references. In the case of irqs, this causes failures since the irqs are not shared (nor should they be).
This patch removes all devm_* calls and manually cleans things up in gmu_remove.
Changes in v2:
- Add iounmap and free_irq to gmu_probe error paths
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 33 ++++++++++++++++++--------- 1 file changed, 22 insertions(+), 11 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +22 -11
@@ -505,9 +505,9 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu) err:if (!IS_ERR_OR_NULL (pdcptr)) -devm_iounmap (gmu->dev, pdcptr); +iounmap (pdcptr);if (!IS_ERR_OR_NULL (seqptr)) -devm_iounmap (gmu->dev, seqptr); +iounmap (seqptr); }/*
@@ -1197,7 +1197,7 @@ static void __iomem *a6xx_gmu_get_mmio(struct platform_device *pdev,return ERR_PTR (-EINVAL ); } - ret =devm_ioremap (&pdev->dev, res->start,resource_size (res)); + ret =ioremap (res->start,resource_size (res));if (!ret) {DRM_DEV_ERROR (&pdev->dev,"Unable to map the %s registers\n" , name);return ERR_PTR (-EINVAL );
@@ -1213,10 +1213,10 @@ static int a6xx_gmu_get_irq(struct a6xx_gmu *gmu, struct platform_device *pdev, irq =platform_get_irq_byname (pdev, name); - ret =devm_request_irq (&pdev->dev, irq, handler,IRQF_TRIGGER_HIGH , - name, gmu); + ret =request_irq (irq, handler,IRQF_TRIGGER_HIGH , name, gmu);if (ret) { -DRM_DEV_ERROR (&pdev->dev,"Unable to get interrupt %s\n" , name); +DRM_DEV_ERROR (&pdev->dev,"Unable to get interrupt %s %d\n" , + name, ret);return ret; }
@@ -1241,12 +1241,18 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)dev_pm_domain_detach (gmu->gxpd, false); } +iounmap (gmu->mmio); + gmu->mmio =NULL ; +a6xx_gmu_memory_free (gmu, gmu->hfi);iommu_detach_device (gmu->domain, gmu->dev);iommu_domain_free (gmu->domain); +free_irq (gmu->gmu_irq, gmu); +free_irq (gmu->hfi_irq, gmu); + gmu->initialized = false; }
@@ -1281,24 +1287,24 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)/* Allocate memory for for the HFI queues */ gmu->hfi =a6xx_gmu_memory_alloc (gmu,SZ_16K );if (IS_ERR (gmu->hfi)) - goto err; + goto err_memory;/* Allocate memory for the GMU debug region */ gmu->debug =a6xx_gmu_memory_alloc (gmu,SZ_16K );if (IS_ERR (gmu->debug)) - goto err; + goto err_memory;/* Map the GMU registers */ gmu->mmio =a6xx_gmu_get_mmio (pdev,"gmu" );if (IS_ERR (gmu->mmio)) - goto err; + goto err_memory;/* Get the HFI and GMU interrupts */ gmu->hfi_irq =a6xx_gmu_get_irq (gmu, pdev,"hfi" , a6xx_hfi_irq); gmu->gmu_irq =a6xx_gmu_get_irq (gmu, pdev,"gmu" , a6xx_gmu_irq);if (gmu->hfi_irq <0 || gmu->gmu_irq <0 ) - goto err; + goto err_mmio;/* * Get a link to the GX power domain to reset the GPU in case of GMU
@@ -1315,7 +1321,12 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node) gmu->initialized = true;return 0 ; -err: + +err_mmio: +iounmap (gmu->mmio); +free_irq (gmu->gmu_irq, gmu); +free_irq (gmu->hfi_irq, gmu); +err_memory:a6xx_gmu_memory_free (gmu, gmu->hfi);if (gmu->domain) {
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20190523171653.138678-4-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org
Jordan Crouse
Reviewed-byRe: [PATCH v2 4/6] drm/msm/a6xx: Remove devm calls from gmu driver
Quoted 12 lines · Sean Paul
From: Sean Paul <[email protected]>
The gmu driver is initialized and cleaned up with calls from the gpu driver. As such, the platform device stays valid after
a6xx_gmu_removeis called and the device managed resources are not freed. In the case of gpu probe failures or unbind, these resources will remain managed.If the gpu bind is run again (eg: if there's a probe defer somewhere in msm), these resources will be initialized again for the same device, creating multiple references. In the case of irqs, this causes failures since the irqs are not shared (nor should they be).
Quoted 8 lines
This patch removes all devm_* calls and manually cleans things up in
gmu_remove.Changes in v2:
- Add iounmap andfree_irqtogmu_probeerror pathsCc Jordan Crouse <[email protected]>Signed-off-by Sean Paul <[email protected]>
As we discussed in IRC, I feel like the way we are probing and dealing with the GMU device is messing up the reference counting. I had hoped that a put_device() would do the trick but testing showed it didn't so there is clearly remaining fail that we should eventually find and fix.
That said; there is really no reason to be using managed resources for this device so this is an entirely appropriate patch.
Quoted 108 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 33 ++++++++++++++++++--------- 1 file changed, 22 insertions(+), 11 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gmu.c +22
-11@@ -505,9 +505,9 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu) err:if (!IS_ERR_OR_NULL (pdcptr)) -devm_iounmap (gmu->dev, pdcptr); +iounmap (pdcptr);if (!IS_ERR_OR_NULL (seqptr)) -devm_iounmap (gmu->dev, seqptr); +iounmap (seqptr); }/* @@ -1197,7 +1197,7 @@ static void __iomem *a6xx_gmu_get_mmio(struct platform_device *pdev,return ERR_PTR (-EINVAL ); } - ret =devm_ioremap (&pdev->dev, res->start,resource_size (res)); + ret =ioremap (res->start,resource_size (res));if (!ret) {DRM_DEV_ERROR (&pdev->dev,"Unable to map the %s registers\n" , name);return ERR_PTR (-EINVAL );@@ -1213,10 +1213,10 @@ static int a6xx_gmu_get_irq(struct a6xx_gmu *gmu, struct platform_device *pdev, irq =platform_get_irq_byname (pdev, name); - ret =devm_request_irq (&pdev->dev, irq, handler,IRQF_TRIGGER_HIGH , - name, gmu); + ret =request_irq (irq, handler,IRQF_TRIGGER_HIGH , name, gmu);if (ret) { -DRM_DEV_ERROR (&pdev->dev,"Unable to get interrupt %s\n" , name); +DRM_DEV_ERROR (&pdev->dev,"Unable to get interrupt %s %d\n" , + name, ret);return ret; }@@ -1241,12 +1241,18 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)dev_pm_domain_detach (gmu->gxpd, false); } +iounmap (gmu->mmio); + gmu->mmio =NULL ; +a6xx_gmu_memory_free (gmu, gmu->hfi);iommu_detach_device (gmu->domain, gmu->dev);iommu_domain_free (gmu->domain); +free_irq (gmu->gmu_irq, gmu); +free_irq (gmu->hfi_irq, gmu); + gmu->initialized = false; }@@ -1281,24 +1287,24 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)/* Allocate memory for for the HFI queues */ gmu->hfi =a6xx_gmu_memory_alloc (gmu,SZ_16K );if (IS_ERR (gmu->hfi)) - goto err; + goto err_memory;/* Allocate memory for the GMU debug region */ gmu->debug =a6xx_gmu_memory_alloc (gmu,SZ_16K );if (IS_ERR (gmu->debug)) - goto err; + goto err_memory;/* Map the GMU registers */ gmu->mmio =a6xx_gmu_get_mmio (pdev,"gmu" );if (IS_ERR (gmu->mmio)) - goto err; + goto err_memory;/* Get the HFI and GMU interrupts */ gmu->hfi_irq =a6xx_gmu_get_irq (gmu, pdev,"hfi" , a6xx_hfi_irq); gmu->gmu_irq =a6xx_gmu_get_irq (gmu, pdev,"gmu" , a6xx_gmu_irq);if (gmu->hfi_irq <0 || gmu->gmu_irq <0 ) - goto err; + goto err_mmio;/* * Get a link to the GX power domain to reset the GPU in case of GMU @@ -1315,7 +1321,12 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node) gmu->initialized = true;return 0 ; -err: + +err_mmio: +iounmap (gmu->mmio); +free_irq (gmu->gmu_irq, gmu); +free_irq (gmu->hfi_irq, gmu); +err_memory:a6xx_gmu_memory_free (gmu, gmu->hfi);if (gmu->domain) {Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v2 5/6 drm/msm/a6xx: Drop the device reference in gmu
In reply to a message not in the archiveFrom: Sean Paul <[email protected]>
of_find_device_by_node() grabs a dev reference, so make sure we clear it on error and remove.
Changes in v2:
- Added to the set (Jordan)
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +11 -3
@@ -1253,6 +1253,9 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)free_irq (gmu->gmu_irq, gmu);free_irq (gmu->hfi_irq, gmu); +/* Drop reference taken in of_find_device_by_node */ +put_device (gmu->dev); + gmu->initialized = false; }
@@ -1277,12 +1280,12 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)/* Get the list of clocks */ ret =a6xx_gmu_clocks_probe (gmu);if (ret) -return ret; + goto err_put_device;/* Set up the IOMMU context bank */ ret =a6xx_gmu_memory_probe (gmu);if (ret) -return ret; + goto err_put_device;/* Allocate memory for for the HFI queues */ gmu->hfi =a6xx_gmu_memory_alloc (gmu,SZ_16K );
@@ -1334,6 +1337,11 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)iommu_domain_free (gmu->domain); } + ret = -ENODEV ; -return -ENODEV ; +err_put_device: +/* Drop reference taken in of_find_device_by_node */ +put_device (gmu->dev); + +return ret; }
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20190523171653.138678-5-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org
Jordan Crouse
Reviewed-byRe: [PATCH v2 5/6] drm/msm/a6xx: Drop the device reference in gmu
Quoted 10 lines · Sean Paul
From: Sean Paul <[email protected]>
of_find_device_by_node()grabs a dev reference, so make sure we clear it on error and remove.Changes in v2:
- Added to the set (Jordan)Cc Jordan Crouse <[email protected]>Signed-off-by Sean Paul <[email protected]>
Quoted 49 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gmu.c +11
-3@@ -1253,6 +1253,9 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)free_irq (gmu->gmu_irq, gmu);free_irq (gmu->hfi_irq, gmu); +/* Drop reference taken in of_find_device_by_node */ +put_device (gmu->dev); + gmu->initialized = false; }@@ -1277,12 +1280,12 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)/* Get the list of clocks */ ret =a6xx_gmu_clocks_probe (gmu);if (ret) -return ret; + goto err_put_device;/* Set up the IOMMU context bank */ ret =a6xx_gmu_memory_probe (gmu);if (ret) -return ret; + goto err_put_device;/* Allocate memory for for the HFI queues */ gmu->hfi =a6xx_gmu_memory_alloc (gmu,SZ_16K );@@ -1334,6 +1337,11 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)iommu_domain_free (gmu->domain); } + ret = -ENODEV ; -return -ENODEV ; +err_put_device: +/* Drop reference taken in of_find_device_by_node */ +put_device (gmu->dev); + +return ret; }Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v2 6/6 drm/msm/a6xx: Rename a6xx_gmu_probe to a6xx_gmu_init
In reply to a message not in the archiveFrom: Sean Paul <[email protected]>
This rename makes it more clear that everything initialized in the _init function must be cleaned up in a6xx_gmu_remove. This will hopefully dissuade people from using device managed resources (for reasons laid out in the previous patch).
Changes in v2:
- None
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +1 -1
@@ -1259,7 +1259,7 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu) gmu->initialized = false; } -int a6xx_gmu_probe (struct a6xx_gpu *a6xx_gpu,struct device_node *node) +int a6xx_gmu_init (struct a6xx_gpu *a6xx_gpu,struct device_node *node) {struct a6xx_gmu *gmu = &a6xx_gpu->gmu;struct platform_device *pdev =of_find_device_by_node (node);
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -1
@@ -854,7 +854,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)/* FIXME: How do we gracefully handle this? */ BUG_ON (!node); - ret =a6xx_gmu_probe (a6xx_gpu, node); + ret =a6xx_gmu_init (a6xx_gpu, node);if (ret) {a6xx_destroy (&(a6xx_gpu->base.base));return ERR_PTR (ret);
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +1 -1
@@ -53,7 +53,7 @@ bool a6xx_gmu_isidle(struct a6xx_gmu *gmu);int a6xx_gmu_set_oob (struct a6xx_gmu *gmu,enum a6xx_gmu_oob_state state);void a6xx_gmu_clear_oob (struct a6xx_gmu *gmu,enum a6xx_gmu_oob_state state); -int a6xx_gmu_probe (struct a6xx_gpu *a6xx_gpu,struct device_node *node); +int a6xx_gmu_init (struct a6xx_gpu *a6xx_gpu,struct device_node *node);void a6xx_gmu_remove (struct a6xx_gpu *a6xx_gpu);void a6xx_gmu_set_freq (struct msm_gpu *gpu,unsigned long freq);
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20190523171653.138678-6-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org
Jordan Crouse
Reviewed-byRe: [PATCH v2 6/6] drm/msm/a6xx: Rename a6xx_gmu_probe to a6xx_gmu_init
Quoted 7 lines · Sean Paul
From: Sean Paul <[email protected]>
This rename makes it more clear that everything initialized in the
_initfunction must be cleaned up ina6xx_gmu_remove. This will hopefully dissuade people from using device managed resources (for reasons laid out in the previous patch).
Quoted 5 lines
Changes in v2:
- NoneCc Jordan Crouse <[email protected]>Signed-off-by Sean Paul <[email protected]>
Quoted 48 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gmu.c +1
-1@@ -1259,7 +1259,7 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu) gmu->initialized = false; } -int a6xx_gmu_probe (struct a6xx_gpu *a6xx_gpu,struct device_node *node) +int a6xx_gmu_init (struct a6xx_gpu *a6xx_gpu,struct device_node *node) {struct a6xx_gmu *gmu = &a6xx_gpu->gmu;struct platform_device *pdev =of_find_device_by_node (node);drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1
-1@@ -854,7 +854,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)/* FIXME: How do we gracefully handle this? */ BUG_ON (!node); - ret =a6xx_gmu_probe (a6xx_gpu, node); + ret =a6xx_gmu_init (a6xx_gpu, node);if (ret) {a6xx_destroy (&(a6xx_gpu->base.base));return ERR_PTR (ret);drivers/gpu/drm/msm/adreno/a6xx_gpu.h +1
-1@@ -53,7 +53,7 @@ bool a6xx_gmu_isidle(struct a6xx_gmu *gmu);int a6xx_gmu_set_oob (struct a6xx_gmu *gmu,enum a6xx_gmu_oob_state state);void a6xx_gmu_clear_oob (struct a6xx_gmu *gmu,enum a6xx_gmu_oob_state state); -int a6xx_gmu_probe (struct a6xx_gpu *a6xx_gpu,struct device_node *node); +int a6xx_gmu_init (struct a6xx_gpu *a6xx_gpu,struct device_node *node);void a6xx_gmu_remove (struct a6xx_gpu *a6xx_gpu);void a6xx_gmu_set_freq (struct msm_gpu *gpu,unsigned long freq);Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Jordan Crouse
Reviewed-byQuoted 10 lines · Sean Paul
From: Sean Paul <[email protected]>
The driver checks for
gmu->mmioas a sign that the device has been initialized, however there are failures in probe below the mmio init. If one of those is hit, mmio will be non-null but freed.In that case,
a6xx_gmu_probewill return an error toa6xx_gpu_initwhich will in turn calla6xx_gmu_removewhich checksgmu->mmioand tries to free resources for a second time. This causes a great boom.
Quoted 8 lines
Fix this by adding an initialized member to gmu which is set on successful probe and cleared on removal.
Changes in v2:
- NoneCc Jordan Crouse <[email protected]>Signed-off-by Sean Paul <[email protected]>
Quoted 87 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 14 +++++++++----- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-)drivers/gpu/drm/msm/adreno/a6xx_gmu.c +9
-5@@ -74,7 +74,7 @@ bool a6xx_gmu_sptprac_is_on(struct a6xx_gmu *gmu)u32 val;/* This can be called from gpu state code so make sure GMU is valid */ -if (IS_ERR_OR_NULL (gmu->mmio)) +if (!gmu->initialized)return false; val =gmu_read (gmu,REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS );@@ -90,7 +90,7 @@ bool a6xx_gmu_gx_is_on(struct a6xx_gmu *gmu)u32 val;/* This can be called from gpu state code so make sure GMU is valid */ -if (IS_ERR_OR_NULL (gmu->mmio)) +if (!gmu->initialized)return false; val =gmu_read (gmu,REG_A6XX_GMU_SPTPRAC_PWR_CLK_STATUS );@@ -695,7 +695,7 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu)struct a6xx_gmu *gmu = &a6xx_gpu->gmu;int status, ret; -if (WARN (!gmu->mmio,"The GMU is not set up yet\n" )) +if (WARN (!gmu->initialized,"The GMU is not set up yet\n" ))return 0 ; gmu->hung = false;@@ -765,7 +765,7 @@ bool a6xx_gmu_isidle(struct a6xx_gmu *gmu) {u32 reg; -if (!gmu->mmio) +if (!gmu->initialized)return true; reg =gmu_read (gmu,REG_A6XX_GPU_GMU_AO_GPU_CX_BUSY_STATUS );@@ -1227,7 +1227,7 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu) {struct a6xx_gmu *gmu = &a6xx_gpu->gmu; -if (IS_ERR_OR_NULL (gmu->mmio)) +if (!gmu->initialized)return ;a6xx_gmu_stop (a6xx_gpu);@@ -1245,6 +1245,8 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)iommu_detach_device (gmu->domain, gmu->dev);iommu_domain_free (gmu->domain); + + gmu->initialized = false; }int a6xx_gmu_probe (struct a6xx_gpu *a6xx_gpu,struct device_node *node)@@ -1309,6 +1311,8 @@ int a6xx_gmu_probe(struct a6xx_gpu *a6xx_gpu, struct device_node *node)/* Set up the HFI queues */ a6xx_hfi_init (gmu); + gmu->initialized = true; +return 0 ; err:a6xx_gmu_memory_free (gmu, gmu->hfi);drivers/gpu/drm/msm/adreno/a6xx_gmu.h +1
-0@@ -75,6 +75,7 @@ struct a6xx_gmu {struct a6xx_hfi_queue queues[2 ]; +bool initialized;bool hung; };Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno