From patchwork Thu Feb 4 17:30:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 12068043 X-Patchwork-Delegate: brendanhiggins@google.com 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 74A14C433DB for ; Thu, 4 Feb 2021 17:34:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 391A564DA1 for ; Thu, 4 Feb 2021 17:34:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238520AbhBDRea (ORCPT ); Thu, 4 Feb 2021 12:34:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238625AbhBDRcN (ORCPT ); Thu, 4 Feb 2021 12:32:13 -0500 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88C02C06121F for ; Thu, 4 Feb 2021 09:30:58 -0800 (PST) Received: by mail-pg1-x549.google.com with SMTP id s17so2782592pgv.14 for ; Thu, 04 Feb 2021 09:30:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=zqtZNtlwovcLal3eUv97iPhE0o+XnEPUYoIDKlk3tf8=; b=RBjmQ6hIYuND03Bk8VkUOB0SOzLL5tWcWkJLCtOVnwhoJJ+6ZNuJemt94v7tRgodhV U/wSgvZxfUmdK9SO0qkrRtrp4AUf5hXIzwPepH6NaRdS/T8n6EfZq6OlDAo/ollLyPhm Qk2/HaB5nZ0p/fVl6lV5KW5TaQw3SLBBZzasR2VzO0dOiRR+5atnKoNsv8fil3jWPgkv aq4tXDBlR/5Kis3pXiOyKckHUExvGQMUqkzddlGRh8i1j8acJHioUfLk5ZPPhAuuqwFC 338y8lT7N2TGvCPzPRik8fd3bpNJrUkbZxXPfzD6roHIMFQ7k8E2QjRJEQur87GrvFVv rI/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=zqtZNtlwovcLal3eUv97iPhE0o+XnEPUYoIDKlk3tf8=; b=BBpNfMXCJ7Nw47f0nYNpzJ1fMhcZjlCm28mvtw5V6SUOAWd7QDgdwhAVoQeD3HMQRE kIXNc/FPddboRhKva0m/bsBwro0uJgKvIfsEus+kkQj8UMmsxVfWxeRLqN2CkBefvQMW RlgFHjdpeqPdEU5GRlS2easgol8+8Qiq6Poq0w8G0WBwhgOe4J4OgWoEyPRPGfzP6vh2 xRXBpnddH6lIXMvzejWky2EEUJBlZRoSmA5Guap8H4u2dHcLKdjDORSLlWg/e5+Kf12b PenYqSyRSmB9h3W4Hb7uOXEVf1uWMN4OZ3GAmm0ZuGr8LKRqQVPE88yJhABewEjnX6bY aMVg== X-Gm-Message-State: AOAM532pkIzSnYJnVCQpp2LgXvPwfvGpfOQw2uGLu2qioN5QFlK/ZTFX NkoDrh3Z83va8MmyXqKQSurMTvmAmhQ2iw== X-Google-Smtp-Source: ABdhPJwjBN6AbJRtvjCPXHOP7ruE/FODp92VdCRsuonDWi05Wg9gR5NSguupAQIpKL2Qyb+isNHUaTPLyIQlGw== Sender: "dlatypov via sendgmr" X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:bd7a:7717:5b5b:de27]) (user=dlatypov job=sendgmr) by 2002:a62:7dc4:0:b029:1ba:765:3af with SMTP id y187-20020a627dc40000b02901ba076503afmr362337pfc.78.1612459857917; Thu, 04 Feb 2021 09:30:57 -0800 (PST) Date: Thu, 4 Feb 2021 09:30:43 -0800 In-Reply-To: <20210204173045.1138504-1-dlatypov@google.com> Message-Id: <20210204173045.1138504-2-dlatypov@google.com> Mime-Version: 1.0 References: <20210204173045.1138504-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH v2 1/3] kunit: add kunit.filter_glob cmdline option to filter suites From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Daniel Latypov Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org E.g. specifying this would run suites with "list" in their name. kunit.filter_glob=list* Note: the executor prints out a TAP header that includes the number of suites we intend to run. So unless we want to report empty results for filtered-out suites, we need to do the filtering here in the executor. It's also probably better in the executor since we most likely don't want any filtering to apply to tests built as modules. This code does add a CONFIG_GLOB=y dependency for CONFIG_KUNIT=y. But the code seems light enough that it shouldn't be an issue. For now, we only filter on suite names so we don't have to create copies of the suites themselves, just the array (of arrays) holding them. The name is rather generic since in the future, we could consider extending it to a syntax like: kunit.filter_glob=. E.g. to run all the del list tests kunit.filter_glob=list-kunit-test.*del* But at the moment, it's far easier to manually comment out test cases in test files as opposed to messing with sets of Kconfig entries to select specific suites. So even just doing this makes using kunit far less annoying. Signed-off-by: Daniel Latypov Reviewed-by: Brendan Higgins --- lib/kunit/Kconfig | 1 + lib/kunit/executor.c | 91 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 83 insertions(+), 9 deletions(-) diff --git a/lib/kunit/Kconfig b/lib/kunit/Kconfig index 00909e6a2443..0b5dfb001bac 100644 --- a/lib/kunit/Kconfig +++ b/lib/kunit/Kconfig @@ -4,6 +4,7 @@ menuconfig KUNIT tristate "KUnit - Enable support for unit tests" + select GLOB if KUNIT=y help Enables support for kernel unit tests (KUnit), a lightweight unit testing and mocking framework for the Linux kernel. These tests are diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c index a95742a4ece7..996efb80dba6 100644 --- a/lib/kunit/executor.c +++ b/lib/kunit/executor.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include +#include /* * These symbols point to the .kunit_test_suites section and are defined in @@ -11,14 +13,79 @@ extern struct kunit_suite * const * const __kunit_suites_end[]; #if IS_BUILTIN(CONFIG_KUNIT) -static void kunit_print_tap_header(void) +static char *filter_glob; +module_param(filter_glob, charp, 0); + +static struct kunit_suite * const * +kunit_filter_subsuite(struct kunit_suite * const * const subsuite) +{ + int i, n = 0; + struct kunit_suite **filtered; + + n = 0; + for (i = 0; subsuite[i] != NULL; ++i) { + if (glob_match(filter_glob, subsuite[i]->name)) + ++n; + } + + if (n == 0) + return NULL; + + filtered = kmalloc_array(n + 1, sizeof(*filtered), GFP_KERNEL); + if (!filtered) + return NULL; + + n = 0; + for (i = 0; subsuite[i] != NULL; ++i) { + if (glob_match(filter_glob, subsuite[i]->name)) + filtered[n++] = subsuite[i]; + } + filtered[n] = NULL; + + return filtered; +} + +struct suite_set { + struct kunit_suite * const * const *start; + struct kunit_suite * const * const *end; +}; + +static struct suite_set kunit_filter_suites(void) +{ + int i; + struct kunit_suite * const **copy, * const *filtered_subsuite; + struct suite_set filtered; + + const size_t max = __kunit_suites_end - __kunit_suites_start; + + if (!filter_glob) { + filtered.start = __kunit_suites_start; + filtered.end = __kunit_suites_end; + return filtered; + } + + copy = kmalloc_array(max, sizeof(*filtered.start), GFP_KERNEL); + filtered.start = copy; + if (!copy) { /* won't be able to run anything, return an empty set */ + filtered.end = copy; + return filtered; + } + + for (i = 0; i < max; ++i) { + filtered_subsuite = kunit_filter_subsuite(__kunit_suites_start[i]); + if (filtered_subsuite) + *copy++ = filtered_subsuite; + } + filtered.end = copy; + return filtered; +} + +static void kunit_print_tap_header(struct suite_set *suite_set) { struct kunit_suite * const * const *suites, * const *subsuite; int num_of_suites = 0; - for (suites = __kunit_suites_start; - suites < __kunit_suites_end; - suites++) + for (suites = suite_set->start; suites < suite_set->end; suites++) for (subsuite = *suites; *subsuite != NULL; subsuite++) num_of_suites++; @@ -30,12 +97,18 @@ int kunit_run_all_tests(void) { struct kunit_suite * const * const *suites; - kunit_print_tap_header(); + struct suite_set suite_set = kunit_filter_suites(); + + kunit_print_tap_header(&suite_set); + + for (suites = suite_set.start; suites < suite_set.end; suites++) + __kunit_test_suites_init(*suites); - for (suites = __kunit_suites_start; - suites < __kunit_suites_end; - suites++) - __kunit_test_suites_init(*suites); + if (filter_glob) { /* a copy was made of each array */ + for (suites = suite_set.start; suites < suite_set.end; suites++) + kfree(*suites); + kfree(suite_set.start); + } return 0; } From patchwork Thu Feb 4 17:30:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 12068045 X-Patchwork-Delegate: brendanhiggins@google.com 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=-26.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 B215EC433DB for ; Thu, 4 Feb 2021 17:34:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F76060203 for ; Thu, 4 Feb 2021 17:34:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238535AbhBDRez (ORCPT ); Thu, 4 Feb 2021 12:34:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238595AbhBDRcu (ORCPT ); Thu, 4 Feb 2021 12:32:50 -0500 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8004C061222 for ; Thu, 4 Feb 2021 09:31:00 -0800 (PST) Received: by mail-qk1-x749.google.com with SMTP id v130so3262830qkb.14 for ; Thu, 04 Feb 2021 09:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=uAmCYhAQV4UKau9nAZmt7fCkOD0B6TnSTE34tccNud4=; b=QJEswYnd7k0toB/opLES3Mv4vKb54wLk5YUbLCj/O3BV5QUC/dN1OMWUvnhJ1zp8g0 2AdAhG758G7mB94t3M/joe5g0tJe8LjCeu4dPGJVULgT8LkGYcOanHTaJt4ZFO8gFPzT K5nDcgeQhxn8+MzIRN+xZMU7P+i/yEflxiwYRqRRCTG21UFsQTotaeRKev3XIl+hnWd1 DW3KFSW6UbLBii26fRdtcQ5o99U/7gA6Ch4JC6S5DPj1xJQOJgZDg0irUaD+IwZ5BqRX vwKqiMqp8aVIPrfQEGCKyb9aGGGwS0rkzYI8zyb57gbDFEbADfesqRAsLzN1GXffBi/n DIiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=uAmCYhAQV4UKau9nAZmt7fCkOD0B6TnSTE34tccNud4=; b=Q3Iopju85KNtQMPtZlDLQAP6slU4zaeh/g+6G4Nb+dDAcndywQ+wUHAo8FbHYcO5Ev Q3/3K1v+vM5hkR+sJqgood9pCS5PEM+cJhwUKqG//P2V/1OUEV4b+03LPQnYHNSahy+M wfsQctU4M7rkMA2iO1eChmCqqllkClgwqpJ2YVgSO+38diopap4AxU4Bf8r8pxla+QVg /m/c/VVcXZQX6hLhc7RTSUaCYF0HCL9CMVGG6YVg2bCIrDZtBDZ+Z3M1Erb8vYEVZn4o WVEihXhZNP776NYBrT3g6vtLiH/katJmMOZQpHbL+GZGUyjJnn/5b9MISsQRciqrbDXO gDlA== X-Gm-Message-State: AOAM530P/iPd2xPW5JS+Dn6Jg09CZIIPW2McuQ5Zw6twL8+YjZohrUcP UQT2FkmTykv34ZXWUwJ6k6slRqsl7hOsKw== X-Google-Smtp-Source: ABdhPJx3GPlLW1cdm0/nPbgAAqmd0IukKPpxRFkbKEDI5vkAjIpEML35GGxVDteQIJtc1Wo5QTqNADgtIsuf7g== Sender: "dlatypov via sendgmr" X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:bd7a:7717:5b5b:de27]) (user=dlatypov job=sendgmr) by 2002:ad4:5981:: with SMTP id ek1mr287773qvb.48.1612459859841; Thu, 04 Feb 2021 09:30:59 -0800 (PST) Date: Thu, 4 Feb 2021 09:30:44 -0800 In-Reply-To: <20210204173045.1138504-1-dlatypov@google.com> Message-Id: <20210204173045.1138504-3-dlatypov@google.com> Mime-Version: 1.0 References: <20210204173045.1138504-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH v2 2/3] kunit: tool: add support for filtering suites by glob From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Daniel Latypov Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org This allows running different subsets of tests, e.g. $ ./tools/testing/kunit/kunit.py build $ ./tools/testing/kunit/kunit.py exec 'list*' $ ./tools/testing/kunit/kunit.py exec 'kunit*' This passes the "kunit_filter.glob" commandline option to the UML kernel, which currently only supports filtering by suite name. Signed-off-by: Daniel Latypov Reviewed-by: Brendan Higgins --- tools/testing/kunit/kunit.py | 21 ++++++++++++++++----- tools/testing/kunit/kunit_kernel.py | 4 +++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py index e808a47c839b..a15ee33bb1f5 100755 --- a/tools/testing/kunit/kunit.py +++ b/tools/testing/kunit/kunit.py @@ -28,12 +28,12 @@ KunitBuildRequest = namedtuple('KunitBuildRequest', ['jobs', 'build_dir', 'alltests', 'make_options']) KunitExecRequest = namedtuple('KunitExecRequest', - ['timeout', 'build_dir', 'alltests']) + ['timeout', 'build_dir', 'alltests', 'filter_glob']) KunitParseRequest = namedtuple('KunitParseRequest', ['raw_output', 'input_data', 'build_dir', 'json']) KunitRequest = namedtuple('KunitRequest', ['raw_output','timeout', 'jobs', - 'build_dir', 'alltests', 'json', - 'make_options']) + 'build_dir', 'alltests', 'filter_glob', + 'json', 'make_options']) KernelDirectoryPath = sys.argv[0].split('tools/testing/kunit/')[0] @@ -93,6 +93,7 @@ def exec_tests(linux: kunit_kernel.LinuxSourceTree, test_start = time.time() result = linux.run_kernel( timeout=None if request.alltests else request.timeout, + filter_glob=request.filter_glob, build_dir=request.build_dir) test_end = time.time() @@ -149,7 +150,7 @@ def run_tests(linux: kunit_kernel.LinuxSourceTree, return build_result exec_request = KunitExecRequest(request.timeout, request.build_dir, - request.alltests) + request.alltests, request.filter_glob) exec_result = exec_tests(linux, exec_request) if exec_result.status != KunitStatus.SUCCESS: return exec_result @@ -197,6 +198,14 @@ def add_exec_opts(parser) -> None: type=int, default=300, metavar='timeout') + parser.add_argument('filter_glob', + help='maximum number of seconds to allow for all tests ' + 'to run. This does not include time taken to build the ' + 'tests.', + type=str, + nargs='?', + default='', + metavar='filter_glob') def add_parse_opts(parser) -> None: parser.add_argument('--raw_output', help='don\'t format output from kernel', @@ -263,6 +272,7 @@ def main(argv, linux=None): cli_args.jobs, cli_args.build_dir, cli_args.alltests, + cli_args.filter_glob, cli_args.json, cli_args.make_options) result = run_tests(linux, request) @@ -304,7 +314,8 @@ def main(argv, linux=None): exec_request = KunitExecRequest(cli_args.timeout, cli_args.build_dir, - cli_args.alltests) + cli_args.alltests, + cli_args.filter_glob) exec_result = exec_tests(linux, exec_request) parse_request = KunitParseRequest(cli_args.raw_output, exec_result.result, diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py index 2076a5a2d060..71b1942f5ccd 100644 --- a/tools/testing/kunit/kunit_kernel.py +++ b/tools/testing/kunit/kunit_kernel.py @@ -199,8 +199,10 @@ class LinuxSourceTree(object): return False return self.validate_config(build_dir) - def run_kernel(self, args=[], build_dir='', timeout=None) -> Iterator[str]: + def run_kernel(self, args=[], build_dir='', filter_glob='', timeout=None) -> Iterator[str]: args.extend(['mem=1G', 'console=tty']) + if filter_glob: + args.append('kunit.filter_glob='+filter_glob) self._ops.linux_bin(args, timeout, build_dir) outfile = get_outfile_path(build_dir) subprocess.call(['stty', 'sane']) From patchwork Thu Feb 4 17:30:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 12068073 X-Patchwork-Delegate: brendanhiggins@google.com 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=-26.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 D1648C433E0 for ; Thu, 4 Feb 2021 17:41:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9504264E4E for ; Thu, 4 Feb 2021 17:41:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238495AbhBDRlQ (ORCPT ); Thu, 4 Feb 2021 12:41:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238598AbhBDRcv (ORCPT ); Thu, 4 Feb 2021 12:32:51 -0500 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8056DC061224 for ; Thu, 4 Feb 2021 09:31:02 -0800 (PST) Received: by mail-qt1-x849.google.com with SMTP id k90so3146179qte.4 for ; Thu, 04 Feb 2021 09:31:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=/SVhbM2uQkfhx0nM8S6aEm/0ZcJ7ciNGwmg4LfVvDlo=; b=Thvd174F9a+GsewOT+nlcPKlXmhil/8YBJC6kx0cQirSj3kOEGPIWE8+idsYw/Jt/D 4+BPW1mdGFi0Rkh5ZAT/GedqQOr8xgFt+rmK97J+dp+Ochcs4qZnfIIE1BJB5LPaFcYp JfwwAlORU8NGAtvPlQAJhvBr0yfxL6C5EA0+gFdlv6DPwNhxYkDiwPn14I0E+SAX+CPH WX/TaymNi6HCVBh/ogLhTWVwiIFPrq4HTnAo9nEPSmB3O2Zmf/E1M8UIRSOLYarJAEEo 7kq6GemeNytdIJxjXaMhUk5RYqcoJhRBPQav2eRcI+KM+xDVwl1nJO1V74nDIQw0ooeK N5XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=/SVhbM2uQkfhx0nM8S6aEm/0ZcJ7ciNGwmg4LfVvDlo=; b=rexql2cPoL5TnqEpt4RuwBcAzisGwDIFD83CkMHjx2hDi90892KUVqkCukAeToCrcB mBHVJu2QYQ4zagUPyOnf3EGZ92z0HzS7Ch8aoc96HQRXkHXwAmvWsFmtohugnrrp3NJ/ 82KRJPfBha6749iDm7/eyFW5YyrieY2XS5dxiouqSEuvLgAwCq+IAGBoQSzWrVQH1zs/ 7UmcZXhr/LRbBsTzCKq3VBQ3bohyrqApnfuOM6ogEJtHa30UodDCIF1uk2ZvhkU+o8yl Z+B04Qv5qpxLmu2oypOWHNObLFmTQeRKZbfzSD6yoQzEcwFnrjlXUZT+iAjR9keNkAJS V8jw== X-Gm-Message-State: AOAM530w98B3Yg3uhNv4fRqXpgxc/GCPuZ/+rEeyxhchhvxUKTp6uHU2 JM5QmBVCqLQOYXnq9cFiXP+5hqyulWhJbA== X-Google-Smtp-Source: ABdhPJxeiBQhDE8ipCm5Yam3J5DXGKIM5RehWcKf6aRy7SPNSKUDJBO2mDGDRSy/Rz3KEXmTwZZRGuB2CbHeqw== Sender: "dlatypov via sendgmr" X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:bd7a:7717:5b5b:de27]) (user=dlatypov job=sendgmr) by 2002:a0c:ee89:: with SMTP id u9mr514981qvr.40.1612459861632; Thu, 04 Feb 2021 09:31:01 -0800 (PST) Date: Thu, 4 Feb 2021 09:30:45 -0800 In-Reply-To: <20210204173045.1138504-1-dlatypov@google.com> Message-Id: <20210204173045.1138504-4-dlatypov@google.com> Mime-Version: 1.0 References: <20210204173045.1138504-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH v2 3/3] kunit: tool: fix unintentional statefulness in run_kernel() From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Daniel Latypov Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org This is a bug that has been present since the first version of this code. Using [] as a default parameter is dangerous, since it's mutable. Example using the REPL: >>> def bad(param = []): ... param.append(len(param)) ... print(param) ... >>> bad() [0] >>> bad() [0, 1] This wasn't a concern in the past since it would just keep appending the same values to it. E.g. before, `args` would just grow in size like: [mem=1G', 'console=tty'] [mem=1G', 'console=tty', mem=1G', 'console=tty'] But with now filter_glob, this is more dangerous, e.g. run_kernel(filter_glob='my-test*') # default modified here run_kernel() # filter_glob still applies here! That earlier `filter_glob` will affect all subsequent calls that don't specify `args`. Note: currently the kunit tool only calls run_kernel() at most once, so it's not possible to trigger any negative side-effects right now. Fixes: 6ebf5866f2e8 ("kunit: tool: add Python wrappers for running KUnit tests") Signed-off-by: Daniel Latypov Reviewed-by: Brendan Higgins --- tools/testing/kunit/kunit_kernel.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py index 71b1942f5ccd..6dd3cf6e8efa 100644 --- a/tools/testing/kunit/kunit_kernel.py +++ b/tools/testing/kunit/kunit_kernel.py @@ -199,7 +199,9 @@ class LinuxSourceTree(object): return False return self.validate_config(build_dir) - def run_kernel(self, args=[], build_dir='', filter_glob='', timeout=None) -> Iterator[str]: + def run_kernel(self, args=None, build_dir='', filter_glob='', timeout=None) -> Iterator[str]: + if not args: + args = [] args.extend(['mem=1G', 'console=tty']) if filter_glob: args.append('kunit.filter_glob='+filter_glob)