From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linaro-mm-sig@lists.linaro.org, "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Chris Wilson" <chris@chris-wilson.co.uk>, "Christian König" <ckoenig.leichtzumerken@gmail.com> Subject: [PATCH] dma_fence_array: Fix PENDING_ERROR leak in dma_fence_array_signaled() Date: Mon, 29 Nov 2021 08:35:33 +0100 [thread overview] Message-ID: <20211129073533.414008-1-thomas.hellstrom@linux.intel.com> (raw) If a dma_fence_array is reported signaled by a call to dma_fence_is_signaled(), it may leak the PENDING_ERROR status. Fix this by clearing the PENDING_ERROR status if we return true in dma_fence_array_signaled(). Fixes: 1f70b8b812f3 ("dma-fence: Propagate errors to dma-fence-array container") Cc: linaro-mm-sig@lists.linaro.org Cc: Christian König <ckoenig.leichtzumerken@gmail.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/dma-buf/dma-fence-array.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/dma-buf/dma-fence-array.c b/drivers/dma-buf/dma-fence-array.c index d3fbd950be94..3e07f961e2f3 100644 --- a/drivers/dma-buf/dma-fence-array.c +++ b/drivers/dma-buf/dma-fence-array.c @@ -104,7 +104,11 @@ static bool dma_fence_array_signaled(struct dma_fence *fence) { struct dma_fence_array *array = to_dma_fence_array(fence); - return atomic_read(&array->num_pending) <= 0; + if (atomic_read(&array->num_pending) > 0) + return false; + + dma_fence_array_clear_pending_error(array); + return true; } static void dma_fence_array_release(struct dma_fence *fence) -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linaro-mm-sig@lists.linaro.org, "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Chris Wilson" <chris@chris-wilson.co.uk>, "Christian König" <ckoenig.leichtzumerken@gmail.com> Subject: [Intel-gfx] [PATCH] dma_fence_array: Fix PENDING_ERROR leak in dma_fence_array_signaled() Date: Mon, 29 Nov 2021 08:35:33 +0100 [thread overview] Message-ID: <20211129073533.414008-1-thomas.hellstrom@linux.intel.com> (raw) If a dma_fence_array is reported signaled by a call to dma_fence_is_signaled(), it may leak the PENDING_ERROR status. Fix this by clearing the PENDING_ERROR status if we return true in dma_fence_array_signaled(). Fixes: 1f70b8b812f3 ("dma-fence: Propagate errors to dma-fence-array container") Cc: linaro-mm-sig@lists.linaro.org Cc: Christian König <ckoenig.leichtzumerken@gmail.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/dma-buf/dma-fence-array.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/dma-buf/dma-fence-array.c b/drivers/dma-buf/dma-fence-array.c index d3fbd950be94..3e07f961e2f3 100644 --- a/drivers/dma-buf/dma-fence-array.c +++ b/drivers/dma-buf/dma-fence-array.c @@ -104,7 +104,11 @@ static bool dma_fence_array_signaled(struct dma_fence *fence) { struct dma_fence_array *array = to_dma_fence_array(fence); - return atomic_read(&array->num_pending) <= 0; + if (atomic_read(&array->num_pending) > 0) + return false; + + dma_fence_array_clear_pending_error(array); + return true; } static void dma_fence_array_release(struct dma_fence *fence) -- 2.31.1
next reply other threads:[~2021-11-29 7:36 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-29 7:35 Thomas Hellström [this message] 2021-11-29 7:35 ` [Intel-gfx] [PATCH] dma_fence_array: Fix PENDING_ERROR leak in dma_fence_array_signaled() Thomas Hellström 2021-11-29 8:21 ` Christian König 2021-11-29 8:21 ` [Intel-gfx] " Christian König 2021-11-29 12:23 ` Thomas Hellström 2021-11-29 12:23 ` [Intel-gfx] " Thomas Hellström 2021-11-29 12:33 ` Christian König 2021-11-29 12:33 ` [Intel-gfx] " Christian König 2021-11-29 12:46 ` Thomas Hellström 2021-11-29 12:46 ` [Intel-gfx] " Thomas Hellström 2021-11-29 12:55 ` Christian König 2021-11-29 12:55 ` [Intel-gfx] " Christian König 2021-11-29 13:14 ` Joonas Lahtinen 2021-11-29 13:14 ` [Intel-gfx] " Joonas Lahtinen 2021-11-30 8:43 ` [Linaro-mm-sig] " Daniel Vetter 2021-11-30 8:43 ` [Intel-gfx] " Daniel Vetter 2021-11-29 9:25 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2021-11-29 11:16 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=20211129073533.414008-1-thomas.hellstrom@linux.intel.com \ --to=thomas.hellstrom@linux.intel.com \ --cc=chris@chris-wilson.co.uk \ --cc=ckoenig.leichtzumerken@gmail.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=linaro-mm-sig@lists.linaro.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.