From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 879A0EE6455 for ; Fri, 15 Sep 2023 10:44:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 49C0110E170; Fri, 15 Sep 2023 10:44:46 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8388410E170; Fri, 15 Sep 2023 10:44:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694774684; x=1726310684; h=date:from:to:cc:subject:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gHhMgUL2fpjx2fD7LHQD/pvlQVocI+8awrAfo7ZYpfo=; b=G6DZXLX5VkX8vgj5b2uP1RNotw6DfKfAzWbJmoeNB48DnNRMIjdsPB+9 r1pu+S2Qf+TEAokZjThrX6qAifS1+0oHOPQtDQ0px+27Jb444Hh/DOY5Q V5hscm1gNXTlwmX6pmR0CgCo7IoZQAVo/QnrSsfGbunn8aHIZe4d5nlMt 7G1Uj7kMDNJ9rK2HtoPsTb6jSUZgPIgvQUtbgAfR2LLN1EKc6pOvxy5/H wKCxbawp6RyOCc1yuwaS0Rl44guBrHkjLjdgpvoYWGDlkR8PT1l4WCyDD DepoEOcT/FqtgyNacNWO5RaxYkPBKThSn3o2yxYTW0RsBTiO53vLAZXDc w==; X-IronPort-AV: E=McAfee;i="6600,9927,10833"; a="445677034" X-IronPort-AV: E=Sophos;i="6.02,148,1688454000"; d="scan'208";a="445677034" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2023 03:44:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10833"; a="694689270" X-IronPort-AV: E=Sophos;i="6.02,148,1688454000"; d="scan'208";a="694689270" Received: from linux.intel.com ([10.54.29.200]) by orsmga003.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2023 03:44:41 -0700 Received: from maurocar-mobl2 (unknown [10.252.9.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id E2E6F580D1F; Fri, 15 Sep 2023 03:44:38 -0700 (PDT) Date: Fri, 15 Sep 2023 12:44:36 +0200 From: Mauro Carvalho Chehab To: Janusz Krzysztofik Message-ID: <20230915124436.08bc29db@maurocar-mobl2> In-Reply-To: <20230908123233.137134-31-janusz.krzysztofik@linux.intel.com> References: <20230908123233.137134-19-janusz.krzysztofik@linux.intel.com> <20230908123233.137134-31-janusz.krzysztofik@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Intel-xe] [Intel-gfx] [PATCH i-g-t v2 12/17] lib/ktap: Use IGT linked lists for storing KTAP results X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, Dominik Karol =?UTF-8?B?UGnEhXRrb3dza2k=?= , igt-dev@lists.freedesktop.org, Isabella Basso , intel-xe@lists.freedesktop.org Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Fri, 8 Sep 2023 14:32:46 +0200 Janusz Krzysztofik wrote: > For code simplicity and clarity, use existing IGT linked lists library > instead of open coding a custom implementation of a list of KTAP results. > > While being at it, flatten the code by inverting a check for pending > results. LGTM. Acked-by: Mauro Carvalho Chehab > > Signed-off-by: Janusz Krzysztofik > --- > lib/igt_kmod.c | 28 ++++++++++++++++------------ > lib/igt_ktap.c | 25 +++++-------------------- > lib/igt_ktap.h | 6 ++++-- > 3 files changed, 25 insertions(+), 34 deletions(-) > > diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c > index 988ac164cb..c692954911 100644 > --- a/lib/igt_kmod.c > +++ b/lib/igt_kmod.c > @@ -760,7 +760,6 @@ static void __igt_kunit(struct igt_ktest *tst, const char *opts) > struct kmod_module *kunit_kmod; > bool is_builtin; > struct ktap_test_results *results; > - struct ktap_test_results_element *temp; > unsigned long taints; > int flags, ret; > > @@ -784,28 +783,33 @@ static void __igt_kunit(struct igt_ktest *tst, const char *opts) > igt_skip("Unable to load %s module\n", tst->module_name); > } > > - while (READ_ONCE(results->still_running) || READ_ONCE(results->head) != NULL) > + while (READ_ONCE(results->still_running) || !igt_list_empty(&results->list)) > { > + struct ktap_test_results_element *result; > + > if (igt_kernel_tainted(&taints)) { > ktap_parser_cancel(); > break; > } > > - if (READ_ONCE(results->head) != NULL) { > - pthread_mutex_lock(&results->mutex); > + pthread_mutex_lock(&results->mutex); > + if (igt_list_empty(&results->list)) { > + pthread_mutex_unlock(&results->mutex); > + continue; > + } > > - igt_dynamic(results->head->test_name) { > - igt_assert(READ_ONCE(results->head->passed)); > + result = igt_list_first_entry(&results->list, result, link); > > - igt_fail_on(igt_kernel_tainted(&taints)); > - } > + igt_list_del(&result->link); > + pthread_mutex_unlock(&results->mutex); > > - temp = results->head; > - results->head = results->head->next; > - free(temp); > + igt_dynamic(result->test_name) { > + igt_assert(READ_ONCE(result->passed)); > > - pthread_mutex_unlock(&results->mutex); > + igt_fail_on(igt_kernel_tainted(&taints)); > } > + > + free(result); > } > > ret = ktap_parser_stop(); > diff --git a/lib/igt_ktap.c b/lib/igt_ktap.c > index 165f6b2cce..5e9967f980 100644 > --- a/lib/igt_ktap.c > +++ b/lib/igt_ktap.c > @@ -12,6 +12,7 @@ > #include "igt_aux.h" > #include "igt_core.h" > #include "igt_ktap.h" > +#include "igt_list.h" > > #define DELIMITER "-" > > @@ -335,7 +336,7 @@ static int parse_tap_level(int fd, char *base_test_name, int test_count, bool *f > bool *found_tests, bool is_builtin) > { > char record[BUF_LEN + 1]; > - struct ktap_test_results_element *r, *temp; > + struct ktap_test_results_element *r; > int internal_test_count; > char test_name[BUF_LEN + 1]; > char base_test_name_for_next_level[BUF_LEN + 1]; > @@ -403,17 +404,9 @@ static int parse_tap_level(int fd, char *base_test_name, int test_count, bool *f > r->test_name[BUF_LEN] = '\0'; > > r->passed = false; > - r->next = NULL; > > pthread_mutex_lock(&results.mutex); > - if (results.head == NULL) { > - results.head = r; > - } else { > - temp = results.head; > - while (temp->next != NULL) > - temp = temp->next; > - temp->next = r; > - } > + igt_list_add_tail(&r->link, &results.list); > pthread_mutex_unlock(&results.mutex); > > test_name[0] = '\0'; > @@ -431,17 +424,9 @@ static int parse_tap_level(int fd, char *base_test_name, int test_count, bool *f > r->test_name[BUF_LEN] = '\0'; > > r->passed = true; > - r->next = NULL; > > pthread_mutex_lock(&results.mutex); > - if (results.head == NULL) { > - results.head = r; > - } else { > - temp = results.head; > - while (temp->next != NULL) > - temp = temp->next; > - temp->next = r; > - } > + igt_list_add_tail(&r->link, &results.list); > pthread_mutex_unlock(&results.mutex); > > test_name[0] = '\0'; > @@ -523,7 +508,7 @@ static pthread_t ktap_parser_thread; > > struct ktap_test_results *ktap_parser_start(int fd, bool is_builtin) > { > - results.head = NULL; > + IGT_INIT_LIST_HEAD(&results.list); > pthread_mutex_init(&results.mutex, NULL); > results.still_running = true; > > diff --git a/lib/igt_ktap.h b/lib/igt_ktap.h > index 991800e912..b4d7a6dbc7 100644 > --- a/lib/igt_ktap.h > +++ b/lib/igt_ktap.h > @@ -28,16 +28,18 @@ > > #include > > +#include "igt_list.h" > + > void *igt_ktap_parser(void *unused); > > typedef struct ktap_test_results_element { > char test_name[BUF_LEN + 1]; > bool passed; > - struct ktap_test_results_element *next; > + struct igt_list_head link; > } ktap_test_results_element; > > struct ktap_test_results { > - ktap_test_results_element *head; > + struct igt_list_head list; > pthread_mutex_t mutex; > bool still_running; > };