From: David Gow <davidgow@google.com>
To: Brendan Higgins <brendanhiggins@google.com>,
Luis Chamberlain <mcgrof@kernel.org>,
Jeremy Kerr <jk@codeconstruct.com.au>,
Daniel Latypov <dlatypov@google.com>,
Shuah Khan <skhan@linuxfoundation.org>,
Andrew Jeffery <andrew@aj.id.au>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andra Paraschiv <andraprs@amazon.com>,
Longpeng <longpeng2@huawei.com>
Cc: Paraschiv@google.com,
"Christophe Leroy" <christophe.leroy@csgroup.eu>,
"David Gow" <davidgow@google.com>,
kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org, "Maíra Canal" <maira.canal@usp.br>,
linux-mmc@vger.kernel.org, linux-aspeed@lists.ozlabs.org,
openbmc@lists.ozlabs.org, linux-usb@vger.kernel.org,
linux-modules@vger.kernel.org,
"Matt Johnston" <matt@codeconstruct.com.au>
Subject: [PATCH v2 4/5] nitro_enclaves: test: Use kunit_test_suite() macro
Date: Tue, 21 Jun 2022 16:53:44 +0800 [thread overview]
Message-ID: <20220621085345.603820-5-davidgow@google.com> (raw)
In-Reply-To: <20220621085345.603820-1-davidgow@google.com>
The kunit_test_suite() macro previously conflicted with module_init,
making it unsuitable for use in the nitro_enclaves test. Now that it's
fixed, we can use it instead of a custom call into internal KUnit
functions to run the test.
As a side-effect, this means that the test results are properly included
with other suites when built-in. To celebrate, enable the test by
default when KUNIT_ALL_TESTS is set (and NITRO_ENCLAVES enabled).
The nitro_enclave tests can now be run via kunit_tool with:
./tools/testing/kunit/kunit.py run --arch=x86_64 \
--kconfig_add CONFIG_PCI=y --kconfig_add CONFIG_SMP=y \
--kconfig_add CONFIG_HOTPLUG_CPU=y \
--kconfig_add CONFIG_VIRT_DRIVERS=y \
--kconfig_add CONFIG_NITRO_ENCLAVES=y \
'ne_misc_dev_test'
(This is a pretty long command, so it may be worth adding a .kunitconfig
file at some point, instead.)
Acked-by: Paraschiv, Andra-Irina <andraprs@amazon.com>
Signed-off-by: David Gow <davidgow@google.com>
---
Changes since v1:
https://lore.kernel.org/linux-kselftest/20220618090310.1174932-5-davidgow@google.com/
- Move the mistakenly-added thunderbolt Kconfig to the previous patch
(Thanks Andra)
- Add Andra's Acked-by tag.
---
drivers/virt/nitro_enclaves/Kconfig | 5 ++--
drivers/virt/nitro_enclaves/ne_misc_dev.c | 27 -------------------
.../virt/nitro_enclaves/ne_misc_dev_test.c | 5 +---
3 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/drivers/virt/nitro_enclaves/Kconfig b/drivers/virt/nitro_enclaves/Kconfig
index 2d3d98158121..ce91add81401 100644
--- a/drivers/virt/nitro_enclaves/Kconfig
+++ b/drivers/virt/nitro_enclaves/Kconfig
@@ -16,8 +16,9 @@ config NITRO_ENCLAVES
The module will be called nitro_enclaves.
config NITRO_ENCLAVES_MISC_DEV_TEST
- bool "Tests for the misc device functionality of the Nitro Enclaves"
- depends on NITRO_ENCLAVES && KUNIT=y
+ bool "Tests for the misc device functionality of the Nitro Enclaves" if !KUNIT_ALL_TESTS
+ depends on NITRO_ENCLAVES && KUNIT
+ default KUNIT_ALL_TESTS
help
Enable KUnit tests for the misc device functionality of the Nitro
Enclaves. Select this option only if you will boot the kernel for
diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
index 20c881b6a4b6..241b94f62e56 100644
--- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
@@ -1759,35 +1759,10 @@ static long ne_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
#if defined(CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST)
#include "ne_misc_dev_test.c"
-
-static inline int ne_misc_dev_test_init(void)
-{
- return __kunit_test_suites_init(ne_misc_dev_test_suites);
-}
-
-static inline void ne_misc_dev_test_exit(void)
-{
- __kunit_test_suites_exit(ne_misc_dev_test_suites);
-}
-#else
-static inline int ne_misc_dev_test_init(void)
-{
- return 0;
-}
-
-static inline void ne_misc_dev_test_exit(void)
-{
-}
#endif
static int __init ne_init(void)
{
- int rc = 0;
-
- rc = ne_misc_dev_test_init();
- if (rc < 0)
- return rc;
-
mutex_init(&ne_cpu_pool.mutex);
return pci_register_driver(&ne_pci_driver);
@@ -1798,8 +1773,6 @@ static void __exit ne_exit(void)
pci_unregister_driver(&ne_pci_driver);
ne_teardown_cpu_pool();
-
- ne_misc_dev_test_exit();
}
module_init(ne_init);
diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev_test.c b/drivers/virt/nitro_enclaves/ne_misc_dev_test.c
index 265797bed0ea..74df43b925be 100644
--- a/drivers/virt/nitro_enclaves/ne_misc_dev_test.c
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev_test.c
@@ -151,7 +151,4 @@ static struct kunit_suite ne_misc_dev_test_suite = {
.test_cases = ne_misc_dev_test_cases,
};
-static struct kunit_suite *ne_misc_dev_test_suites[] = {
- &ne_misc_dev_test_suite,
- NULL
-};
+kunit_test_suite(ne_misc_dev_test_suite);
--
2.37.0.rc0.104.g0611611a94-goog
next prev parent reply other threads:[~2022-06-21 8:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 8:53 [PATCH v2 0/5] Rework KUnit test execution in modules David Gow
2022-06-21 8:53 ` [PATCH v2 1/5] kunit: unify module and builtin suite definitions David Gow
2022-06-21 8:53 ` [PATCH v2 2/5] kunit: flatten kunit_suite*** to kunit_suite** in .kunit_test_suites David Gow
2022-06-21 20:29 ` Daniel Latypov
2022-06-21 8:53 ` [PATCH v2 3/5] thunderbolt: test: Use kunit_test_suite() macro David Gow
2022-06-21 20:23 ` Daniel Latypov
2022-06-22 7:16 ` David Gow
2022-06-21 8:53 ` David Gow [this message]
2022-06-21 15:57 ` [PATCH v2 4/5] nitro_enclaves: " Paraschiv, Andra-Irina
2022-06-21 8:53 ` [PATCH v2 5/5] mmc: sdhci-of-aspeed: " David Gow
2022-06-21 22:19 ` Daniel Latypov
2022-06-23 12:23 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220621085345.603820-5-davidgow@google.com \
--to=davidgow@google.com \
--cc=Paraschiv@google.com \
--cc=andraprs@amazon.com \
--cc=andrew@aj.id.au \
--cc=brendanhiggins@google.com \
--cc=christophe.leroy@csgroup.eu \
--cc=dlatypov@google.com \
--cc=jk@codeconstruct.com.au \
--cc=kunit-dev@googlegroups.com \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=longpeng2@huawei.com \
--cc=maira.canal@usp.br \
--cc=matt@codeconstruct.com.au \
--cc=mcgrof@kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=openbmc@lists.ozlabs.org \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).