Re: [PATCH 19/51] drm: Cleanups after drmm_add_final_kfree rollout

Am 02.03.20 um 23:25 schrieb Daniel Vetter:

A few things:

• Update the example driver in the documentation.
• We can drop the old kfree in drm_dev_release.
• Add a WARN_ON check in drm_dev_register to make sure everyone calls drmm_add_final_kfree and there's no leaks.

Signed-off-by: Daniel Vetter daniel.vetter@intel.com

Acked-by: Thomas Zimmermann tzimmermann@suse.de

---

drivers/gpu/drm/drm_drv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 7b84ee8a5eb5..1a048325f30e 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -297,8 +297,6 @@ void drm_minor_release(struct drm_minor *minor)

• drm_mode_config_cleanup(drm);
  

• drm_dev_fini(drm);
  

• • kfree(priv->userspace_facing);
    

• • kfree(priv);
    

  • }
  • static struct drm_driver driver_drm_driver = {

@@ -326,10 +324,11 @@ void drm_minor_release(struct drm_minor *minor)

• 	kfree(drm);
  

• 	return ret;
  

• }
  

• • drmm_add_final_kfree(drm, priv);
    

  • drm_mode_config_init(drm);
    

• • priv->userspace_facing = kzalloc(..., GFP_KERNEL);
    

• • priv->userspace_facing = drmm_kzalloc(..., GFP_KERNEL);
    

  • if (!priv->userspace_facing)
    

  • 	return -ENOMEM;
    

@@ -961,6 +960,8 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) struct drm_driver *driver = dev->driver; int ret;

• WARN_ON(!dev->managed.final_kfree);
• if (drm_dev_needs_global_mutex(dev)) mutex_lock(&drm_global_mutex);