[PATCH 1/2] dma-fence: Propagate errors to dma-fence-array container

[PATCH 1/2] dma-fence: Propagate errors to dma-fence-array container

[Chris Wilson]

When one of the array of fences is signaled, propagate its errors to the
parent fence-array (keeping the first error to be raised).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
---
 drivers/dma-buf/dma-fence-array.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/dma-buf/dma-fence-array.c b/drivers/dma-buf/dma-fence-array.c
index a8c254497251..f931226616c0 100644
--- a/drivers/dma-buf/dma-fence-array.c
+++ b/drivers/dma-buf/dma-fence-array.c
@@ -46,6 +46,9 @@ static void dma_fence_array_cb_func(struct dma_fence *f,
 		container_of(cb, struct dma_fence_array_cb, cb);
 	struct dma_fence_array *array = array_cb->array;
 
+	if (atomic_read(&array->num_pending) > 0)
+		cmpxchg_local(&array->base.error, 0, f->error);
+
 	if (atomic_dec_and_test(&array->num_pending))
 		irq_work_queue(&array->work);
 	else
@@ -71,6 +74,7 @@ static bool dma_fence_array_enable_signaling(struct dma_fence *fence)
 		dma_fence_get(&array->base);
 		if (dma_fence_add_callback(array->fences[i], &cb[i].cb,
 					   dma_fence_array_cb_func)) {
+			cmpxchg(&array->base.error, 0, array->fences[i]->error);
 			dma_fence_put(&array->base);
 			if (atomic_dec_and_test(&array->num_pending))
 				return false;
-- 
2.20.1

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

[PATCH 2/2] dma-fence: Report the composite sync_file status

[Chris Wilson]

Same as for the individual fences, we want to report the actual status
of the fence when queried.

Reported-by: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Petri Latvala <petri.latvala@intel.com>
---
 drivers/dma-buf/sync_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c
index 4f6305ca52c8..facaf84e362f 100644
--- a/drivers/dma-buf/sync_file.c
+++ b/drivers/dma-buf/sync_file.c
@@ -427,7 +427,7 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
 	 * info->num_fences.
 	 */
 	if (!info.num_fences) {
-		info.status = dma_fence_is_signaled(sync_file->fence);
+		info.status = dma_fence_get_status(sync_file->fence);
 		goto no_fences;
 	} else {
 		info.status = 1;
-- 
2.20.1

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

✗ Fi.CI.BAT: failure for series starting with [1/2] dma-fence: Propagate errors to dma-fence-array container

[Patchwork]

== Series Details ==

Series: series starting with [1/2] dma-fence: Propagate errors to dma-fence-array container
URL   : https://patchwork.freedesktop.org/series/58460/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_5802 -> Patchwork_12586
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_12586 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_12586, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/58460/revisions/1/mbox/

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_12586:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live_contexts:
    - fi-bdw-gvtdvm:      PASS -> DMESG-FAIL

  
Known issues
------------

  Here are the changes found in Patchwork_12586 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_exec_basic@readonly-bsd2:
    - fi-pnv-d510:        NOTRUN -> SKIP [fdo#109271] +76

  * igt@i915_selftest@live_execlists:
    - fi-apl-guc:         PASS -> INCOMPLETE [fdo#103927] / [fdo#109720]

  * igt@i915_selftest@live_hangcheck:
    - fi-skl-iommu:       PASS -> INCOMPLETE [fdo#108602] / [fdo#108744]

  * igt@kms_busy@basic-flip-c:
    - fi-pnv-d510:        NOTRUN -> SKIP [fdo#109271] / [fdo#109278]

  * igt@runner@aborted:
    - fi-skl-iommu:       NOTRUN -> FAIL [fdo#104108] / [fdo#108602]

  
#### Possible fixes ####

  * igt@gem_tiled_pread_basic:
    - fi-bsw-n3050:       FAIL -> PASS

  * igt@i915_selftest@live_contexts:
    - fi-skl-gvtdvm:      DMESG-FAIL -> PASS

  
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
  [fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
  [fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
  [fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720


Participating hosts (39 -> 35)
------------------------------

  Additional (1): fi-pnv-d510 
  Missing    (5): fi-kbl-soraka fi-ilk-m540 fi-bdw-5557u fi-hsw-4200u fi-byt-squawks 


Build changes
-------------

    * Linux: CI_DRM_5802 -> Patchwork_12586

  CI_DRM_5802: 4a20c1b9790798f7bb44cc28e42e2377304ea2fe @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4900: 09796413394c5490c4adfc5cded5d4344af6af17 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_12586: 61f18408ef2835ba92dc836262c1806bb73e2d60 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

61f18408ef28 dma-fence: Report the composite sync_file status
c53bb1e607df dma-fence: Propagate errors to dma-fence-array container

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12586/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 1/2] dma-fence: Propagate errors to dma-fence-array container

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 3669 bytes --]

Hi Chris,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on linus/master]
[also build test WARNING on v5.1-rc1 next-20190322]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Chris-Wilson/dma-fence-Propagate-errors-to-dma-fence-array-container/20190325-074009
config: sparc64-allmodconfig (attached as .config)
compiler: sparc64-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        GCC_VERSION=7.2.0 make.cross ARCH=sparc64 

All warnings (new ones prefixed by >>):

   In file included from arch/sparc/include/asm/cmpxchg.h:5:0,
                    from arch/sparc/include/asm/atomic_64.h:12,
                    from arch/sparc/include/asm/atomic.h:5,
                    from include/linux/atomic.h:7,
                    from include/asm-generic/bitops/lock.h:5,
                    from arch/sparc/include/asm/bitops_64.h:52,
                    from arch/sparc/include/asm/bitops.h:5,
                    from include/linux/bitops.h:19,
                    from include/linux/kernel.h:12,
                    from include/asm-generic/bug.h:18,
                    from arch/sparc/include/asm/bug.h:25,
                    from include/linux/bug.h:5,
                    from include/linux/mmdebug.h:5,
                    from include/linux/gfp.h:5,
                    from include/linux/slab.h:15,
                    from drivers/dma-buf/dma-fence-array.c:21:
   drivers/dma-buf/dma-fence-array.c: In function 'dma_fence_array_cb_func':
   arch/sparc/include/asm/cmpxchg_64.h:199:3: warning: value computed is not used [-Wunused-value]
     ((__typeof__(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(o), \
     ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       (unsigned long)(n), sizeof(*(ptr))))
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/dma-buf/dma-fence-array.c:50:3: note: in expansion of macro 'cmpxchg_local'
      cmpxchg_local(&array->base.error, 0, f->error);
      ^~~~~~~~~~~~~

vim +/cmpxchg_local +50 drivers/dma-buf/dma-fence-array.c

  > 21	#include <linux/slab.h>
    22	#include <linux/dma-fence-array.h>
    23	
    24	static const char *dma_fence_array_get_driver_name(struct dma_fence *fence)
    25	{
    26		return "dma_fence_array";
    27	}
    28	
    29	static const char *dma_fence_array_get_timeline_name(struct dma_fence *fence)
    30	{
    31		return "unbound";
    32	}
    33	
    34	static void irq_dma_fence_array_work(struct irq_work *wrk)
    35	{
    36		struct dma_fence_array *array = container_of(wrk, typeof(*array), work);
    37	
    38		dma_fence_signal(&array->base);
    39		dma_fence_put(&array->base);
    40	}
    41	
    42	static void dma_fence_array_cb_func(struct dma_fence *f,
    43					    struct dma_fence_cb *cb)
    44	{
    45		struct dma_fence_array_cb *array_cb =
    46			container_of(cb, struct dma_fence_array_cb, cb);
    47		struct dma_fence_array *array = array_cb->array;
    48	
    49		if (atomic_read(&array->num_pending) > 0)
  > 50			cmpxchg_local(&array->base.error, 0, f->error);
    51	
    52		if (atomic_dec_and_test(&array->num_pending))
    53			irq_work_queue(&array->work);
    54		else
    55			dma_fence_put(&array->base);
    56	}
    57	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 56723 bytes --]

[-- Attachment #3: Type: text/plain, Size: 159 bytes --]

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

[PATCH v2] dma-fence: Propagate errors to dma-fence-array container

[Chris Wilson]

When one of the array of fences is signaled, propagate its errors to the
parent fence-array (keeping the first error to be raised).

v2: Opencode cmpxchg_local to avoid compiler freakout.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
---
 drivers/dma-buf/dma-fence-array.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/dma-buf/dma-fence-array.c b/drivers/dma-buf/dma-fence-array.c
index a8c254497251..223f6f85f585 100644
--- a/drivers/dma-buf/dma-fence-array.c
+++ b/drivers/dma-buf/dma-fence-array.c
@@ -21,6 +21,12 @@
 #include <linux/slab.h>
 #include <linux/dma-fence-array.h>
 
+static void fence_set_error_once(struct dma_fence *fence, int error)
+{
+	if (!fence->error && error)
+		dma_fence_set_error(fence, error);
+}
+
 static const char *dma_fence_array_get_driver_name(struct dma_fence *fence)
 {
 	return "dma_fence_array";
@@ -46,6 +52,13 @@ static void dma_fence_array_cb_func(struct dma_fence *f,
 		container_of(cb, struct dma_fence_array_cb, cb);
 	struct dma_fence_array *array = array_cb->array;
 
+	/*
+	 * Propagate the first error reported by any of our fences, but only
+	 * before we ourselves are signaled.
+	 */
+	if (atomic_read(&array->num_pending) > 0)
+		fence_set_error_once(&array->base, f->error);
+
 	if (atomic_dec_and_test(&array->num_pending))
 		irq_work_queue(&array->work);
 	else
@@ -71,6 +84,8 @@ static bool dma_fence_array_enable_signaling(struct dma_fence *fence)
 		dma_fence_get(&array->base);
 		if (dma_fence_add_callback(array->fences[i], &cb[i].cb,
 					   dma_fence_array_cb_func)) {
+			fence_set_error_once(&array->base,
+					     array->fences[i]->error);
 			dma_fence_put(&array->base);
 			if (atomic_dec_and_test(&array->num_pending))
 				return false;
-- 
2.20.1

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

✗ Fi.CI.BAT: failure for series starting with [v2] dma-fence: Propagate errors to dma-fence-array container (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [v2] dma-fence: Propagate errors to dma-fence-array container (rev2)
URL   : https://patchwork.freedesktop.org/series/58460/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_5808 -> Patchwork_12587
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_12587 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_12587, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/58460/revisions/2/mbox/


Changes
-------

  No changes found


Participating hosts (36 -> 11)
------------------------------

  ERROR: It appears as if the changes made in Patchwork_12587 prevented too many machines from booting.

  Missing    (25): fi-skl-6770hq fi-apl-guc fi-snb-2520m fi-pnv-d510 fi-skl-lmem fi-blb-e6850 fi-byt-n2820 fi-bxt-dsi fi-bsw-n3050 fi-ilk-650 fi-kbl-7500u fi-ivb-3770 fi-elk-e7500 fi-ilk-m540 fi-skl-gvtdvm fi-skl-guc fi-cfl-8700k fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-cfl-guc fi-kbl-guc fi-whl-u fi-cfl-8109u fi-kbl-8809g 


Build changes
-------------

    * Linux: CI_DRM_5808 -> Patchwork_12587

  CI_DRM_5808: 0053882c75f979b475f4d543c4b14cbbed218f38 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4902: 3d325bb211d8cd84c6862c9945185a937395cb44 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_12587: 8f2dca06e8a814bab5297b48befc7d74ac0386a3 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

8f2dca06e8a8 dma-fence: Report the composite sync_file status
ce958c055df6 dma-fence: Propagate errors to dma-fence-array container

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12587/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 1/2] dma-fence: Propagate errors to dma-fence-array container

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 1940 bytes --]

Hi Chris,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on linus/master]
[also build test ERROR on v5.1-rc2 next-20190325]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Chris-Wilson/dma-fence-Propagate-errors-to-dma-fence-array-container/20190325-074009
config: sh-allyesconfig (attached as .config)
compiler: sh4-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        GCC_VERSION=7.2.0 make.cross ARCH=sh 

All errors (new ones prefixed by >>):

   drivers/dma-buf/dma-fence-array.c: In function 'dma_fence_array_cb_func':
>> drivers/dma-buf/dma-fence-array.c:50:3: error: implicit declaration of function 'cmpxchg_local'; did you mean 'cmpxchg_relaxed'? [-Werror=implicit-function-declaration]
      cmpxchg_local(&array->base.error, 0, f->error);
      ^~~~~~~~~~~~~
      cmpxchg_relaxed
   cc1: some warnings being treated as errors

vim +50 drivers/dma-buf/dma-fence-array.c

    41	
    42	static void dma_fence_array_cb_func(struct dma_fence *f,
    43					    struct dma_fence_cb *cb)
    44	{
    45		struct dma_fence_array_cb *array_cb =
    46			container_of(cb, struct dma_fence_array_cb, cb);
    47		struct dma_fence_array *array = array_cb->array;
    48	
    49		if (atomic_read(&array->num_pending) > 0)
  > 50			cmpxchg_local(&array->base.error, 0, f->error);
    51	
    52		if (atomic_dec_and_test(&array->num_pending))
    53			irq_work_queue(&array->work);
    54		else
    55			dma_fence_put(&array->base);
    56	}
    57	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 51417 bytes --]

[-- Attachment #3: Type: text/plain, Size: 159 bytes --]

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

Re: [PATCH v2] dma-fence: Propagate errors to dma-fence-array container

[Chris Wilson]

Quoting Chris Wilson (2019-03-25 08:07:33)
> When one of the array of fences is signaled, propagate its errors to the
> parent fence-array (keeping the first error to be raised).
> 
> v2: Opencode cmpxchg_local to avoid compiler freakout.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: Gustavo Padovan <gustavo@padovan.org>

Any one have the chance to review this pair of patches so we can close a
bug in CI?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx