[igt-dev] [PATCH i-g-t] tests/core_auth: Merge getclient subtests
Daniel Vetter
daniel.vetter at ffwll.ch
Wed Jan 23 11:31:08 UTC 2019
Emil has another auth test which could use the check_auth function, so
best to merge them all.
We need a subtest group and put the tests which need to fully control
who's master and how many open drm fd there are first.
Cc: Emil Velikov <emil.l.velikov at gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
tests/Makefile.sources | 1 -
tests/core_auth.c | 75 +++++++++++++++++++++++---
tests/core_get_client_auth.c | 102 -----------------------------------
tests/meson.build | 1 -
4 files changed, 68 insertions(+), 111 deletions(-)
delete mode 100644 tests/core_get_client_auth.c
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 0de5154c5f4b..1de7762fda95 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -13,7 +13,6 @@ AMDGPU_TESTS = \
TESTS_progs = \
core_auth \
- core_get_client_auth \
core_getclient \
core_getstats \
core_getversion \
diff --git a/tests/core_auth.c b/tests/core_auth.c
index cedcff923937..0c016a37f654 100644
--- a/tests/core_auth.c
+++ b/tests/core_auth.c
@@ -42,8 +42,44 @@
#include <sys/resource.h>
#include "drm.h"
+#ifdef __linux__
+# include <sys/syscall.h>
+#else
+# include <pthread.h>
+#endif
+
IGT_TEST_DESCRIPTION("Call drmGetMagic() and drmAuthMagic() and see if it behaves.");
+static bool
+is_local_tid(pid_t tid)
+{
+#ifndef __linux__
+ return pthread_self() == tid;
+#else
+ /* On Linux systems, drmGetClient() would return the thread ID
+ instead of the actual process ID */
+ return syscall(SYS_gettid) == tid;
+#endif
+}
+
+
+static bool check_auth(int fd)
+{
+ pid_t client_pid;
+ int i, auth, pid, uid;
+ unsigned long magic, iocs;
+ bool is_authenticated = false;
+
+ client_pid = getpid();
+ for (i = 0; !is_authenticated; i++) {
+ if (drmGetClient(fd, i, &auth, &pid, &uid, &magic, &iocs) != 0)
+ break;
+ is_authenticated = auth && (pid == client_pid || is_local_tid(pid));
+ }
+ return is_authenticated;
+}
+
+
static int magic_cmp(const void *p1, const void *p2)
{
return *(const drm_magic_t*)p1 < *(const drm_magic_t*)p2;
@@ -158,13 +194,38 @@ igt_main
{
int master;
- igt_fixture
- master = drm_open_driver_master(DRIVER_ANY);
+ /* root (which we run igt as) should always be authenticated */
+ igt_subtest("getclient-simple") {
+ int fd = drm_open_driver(DRIVER_ANY);
- igt_subtest("basic-auth")
- test_basic_auth(master);
+ igt_assert(check_auth(fd) == true);
- /* this must be last, we adjust the rlimit */
- igt_subtest("many-magics")
- test_many_magics(master);
+ close(fd);
+ }
+
+ igt_subtest("getclient-master-drop") {
+ int fd = drm_open_driver(DRIVER_ANY);
+ int fd2 = drm_open_driver(DRIVER_ANY);
+
+ igt_assert(check_auth(fd2) == true);
+
+ close(fd);
+
+ igt_assert(check_auth(fd2) == true);
+
+ close(fd2);
+ }
+
+ /* above tests require that no drm fd is open */
+ igt_subtest_group {
+ igt_fixture
+ master = drm_open_driver_master(DRIVER_ANY);
+
+ igt_subtest("basic-auth")
+ test_basic_auth(master);
+
+ /* this must be last, we adjust the rlimit */
+ igt_subtest("many-magics")
+ test_many_magics(master);
+ }
}
diff --git a/tests/core_get_client_auth.c b/tests/core_get_client_auth.c
deleted file mode 100644
index 9c64699d83a9..000000000000
--- a/tests/core_get_client_auth.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright © 2012,2013 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Daniel Vetter <daniel.vetter at ffwll.ch>
- *
- * Based upon code from libva/va/drm/va_drm_auth.c:
- */
-
-/*
- * Testcase: Check that the hollowed-out get_client ioctl still works for libva
- *
- * Oh dear, libva, why do you do such funny things?
- */
-
-#include "igt.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef __linux__
-# include <sys/syscall.h>
-#else
-# include <pthread.h>
-#endif
-
-#include "drm.h"
-
-/* Checks whether the thread id is the current thread */
-static bool
-is_local_tid(pid_t tid)
-{
-#ifndef __linux__
- return pthread_self() == tid;
-#else
- /* On Linux systems, drmGetClient() would return the thread ID
- instead of the actual process ID */
- return syscall(SYS_gettid) == tid;
-#endif
-}
-
-
-static bool check_auth(int fd)
-{
- pid_t client_pid;
- int i, auth, pid, uid;
- unsigned long magic, iocs;
- bool is_authenticated = false;
-
- client_pid = getpid();
- for (i = 0; !is_authenticated; i++) {
- if (drmGetClient(fd, i, &auth, &pid, &uid, &magic, &iocs) != 0)
- break;
- is_authenticated = auth && (pid == client_pid || is_local_tid(pid));
- }
- return is_authenticated;
-}
-
-
-igt_main
-{
- /* root (which we run igt as) should always be authenticated */
- igt_subtest("simple") {
- int fd = drm_open_driver(DRIVER_ANY);
-
- igt_assert(check_auth(fd) == true);
-
- close(fd);
- }
-
- igt_subtest("master-drop") {
- int fd = drm_open_driver(DRIVER_ANY);
- int fd2 = drm_open_driver(DRIVER_ANY);
-
- igt_assert(check_auth(fd2) == true);
-
- close(fd);
-
- igt_assert(check_auth(fd2) == true);
-
- close(fd2);
- }
-}
diff --git a/tests/meson.build b/tests/meson.build
index b8a6e61b3404..6a23811f4f58 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,6 +1,5 @@
test_progs = [
'core_auth',
- 'core_get_client_auth',
'core_getclient',
'core_getstats',
'core_getversion',
--
2.20.1
More information about the igt-dev
mailing list