From patchwork Wed Feb 3 23:41:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 12065771 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=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 70EC3C433DB for ; Wed, 3 Feb 2021 23:43:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3473564F59 for ; Wed, 3 Feb 2021 23:43:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233480AbhBCXmy (ORCPT ); Wed, 3 Feb 2021 18:42:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233985AbhBCXmF (ORCPT ); Wed, 3 Feb 2021 18:42:05 -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 A39F3C061786 for ; Wed, 3 Feb 2021 15:41:25 -0800 (PST) Received: by mail-qk1-x749.google.com with SMTP id u66so1003275qkd.13 for ; Wed, 03 Feb 2021 15:41:25 -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=wZJ3xIt4HVxcRfrrlRk8Ya59f1V5w/lhWnv38F4pYvc=; b=UkTHiUYpKPQSoeKDXPIxe6OhbAOMqXIP6wUV1FWPmmIvdnKphrOdl2DCtBgVEWPh0O CivO25vQCoczYUz799OAjvd2I2wCkQvrMGpmAdJXtPcptcUA9GyEx/EGdF67aEWLmpYX 72Tzs8iBSfG2cJJCvqwh5FF4nJFfgGdUEEZFc6BEQLYG3hrT8kmJ/OXpkoSepceSo0o5 W3AprQKK3yqdjr/Vy8/UY9EaXUF7JrTBmkzUmeIjYbOME9wgJa7g6QE2UeJqjWCLJNZp gkHt5C3fi/FoQtj067vRhfqhyawElcf23v69FA5hZBW9bpF0j5SHNypAxnULkCuScrWq O1mw== 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=wZJ3xIt4HVxcRfrrlRk8Ya59f1V5w/lhWnv38F4pYvc=; b=ounXChrKxrexTaMwinC37fIIMEcJ3USX9VhRk4o2JYgClKG0/8ctK7UUXiMWjT0xvn SpA6B3g48lMXLlrNlqZULZMDz60sXh1pQBbfiX6OlUcjSSgkBerkcYmYEP5+XTEDu8ts Q9zSDl+O+fw8G7bREBkpDlsjHFcjkCmccjG1I8siS3jewpjpUpE/ayuUrWPF2O92/ERk O9zvf8CparGywEvZYeVB3OeGQuNXQ//3+wZ0kNSfsKpontCdEbLpzWb5OVhjzjJZDk8L BBlCYRkQvxjhRnxG6Bgx5Z1Fr8f50B57mJQtVQMEBJdtW3TeL/oX59cCbbHmwd8amAr7 SGVQ== X-Gm-Message-State: AOAM533HVTrUuJO6qVV37zr8piDN1UP08SM+HFtNC54Tr5d3cZPpxpCv BnhPJiK2bJ5pc/xCeNtDZdCL3V+vomJWtg== X-Google-Smtp-Source: ABdhPJwV3sjtxyuxBYvuOQs+8e7t2WCFFoUA9583ENMJlaKHPKJa8w7lPdLSKI7NQ5/XChwx20agiTq/ETcxJw== 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:eb4c:: with SMTP id c12mr4987586qvq.62.1612395684811; Wed, 03 Feb 2021 15:41:24 -0800 (PST) Date: Wed, 3 Feb 2021 15:41:14 -0800 In-Reply-To: <20210203234116.839819-1-dlatypov@google.com> Message-Id: <20210203234116.839819-2-dlatypov@google.com> Mime-Version: 1.0 References: <20210203234116.839819-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH 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 Reported-by: kernel test robot Reported-by: Dan Carpenter --- 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..25a891285816 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 Wed Feb 3 23:41:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 12065769 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, URIBL_BLOCKED,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 6E021C433DB for ; Wed, 3 Feb 2021 23:42:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2479564F59 for ; Wed, 3 Feb 2021 23:42:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233858AbhBCXmb (ORCPT ); Wed, 3 Feb 2021 18:42:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234038AbhBCXm2 (ORCPT ); Wed, 3 Feb 2021 18:42:28 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80E71C06178B for ; Wed, 3 Feb 2021 15:41:27 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id s7so1522985ybj.0 for ; Wed, 03 Feb 2021 15:41:27 -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=khcVyMAhcRUhcRKjiYExHRTX599riVykuibmOlmjuLDyGQ7heA6O9/c17by2GHvWio uZMLRuxnMQbWTBTDV5Er2N/LxNCIz+9h/hDqZhWjbiyP8rCQVNByddttghKten/C61hp 2yW/M4qHlTH0uxEAenlgxgRReF8f5qDJGycbbf183aPuOltUBtLfVYxyfVOJ34dGDzvK wCqaIXmsBBzvR1+oZbgUhlFVPoJxgYYZlHX2wBsJkbGoNZes9oIJ+1ueda0j4qR9FJky CIhpCB/sraLJsV3auOxJUxpirza0Da8yB4zWiRTbH6pAJZh4sRNPl8gkqpT/27t58EIV 8EbA== 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=Rgmnl5jg6ztVDJMzaY7l5Z2c6XgpGLrhHT8b/yTbo/b1nBOjbz2va4nh+b6VR4qVBt DJlsdjqHKvKfYfGrJh9UupUaaUYs4B+Cw5n5/RhDIUenbcwaamhhroGQZqdYdQ9zt96+ HPmG4AJFSm7nmfrMgcrL98IuTwXIkkKyfGBPYwWP+1VTIO97hQJG8q/2augVm12njGAR x29vz9in7646KAIF9gQnJCEwK7UVcOLPW8Z79vNN4hOwuPvtRhTBLbYmv2kPCo/2AckQ g/mL0HZw7z4U4lDV6MOhr98PInlFSrQ5zlrVieh4Ltu/Sx5c8N9IfGqlJK0p/529xGAl FsQw== X-Gm-Message-State: AOAM5325NRp2OALjjlCOav6fvulrK3K44D8FeDzjLHS3AXwgJdVi72Vl vXRu1dUxT55pS4FPsOKwQZ+jpzwGD5ADYg== X-Google-Smtp-Source: ABdhPJzguVHff2mKhgY6sDYZaNTFV2HUrt3mLlKkcyy7ArbznJ8pWP/ETNS6YCCPd0sbSkJyhRqjGlov7uINdQ== 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:a25:6ad6:: with SMTP id f205mr7633339ybc.41.1612395686696; Wed, 03 Feb 2021 15:41:26 -0800 (PST) Date: Wed, 3 Feb 2021 15:41:15 -0800 In-Reply-To: <20210203234116.839819-1-dlatypov@google.com> Message-Id: <20210203234116.839819-3-dlatypov@google.com> Mime-Version: 1.0 References: <20210203234116.839819-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH 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 --- 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 Wed Feb 3 23:41:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 12065773 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, URIBL_BLOCKED,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 A3925C433E9 for ; Wed, 3 Feb 2021 23:43:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 76A7E64F51 for ; Wed, 3 Feb 2021 23:43:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233362AbhBCXnC (ORCPT ); Wed, 3 Feb 2021 18:43:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234050AbhBCXmq (ORCPT ); Wed, 3 Feb 2021 18:42:46 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5657EC061793 for ; Wed, 3 Feb 2021 15:41:29 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id v7so1457801ybl.15 for ; Wed, 03 Feb 2021 15:41:29 -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=Q+TS3qW6SM6wIum0mxOGE5YURZnsMYYXVSeHKas03nAKV+6CXav4beYt/9wPKkYXU6 W7jrNlSwqIxTLQK14x0h5aIOha4ZURMIfOSQfORcGG8lxtMT1NLiKJWFCSyrtFKDBLI+ OBD/YYnJKDCm/OXCc+d2le2RtKUf126s9WMiQHkHe0oSGLf1PwxnmLbyapGx3yC7AIzA 3iguXBVmPPf1f80hNqk25+6EINJkRiJ6JwMYJpTlrWAxulcRsYIZhjlTu5nPPWpYSS7k /uHRc7Xbi186oOVVHyj/z4my/C0QM++n7iTgbkqPXswDLlj70yQViF+QgstB2XfXEsQd 327g== 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=A/1vmU/LEnUdKQtUH1JzSbtBfIJWje8soaod+uqZBKiIjq8x2zLRByCy4Psf5zdFx4 xfQdv3HcXmt2og9vRaVq2qsnLfPWsGw5N+TWI9G1cn1Yleb6pE9SKuE96lv5/RvTFcbt X9zvuVN09CVQMtEiBXjd0DHjI4btvIjzGq/p592RRoqNXJc1Wieq8eRHwmZ3jW7jLbWd cqb6sLEEBI6DOtPG2W3owEhSJ20JGfwjtpQGCK7BE0WNWpn75Z7TannVcLkhvppRrUju huLYDLvdlHYFlbO3FsiRPYZrShBlklp12yJ034y+07aaLMcGa0uS20hTpRpddkn/wtLm P4UA== X-Gm-Message-State: AOAM531RaxT2rA8sCvlt26b9FNhJ/BtKWElVJn2NCub70z8YHpxkyGtC XMbgCeR050VdgCiCw/ZGMojGFg9YWCSHNQ== X-Google-Smtp-Source: ABdhPJxW1mSlBMiPe8VFlR0C0NhwCMngW1NOxzWO+d2kKzqhcyVSzN7MogWuLZ/h8WcbhdA1GJCFqxYTIbPQ1g== 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:a05:6902:706:: with SMTP id k6mr8182212ybt.52.1612395688574; Wed, 03 Feb 2021 15:41:28 -0800 (PST) Date: Wed, 3 Feb 2021 15:41:16 -0800 In-Reply-To: <20210203234116.839819-1-dlatypov@google.com> Message-Id: <20210203234116.839819-4-dlatypov@google.com> Mime-Version: 1.0 References: <20210203234116.839819-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH 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 --- 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)