From patchwork Mon Aug 7 10:23:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 131863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1395815vqr; Mon, 7 Aug 2023 05:02:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEzxLcHiXNGBR/gvZJRFsM/VUlExODr6MjlE2j2gg0csbzi2VvsMD2eQgJ/tkCGdEG9dcUC X-Received: by 2002:a17:902:ecd0:b0:1bc:7001:6e62 with SMTP id a16-20020a170902ecd000b001bc70016e62mr1584747plh.35.1691409725055; Mon, 07 Aug 2023 05:02:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691409725; cv=none; d=google.com; s=arc-20160816; b=Y0lQ4Lz/jp1hsVfCQCRBX1VBqcuUrjnaNiPrJMyyA2exIT4mjK2UhcBv34t2hqsFWe fybTiqh+sOZdWaWGzHHeSeovQgX0Yrnt8rxAjFcFStWpbmBaJo1tggxr8MUHNs271k11 lRm1v5bhMY1q2JJfMLc95z5aPAQp5CEXuAhE6FCbe5wDeP8lKPz4Q8ybRV7xhp+mhsWa 7Dewh/wQGa9pN7JZbFagQJiQ5hd42OBwDoDRPjTMOPjwKghY4ckJnYwAJ67i2SP4Q3Nh O3ip/fWKEu4DLXmuRgywLCNlATcdrnHevhLx0L1derO15/e/cBOAj9GZm+dyjHBW88Eg 6zhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tCiQXds2L6pp5PDMD3PN8H+dSVQLyK9JPReqAAdCT38=; fh=lK2waLL/9kOOSPYhHXVFA/ASjnnvCMfcH9+nf0X7mD4=; b=JDiXSmZWf7t1JLiKMbqMHmUi3NwhrJ+xH2lckfFRkxkS4SkEQrqiestZmWbuoT6OZo 2HT7Tij2W6yyuRrUvzlm3G5wdXiE0/qo84ItYhSViHmDokFGDfzdCXR435GVVFUTGzoA dpVQaqLnfWRjA9q3sW0DMiiH0dECMBTIZKZco48TS2VgnW5YYQdExqGTM9rRPDJaqO5K 1rIPxG1SeDhUgkca7L49MpKhSmpowH70E3z6xuM32iwcSfy9ZeWZbcft6YymwRnT0Fjd SMbf/RGUHDGTcmrTS0ljbYcY23fAhx0NIzIIlWoGprhgRWPNUV6ST4r9FB487BNsgiKN slTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EqmNIVqP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i3-20020a17090332c300b001bc56c3eba1si4066493plr.593.2023.08.07.05.01.25; Mon, 07 Aug 2023 05:02:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EqmNIVqP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231519AbjHGK2q (ORCPT + 99 others); Mon, 7 Aug 2023 06:28:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231607AbjHGK2n (ORCPT ); Mon, 7 Aug 2023 06:28:43 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 098E110F7; Mon, 7 Aug 2023 03:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691404120; x=1722940120; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gA6dLReLXWbnM/5+Z4XnRH5++WtlR2U+/c2WVYIMttw=; b=EqmNIVqPYm/3qC+n3vksTi9rK8xxTxfeYU4EuWYT++d+HdH/k22LoMA2 ewNIt8E11HP0+osNuOaqY605XrYvKL3ZGIo2ZugGDrztT38XDaAQnEAWD jTplJ8FASaxf2ZnjF/xvcK3uHCIPCasgo9KBdPqA8wt2/QPFaD3b5BAVk 95hFH3pquqm7U6PSOJG4XajuEFWOHacxV/UkzZ+geLMg4jExCs1qRYcvm 9ojir5DI9m5tfcDPRfLm0Jf4ygh1fyWdx9N7tIxizs8IFmNbkCOhBFyt2 aknNYKNf0CQsFlSehpyGDBkZoZa7HDkF4jVrhH9+87uO+rzqtkiLr21as A==; X-IronPort-AV: E=McAfee;i="6600,9927,10794"; a="350818206" X-IronPort-AV: E=Sophos;i="6.01,261,1684825200"; d="scan'208";a="350818206" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2023 03:28:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10794"; a="730909354" X-IronPort-AV: E=Sophos;i="6.01,261,1684825200"; d="scan'208";a="730909354" Received: from kornelo-mobl2.ger.corp.intel.com (HELO jkrzyszt-mobl2.ger.corp.intel.com) ([10.213.30.73]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2023 03:28:35 -0700 From: Janusz Krzysztofik To: Brendan Higgins , David Gow Cc: linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, Mauro Carvalho Chehab , igt-dev@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rae Moar , Janusz Krzysztofik Subject: [PATCH v5 2/3] kunit: Make 'list' action available to kunit test modules Date: Mon, 7 Aug 2023 12:23:55 +0200 Message-ID: <20230807102352.4607-7-janusz.krzysztofik@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230807102352.4607-5-janusz.krzysztofik@linux.intel.com> References: <20230807102352.4607-5-janusz.krzysztofik@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773571644007702582 X-GMAIL-MSGID: 1773571644007702582 Results from kunit tests reported via dmesg may be interleaved with other kernel messages. When parsing dmesg for modular kunit results in real time, external tools, e.g., Intel GPU tools (IGT), may want to insert their own test name markers into dmesg at the start of each test, before any kernel message related to that test appears there, so existing upper level test result parsers have no doubt which test to blame for a specific kernel message. Unfortunately, kunit reports names of tests only at their completion (with the exeption of a not standarized "# Subtest: " header above a test plan of each test suite or parametrized test). External tools could be able to insert their own "start of the test" markers with test names included if they new those names in advance. Test names could be learned from a list if provided by a kunit test module. There exists a feature of listing kunit tests without actually executing them, but it is now limited to configurations with the kunit module built in and covers only built-in tests, already available at boot time. Moreover, switching from list to normal mode requires reboot. If that feature was also available when kunit is built as a module, userspace could load the module with action=list parameter, load some kunit test modules they are interested in and learn about the list of tests provided by those modules, then unload them, reload the kunit module in normal mode and execute the tests with their lists already known. Extend kunit module notifier initialization callback with a processing path for only listing the tests provided by a module if the kunit action parameter is set to "list" or "list_attr". For user convenience, make the kunit.action parameter visible in sysfs. v2: Don't use a different format, use kunit_exec_list_tests() (Rae), - refresh on top of new attributes patches, handle newly introduced kunit.action=list_attr case (Rae). Signed-off-by: Janusz Krzysztofik Cc: Rae Moar Reviewed-by: David Gow --- include/kunit/test.h | 2 ++ lib/kunit/executor.c | 28 +++++++++++++++++----------- lib/kunit/test.c | 18 +++++++++++++++--- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/include/kunit/test.h b/include/kunit/test.h index 3d002e6b252f2..6a338a3267ed5 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -309,6 +309,7 @@ static inline void kunit_set_failure(struct kunit *test) } bool kunit_enabled(void); +const char *kunit_action(void); void kunit_init_test(struct kunit *test, const char *name, char *log); @@ -324,6 +325,7 @@ int __kunit_test_suites_init(struct kunit_suite * const * const suites, int num_ void __kunit_test_suites_exit(struct kunit_suite **suites, int num_suites); void kunit_exec_run_tests(struct kunit_suite_set *suite_set, bool builtin); +void kunit_exec_list_tests(struct kunit_suite_set *suite_set, bool include_attr); #if IS_BUILTIN(CONFIG_KUNIT) int kunit_run_all_tests(void); diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c index 5ef90c334eb0f..e877c1f1e75c8 100644 --- a/lib/kunit/executor.c +++ b/lib/kunit/executor.c @@ -13,22 +13,29 @@ extern struct kunit_suite * const __kunit_suites_start[]; extern struct kunit_suite * const __kunit_suites_end[]; +static char *action_param; + +module_param_named(action, action_param, charp, 0400); +MODULE_PARM_DESC(action, + "Changes KUnit executor behavior, valid values are:\n" + ": run the tests like normal\n" + "'list' to list test names instead of running them.\n" + "'list_attr' to list test names and attributes instead of running them.\n"); + +const char *kunit_action(void) +{ + return action_param; +} + #if IS_BUILTIN(CONFIG_KUNIT) static char *filter_glob_param; -static char *action_param; static char *filter_param; static char *filter_action_param; module_param_named(filter_glob, filter_glob_param, charp, 0); MODULE_PARM_DESC(filter_glob, "Filter which KUnit test suites/tests run at boot-time, e.g. list* or list*.*del_test"); -module_param_named(action, action_param, charp, 0); -MODULE_PARM_DESC(action, - "Changes KUnit executor behavior, valid values are:\n" - ": run the tests like normal\n" - "'list' to list test names instead of running them.\n" - "'list_attr' to list test names and attributes instead of running them.\n"); module_param_named(filter, filter_param, charp, 0); MODULE_PARM_DESC(filter, "Filter which KUnit test suites/tests run at boot-time using attributes, e.g. speed>slow"); @@ -239,10 +246,7 @@ void kunit_exec_run_tests(struct kunit_suite_set *suite_set, bool builtin) __kunit_test_suites_init(suite_set->start, num_suites); } -#if IS_BUILTIN(CONFIG_KUNIT) - -static void kunit_exec_list_tests(struct kunit_suite_set *suite_set, - bool include_attr) +void kunit_exec_list_tests(struct kunit_suite_set *suite_set, bool include_attr) { struct kunit_suite * const *suites; struct kunit_case *test_case; @@ -265,6 +269,8 @@ static void kunit_exec_list_tests(struct kunit_suite_set *suite_set, } } +#if IS_BUILTIN(CONFIG_KUNIT) + int kunit_run_all_tests(void) { struct kunit_suite_set suite_set = { diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 8b2808068497f..5232a43737826 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -739,13 +739,25 @@ static void kunit_module_init(struct module *mod) struct kunit_suite_set suite_set = { mod->kunit_suites, mod->kunit_suites + mod->num_kunit_suites, }; - - kunit_exec_run_tests(&suite_set, false); + const char *action = kunit_action(); + + if (!action) + kunit_exec_run_tests(&suite_set, false); + else if (!strcmp(action, "list")) + kunit_exec_list_tests(&suite_set, false); + else if (!strcmp(action, "list_attr")) + kunit_exec_list_tests(&suite_set, true); + else + pr_err("kunit: unknown action '%s'\n", action); } static void kunit_module_exit(struct module *mod) { - __kunit_test_suites_exit(mod->kunit_suites, mod->num_kunit_suites); + const char *action = kunit_action(); + + if (!action) + __kunit_test_suites_exit(mod->kunit_suites, + mod->num_kunit_suites); } static int kunit_module_notify(struct notifier_block *nb, unsigned long val,