From patchwork Tue Jan 28 07:20:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Higgins X-Patchwork-Id: 11353719 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D237139A for ; Tue, 28 Jan 2020 07:20:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A64B24687 for ; Tue, 28 Jan 2020 07:20:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Z9Rb2a9O" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726296AbgA1HUb (ORCPT ); Tue, 28 Jan 2020 02:20:31 -0500 Received: from mail-pf1-f201.google.com ([209.85.210.201]:35953 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726290AbgA1HUb (ORCPT ); Tue, 28 Jan 2020 02:20:31 -0500 Received: by mail-pf1-f201.google.com with SMTP id 6so8082354pfv.3 for ; Mon, 27 Jan 2020 23:20:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ef0MAJ1wuFu9y6HizHmc+/vFBSY+7F2zQHC6+1+Hv1k=; b=Z9Rb2a9OQQHmevk8nrBhA6nMqohaXS+cG6wGimkIIX5tHmd4Pla36/oP2X+CBhBu+I MZIwM4ZWPLsGyRKF+THFYAWYcrFw4AOPprobTmns1Y4xUpQZDFGHWhylzEMDgvhPIWTw s0rhejVCZb6PwJGu/hcxbA6wWyRhioPtQqiA6KNwkqRiDwHD9IWqpxxO3p77HSNL6oSz PZ5RN2GLx7NCetNZWXyjyLHYApiADsuou7UdhE0NpbtXfdxNLo4Lf1wa8CGK6BYNTdbF n1fGAt/9obdNBLBZ/c8m0DnIeUsAhvgCBZr/Obx1G05HyHiH1ApxH0jtUzg/SLSE/jav PYsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ef0MAJ1wuFu9y6HizHmc+/vFBSY+7F2zQHC6+1+Hv1k=; b=ibMqQpF/LP+2uywGI5qQc1ql+EdNXdFBRqclXbV9qFXdu/n4X6eVa24ygNzbBS8cUi kulG6ZDoHLtRby1eVQsHT5S64B8l/PQKM0o1DeI0Cjx5FiJAbe2MiwZSVbt7puG64mtg sx2ogD/gidUucXIJCDg/M/r2jOak8yy2+UorZApGw0j0OXfqF4FUgcfjWuBUli7h73B+ wQOw5OjC+QnG0k8XtvnY+tlJoZiYpGyPjpIMc67d3q5TBgclbP2NLwiF20xioDjfMQnO dGEVroCA0MVaiFeEzBS1JUSg3Q/4JBk4dkdJAo4CD1JB4jfFUr2CItW6i7CqUHanJE3O qlOA== X-Gm-Message-State: APjAAAUIpp+JuiZgZilWRJOHggWBB+G3q4udEFU73xit41QqA/pAl3gb ISSJXVj9BrdJNTfok4MQkRNrrFgSS78nx4Ei1QrzEA== X-Google-Smtp-Source: APXvYqy+iukg1YFtkL0zEsGFAFKLSUcupLf+r9TZ5GGj6CTFqS5Dypdm73H+Nj4kyXHdRRRLEEtoMmp3GQtENLhfPkCjiQ== X-Received: by 2002:a63:4d4c:: with SMTP id n12mr24215375pgl.212.1580196030652; Mon, 27 Jan 2020 23:20:30 -0800 (PST) Date: Mon, 27 Jan 2020 23:20:01 -0800 In-Reply-To: <20200128072002.79250-1-brendanhiggins@google.com> Message-Id: <20200128072002.79250-7-brendanhiggins@google.com> Mime-Version: 1.0 References: <20200128072002.79250-1-brendanhiggins@google.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog Subject: [PATCH v1 6/7] kunit: Add 'kunit_shutdown' option From: Brendan Higgins To: jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, arnd@arndb.de, keescook@chromium.org, skhan@linuxfoundation.org, alan.maguire@oracle.com, yzaikin@google.com, davidgow@google.com, akpm@linux-foundation.org, rppt@linux.ibm.com, frowand.list@gmail.com Cc: gregkh@linuxfoundation.org, sboyd@kernel.org, logang@deltatee.com, mcgrof@kernel.org, knut.omang@oracle.com, linux-um@lists.infradead.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Brendan Higgins Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: David Gow Add a new kernel command-line option, 'kunit_shutdown', which allows the user to specify that the kernel poweroff, halt, or reboot after completing all KUnit tests; this is very handy for running KUnit tests on UML or a VM so that the UML/VM process exits cleanly immediately after running all tests without needing a special initramfs. Signed-off-by: David Gow Signed-off-by: Brendan Higgins Reviewed-by: Stephen Boyd --- lib/kunit/executor.c | 20 ++++++++++++++++++++ tools/testing/kunit/kunit_kernel.py | 2 +- tools/testing/kunit/kunit_parser.py | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c index 7fd16feff157e..d3ec1265a72fd 100644 --- a/lib/kunit/executor.c +++ b/lib/kunit/executor.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include /* * These symbols point to the .kunit_test_suites section and are defined in @@ -11,6 +12,23 @@ extern struct kunit_suite * const * const __kunit_suites_end[]; #if IS_BUILTIN(CONFIG_KUNIT) +static char *kunit_shutdown; +core_param(kunit_shutdown, kunit_shutdown, charp, 0644); + +static void kunit_handle_shutdown(void) +{ + if (!kunit_shutdown) + return; + + if (!strcmp(kunit_shutdown, "poweroff")) { + kernel_power_off(); + } else if (!strcmp(kunit_shutdown, "halt")) { + kernel_halt(); + } else if (!strcmp(kunit_shutdown, "reboot")) { + kernel_restart(NULL); + } +} + static void kunit_print_tap_header(void) { struct kunit_suite * const * const *suites, * const *subsuite; @@ -42,6 +60,8 @@ int kunit_run_all_tests(void) } } + kunit_handle_shutdown(); + if (has_test_failed) return -EFAULT; diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py index cc5d844ecca13..43314aa537d30 100644 --- a/tools/testing/kunit/kunit_kernel.py +++ b/tools/testing/kunit/kunit_kernel.py @@ -141,7 +141,7 @@ class LinuxSourceTree(object): return True def run_kernel(self, args=[], timeout=None, build_dir=''): - args.extend(['mem=256M']) + args.extend(['mem=256M', 'kunit_shutdown=halt']) process = self._ops.linux_bin(args, timeout, build_dir) with open(os.path.join(build_dir, 'test.log'), 'w') as f: for line in process.stdout: diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py index 78b3bdd03b1e4..633811dd9bce8 100644 --- a/tools/testing/kunit/kunit_parser.py +++ b/tools/testing/kunit/kunit_parser.py @@ -48,7 +48,7 @@ class TestStatus(Enum): FAILURE_TO_PARSE_TESTS = auto() kunit_start_re = re.compile(r'^TAP version [0-9]+$') -kunit_end_re = re.compile('List of all partitions:') +kunit_end_re = re.compile(r'reboot: System halted') def isolate_kunit_output(kernel_output): started = False