[igt-dev] [PATCH i-g-t 1/2] tests/i915/gem_fd_exhaustion.c: Remove unused sysfs functions

[igt-dev] [PATCH i-g-t 1/2] tests/i915/gem_fd_exhaustion.c: Remove unused sysfs functions

[Antonio Argenziano]

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
---
 tests/i915/gem_fd_exhaustion.c | 35 ----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/tests/i915/gem_fd_exhaustion.c b/tests/i915/gem_fd_exhaustion.c
index 9704fa02..23602b98 100644
--- a/tests/i915/gem_fd_exhaustion.c
+++ b/tests/i915/gem_fd_exhaustion.c
@@ -33,39 +33,6 @@
 #include <fcntl.h>
 #include <limits.h>
 
-unsigned int original_nr_open;
-
-static int read_sysctl(const char *path)
-{
-	unsigned int val;
-	FILE *f = fopen(path, "r");
-
-	if (f) {
-		igt_assert(fscanf(f, "%u", &val) == 1);
-		fclose(f);
-		return val;
-	}
-	return -errno;
-}
-
-static int write_sysctl(const char *path, unsigned int val)
-{
-	FILE *f = fopen(path, "w");
-
-	if (f) {
-		igt_assert(fprintf(f, "%u", val));
-		fclose(f);
-		return 0;
-	}
-	return -errno;
-}
-
-static void restore_original_sysctl(int sig)
-{
-	if (original_nr_open > 0)
-		write_sysctl("/proc/sys/fs/nr_open", original_nr_open);
-}
-
 igt_simple_main
 {
 	int fd;
@@ -74,8 +41,6 @@ igt_simple_main
 
 	fd = drm_open_driver(DRIVER_INTEL);
 
-	igt_install_exit_handler(restore_original_sysctl);
-
 	igt_fork(n, 1) {
 		igt_drop_root();
 
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] [PATCH i-g-t 2/2] tests/i915/gem_fd_exhaustion.c: Expect ENFILE when fds run out

[Antonio Argenziano]

Change the test to expect gem_create to return ENFILE when we run out of
fds.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
---
 tests/i915/gem_fd_exhaustion.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/i915/gem_fd_exhaustion.c b/tests/i915/gem_fd_exhaustion.c
index 23602b98..83d0e926 100644
--- a/tests/i915/gem_fd_exhaustion.c
+++ b/tests/i915/gem_fd_exhaustion.c
@@ -48,15 +48,16 @@ igt_simple_main
 			int leak = open("/dev/null", O_RDONLY);
 			uint32_t handle;
 
-			if (__gem_create(fd, 4096, &handle) == 0)
-				gem_close(fd, handle);
-
 			if (leak < 0) {
 				igt_info("fd exhaustion after %i rounds.\n", i);
-				igt_assert(__gem_create(fd, 4096,
-							&handle) < 0);
+				igt_assert_eq(__gem_create(fd, 4096,
+							&handle), -ENFILE);
 				break;
 			}
+
+			if (__gem_create(fd, 4096, &handle) == 0)
+				gem_close(fd, handle);
+
 		}
 
 		/* The child will free all the fds when exiting, so no need to
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915/gem_fd_exhaustion.c: Expect ENFILE when fds run out

[Chris Wilson]

Quoting Antonio Argenziano (2019-04-08 23:52:00)
> Change the test to expect gem_create to return ENFILE when we run out of
> fds.
> 
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
> ---
>  tests/i915/gem_fd_exhaustion.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/i915/gem_fd_exhaustion.c b/tests/i915/gem_fd_exhaustion.c
> index 23602b98..83d0e926 100644
> --- a/tests/i915/gem_fd_exhaustion.c
> +++ b/tests/i915/gem_fd_exhaustion.c
> @@ -48,15 +48,16 @@ igt_simple_main
>                         int leak = open("/dev/null", O_RDONLY);
>                         uint32_t handle;
>  
> -                       if (__gem_create(fd, 4096, &handle) == 0)
> -                               gem_close(fd, handle);
> -
>                         if (leak < 0) {
>                                 igt_info("fd exhaustion after %i rounds.\n", i);
> -                               igt_assert(__gem_create(fd, 4096,
> -                                                       &handle) < 0);
> +                               igt_assert_eq(__gem_create(fd, 4096,
> +                                                       &handle), -ENFILE);

It can also just fail by running out of memory, and memory says EMFILE.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915/gem_fd_exhaustion.c: Expect ENFILE when fds run out

[Antonio Argenziano]

On 08/04/19 16:00, Chris Wilson wrote:
> Quoting Antonio Argenziano (2019-04-08 23:52:00)
>> Change the test to expect gem_create to return ENFILE when we run out of
>> fds.
>>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Petri Latvala <petri.latvala@intel.com>
>> Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
>> ---
>>   tests/i915/gem_fd_exhaustion.c | 11 ++++++-----
>>   1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/tests/i915/gem_fd_exhaustion.c b/tests/i915/gem_fd_exhaustion.c
>> index 23602b98..83d0e926 100644
>> --- a/tests/i915/gem_fd_exhaustion.c
>> +++ b/tests/i915/gem_fd_exhaustion.c
>> @@ -48,15 +48,16 @@ igt_simple_main
>>                          int leak = open("/dev/null", O_RDONLY);
>>                          uint32_t handle;
>>   
>> -                       if (__gem_create(fd, 4096, &handle) == 0)
>> -                               gem_close(fd, handle);
>> -
>>                          if (leak < 0) {
>>                                  igt_info("fd exhaustion after %i rounds.\n", i);
>> -                               igt_assert(__gem_create(fd, 4096,
>> -                                                       &handle) < 0);
>> +                               igt_assert_eq(__gem_create(fd, 4096,
>> +                                                       &handle), -ENFILE);
> 
> It can also just fail by running out of memory, and memory says EMFILE.

ret = __gem_create();
ret == ENFILE || ret == EMFILE? Or is there something we could check 
beforehand so we know what to expect?

Antonio

> -Chris
> 
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915/gem_fd_exhaustion.c: Expect ENFILE when fds run out

[Chris Wilson]

Quoting Antonio Argenziano (2019-04-09 00:06:35)
> 
> 
> On 08/04/19 16:00, Chris Wilson wrote:
> > Quoting Antonio Argenziano (2019-04-08 23:52:00)
> >> Change the test to expect gem_create to return ENFILE when we run out of
> >> fds.
> >>
> >> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> >> Cc: Petri Latvala <petri.latvala@intel.com>
> >> Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
> >> ---
> >>   tests/i915/gem_fd_exhaustion.c | 11 ++++++-----
> >>   1 file changed, 6 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/tests/i915/gem_fd_exhaustion.c b/tests/i915/gem_fd_exhaustion.c
> >> index 23602b98..83d0e926 100644
> >> --- a/tests/i915/gem_fd_exhaustion.c
> >> +++ b/tests/i915/gem_fd_exhaustion.c
> >> @@ -48,15 +48,16 @@ igt_simple_main
> >>                          int leak = open("/dev/null", O_RDONLY);
> >>                          uint32_t handle;
> >>   
> >> -                       if (__gem_create(fd, 4096, &handle) == 0)
> >> -                               gem_close(fd, handle);
> >> -
> >>                          if (leak < 0) {
> >>                                  igt_info("fd exhaustion after %i rounds.\n", i);
> >> -                               igt_assert(__gem_create(fd, 4096,
> >> -                                                       &handle) < 0);
> >> +                               igt_assert_eq(__gem_create(fd, 4096,
> >> +                                                       &handle), -ENFILE);
> > 
> > It can also just fail by running out of memory, and memory says EMFILE.
> 
> ret = __gem_create();
> ret == ENFILE || ret == EMFILE? Or is there something we could check 
> beforehand so we know what to expect?

No, and I see little value in demanding that the failure matches.

The "test" is just that the kernel doesn't die or leak when we run out of
system resources. I suspect fault injection would do a better job of
providing coverage for the error paths.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] tests/i915/gem_fd_exhaustion.c: Remove unused sysfs functions

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/2] tests/i915/gem_fd_exhaustion.c: Remove unused sysfs functions
URL   : https://patchwork.freedesktop.org/series/59200/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5891 -> IGTPW_2821
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_ctx_create@basic-files:
    - fi-gdg-551:         NOTRUN -> SKIP [fdo#109271] +106

  * igt@gem_exec_suspend@basic-s3:
    - fi-blb-e6850:       PASS -> INCOMPLETE [fdo#107718]

  * igt@i915_pm_rpm@module-reload:
    - fi-glk-dsi:         NOTRUN -> DMESG-WARN [fdo#105538] / [fdo#107732] / [fdo#109513]

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

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

  * igt@kms_force_connector_basic@force-edid:
    - fi-glk-dsi:         NOTRUN -> SKIP [fdo#109271] +8

  * igt@kms_frontbuffer_tracking@basic:
    - fi-glk-dsi:         NOTRUN -> FAIL [fdo#103167]

  * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
    - fi-icl-y:           PASS -> INCOMPLETE [fdo#107713]

  * igt@runner@aborted:
    - fi-glk-dsi:         NOTRUN -> FAIL [k.org#202321]
    - fi-skl-iommu:       NOTRUN -> FAIL [fdo#104108] / [fdo#108602]

  
#### Possible fixes ####

  * igt@gem_cpu_reloc@basic:
    - {fi-icl-u2}:        INCOMPLETE [fdo#110246] -> PASS

  * igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size:
    - fi-glk-dsi:         INCOMPLETE [fdo#103359] / [k.org#198133] -> PASS

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
  [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
  [fdo#105538]: https://bugs.freedesktop.org/show_bug.cgi?id=105538
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
  [fdo#107732]: https://bugs.freedesktop.org/show_bug.cgi?id=107732
  [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
  [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#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
  [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
  [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
  [fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
  [fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
  [fdo#109316]: https://bugs.freedesktop.org/show_bug.cgi?id=109316
  [fdo#109513]: https://bugs.freedesktop.org/show_bug.cgi?id=109513
  [fdo#110246]: https://bugs.freedesktop.org/show_bug.cgi?id=110246
  [k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
  [k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321


Participating hosts (48 -> 41)
------------------------------

  Additional (1): fi-gdg-551 
  Missing    (8): fi-ilk-m540 fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-whl-u fi-pnv-d510 fi-byt-clapper 


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

    * IGT: IGT_4932 -> IGTPW_2821

  CI_DRM_5891: a46e12e83547c781a779776f33fbeeefe2978905 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_2821: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2821/
  IGT_4932: 08cf63a8fac11e3594b57580331fb319241a0d69 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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

[igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,1/2] tests/i915/gem_fd_exhaustion.c: Remove unused sysfs functions

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/2] tests/i915/gem_fd_exhaustion.c: Remove unused sysfs functions
URL   : https://patchwork.freedesktop.org/series/59200/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5891_full -> IGTPW_2821_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

  * igt@i915_pm_rc6_residency@rc6-accuracy:
    - shard-kbl:          PASS -> SKIP [fdo#109271]

  * igt@i915_pm_rpm@reg-read-ioctl:
    - shard-glk:          PASS -> DMESG-WARN [fdo#109513]

  * igt@kms_atomic_transition@3x-modeset-transitions:
    - shard-kbl:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +3

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-mmap-wc:
    - shard-kbl:          NOTRUN -> SKIP [fdo#109271] +12

  * igt@kms_pipe_crc_basic@hang-read-crc-pipe-e:
    - shard-apl:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +10

  * igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
    - shard-apl:          NOTRUN -> FAIL [fdo#108145] +2
    - shard-kbl:          NOTRUN -> FAIL [fdo#108145] / [fdo#108590]

  * igt@kms_vblank@pipe-a-query-idle-hang:
    - shard-glk:          PASS -> INCOMPLETE [fdo#103359] / [k.org#198133]

  * igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm:
    - shard-apl:          NOTRUN -> FAIL [fdo#104894]
    - shard-kbl:          PASS -> FAIL [fdo#104894]

  * igt@prime_nv_api@i915_nv_reimport_twice_check_flink_name:
    - shard-apl:          NOTRUN -> SKIP [fdo#109271] +164

  * igt@prime_nv_api@i915_self_import:
    - shard-glk:          NOTRUN -> SKIP [fdo#109271] +6

  
#### Possible fixes ####

  * igt@kms_color@pipe-a-ctm-max:
    - shard-kbl:          FAIL [fdo#108147] -> PASS

  * igt@kms_cursor_crc@cursor-64x64-sliding:
    - shard-apl:          FAIL [fdo#103232] -> PASS
    - shard-kbl:          FAIL [fdo#103232] -> PASS

  * igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-shrfb-plflip-blt:
    - shard-glk:          FAIL [fdo#103167] -> PASS

  * igt@kms_plane@pixel-format-pipe-a-planes:
    - shard-glk:          SKIP [fdo#109271] -> PASS

  * igt@kms_plane_scaling@pipe-c-scaler-with-rotation:
    - shard-glk:          SKIP [fdo#109271] / [fdo#109278] -> PASS +1

  * igt@kms_rotation_crc@multiplane-rotation:
    - shard-kbl:          INCOMPLETE [fdo#103665] -> PASS +1

  * igt@kms_vblank@pipe-b-ts-continuation-modeset-rpm:
    - shard-apl:          FAIL [fdo#104894] -> PASS
    - shard-kbl:          FAIL [fdo#104894] -> PASS +1

  
#### Warnings ####

  * igt@runner@aborted:
    - shard-glk:          FAIL [fdo#109373] / [k.org#202321] -> ( 3 FAIL ) [fdo#109373] / [k.org#202321]

  
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
  [fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
  [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
  [fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
  [fdo#108590]: https://bugs.freedesktop.org/show_bug.cgi?id=108590
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
  [fdo#109373]: https://bugs.freedesktop.org/show_bug.cgi?id=109373
  [fdo#109513]: https://bugs.freedesktop.org/show_bug.cgi?id=109513
  [k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
  [k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321


Participating hosts (10 -> 5)
------------------------------

  Missing    (5): shard-skl pig-hsw-4770r pig-glk-j5005 shard-iclb pig-skl-6260u 


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

    * IGT: IGT_4932 -> IGTPW_2821
    * Piglit: piglit_4509 -> None

  CI_DRM_5891: a46e12e83547c781a779776f33fbeeefe2978905 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_2821: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2821/
  IGT_4932: 08cf63a8fac11e3594b57580331fb319241a0d69 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

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