| Message ID | 20221107224656.278135-3-mcanal@igalia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Balance mutex_init and mutex_destroy calls | expand |
On Mon, Nov 07, 2022 at 07:46:56PM -0300, Maíra Canal wrote: > v3d_perfmon_open_file() instantiates a mutex for a particular file > instance, but it never destroys it by calling mutex_destroy() in > v3d_perfmon_close_file(). > > Similarly, v3d_perfmon_create_ioctl() instantiates a mutex for a > particular perfmon, but it never destroys it by calling mutex_destroy() > in v3d_perfmon_destroy_ioctl(). > > So, add the missing mutex_destroy on both cases. > > Signed-off-by: Maíra Canal <mcanal@igalia.com> > --- > drivers/gpu/drm/v3d/v3d_perfmon.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/v3d/v3d_perfmon.c b/drivers/gpu/drm/v3d/v3d_perfmon.c > index 48aaaa972c49..292c73544255 100644 > --- a/drivers/gpu/drm/v3d/v3d_perfmon.c > +++ b/drivers/gpu/drm/v3d/v3d_perfmon.c > @@ -113,6 +113,7 @@ void v3d_perfmon_close_file(struct v3d_file_priv *v3d_priv) > idr_for_each(&v3d_priv->perfmon.idr, v3d_perfmon_idr_del, NULL); > idr_destroy(&v3d_priv->perfmon.idr); > mutex_unlock(&v3d_priv->perfmon.lock); > + mutex_destroy(&v3d_priv->perfmon.lock); > } > > int v3d_perfmon_create_ioctl(struct drm_device *dev, void *data, > @@ -177,6 +178,7 @@ int v3d_perfmon_destroy_ioctl(struct drm_device *dev, void *data, > if (!perfmon) > return -EINVAL; > > + mutex_destroy(&perfmon->lock); This one looks wrong, I think this should be put into v3d_perfmon_put. There is also an error case in v3d_perfmon_create_ioctl() that I think you missed, right above the kfree(perfmon). With these two fixes this is Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > v3d_perfmon_put(perfmon); > > return 0; > -- > 2.38.1 >
diff --git a/drivers/gpu/drm/v3d/v3d_perfmon.c b/drivers/gpu/drm/v3d/v3d_perfmon.c index 48aaaa972c49..292c73544255 100644 --- a/drivers/gpu/drm/v3d/v3d_perfmon.c +++ b/drivers/gpu/drm/v3d/v3d_perfmon.c @@ -113,6 +113,7 @@ void v3d_perfmon_close_file(struct v3d_file_priv *v3d_priv) idr_for_each(&v3d_priv->perfmon.idr, v3d_perfmon_idr_del, NULL); idr_destroy(&v3d_priv->perfmon.idr); mutex_unlock(&v3d_priv->perfmon.lock); + mutex_destroy(&v3d_priv->perfmon.lock); } int v3d_perfmon_create_ioctl(struct drm_device *dev, void *data, @@ -177,6 +178,7 @@ int v3d_perfmon_destroy_ioctl(struct drm_device *dev, void *data, if (!perfmon) return -EINVAL; + mutex_destroy(&perfmon->lock); v3d_perfmon_put(perfmon); return 0;
v3d_perfmon_open_file() instantiates a mutex for a particular file instance, but it never destroys it by calling mutex_destroy() in v3d_perfmon_close_file(). Similarly, v3d_perfmon_create_ioctl() instantiates a mutex for a particular perfmon, but it never destroys it by calling mutex_destroy() in v3d_perfmon_destroy_ioctl(). So, add the missing mutex_destroy on both cases. Signed-off-by: Maíra Canal <mcanal@igalia.com> --- drivers/gpu/drm/v3d/v3d_perfmon.c | 2 ++ 1 file changed, 2 insertions(+)