Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp3019205rdb; Mon, 4 Dec 2023 14:20:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IEHCHktmsD0+4ljprK9xI4epLXxhPqNu/1zZdYazHFqAaku4QWeNZNMMu2bhSYVp+mmKTa4 X-Received: by 2002:a05:6a20:5652:b0:18f:97c:616a with SMTP id is18-20020a056a20565200b0018f097c616amr4999748pzc.103.1701728459397; Mon, 04 Dec 2023 14:20:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701728459; cv=none; d=google.com; s=arc-20160816; b=BqdWDvZCvu+uPPE/TKoxkcKgkt5RoiOxzdF3cmbxKwWrLkT2TYjbPSL9p1PToJn8O8 0pKwe8pV/TehhjL558Ryn0xHhfUqnT175wcY7rkK3byWCa36Mka576B2xPSpnGkejrEv 3SDtpXm2EBQc2cofpi+Wtin6srjbTJg4ok/EBUBYAl8qtGmb07GqMnEcKMWprIHU73H/ /GkA8gicy2PwUtXZlY6JLTaGeg7CFa2kkezsVMpHVXX3MHjgAXMkagl2HNyKTBKKxddp FsW0itpZRPSX4l8lb5yzxUzkW77LEuZokmZ19KgkX/A68LegPD9ptv/L5TU1D2T3x2t4 xjVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=R10zjW0JVsp8M4qo1xhNAkM6zfuGofXdUJMDPp7V66o=; fh=6RrXC9a42eRtUq33jTxbdw6zXjl3feewHokQkvv5rHU=; b=nnCjVaXCZpXBsY6mhSDzOf6189GnfgwZ9qUUcy0JiYebvOZvw8unbkXACwo5pYo7vY sejHPCgCN2VxZwLxNSX22Z5Z+d13jcqKd49S/1BHYuPVC97ZwzMMDsPNDSNRBri1BVsT VqIRvK1LAKUrmzg3qyGDs4VpOlnTxiPg5kbCzCwbW3eMJq2gj+P4/21DBPttupBQFCPl a7c09TYLfw48zqqyBuH4H+gNqmdVyC3QysyJTy2vecdU8uCxZomnDOFSVSeXcPFl/rM+ NbsUXMhPIULKUAecPRdL85/3/HrvsV+wpA2lFNBQAQ3csE0RwRYzzUpkWYGasVkhwVBl IuLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=BaRuDXqD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id b11-20020a056a00114b00b006cbf67abff9si8593799pfm.269.2023.12.04.14.20.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 14:20:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=BaRuDXqD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 7D4A4807F49F; Mon, 4 Dec 2023 14:20:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234835AbjLDWT7 (ORCPT + 99 others); Mon, 4 Dec 2023 17:19:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234780AbjLDWTq (ORCPT ); Mon, 4 Dec 2023 17:19: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 77E2118A for ; Mon, 4 Dec 2023 14:19:45 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-db5508d1beeso2655053276.2 for ; Mon, 04 Dec 2023 14:19:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701728384; x=1702333184; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=R10zjW0JVsp8M4qo1xhNAkM6zfuGofXdUJMDPp7V66o=; b=BaRuDXqDWbREMkH5y2FpCN+H6VV89rt+pQUcWxSLAIJzD6Qu0ygl3Ht931FdVuUOUp GNp2byCZ94V6JaUZg42oMXxwrMiLXw+FdhCzfV2KZfZtq6l2LzF6uWpUpg/pIxnA/wFu rh8TzbvJuaYhvwMcKRgAfdXAt11d6M+k38eL08cL2BOALyOFDUcqEMpMhFvbLYQbRLJh ujBi8sHUosLL8zKVzBByyF1JGkIz0s61iH8m67gx0P0jcKHHnHHzAzj93GhjVnabXzvV kaxbkF4o//s8FhUi8zTn3YLqOAd+hPG/QWjCS6AB+Fh0iXjQBOJN+X+RErrHYr41UoZD WHrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701728384; x=1702333184; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=R10zjW0JVsp8M4qo1xhNAkM6zfuGofXdUJMDPp7V66o=; b=h9iEvG8Kg2GglMWWk9HCQKazStvr+vW1Lbsh0XmF6bx87QUdfbSfpVhLQ7tBVkwhko EOG22Dplb3xozNJeWYhwBxAfJ+UzWjt/vky0466G9ZnlIeHMOklpgVizMFgfpy2BGqhw btyRRbp5FZKo98N330UTMvsaBr3algB8pHp3QY3OfRKdSTp2UyECMS6zELmQVmYSHh4H b28GbPU31qj37N0y/Yq1bTLm+cgXHMPKD2oB5PHF/+TjRuKMeMQpRc7PEJ5aaxtTDouH mna7sR2HJuAy2ljyi42bkuxm5RVFqyzfIzH7WnqHZ7MQfr6rJJLn+ri+wWllFVW2wAX1 CmPw== X-Gm-Message-State: AOJu0YwMIXpwwkUj6AIeALq4U8lpsKtS7byiDYD5aTSKRnXpJiLF5nrS s4r+jSrWcjljlfjsptXamXI+W1iPKg== X-Received: from rmoar-specialist.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:45d3]) (user=rmoar job=sendgmr) by 2002:a25:3106:0:b0:da3:723b:b2a4 with SMTP id x6-20020a253106000000b00da3723bb2a4mr867924ybx.7.1701728384660; Mon, 04 Dec 2023 14:19:44 -0800 (PST) Date: Mon, 4 Dec 2023 22:19:30 +0000 In-Reply-To: <20231204221932.1465004-1-rmoar@google.com> Mime-Version: 1.0 References: <20231204221932.1465004-1-rmoar@google.com> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog Message-ID: <20231204221932.1465004-5-rmoar@google.com> Subject: [PATCH v3 5/6] kunit: add ability to run tests after boot using debugfs From: Rae Moar To: shuah@kernel.org, davidgow@google.com, dlatypov@google.com, brendan.higgins@linux.dev, sadiyakazi@google.com Cc: keescook@chromium.org, arnd@arndb.de, linux-kselftest@vger.kernel.org, linux-arch@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, Rae Moar Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 04 Dec 2023 14:20:20 -0800 (PST) Add functionality to run built-in tests after boot by writing to a debugfs file. Add a new debugfs file labeled "run" for each test suite to use for this purpose. As an example, write to the file using the following: echo "any string" > /sys/kernel/debugfs/kunit//run This will trigger the test suite to run and will print results to the kernel log. To guard against running tests concurrently with this feature, add a mutex lock around running kunit. This supports the current practice of not allowing tests to be run concurrently on the same kernel. This new functionality could be used to design a parameter injection feature in the future. Signed-off-by: Rae Moar --- Changes since v2: - Move resetting the log to test.c - Add is_init attribute and patches to change linker sections to avoid re-running tests that use init data and functions lib/kunit/debugfs.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ lib/kunit/test.c | 10 +++++++ 2 files changed, 78 insertions(+) diff --git a/lib/kunit/debugfs.c b/lib/kunit/debugfs.c index 270d185737e6..2e0a92a0c461 100644 --- a/lib/kunit/debugfs.c +++ b/lib/kunit/debugfs.c @@ -8,12 +8,14 @@ #include #include +#include #include "string-stream.h" #include "debugfs.h" #define KUNIT_DEBUGFS_ROOT "kunit" #define KUNIT_DEBUGFS_RESULTS "results" +#define KUNIT_DEBUGFS_RUN "run" /* * Create a debugfs representation of test suites: @@ -21,6 +23,8 @@ * Path Semantics * /sys/kernel/debug/kunit//results Show results of last run for * testsuite + * /sys/kernel/debug/kunit//run Write to this file to trigger + * testsuite to run * */ @@ -99,6 +103,51 @@ static int debugfs_results_open(struct inode *inode, struct file *file) return single_open(file, debugfs_print_results, suite); } +/* + * Print a usage message to the debugfs "run" file + * (/sys/kernel/debug/kunit//run) if opened. + */ +static int debugfs_print_run(struct seq_file *seq, void *v) +{ + struct kunit_suite *suite = (struct kunit_suite *)seq->private; + + seq_puts(seq, "Write to this file to trigger the test suite to run.\n"); + seq_printf(seq, "usage: echo \"any string\" > /sys/kernel/debugfs/kunit/%s/run\n", + suite->name); + return 0; +} + +/* + * The debugfs "run" file (/sys/kernel/debug/kunit//run) + * contains no information. Write to the file to trigger the test suite + * to run. + */ +static int debugfs_run_open(struct inode *inode, struct file *file) +{ + struct kunit_suite *suite; + + suite = (struct kunit_suite *)inode->i_private; + + return single_open(file, debugfs_print_run, suite); +} + +/* + * Trigger a test suite to run by writing to the suite's "run" debugfs + * file found at: /sys/kernel/debug/kunit//run + * + * Note: what is written to this file will not be saved. + */ +static ssize_t debugfs_run(struct file *file, + const char __user *buf, size_t count, loff_t *ppos) +{ + struct inode *f_inode = file->f_inode; + struct kunit_suite *suite = (struct kunit_suite *) f_inode->i_private; + + __kunit_test_suites_init(&suite, 1); + + return count; +} + static const struct file_operations debugfs_results_fops = { .open = debugfs_results_open, .read = seq_read, @@ -106,10 +155,22 @@ static const struct file_operations debugfs_results_fops = { .release = debugfs_release, }; +static const struct file_operations debugfs_run_fops = { + .open = debugfs_run_open, + .read = seq_read, + .write = debugfs_run, + .llseek = seq_lseek, + .release = debugfs_release, +}; + void kunit_debugfs_create_suite(struct kunit_suite *suite) { struct kunit_case *test_case; + /* If suite log already allocated, do not create new debugfs files. */ + if (suite->log) + return; + /* Allocate logs before creating debugfs representation. */ suite->log = alloc_string_stream(GFP_KERNEL); string_stream_set_append_newlines(suite->log, true); @@ -124,6 +185,13 @@ void kunit_debugfs_create_suite(struct kunit_suite *suite) debugfs_create_file(KUNIT_DEBUGFS_RESULTS, S_IFREG | 0444, suite->debugfs, suite, &debugfs_results_fops); + + /* Do not create file to re-run test if test runs on init */ + if (!suite->attr.is_init) { + debugfs_create_file(KUNIT_DEBUGFS_RUN, S_IFREG | 0644, + suite->debugfs, + suite, &debugfs_run_fops); + } } void kunit_debugfs_destroy_suite(struct kunit_suite *suite) diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 8bae6e2bc6a0..58e46bb3b4c4 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -22,6 +23,8 @@ #include "string-stream.h" #include "try-catch-impl.h" +static DEFINE_MUTEX(kunit_run_lock); + /* * Hook to fail the current test and print an error message to the log. */ @@ -654,6 +657,7 @@ static void kunit_init_suite(struct kunit_suite *suite) kunit_debugfs_create_suite(suite); suite->status_comment[0] = '\0'; suite->suite_init_err = 0; + string_stream_clear(suite->log); } bool kunit_enabled(void) @@ -670,6 +674,11 @@ int __kunit_test_suites_init(struct kunit_suite * const * const suites, int num_ return 0; } + /* Use mutex lock to guard against running tests concurrently. */ + if (mutex_lock_interruptible(&kunit_run_lock)) { + pr_err("kunit: test interrupted\n"); + return -EINTR; + } static_branch_inc(&kunit_running); for (i = 0; i < num_suites; i++) { @@ -678,6 +687,7 @@ int __kunit_test_suites_init(struct kunit_suite * const * const suites, int num_ } static_branch_dec(&kunit_running); + mutex_unlock(&kunit_run_lock); return 0; } EXPORT_SYMBOL_GPL(__kunit_test_suites_init); -- 2.43.0.rc2.451.g8631bc7472-goog