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);