From patchwork Thu Feb 4 22:54:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 377278 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 ADC0AC433DB for ; Thu, 4 Feb 2021 22:55:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73AE864FAD for ; Thu, 4 Feb 2021 22:55:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229500AbhBDWzi (ORCPT ); Thu, 4 Feb 2021 17:55:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229850AbhBDWzh (ORCPT ); Thu, 4 Feb 2021 17:55:37 -0500 Received: from mail-qv1-xf49.google.com (mail-qv1-xf49.google.com [IPv6:2607:f8b0:4864:20::f49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C943C06178A for ; Thu, 4 Feb 2021 14:54:57 -0800 (PST) Received: by mail-qv1-xf49.google.com with SMTP id j13so3446320qvy.19 for ; Thu, 04 Feb 2021 14:54:57 -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=8M/syFwNKdzYEjkQkOYzNkXR9VPw1LAYsj1sJNWjiBk=; b=lV4qokZpvz9TBE6gXOr2d5HkvXq7zGHt4OIXu6Ce4kM0s8A9g8yBbQ8ElirRcUxRgl dP6GWRVMbDFNGbMM0irGa8mJvWqwhbgj30dkDJIGUYZp3c4ci+bDwzpePFC1rmanj4I0 S3Nv0VOlruxlNlPXN/n6nEmneE6nna28QDkqYv5QYb/zdd/8crkW4r7rvEdR6sAFzPbY ZbEBKffeGdCwf29Q5zz9+we+4cvjNR3NOCl+gv6Ht5twvWTH0KykM04HLrstHOPAxN+I FAgeoJ8cZuyIBFx2QQEAPHx+du9ycRiq4j6Fw2spRW/1aNpWaH3z4OT7OvshwzRXWiHX kyCg== 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=8M/syFwNKdzYEjkQkOYzNkXR9VPw1LAYsj1sJNWjiBk=; b=tO57Sy88X/QGP7HC/VG9WXKmkQFoHrcIEfCsJ+J2tuAJ9FSzbndyzlxW7ythVJql86 EBuoAd+iJBLzFT6LeKrLzNSA0dPhhcA/N9qJEWkgkjQOYIqrqn8myeAMpAYZHIysvyRo nUzZ/yAy36DUR6SPz80rijPj3TKSsGhD6gzT7VmUawfqHIzNZd8tXL5ZPeZovZiqgQbn 2wsvPF3MY9iP1RuHOsimOBDQ0J4QlLvziyZd63AiN1jYPjZzRdOSoml+6Q5xeAHpj+cg ha32GaJGRh3VS7QMTQK24o7dkboeDcZfA4qJuW9fzZGfpKqkRutbFP9Tphttso69g5pp EQHQ== X-Gm-Message-State: AOAM531aMgRouQggv+ZJsnm1KQ49V2GxqspNSdL4BWRIJU4JKGgz6OiG tD4DZk/SIhUr0GjJGOePG9aT5rCiOjQ4IA== X-Google-Smtp-Source: ABdhPJxB7zDMtGOhWk5MI+yovqPNBcal/Jo12FfODeGP8MLAllpAWvaVYTLbiu6xLUUrISe+jO4Vg9Oui3yB0Q== 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:b9a2:: with SMTP id v34mr1791579qvf.17.1612479296534; Thu, 04 Feb 2021 14:54:56 -0800 (PST) Date: Thu, 4 Feb 2021 14:54:46 -0800 In-Reply-To: <20210204225448.1393741-1-dlatypov@google.com> Message-Id: <20210204225448.1393741-2-dlatypov@google.com> Mime-Version: 1.0 References: <20210204225448.1393741-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.478.g8a0d178c01-goog Subject: [PATCH v3 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 | 93 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 85 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..15832ed44668 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,81 @@ 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); +MODULE_PARM_DESC(filter_glob, + "Filter which KUnit test suites run at boot-time, e.g. list*"); + +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 +99,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 22:54:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 377277 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=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 D609EC433E9 for ; Thu, 4 Feb 2021 22:55:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 95A9264FAC for ; Thu, 4 Feb 2021 22:55:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229969AbhBDWzm (ORCPT ); Thu, 4 Feb 2021 17:55:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229983AbhBDWzj (ORCPT ); Thu, 4 Feb 2021 17:55:39 -0500 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F10B7C06178C for ; Thu, 4 Feb 2021 14:54:58 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id nm1so2902222pjb.1 for ; Thu, 04 Feb 2021 14:54: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=M0j63Y+dGrapku6v2TeatocmD7eQzHpeOBCsoHcCmr8=; b=ZTYXSsgggGJz5jGj8p6Ols2kXiqqWJ7Hf1B/onFHGGkZxzizQdPOQQv7QnZXz7i57R f59xM0Pb19jW1IkNItgm1FtQ1HzlPWrizu/VriIAAWZ+R4UW/MqRMKGmAGByCJKdCcMW YWY9i+HbzqrS1Mw3QwvE6eRFZHJqrMpiZJmNKtVbQDdbaI2ceY7dE6bSe5R9nO0Y/W90 L6D2d/KnrPj/2Qj1NOmWZzUulbybc4a06iqPmnsvmpC7SMW21WE4UAePOGjjcdGknwsB T664uNXsY8Qje7+o/NfqkwBfK7cHq8heh2tep/KhoKV2aAjryzhG/GZZsRjeipovKgnq lYzw== 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=M0j63Y+dGrapku6v2TeatocmD7eQzHpeOBCsoHcCmr8=; b=ZEIbLrZuRj6J7m4O+hGjE1yWgLpacKqKLJPLX84OSFADHPDI1e7Ep4d0V7EZzVv+py 6LNbvI84J4wlcgebs4b620iybOa3SGU34DuQC7KBwRSbCMfC2CMfB2psLgdNZTNCvjgp tUFLB0L6/lnUUO3HLFak+x77qJHnYsz/gBREEPlWRWyarjzeTQ4bXH8mbUtMahYQC84Z uhdStQ/9dbOR1o1LikH4C+ICnvNl5nfIC/m68lf1ZO4r0S7Q/4V7Rs4q40W4q5ECRUGj 2j0v644SRsnFYJFQnEAyife0lPuFZlMIlj7XPs49+KsMlVe1WPMuzns5wp1Xyg806hIC OAmw== X-Gm-Message-State: AOAM531QeI1/w2Yg+f8cuATncoaDdsM/KlgErGbR8obLDtckfcuQgN3q JUbRBfBeBHeMhHcG0u+WC+YXh0+J024FiA== X-Google-Smtp-Source: ABdhPJzGDJJb99I4uPs0OtacvEjb+GqAyjJeAQCifyLhXhsh82fYNZkotlFKA2eeDEt/b2U2ya+6tJl85WcLUA== 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:a17:90a:aa8a:: with SMTP id l10mr1274505pjq.86.1612479298500; Thu, 04 Feb 2021 14:54:58 -0800 (PST) Date: Thu, 4 Feb 2021 14:54:47 -0800 In-Reply-To: <20210204225448.1393741-1-dlatypov@google.com> Message-Id: <20210204225448.1393741-3-dlatypov@google.com> Mime-Version: 1.0 References: <20210204225448.1393741-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.478.g8a0d178c01-goog Subject: [PATCH v3 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 22:54:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 376574 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 18808C433E0 for ; Thu, 4 Feb 2021 22:56:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD5A364FAC for ; Thu, 4 Feb 2021 22:56:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229690AbhBDW4V (ORCPT ); Thu, 4 Feb 2021 17:56:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229841AbhBDW4R (ORCPT ); Thu, 4 Feb 2021 17:56:17 -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 4FDD6C061797 for ; Thu, 4 Feb 2021 14:55:01 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id q191so4838620ybg.4 for ; Thu, 04 Feb 2021 14:55:01 -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=Wkqh1wBZi1KMSWP9n4B3+7R4NMp7xQIbcrZ87gljot4=; b=iYbKyTjxF+2utdWW8EqdT/kRukPx6bdkOrTGffBQ3EQrvhGlQhMUHl9GQzbCEjBDRk WyU4ioaBh/EghQ4qsB08wQUS+sh9s9/zbXYZUP6fnKZd9xakktG/+CYlj12MKFPFaJC+ RPm4eTDjCGHR9Eyt6MO6LqsklaY2Wtfft1AJ6oFyvC3cE/eCjZQFNRwwkHXe8Oil1Bk9 UgfjWtqPaiBO7r4jVqQb77XUeK5LvbHuUEObXh43X63HHx73M6IwvkvgNll9ofNG/huK e0PGax3yohgTMXAN7PNdMPkK9359NPAuCHEPOhMt2wENbMkcX49Ce3Lbc1kRA4TTv3S3 ZfWQ== 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=Wkqh1wBZi1KMSWP9n4B3+7R4NMp7xQIbcrZ87gljot4=; b=NBIP9hU/bnsC4O7TGMDNzUuRDjrjJvOcZ0vuVdK3h0lJ4LJL0P8knCNOX8hklkd33+ e+x92vqHXs+74QNvLcnINU3Oa0stzH5IreIizI8+AePHLuU/0Fvvv31/4epaGP4qDIY3 wxwtPyov/AxUlWYNjzX3fY5W+ANhsqDW3q0STw45d2FDGhcLI2h3aezgbzMvvCIB2Iyy j9KxwsRUn+LFmBppRTia0NC6xG+5YoFWI8SVDuOXUxmfswbUz7dO4l0e5dCbm0s3ox2I ileRXtNeTYC2UF4LYTksztEsmHxTfNm9njqHLXZa3OKm7Hcwpv4Iopsduu7Y8Ks1Q6o7 j4eg== X-Gm-Message-State: AOAM532XSxaSkQJx9/nmdladFriTCWPz5BFSPK0zvoz/9AphYd8ZIzl4 UZdldwW7RrIEiMC0zKU4OSQn03FoUewRFQ== X-Google-Smtp-Source: ABdhPJwoINV61XBqm1+2y6JBPKINVE5ci4YcuQgf9RpZwrWA4UcY6q/lgnsC0tACbu0OUhf3hAuSoOwt1qLA3w== 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:d441:: with SMTP id m62mr1482057ybf.109.1612479300511; Thu, 04 Feb 2021 14:55:00 -0800 (PST) Date: Thu, 4 Feb 2021 14:54:48 -0800 In-Reply-To: <20210204225448.1393741-1-dlatypov@google.com> Message-Id: <20210204225448.1393741-4-dlatypov@google.com> Mime-Version: 1.0 References: <20210204225448.1393741-1-dlatypov@google.com> X-Mailer: git-send-email 2.30.0.478.g8a0d178c01-goog Subject: [PATCH v3 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)