From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Cc: igt-dev@lists.freedesktop.org, Chris Wilson <chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH i-g-t 2/2] i915/sysfs_clients: Check that client ids are cyclic Date: Tue, 26 Jan 2021 13:05:05 +0000 [thread overview] Message-ID: <20210126130505.2938391-2-chris@chris-wilson.co.uk> (raw) In-Reply-To: <20210126130505.2938391-1-chris@chris-wilson.co.uk> The client id used is a cyclic allocator as that reduces the likelihood of userspace seeing the same id used again (and so confusing the new client as the old). Verify that each new client has an id greater than the last. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> --- tests/i915/sysfs_clients.c | 129 +++++++++++++++++++++++++++++++------ 1 file changed, 108 insertions(+), 21 deletions(-) diff --git a/tests/i915/sysfs_clients.c b/tests/i915/sysfs_clients.c index a3a1f81e1..d2c1ebc5f 100644 --- a/tests/i915/sysfs_clients.c +++ b/tests/i915/sysfs_clients.c @@ -8,6 +8,7 @@ #include <errno.h> #include <fcntl.h> #include <inttypes.h> +#include <limits.h> #include <math.h> #include <sched.h> #include <sys/socket.h> @@ -47,6 +48,8 @@ #define assert_within_epsilon(x, ref, tolerance) \ __assert_within_epsilon(x, ref, tolerance / 100., tolerance / 100.) +#define BUFSZ 280 + #define MI_BATCH_BUFFER_START (0x31 << 23) #define MI_BATCH_BUFFER_END (0xa << 23) #define MI_ARB_CHECK (0x5 << 23) @@ -75,7 +78,7 @@ static void pidname(int i915, int clients) { struct dirent *de; int sv[2], rv[2]; - char buf[280]; + char buf[BUFSZ]; int me = -1; long count; pid_t pid; @@ -180,7 +183,7 @@ static long count_clients(int clients) { struct dirent *de; long count = 0; - char buf[280]; + char buf[BUFSZ]; DIR *dir; dir = fdopendir(dup(clients)); @@ -229,32 +232,113 @@ static void create(int i915, int clients) igt_assert_eq(count_clients(clients), 1); } +static const char *find_client(int clients, pid_t pid, char *buf) +{ + DIR *dir = fdopendir(dup(clients)); + + /* Reading a dir as it changes does not appear to be stable, SEP */ + for (int pass = 0; pass < 2; pass++) { + struct dirent *de; + + rewinddir(dir); + while ((de = readdir(dir))) { + if (!isdigit(de->d_name[0])) + continue; + + snprintf(buf, BUFSZ, "%s/pid", de->d_name); + igt_sysfs_read(clients, buf, buf, sizeof(buf)); + if (atoi(buf) != pid) + continue; + + strncpy(buf, de->d_name, BUFSZ); + goto out; + } + } + *buf = '\0'; +out: + closedir(dir); + return buf; +} + static int find_me(int clients, pid_t pid) { - struct dirent *de; - char buf[280]; - int me = -1; - DIR *dir; + char buf[BUFSZ]; - dir = fdopendir(dup(clients)); - igt_assert(dir); - rewinddir(dir); + return openat(clients, + find_client(clients, pid, buf), + O_DIRECTORY | O_RDONLY); +} - while ((de = readdir(dir))) { - if (!isdigit(de->d_name[0])) - continue; +static int reopen_directory(int fd) +{ + char buf[BUFSZ]; + int dir; - snprintf(buf, sizeof(buf), "%s/pid", de->d_name); - igt_sysfs_read(clients, buf, buf, sizeof(buf)); - if (atoi(buf) != pid) - continue; + snprintf(buf, sizeof(buf), "/proc/self/fd/%d", fd); + dir = open(buf, O_RDONLY); + igt_assert_fd(dir); - me = openat(clients, de->d_name, O_DIRECTORY | O_RDONLY); - break; + return dir; +} + +static unsigned int my_id(int clients, pid_t pid) +{ + char buf[BUFSZ]; + + return atoi(find_client(clients, pid, buf)); +} + +static unsigned int recycle_client(int i915, int clients) +{ + int device, client; + + device = gem_reopen_driver(i915); + client = my_id(clients, getpid()); + close(device); + + return client; +} + +static void recycle(int i915, int clients) +{ + const int ncpus = sysconf(_SC_NPROCESSORS_ONLN); + + /* + * As we open and close clients, we do not expect to reuse old ids, + * i.e. we use a cyclic ida. This reduces the likelihood of userspace + * watchers becoming confused and mistaking the new client as a + * continuation of the old. + */ + igt_require(my_id(clients, getpid()) < INT_MAX / 2); + igt_assert(my_id(clients, getpid())); + + igt_fork(child, 2 * ncpus) { + unsigned int client, last; + + /* Reopen the directory fd for each client */ + clients = reopen_directory(clients); + + last = recycle_client(i915, clients); + igt_info("Child[%d] first client:%d\n", getpid(), last); + igt_until_timeout(5) { + client = recycle_client(i915, clients); + + /* In 5 seconds we are not going to exhaust the ids */ + igt_assert(client > last); + last = client; + } + igt_info("Child[%d] last client:%d\n", getpid(), last); } + igt_waitchildren(); - closedir(dir); - return me; + /* Cleanup delayed behind rcu */ + igt_until_timeout(30) { + sched_yield(); + if (count_clients(clients) == 1) + break; + usleep(10000); + } + igt_assert_eq(count_clients(clients), 1); } static int64_t read_runtime(int client, int class) @@ -719,7 +803,7 @@ sema(int i915, int clients, const struct intel_execution_engine2 *e, int f) static int read_all(int clients, pid_t pid, int class, uint64_t *runtime) { struct dirent *de; - char buf[280]; + char buf[BUFSZ]; int count = 0; DIR *dir; @@ -958,6 +1042,9 @@ igt_main igt_subtest("create") create(i915, clients); + igt_subtest("recycle") + recycle(i915, clients); + igt_subtest_group test_busy(i915, clients); -- 2.30.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Chris Wilson <chris@chris-wilson.co.uk> To: intel-gfx@lists.freedesktop.org Cc: igt-dev@lists.freedesktop.org, Chris Wilson <chris@chris-wilson.co.uk> Subject: [igt-dev] [PATCH i-g-t 2/2] i915/sysfs_clients: Check that client ids are cyclic Date: Tue, 26 Jan 2021 13:05:05 +0000 [thread overview] Message-ID: <20210126130505.2938391-2-chris@chris-wilson.co.uk> (raw) In-Reply-To: <20210126130505.2938391-1-chris@chris-wilson.co.uk> The client id used is a cyclic allocator as that reduces the likelihood of userspace seeing the same id used again (and so confusing the new client as the old). Verify that each new client has an id greater than the last. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> --- tests/i915/sysfs_clients.c | 129 +++++++++++++++++++++++++++++++------ 1 file changed, 108 insertions(+), 21 deletions(-) diff --git a/tests/i915/sysfs_clients.c b/tests/i915/sysfs_clients.c index a3a1f81e1..d2c1ebc5f 100644 --- a/tests/i915/sysfs_clients.c +++ b/tests/i915/sysfs_clients.c @@ -8,6 +8,7 @@ #include <errno.h> #include <fcntl.h> #include <inttypes.h> +#include <limits.h> #include <math.h> #include <sched.h> #include <sys/socket.h> @@ -47,6 +48,8 @@ #define assert_within_epsilon(x, ref, tolerance) \ __assert_within_epsilon(x, ref, tolerance / 100., tolerance / 100.) +#define BUFSZ 280 + #define MI_BATCH_BUFFER_START (0x31 << 23) #define MI_BATCH_BUFFER_END (0xa << 23) #define MI_ARB_CHECK (0x5 << 23) @@ -75,7 +78,7 @@ static void pidname(int i915, int clients) { struct dirent *de; int sv[2], rv[2]; - char buf[280]; + char buf[BUFSZ]; int me = -1; long count; pid_t pid; @@ -180,7 +183,7 @@ static long count_clients(int clients) { struct dirent *de; long count = 0; - char buf[280]; + char buf[BUFSZ]; DIR *dir; dir = fdopendir(dup(clients)); @@ -229,32 +232,113 @@ static void create(int i915, int clients) igt_assert_eq(count_clients(clients), 1); } +static const char *find_client(int clients, pid_t pid, char *buf) +{ + DIR *dir = fdopendir(dup(clients)); + + /* Reading a dir as it changes does not appear to be stable, SEP */ + for (int pass = 0; pass < 2; pass++) { + struct dirent *de; + + rewinddir(dir); + while ((de = readdir(dir))) { + if (!isdigit(de->d_name[0])) + continue; + + snprintf(buf, BUFSZ, "%s/pid", de->d_name); + igt_sysfs_read(clients, buf, buf, sizeof(buf)); + if (atoi(buf) != pid) + continue; + + strncpy(buf, de->d_name, BUFSZ); + goto out; + } + } + *buf = '\0'; +out: + closedir(dir); + return buf; +} + static int find_me(int clients, pid_t pid) { - struct dirent *de; - char buf[280]; - int me = -1; - DIR *dir; + char buf[BUFSZ]; - dir = fdopendir(dup(clients)); - igt_assert(dir); - rewinddir(dir); + return openat(clients, + find_client(clients, pid, buf), + O_DIRECTORY | O_RDONLY); +} - while ((de = readdir(dir))) { - if (!isdigit(de->d_name[0])) - continue; +static int reopen_directory(int fd) +{ + char buf[BUFSZ]; + int dir; - snprintf(buf, sizeof(buf), "%s/pid", de->d_name); - igt_sysfs_read(clients, buf, buf, sizeof(buf)); - if (atoi(buf) != pid) - continue; + snprintf(buf, sizeof(buf), "/proc/self/fd/%d", fd); + dir = open(buf, O_RDONLY); + igt_assert_fd(dir); - me = openat(clients, de->d_name, O_DIRECTORY | O_RDONLY); - break; + return dir; +} + +static unsigned int my_id(int clients, pid_t pid) +{ + char buf[BUFSZ]; + + return atoi(find_client(clients, pid, buf)); +} + +static unsigned int recycle_client(int i915, int clients) +{ + int device, client; + + device = gem_reopen_driver(i915); + client = my_id(clients, getpid()); + close(device); + + return client; +} + +static void recycle(int i915, int clients) +{ + const int ncpus = sysconf(_SC_NPROCESSORS_ONLN); + + /* + * As we open and close clients, we do not expect to reuse old ids, + * i.e. we use a cyclic ida. This reduces the likelihood of userspace + * watchers becoming confused and mistaking the new client as a + * continuation of the old. + */ + igt_require(my_id(clients, getpid()) < INT_MAX / 2); + igt_assert(my_id(clients, getpid())); + + igt_fork(child, 2 * ncpus) { + unsigned int client, last; + + /* Reopen the directory fd for each client */ + clients = reopen_directory(clients); + + last = recycle_client(i915, clients); + igt_info("Child[%d] first client:%d\n", getpid(), last); + igt_until_timeout(5) { + client = recycle_client(i915, clients); + + /* In 5 seconds we are not going to exhaust the ids */ + igt_assert(client > last); + last = client; + } + igt_info("Child[%d] last client:%d\n", getpid(), last); } + igt_waitchildren(); - closedir(dir); - return me; + /* Cleanup delayed behind rcu */ + igt_until_timeout(30) { + sched_yield(); + if (count_clients(clients) == 1) + break; + usleep(10000); + } + igt_assert_eq(count_clients(clients), 1); } static int64_t read_runtime(int client, int class) @@ -719,7 +803,7 @@ sema(int i915, int clients, const struct intel_execution_engine2 *e, int f) static int read_all(int clients, pid_t pid, int class, uint64_t *runtime) { struct dirent *de; - char buf[280]; + char buf[BUFSZ]; int count = 0; DIR *dir; @@ -958,6 +1042,9 @@ igt_main igt_subtest("create") create(i915, clients); + igt_subtest("recycle") + recycle(i915, clients); + igt_subtest_group test_busy(i915, clients); -- 2.30.0 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2021-01-26 13:05 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-26 13:05 [Intel-gfx] [PATCH i-g-t 1/2] i915/sysfs_client: Ignore clients being closed as we read their sysfs Chris Wilson 2021-01-26 13:05 ` [igt-dev] " Chris Wilson 2021-01-26 13:05 ` Chris Wilson [this message] 2021-01-26 13:05 ` [igt-dev] [PATCH i-g-t 2/2] i915/sysfs_clients: Check that client ids are cyclic Chris Wilson 2021-01-26 16:47 ` [Intel-gfx] " Tvrtko Ursulin 2021-01-26 16:47 ` [igt-dev] " Tvrtko Ursulin 2021-01-26 22:04 ` [Intel-gfx] " Chris Wilson 2021-01-26 22:07 ` Chris Wilson 2021-01-26 22:07 ` [igt-dev] " Chris Wilson 2021-01-27 9:12 ` [Intel-gfx] " Tvrtko Ursulin 2021-01-27 9:12 ` [igt-dev] " Tvrtko Ursulin 2021-01-27 9:51 ` [Intel-gfx] " Chris Wilson 2021-01-27 9:51 ` [igt-dev] " Chris Wilson 2021-01-29 9:18 ` [Intel-gfx] " Tvrtko Ursulin 2021-01-29 9:52 ` Chris Wilson 2021-01-29 9:52 ` [igt-dev] " Chris Wilson 2021-01-29 18:30 ` [Intel-gfx] " Tvrtko Ursulin 2021-01-26 16:33 ` [Intel-gfx] [igt-dev] [PATCH i-g-t 1/2] i915/sysfs_client: Ignore clients being closed as we read their sysfs Tvrtko Ursulin 2021-01-26 18:06 ` [igt-dev] ✗ GitLab.Pipeline: failure for series starting with [i-g-t,1/2] " Patchwork 2021-01-26 18:18 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork 2021-01-26 23:20 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2021-01-26 10:30 [Intel-gfx] [PATCH i-g-t 1/2] " Chris Wilson 2021-01-26 10:30 ` [Intel-gfx] [PATCH i-g-t 2/2] i915/sysfs_clients: Check that client ids are cyclic Chris Wilson
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=20210126130505.2938391-2-chris@chris-wilson.co.uk \ --to=chris@chris-wilson.co.uk \ --cc=igt-dev@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.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.