AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
To: "Christian König" <ckoenig.leichtzumerken@gmail.com>,
	amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/syncobj: fix leaking dma_fence in drm_syncobj_query_ioctl
Date: Mon, 22 Jul 2019 16:16:37 +0300	[thread overview]
Message-ID: <fb8e26b0-c3f0-d4c8-8375-ec21e2cebea3@intel.com> (raw)
In-Reply-To: <20190722125938.43308-1-christian.koenig@amd.com>

On 22/07/2019 15:59, Christian König wrote:
> We need to check the context number instead if the previous sequence to detect
> an error and if an error is detected we need to drop the reference to the
> current fence or otherwise would leak it.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>

Fixes: 27b575a9aa2f ("drm/syncobj: add timeline payload query ioctl v6")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

> ---
>   drivers/gpu/drm/drm_syncobj.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
> index 75cb4bb7619e..1438dcb3ebb1 100644
> --- a/drivers/gpu/drm/drm_syncobj.c
> +++ b/drivers/gpu/drm/drm_syncobj.c
> @@ -1298,14 +1298,14 @@ int drm_syncobj_query_ioctl(struct drm_device *dev, void *data,
>   			struct dma_fence *iter, *last_signaled = NULL;
>   
>   			dma_fence_chain_for_each(iter, fence) {
> -				if (!iter)
> -					break;
> -				dma_fence_put(last_signaled);
> -				last_signaled = dma_fence_get(iter);
> -				if (!to_dma_fence_chain(last_signaled)->prev_seqno)
> +				if (iter->context != fence->context) {
> +					dma_fence_put(iter);
>   					/* It is most likely that timeline has
>   					 * unorder points. */
>   					break;
> +				}
> +				dma_fence_put(last_signaled);
> +				last_signaled = dma_fence_get(iter);
>   			}
>   			point = dma_fence_is_signaled(last_signaled) ?
>   				last_signaled->seqno :


_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2019-07-22 13:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-22 12:59 [PATCH] drm/syncobj: fix leaking dma_fence in drm_syncobj_query_ioctl Christian König
2019-07-22 13:16 ` Lionel Landwerlin [this message]
2019-07-22 13:21   ` Christian König
     [not found]     ` <a4c1c291-bff1-d7cb-f510-fdea63e1eb9b-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-07-22 13:35       ` Lionel Landwerlin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fb8e26b0-c3f0-d4c8-8375-ec21e2cebea3@intel.com \
    --to=lionel.g.landwerlin@intel.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=ckoenig.leichtzumerken@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox