From patchwork Tue Jan 26 13:05:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 12046477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20252C433DB for ; Tue, 26 Jan 2021 13:05:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C704B23109 for ; Tue, 26 Jan 2021 13:05:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C704B23109 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chris-wilson.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 228EE89AA2; Tue, 26 Jan 2021 13:05:18 +0000 (UTC) Received: from fireflyinternet.com (unknown [77.68.26.236]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4FD2589A88; Tue, 26 Jan 2021 13:05:15 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 23703448-1500050 for multiple; Tue, 26 Jan 2021 13:05:03 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 26 Jan 2021 13:05:04 +0000 Message-Id: <20210126130505.2938391-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 1/2] i915/sysfs_client: Ignore clients being closed as we read their sysfs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org, Chris Wilson Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" An earlier client from an old test may still be lingering and disappear as we scan the sysfs. Be graceful and let it go without tripping over it. Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin --- tests/i915/sysfs_clients.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/i915/sysfs_clients.c b/tests/i915/sysfs_clients.c index 6be52c04f..a3a1f81e1 100644 --- a/tests/i915/sysfs_clients.c +++ b/tests/i915/sysfs_clients.c @@ -62,11 +62,13 @@ static void strterm(char *s, int len) { - igt_assert(len > 0); - - s[len] = '\0'; - if (s[len - 1] == '\n') - s[len - 1] = '\0'; + if (len < 0) { + *s = '\0'; + } else { + s[len] = '\0'; + if (s[len - 1] == '\n') + s[len - 1] = '\0'; + } } static void pidname(int i915, int clients) @@ -78,7 +80,6 @@ static void pidname(int i915, int clients) long count; pid_t pid; DIR *dir; - int len; dir = fdopendir(dup(clients)); igt_assert(dir); @@ -90,13 +91,11 @@ static void pidname(int i915, int clients) continue; snprintf(buf, sizeof(buf), "%s/name", de->d_name); - len = igt_sysfs_read(clients, buf, buf, sizeof(buf) - 1); - igt_assert_f(len > 0, "failed to open '%s/name'\n", de->d_name); - strterm(buf, len); + strterm(buf, igt_sysfs_read(clients, buf, buf, sizeof(buf) - 1)); igt_debug("%s: %s\n", de->d_name, buf); /* Ignore closed clients created by drm_driver_open() */ - if (*buf == '<') + if (*buf == '\0' || *buf == '<') continue; close(me); From patchwork Tue Jan 26 13:05:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 12046479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5172AC433E0 for ; Tue, 26 Jan 2021 13:05:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B451823109 for ; Tue, 26 Jan 2021 13:05:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B451823109 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=chris-wilson.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 27E946E428; Tue, 26 Jan 2021 13:05:23 +0000 (UTC) Received: from fireflyinternet.com (unknown [77.68.26.236]) by gabe.freedesktop.org (Postfix) with ESMTPS id 662BC6E426; Tue, 26 Jan 2021 13:05:18 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 23703449-1500050 for multiple; Tue, 26 Jan 2021 13:05:04 +0000 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 26 Jan 2021 13:05:05 +0000 Message-Id: <20210126130505.2938391-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210126130505.2938391-1-chris@chris-wilson.co.uk> References: <20210126130505.2938391-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 2/2] i915/sysfs_clients: Check that client ids are cyclic X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org, Chris Wilson Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 Cc: Tvrtko Ursulin Reviewed-by: Tvrtko Ursulin --- 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 #include #include +#include #include #include #include @@ -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);