[Mesa-dev] [PATCH] nv50, nvc0: free memory allocated by performance metrics

[Ilia Mirkin]

Acked-by: Ilia Mirkin <imirkin at alum.mit.edu>

This conditional stuff is very confusing but... meh.

On Wed, Dec 16, 2015 at 4:47 PM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> The destroy_query() helper was actually never called. This fixes
> a memory leak while monitoring performance metrics.
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  src/gallium/drivers/nouveau/nv50/nv50_query_hw.c        | 6 ++++++
>  src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c | 3 ++-
>  src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c     | 4 +++-
>  src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c        | 6 ++++++
>  src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c | 3 ++-
>  src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c     | 4 +++-
>  6 files changed, 22 insertions(+), 4 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c b/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c
> index b6ebbbf..cccd3b7 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_query_hw.c
> @@ -113,6 +113,12 @@ static void
>  nv50_hw_destroy_query(struct nv50_context *nv50, struct nv50_query *q)
>  {
>     struct nv50_hw_query *hq = nv50_hw_query(q);
> +
> +   if (hq->funcs && hq->funcs->destroy_query) {
> +      hq->funcs->destroy_query(nv50, hq);
> +      return;
> +   }
> +
>     nv50_hw_query_allocate(nv50, q, 0);
>     nouveau_fence_ref(NULL, &hq->fence);
>     FREE(hq);
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c
> index d1bccb9..4a605f2 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_metric.c
> @@ -71,7 +71,8 @@ nv50_hw_metric_destroy_query(struct nv50_context *nv50,
>     unsigned i;
>
>     for (i = 0; i < hmq->num_queries; i++)
> -      hmq->queries[i]->funcs->destroy_query(nv50, hmq->queries[i]);
> +      if (hmq->queries[i]->funcs->destroy_query)
> +         hmq->queries[i]->funcs->destroy_query(nv50, hmq->queries[i]);
>     FREE(hmq);
>  }
>
> diff --git a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
> index 8453ce7..79c7023 100644
> --- a/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
> +++ b/src/gallium/drivers/nouveau/nv50/nv50_query_hw_sm.c
> @@ -153,7 +153,9 @@ static void
>  nv50_hw_sm_destroy_query(struct nv50_context *nv50, struct nv50_hw_query *hq)
>  {
>     struct nv50_query *q = &hq->base;
> -   q->funcs->destroy_query(nv50, q);
> +   nv50_hw_query_allocate(nv50, q, 0);
> +   nouveau_fence_ref(NULL, &hq->fence);
> +   FREE(hq);
>  }
>
>  static boolean
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c
> index 90ee82f..a70d524 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c
> @@ -116,6 +116,12 @@ static void
>  nvc0_hw_destroy_query(struct nvc0_context *nvc0, struct nvc0_query *q)
>  {
>     struct nvc0_hw_query *hq = nvc0_hw_query(q);
> +
> +   if (hq->funcs && hq->funcs->destroy_query) {
> +      hq->funcs->destroy_query(nvc0, hq);
> +      return;
> +   }
> +
>     nvc0_hw_query_allocate(nvc0, q, 0);
>     nouveau_fence_ref(NULL, &hq->fence);
>     FREE(hq);
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c
> index 323bd47..f020d0d 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_metric.c
> @@ -293,7 +293,8 @@ nvc0_hw_metric_destroy_query(struct nvc0_context *nvc0,
>     unsigned i;
>
>     for (i = 0; i < hmq->num_queries; i++)
> -      hmq->queries[i]->funcs->destroy_query(nvc0, hmq->queries[i]);
> +      if (hmq->queries[i]->funcs->destroy_query)
> +         hmq->queries[i]->funcs->destroy_query(nvc0, hmq->queries[i]);
>     FREE(hmq);
>  }
>
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
> index 08c8103..3f5a876 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_query_hw_sm.c
> @@ -782,7 +782,9 @@ static void
>  nvc0_hw_sm_destroy_query(struct nvc0_context *nvc0, struct nvc0_hw_query *hq)
>  {
>     struct nvc0_query *q = &hq->base;
> -   q->funcs->destroy_query(nvc0, q);
> +   nvc0_hw_query_allocate(nvc0, q, 0);
> +   nouveau_fence_ref(NULL, &hq->fence);
> +   FREE(hq);
>  }
>
>  static boolean
> --
> 2.6.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev