Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp5991873rwb; Tue, 1 Aug 2023 10:37:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlEqInXQuWx0GJUxo51QJJIJ+c5SuEjdHRCRvhwujbcQSrEndXzp2T0cNWiKqVKtAp2Q7Ont X-Received: by 2002:a17:907:7846:b0:99b:dea3:8d44 with SMTP id lb6-20020a170907784600b0099bdea38d44mr2677002ejc.71.1690911433664; Tue, 01 Aug 2023 10:37:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690911433; cv=none; d=google.com; s=arc-20160816; b=Zb0MuvBnLt5q1Z08eHr5oxbVOkyrp3FMhbYOjzm8UsnSEqxGaUWjTJJkAY7RqH/GZI xlBSkNwyMSD/P/bxW4uUrmmZEeR8/EOxjNHJ6wI9LeK3fRI5KNEQ1e6LnYC1L3iB+iAc /C1frPZ8JP2NAwZPukSJxhNjeTaB5NAupbRiRQATZ2TsVCKqJ7MYAa237mgcfcZQ13bG i/z9PzGschoOgnxflBUcK9Q9NVg3TrO/askRUTJs5dNtIIPj3gly/aA1r1QlXyL1825c 977ct682GoJSN/Yer/G2O9F2boIfoYR9/bFf6iFcEYAv1/LfNdnT/ok9dOOulYHmoMr+ q9ww== 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:organization:message-id:date:subject:cc:to :from:dkim-signature; bh=LPF1BjYGn2jtNKE6lw2TgYdSs/FI0HERQCyX0c5NMjA=; fh=sJMzKF+5e0axZHYHjY8ztJNt7mlACw6aqKjty2sJg0s=; b=WXlmnb+CC8trI1Ys56grfs+HF5VPTN6SqOUFSwbRv3k3XQ1q53x5Ze1VdcclFK2+wy lw2mfWj4EBh9aJJL9X7M5Bs7L9s7h2uSmiH3m4zYde4ZjSpL+r+1FyQ0gwBS8UVaodBF ZWN6jd5Sr0AoW8tQ4+2Wy12PhBalnoZjXBZ8MpzeNQu165NO96X7TW2dXtFbZWS3xC1w CTdY0khtr0AJEyCldj+8nVSVy/HW7c384fSaV7EU8f1cjmeQktDA4MKzQQyPOKyupSO8 RZuMEDm1pQ6ds2K6VJUAe5W7pV17RumQt1uS7UrM/pWr+9WjbQGtM9HItB+KDFfuk1X3 /nuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=L9TuzraJ; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id re18-20020a170906d8d200b009936afb1e23si5195120ejb.130.2023.08.01.10.36.47; Tue, 01 Aug 2023 10:37:13 -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=L9TuzraJ; 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 S232549AbjHAPSV (ORCPT + 99 others); Tue, 1 Aug 2023 11:18:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231309AbjHAPST (ORCPT ); Tue, 1 Aug 2023 11:18:19 -0400 Received: from mgamail.intel.com (unknown [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BFBE1BFF; Tue, 1 Aug 2023 08:18:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690903098; x=1722439098; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hxJizv94JDnUGjIcUH36TXm1Z5CnQY6la771ZqEJtZ4=; b=L9TuzraJJ3+GTUgtQHZ7HVXmexwWHVopIy9U7rD66cA4Zvs3Y4ljhvgn 4h03+z933/n3jGoQX7PkF1lLyY1pJOfcZnv8ra8zKnx/i92yl0fuqN1HS FTsrRWvx79Es1+gHYkWFIAji38H0wGnM2MgBMiP9lURFsSBz+GsMXaAIT R81geUm00cz3NgwayEFqS7dQ73RLlpnml5Xct7dmB0ErHCVm6uoZ0oZQs R+bbl9ICddEficbEHhHZ9hXUw1VdmE8oR8aGiv5AMyTwNeu1CVTWbxjFh wv7GvkxmDE/VtM/MWmFYKaJ2hLkui56oudOIijOrwXnh1MFFwLifOMIaD g==; X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="372037313" X-IronPort-AV: E=Sophos;i="6.01,247,1684825200"; d="scan'208";a="372037313" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2023 08:18:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="722509811" X-IronPort-AV: E=Sophos;i="6.01,247,1684825200"; d="scan'208";a="722509811" Received: from jkrzyszt-mobl2.ger.corp.intel.com ([10.213.27.8]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2023 08:18:12 -0700 From: Janusz Krzysztofik To: Mauro Carvalho Chehab Cc: Brendan Higgins , David Gow , linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, igt-dev@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org, Janusz Krzysztofik Subject: Re: [PATCH v3 2/3] kunit: Make 'list' action available to kunit test modules Date: Tue, 01 Aug 2023 17:18:10 +0200 Message-ID: <2361154.yKrmzQ4Hd0@jkrzyszt-mobl2.ger.corp.intel.com> Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 In-Reply-To: <20230801152120.3f53f876@coco.lan> References: <20230731141021.2854827-5-janusz.krzysztofik@linux.intel.com> <20230731141021.2854827-7-janusz.krzysztofik@linux.intel.com> <20230801152120.3f53f876@coco.lan> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" 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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 Hi Mauro, On Tuesday, 1 August 2023 15:21:20 CEST Mauro Carvalho Chehab wrote: > Em Mon, 31 Jul 2023 16:10:24 +0200 > Janusz Krzysztofik escreveu: > > > 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". For ease of use, submit the list in the > > format of a standard KTAP report, with SKIP result from each test case, > > giving "list mode" as the reason for skipping. For each test suite > > provided by a kunit test module, make such list of its test cases also > > available via kunit debugfs for the lifetime of the module. For user > > convenience, make the kunit.action parameter visible in sysfs. > > It sounds interesting to have a modprobe option to just list the > tests without excecuting. > > > > > Signed-off-by: Janusz Krzysztofik > > --- > > include/kunit/test.h | 1 + > > lib/kunit/executor.c | 19 +++++++++++++------ > > lib/kunit/test.c | 30 +++++++++++++++++++++++++++++- > > 3 files changed, 43 insertions(+), 7 deletions(-) > > > > diff --git a/include/kunit/test.h b/include/kunit/test.h > > index 23120d50499ef..6d693f21a4833 100644 > > --- a/include/kunit/test.h > > +++ b/include/kunit/test.h > > @@ -237,6 +237,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); > > > > diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c > > index 74982b83707ca..d1c0616569dfd 100644 > > --- a/lib/kunit/executor.c > > +++ b/lib/kunit/executor.c > > @@ -12,19 +12,26 @@ > > 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"); > > Help message sounded confusing. What about adding a boolean modprobe > parameter, like "list_tests"? While the above lines may look like a new code that introduced a new module parameter at a first glance, please note that's a chunk of the existing code, only moved out of #if IS_BUILTIN(CONFIG_KUNIT) section below. Having that clarified, do you mean adding a new module parameter that effectively replicates the function of the existing built-in only action=list parameter but is available also for modular kunit? Or do you mean replacing the existing action=list parameter completely with the new one? If the latter then that would mean a change to the existing ABI, and I'd rather not add it to the scope of this change as not required. Thanks, Janusz > > > + > > +const char *kunit_action(void) > > +{ > > + return action_param; > > +} > > + > > #if IS_BUILTIN(CONFIG_KUNIT) > > > > static char *filter_glob_param; > > -static char *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"); > > > > /* glob_match() needs NULL terminated strings, so we need a copy of filter_glob_param. */ > > struct kunit_test_filter { > > diff --git a/lib/kunit/test.c b/lib/kunit/test.c > > index a29ca1acc4d81..413d9fd364a8d 100644 > > --- a/lib/kunit/test.c > > +++ b/lib/kunit/test.c > > @@ -674,6 +674,27 @@ int kunit_run_tests(struct kunit_suite *suite) > > } > > EXPORT_SYMBOL_GPL(kunit_run_tests); > > > > +static void kunit_list_suite(struct kunit_suite *suite) > > +{ > > + struct kunit_case *test_case; > > + > > + kunit_print_suite_start(suite); > > + > > + kunit_suite_for_each_test_case(suite, test_case) { > > + struct kunit test = { .param_value = NULL, .param_index = 0 }; > > + > > + kunit_init_test(&test, test_case->name, test_case->log); > > + > > + kunit_print_ok_not_ok(&test, true, KUNIT_SKIPPED, > > + kunit_test_case_num(suite, test_case), > > + test_case->name, "list mode"); > > + } > > + > > + kunit_print_ok_not_ok((void *)suite, false, KUNIT_SKIPPED, > > + kunit_suite_counter++, > > + suite->name, "list mode"); > > +} > > + > > static void kunit_init_suite(struct kunit_suite *suite) > > { > > kunit_debugfs_create_suite(suite); > > @@ -688,6 +709,7 @@ bool kunit_enabled(void) > > > > int __kunit_test_suites_init(struct kunit_suite * const * const suites, int num_suites) > > { > > + const char *action = kunit_action(); > > unsigned int i; > > > > if (!kunit_enabled() && num_suites > 0) { > > @@ -699,7 +721,13 @@ int __kunit_test_suites_init(struct kunit_suite * const * const suites, int num_ > > > > for (i = 0; i < num_suites; i++) { > > kunit_init_suite(suites[i]); > > - kunit_run_tests(suites[i]); > > + > > + if (!action) > > + kunit_run_tests(suites[i]); > > + else if (!strcmp(action, "list")) > > + kunit_list_suite(suites[i]); > > + else > > + pr_err("kunit: unknown action '%s'\n", action); > > } > > > > static_branch_dec(&kunit_running); > > The remaining code LGTM. > > > Thanks, > Mauro >