Skip to contentSkip to conversation

tests/chamelium: Close DRM file descriptor after tests

PATCH In review Paul Kocialkowski 3 participants 5 messages Jun 12, 2017 – Jun 14, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/chamelium: Close DRM file descriptor after tests

This adds a call to close the DRM file descriptor. It is reauired as IGT will attempt to become DRM master after running the test, resulting in a failure.

---
 tests/chamelium.c | 4 ++++
 1 file changed, 4 insertions(+)
tests/chamelium.c +4 -0
index acd17886..bd7772f8 100644
@@ -749,4 +749,8 @@ igt_main
 		connector_subtest("vga-hpd-without-ddc", VGA)
 			test_hpd_without_ddc(&data, port);
 	}
+
+	igt_fixture {
+		close(data.drm_fd);
+	}
 }
Signature · 6 lines
2.13.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 3 lines · Paul Kocialkowski

This adds a call to close the DRM file descriptor. It is reauired as IGT will attempt to become DRM master after running the test, resulting in a failure.

This should fix (at least) 3 of the failures seen on the CI machine that runs chamelium tests.

Quoted 18 lines
---
 tests/chamelium.c | 4 ++++
 1 file changed, 4 insertions(+)
tests/chamelium.c +4 -0
index acd17886..bd7772f8 100644
@@ -749,4 +749,8 @@ igt_main
 		connector_subtest("vga-hpd-without-ddc", VGA)
 			test_hpd_without_ddc(&data, port);
 	}
+
+	igt_fixture {
+		close(data.drm_fd);
+	}
 }
Signature · 6 lines
Paul Kocialkowski <[email protected]>
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by
#2 lore raw
Quoted 7 lines · Paul Kocialkowski
Quoted 3 lines · Paul Kocialkowski

This adds a call to close the DRM file descriptor. It is reauired as IGT will attempt to become DRM master after running the test, resulting in a failure.

This should fix (at least) 3 of the failures seen on the CI machine that runs chamelium tests.

Hey Paul,

I've pushed the patch with

For future patches please adhere to instructions from CONTRIBUTING file:

Please use --subject-prefix="PATCH i-g-t" so that i-g-t patches are easily identified in the massive amount mails on intel-gfx. To ensure this is always done, autogen.sh will run:

git config format.subjectprefix "PATCH i-g-t"

on its first invocation.

Otherwise patchwork won't pick up the series and it may slip through my search filters.

Thanks!

Signature · 2 lines
Cheers,
Arek
Quoted 6 lines
Quoted 6 lines
---
 tests/chamelium.c | 4 ++++
 1 file changed, 4 insertions(+)
Quoted 16 lines
Quoted 13 lines
tests/chamelium.c +4 -0
index acd17886..bd7772f8 100644
@@ -749,4 +749,8 @@ igt_main
 		connector_subtest("vga-hpd-without-ddc", VGA)
 			test_hpd_without_ddc(&data, port);
 	}
+
+	igt_fixture {
+		close(data.drm_fd);
+	}
 }
Signature · 2 lines
Paul Kocialkowski <[email protected]>
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to Paul Kocialkowski

Quoting Paul Kocialkowski (2017-06-12 16:21:45)

Quoted 7 lines · Paul Kocialkowski
Quoted 3 lines

This adds a call to close the DRM file descriptor. It is reauired as IGT will attempt to become DRM master after running the test, resulting in a failure.

This should fix (at least) 3 of the failures seen on the CI machine that runs chamelium tests.

This would be papering over the bug in the atexit handlers if they assume they can become drm master and worse cause a failure it they don't. I was not aware that the core made that presumption, so more details would be useful.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 6 lines · Chris Wilson

Quoting Paul Kocialkowski (2017-06-12 16:21:45)

Quoted 5 lines · Paul Kocialkowski
Quoted 3 lines

This adds a call to close the DRM file descriptor. It is reauired as IGT will attempt to become DRM master after running the test, resulting in a failure.

Quoted 8 lines
Quoted 3 lines

This should fix (at least) 3 of the failures seen on the CI machine that runs
chamelium tests.

This would be papering over the bug in the atexit handlers if they assume they can become drm master and worse cause a failure it they don't. I was not aware that the core made that presumption, so more details would be useful.

Here is the log from running the dp-hpd-storm test:

IGT-Version: 1.19-geeeb304a (x86_64) (Linux: 4.12.0-rc4-ARCH+ x86_64) Subtest dp-hpd-storm: SUCCESS (8.917s)
Test requirement not met in function require_connector_present, file chamelium.c:99:
Test requirement: found
No port of type HDMI-A was found
Test requirement not met in function require_connector_present, file chamelium.c:99:
Test requirement: found
No port of type VGA was found
Test requirement not met in function drm_open_driver_master, file drmtest.c:391:
Test requirement: drmSetMaster(fd) == 0
Can't become DRM master, please check if no other DRM client is running. Last errno: 22, Invalid argument
chamelium: igt_core.c:955: igt_skip: Assertion `in_fixture' failed.
./chamelium.sh: line 3: 8566 Aborted (core dumped)
/usr/local/libexec/intel-gpu-tools/chamelium "$@"

Which is actually called by igt_hpd_storm_exit_handler in order to call igt_hpd_storm_reset with the drm fd.

Thinking about it, I should have made it clear in the commit message that this is very specific to the hpd storm feature testing.

Signature · 6 lines
Paul Kocialkowski <[email protected]>
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx